8 files changed, 85 insertions, 42 deletions

diff --git a/devel/ding-libs/Makefile b/devel/ding-libs/Makefile
index d3e3098eb8f5..a726a5246f7f 100644
--- a/devel/ding-libs/Makefile
+++ b/devel/ding-libs/Makefile
@@ -2,33 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	ding-libs
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1
 CATEGORIES=	devel
-MASTER_SITES=	https://fedorahosted.org/released/${PORTNAME}/
-
-MAINTAINER=	aweits@rit.edu
+MASTER_SITES=	https://releases.pagure.org/SSSD/ding-libs/ \
+		LOCAL/tobik/ding-libs
+DIST_SUBDIR=	ding-libs
+
+# Build fixes for non-Linux systems
+PATCH_SITES=	LOCAL/tobik/ding-libs \
+		https://pagure.io/SSSD/ding-libs/c/
+PATCHFILES=	8fc522605a90e670fe76dc1b44669230c121a96e.patch:-p1 \
+		72c19bd018b107ecf5a80963b433e9922f7243fd.patch:-p1 \
+		315a0d527e0734ed2fd4529c9b685e41d2ce5dad.patch:-p1 \
+		be9ca3a2c26b061d1f22bd4a09009bba7a01f67b.patch:-p1 \
+		a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b.patch:-p1
+
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Collection of useful libraries for developers
 
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-GNU_CONFIGURE=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB} -lintl
+LICENSE=	GPLv3+ LGPL3+
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LESSER
 
-USES=		autoreconf iconv gettext libtool pathfix pkgconfig
+USES=		iconv gettext-runtime libtool localbase
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 
-CONFIGURE_ENV+=	DOXYGEN=""
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-static
+CONFIGURE_ENV=	DOXYGEN=""
+LIBS+=		${ICONV_LIB} -lintl
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS TEST
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/collection/collection_tools.c \
-		${WRKSRC}/refarray/ref_array.c
-	@${REINPLACE_CMD} -e 's|git log -1 &>/dev/null|true|g' \
-		${WRKSRC}/configure.ac
+# libcheck is required to run *all* the unit tests.
+# Without it only 14/20 tests will run.
+TEST_BUILD_DEPENDS=	check>=0:devel/check
+TEST_USES=		pkgconfig
 
 .include <bsd.port.mk>
