6 files changed, 34 insertions, 11 deletions

diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile
index b61362be89d4..d18c81d98aaa 100644
--- a/sysutils/libdnf/Makefile
+++ b/sysutils/libdnf/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libdnf
-DISTVERSION=	0.55.2
+DISTVERSION=	0.60.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/libdnf/distinfo b/sysutils/libdnf/distinfo
index dfffa375ada1..710835c40ea1 100644
--- a/sysutils/libdnf/distinfo
+++ b/sysutils/libdnf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607314320
-SHA256 (rpm-software-management-libdnf-0.55.2_GH0.tar.gz) = 67e2113e5d27501163f96dd15e2fb76a4fcff9d861a5618e3a4d322e64cd5a28
-SIZE (rpm-software-management-libdnf-0.55.2_GH0.tar.gz) = 1048788
+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
diff --git a/sysutils/libdnf/files/patch-CMakeLists.txt b/sysutils/libdnf/files/patch-CMakeLists.txt
index fbfe2ee6a797..7ecbbd2c1d37 100644
--- a/sysutils/libdnf/files/patch-CMakeLists.txt
+++ b/sysutils/libdnf/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2020-06-02 09:41:46 UTC
+--- CMakeLists.txt.orig	2021-03-01 17:31:02 UTC
 +++ CMakeLists.txt
-@@ -171,15 +171,19 @@ add_subdirectory(po)
+@@ -168,15 +168,19 @@ add_subdirectory(po)
  
  
  # build docs
diff --git a/sysutils/libdnf/files/patch-libdnf_config.h b/sysutils/libdnf/files/patch-libdnf_config.h
new file mode 100644
index 000000000000..e470f65e4957
--- /dev/null
+++ b/sysutils/libdnf/files/patch-libdnf_config.h
@@ -0,0 +1,22 @@
+--- libdnf/config.h.orig	2021-03-07 20:35:58 UTC
++++ libdnf/config.h
+@@ -18,7 +18,18 @@
+  * 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"
diff --git a/sysutils/libdnf/files/patch-tests_CMakeLists.txt b/sysutils/libdnf/files/patch-tests_CMakeLists.txt
index 5f5e577d39d1..f62353ebc26e 100644
--- a/sysutils/libdnf/files/patch-tests_CMakeLists.txt
+++ b/sysutils/libdnf/files/patch-tests_CMakeLists.txt
@@ -1,12 +1,12 @@
---- tests/CMakeLists.txt.orig	2020-09-26 05:07:59 UTC
+--- tests/CMakeLists.txt.orig	2021-03-01 17:31:02 UTC
 +++ tests/CMakeLists.txt
-@@ -2,7 +2,9 @@ add_subdirectory(libdnf/module/modulemd)
- add_subdirectory(libdnf/module)
+@@ -3,7 +3,9 @@ add_subdirectory(libdnf/module)
  add_subdirectory(libdnf/repo)
  add_subdirectory(libdnf/transaction)
-+if (BUILD_TESTING)
+ add_subdirectory(libdnf/sack)
+++if (BUILD_TESTING)
  add_subdirectory(hawkey)
-+endif()
+++endif()
  add_subdirectory(libdnf)
  
  
diff --git a/sysutils/libdnf/pkg-plist b/sysutils/libdnf/pkg-plist
index 1fad5cffe46b..98def8cc60ad 100644
--- a/sysutils/libdnf/pkg-plist
+++ b/sysutils/libdnf/pkg-plist
@@ -16,6 +16,7 @@ include/libdnf/config.h
 include/libdnf/dnf-advisory.h
 include/libdnf/dnf-advisorypkg.h
 include/libdnf/dnf-advisoryref.h
+include/libdnf/dnf-conf.h
 include/libdnf/dnf-context.h
 include/libdnf/dnf-db.h
 include/libdnf/dnf-enums.h