git: bc975bf259c9 - main - sysutils/libdnf: Update 0.60.0 -> 0.60.1

[Yuri Victorovich]

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bc975bf259c9a6e1d60cdf3f07afaae447d6e16f

commit bc975bf259c9a6e1d60cdf3f07afaae447d6e16f
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-04-14 20:12:54 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-04-14 20:15:03 +0000

    sysutils/libdnf: Update 0.60.0 -> 0.60.1
    
    Reported by:    portscout
---
 sysutils/libdnf/Makefile                        |  2 +-
 sysutils/libdnf/distinfo                        |  6 +++---
 sysutils/libdnf/files/patch-libdnf_config.h     | 25 +++++++------------------
 sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp | 13 ++++++-------
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile
index 8db380e77a18..6cbf92d03709 100644
--- a/sysutils/libdnf/Makefile
+++ b/sysutils/libdnf/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libdnf
-DISTVERSION=	0.60.0
+DISTVERSION=	0.60.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri at FreeBSD.org
diff --git a/sysutils/libdnf/distinfo b/sysutils/libdnf/distinfo
index 710835c40ea1..aa611345f0b6 100644
--- a/sysutils/libdnf/distinfo
+++ b/sysutils/libdnf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615148130
-SHA256 (rpm-software-management-libdnf-0.60.0_GH0.tar.gz) = df60c15fdbea5b8594334cfe270b3eb84fc0d3cab4744f4dfc7dfeb47a78bea6
-SIZE (rpm-software-management-libdnf-0.60.0_GH0.tar.gz) = 1065223
+TIMESTAMP = 1618430096
+SHA256 (rpm-software-management-libdnf-0.60.1_GH0.tar.gz) = a3c7253575c58b88146539bce633c3be63c880d5bed54a095f8aa302e9f2c394
+SIZE (rpm-software-management-libdnf-0.60.1_GH0.tar.gz) = 1066173
diff --git a/sysutils/libdnf/files/patch-libdnf_config.h b/sysutils/libdnf/files/patch-libdnf_config.h
index e470f65e4957..91b94fe32fad 100644
--- a/sysutils/libdnf/files/patch-libdnf_config.h
+++ b/sysutils/libdnf/files/patch-libdnf_config.h
@@ -1,22 +1,11 @@
---- libdnf/config.h.orig	2021-03-07 20:35:58 UTC
+--- libdnf/config.h.orig	2021-04-12 15:10:19 UTC
 +++ libdnf/config.h
-@@ -18,7 +18,18 @@
+@@ -18,7 +18,7 @@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
--#include <bits/wordsize.h>
-+//#include <bits/wordsize.h>
-+
-+#include <stdint.h>
-+
-+#ifndef __WORDSIZE
-+#  if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX)
-+#    define __WORDSIZE 64
-+#  else
-+#    define __WORDSIZE 32
-+#  endif
-+#endif
-+
- 
- #if __WORDSIZE == 32
- #include "config-32.h"
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <stdint.h>
+ #else
+ #include <bits/wordsize.h>
diff --git a/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp b/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp
index 081a4fdb9e8a..321c186a3265 100644
--- a/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp
+++ b/sysutils/libdnf/files/patch-libdnf_hy-iutil.cpp
@@ -1,12 +1,11 @@
---- libdnf/hy-iutil.cpp.orig	2020-09-20 22:51:04 UTC
+--- libdnf/hy-iutil.cpp.orig	2021-04-12 15:10:19 UTC
 +++ libdnf/hy-iutil.cpp
-@@ -22,7 +22,9 @@
+@@ -22,7 +22,7 @@
  #include <errno.h>
  #include <dirent.h>
  #include <fcntl.h>
-+#if !defined(__FreeBSD__)
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <limits.h>
+ #else
  #include <linux/limits.h>
-+#endif
- #include <pwd.h>
- #include <unistd.h>
- #include <stdio.h>