diff --git a/devel/ding-libs/distinfo b/devel/ding-libs/distinfo
index 3184ea333373..b651578af857 100644
--- a/devel/ding-libs/distinfo
+++ b/devel/ding-libs/distinfo
@@ -1,2 +1,13 @@
-SHA256 (ding-libs-0.5.0.tar.gz) = dab937537a05d7a7cbe605fdb9b3809080d67b124ac97eb321255b35f5b172fd
-SIZE (ding-libs-0.5.0.tar.gz) = 868840
+TIMESTAMP = 1527583392
+SHA256 (ding-libs/ding-libs-0.6.1.tar.gz) = a319a327deb81f2dfab9ce4a4926e80e1dac5dcfc89f4c7e548cec2645af27c1
+SIZE (ding-libs/ding-libs-0.6.1.tar.gz) = 904092
+SHA256 (ding-libs/8fc522605a90e670fe76dc1b44669230c121a96e.patch) = d1f5265adb08915349c7bda9dad80fd3dc50b87e39da89a5380b9e36fd54b5ca
+SIZE (ding-libs/8fc522605a90e670fe76dc1b44669230c121a96e.patch) = 1604
+SHA256 (ding-libs/72c19bd018b107ecf5a80963b433e9922f7243fd.patch) = 7d0423031d45b78fdadc4a927333da76d1f0bdc3f83a0fe7cd4f3b1bc1b6cb42
+SIZE (ding-libs/72c19bd018b107ecf5a80963b433e9922f7243fd.patch) = 1568
+SHA256 (ding-libs/315a0d527e0734ed2fd4529c9b685e41d2ce5dad.patch) = 0b4df91d6c8bec9732375f79bd007af0690871c6eeff06d748f946294379abb8
+SIZE (ding-libs/315a0d527e0734ed2fd4529c9b685e41d2ce5dad.patch) = 991
+SHA256 (ding-libs/be9ca3a2c26b061d1f22bd4a09009bba7a01f67b.patch) = e129950a3bee6498f60ce9db7c98b8ce0e974cfea032a717ae06fa748f872c0c
+SIZE (ding-libs/be9ca3a2c26b061d1f22bd4a09009bba7a01f67b.patch) = 4037
+SHA256 (ding-libs/a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b.patch) = d39a70ecb642c5fc6ccec16e4d9a3e32ec672497a9e3ea9e9844a8e553214611
+SIZE (ding-libs/a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b.patch) = 862
diff --git a/devel/ding-libs/files/patch-configure b/devel/ding-libs/files/patch-configure
new file mode 100644
index 000000000000..6240169e6680
--- /dev/null
+++ b/devel/ding-libs/files/patch-configure
@@ -0,0 +1,15 @@
+Get rid of bashism
+
+https://pagure.io/SSSD/ding-libs/c/90f715c882a715f8cb827db14167ce8976a0fcd9
+
+--- configure.orig	2017-09-22 15:44:32 UTC
++++ configure
+@@ -12658,7 +12658,7 @@ BASICOBJECTS_VERSION=0.1.1
+ INI_CONFIG_VERSION=1.3.1
+ 
+ 
+- if git log -1 &>/dev/null; then
++ if git log -1 > /dev/null 2>&1; then
+   GIT_CHECKOUT_TRUE=
+   GIT_CHECKOUT_FALSE='#'
+ else
diff --git a/devel/ding-libs/files/patch-ini__ini_parse_ut.c b/devel/ding-libs/files/patch-ini__ini_parse_ut.c
deleted file mode 100644
index afb5bf72b35f..000000000000
--- a/devel/ding-libs/files/patch-ini__ini_parse_ut.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ini/ini_parse_ut.c.orig	2014-05-09 20:57:53 UTC
-+++ ini/ini_parse_ut.c
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <limits.h>
- #include <sys/stat.h>
-+#include <sys/wait.h>
- #include "ini_defines.h"
- #include "ini_configobj.h"
- #include "ini_config_priv.h"
diff --git a/devel/ding-libs/files/patch-ini_ini__save__ut.c b/devel/ding-libs/files/patch-ini_ini__save__ut.c
new file mode 100644
index 000000000000..f99502e67592
--- /dev/null
+++ b/devel/ding-libs/files/patch-ini_ini__save__ut.c
@@ -0,0 +1,11 @@
+--- ini/ini_save_ut.c.orig	2018-05-29 07:31:23 UTC
++++ ini/ini_save_ut.c
+@@ -180,7 +180,7 @@ static int basic_test(void)
+                  (srcdir == NULL) ? "." : srcdir,
+                  cmp_files[i]);
+ 
+-        snprintf(command, PATH_MAX * 3, "cmp -l -b %s %s", resname, cmpname);
++        snprintf(command, PATH_MAX * 3, "cmp -l %s %s", resname, cmpname);
+         error = system(command);
+         if ((error) || (WEXITSTATUS(error))) {
+             printf("Failed to compare files %d %d.\n",  error,
diff --git a/devel/ding-libs/files/patch-path__utils_path__utils__ut.c b/devel/ding-libs/files/patch-path__utils_path__utils__ut.c
new file mode 100644
index 000000000000..d4183d1444bc
--- /dev/null
+++ b/devel/ding-libs/files/patch-path__utils_path__utils__ut.c
@@ -0,0 +1,11 @@
+--- path_utils/path_utils_ut.c.orig	2018-05-29 08:04:46 UTC
++++ path_utils/path_utils_ut.c
+@@ -62,7 +62,7 @@ START_TEST(test_dirname)
+     fail_unless_str_equal(p, "//foo");
+ 
+     fail_unless(get_dirname(p, PATH_MAX, "//foo//") == SUCCESS);
+-    fail_unless_str_equal(p, "//");
++    fail_unless_str_equal(p, "/");
+ 
+     fail_unless(get_dirname(p, PATH_MAX, "foo//bar") == SUCCESS);
+     fail_unless_str_equal(p, "foo");
diff --git a/devel/ding-libs/pkg-descr b/devel/ding-libs/pkg-descr
index 6a357f07972a..6baebe76799f 100644
--- a/devel/ding-libs/pkg-descr
+++ b/devel/ding-libs/pkg-descr
@@ -7,4 +7,4 @@ array (libref_array), and a library to process configuration files in
 initialization format (INI) into a library collection data structure
 (libini_config).
 
-WWW: https://fedorahosted.org/sssd/
+WWW: https://pagure.io/SSSD/ding-libs/
diff --git a/devel/ding-libs/pkg-plist b/devel/ding-libs/pkg-plist
index e87904fa8192..cc14ce6c6c12 100644
--- a/devel/ding-libs/pkg-plist
+++ b/devel/ding-libs/pkg-plist
@@ -11,27 +11,21 @@ include/ini_valueobj.h
 include/path_utils.h
 include/ref_array.h
 include/simplebuffer.h
-lib/libbasicobjects.a
 lib/libbasicobjects.so
 lib/libbasicobjects.so.0
 lib/libbasicobjects.so.0.1.0
-lib/libcollection.a
 lib/libcollection.so
 lib/libcollection.so.4
-lib/libcollection.so.4.1.0
-lib/libdhash.a
+lib/libcollection.so.4.1.1
 lib/libdhash.so
 lib/libdhash.so.1
-lib/libdhash.so.1.0.2
-lib/libini_config.a
+lib/libdhash.so.1.1.0
 lib/libini_config.so
 lib/libini_config.so.5
-lib/libini_config.so.5.1.0
-lib/libpath_utils.a
+lib/libini_config.so.5.2.1
 lib/libpath_utils.so
 lib/libpath_utils.so.1
 lib/libpath_utils.so.1.0.1
-lib/libref_array.a
 lib/libref_array.so
 lib/libref_array.so.1
 lib/libref_array.so.1.2.1