dns/ldns: update to 1.7.1

While here, improve formatting, pet portlint.

PR:		239525
PR:		239526
Submitted by:	Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer)

7 files changed, 43 insertions, 108 deletions

diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 34417701485e..78794287f121 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldns
-PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTVERSION=	1.7.1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.nlnetlabs.nl/downloads/ldns/ \
 		LOCAL/ehaupt
@@ -14,16 +13,17 @@ COMMENT=	Library for programs conforming to DNS RFCs and drafts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-GNU_CONFIGURE=	yes
-USES=		cpe gmake libtool ssl perl5
+USES=		cpe gmake libtool perl5 ssl
 USE_PERL5=	build
-CPE_VENDOR=	nlnetlabs
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE} --disable-dane-ta-usage
+CPE_VENDOR=	nlnetlabs
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--disable-dane-ta-usage \
+			--with-ssl=${OPENSSLBASE}
 
 .if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL))
-OPTIONS_DEFINE=	DOXYGEN EXAMPLES DRILL
+OPTIONS_DEFINE=		DOXYGEN DRILL EXAMPLES
 OPTIONS_DEFAULT=	DRILL
 
 DRILL_DESC=	With drill program
@@ -31,10 +31,10 @@ DRILL_DESC=	With drill program
 .endif
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
-HTMLDOCS=	doc/html/*
+HTMLDOCS=		doc/html/*
 
-OPTIONS_DEFINE+=	GOST DANETAUSAGE \
-		RRTYPENINFO RRTYPERKEY RRTYPETA RRTYPEAVC 
+OPTIONS_DEFINE+=	DANETAUSAGE GOST RRTYPEAMTRELAY RRTYPEAVC RRTYPENINFO \
+			RRTYPERKEY RRTYPETA
 
 DANETAUSAGE_DESC=	Enable ta uasage, requires openssl >= 1.1.0
 GOST_DESC=		GOST signatures enabled, requires openssl >= 1.0.0
@@ -42,20 +42,22 @@ RRTYPENINFO_DESC=	Enable draft RR type ninfo.
 RRTYPERKEY_DESC=	Enable draft RR type rkey.
 RRTYPETA_DESC=		Enable draft RR type ta.
 RRTYPEAVC_DESC=		Enable draft RR type avc.
+RRTYPEAMTRELAY_DESC=	Enable draft RR type amtrelay.
 
 OPTIONS_SUB=	yes
 
-DANETAUSAGE_CONFIGURE_ENABLE=	dane-ta-usage
-DANETAUSAGE_IMPLIES=		RRTYPETA
-GOST_CONFIGURE_ENABLE=		gost
-RRTYPENINFO_CONFIGURE_ENABLE=	rrtype-ninfo
-RRTYPERKEY_CONFIGURE_ENABLE=	rrtype-rkey
-RRTYPETA_CONFIGURE_ENABLE=	rrtype-ta
-RRTYPEAVC_CONFIGURE_ENABLE=	rrtype-avc
-EXAMPLES_CONFIGURE_WITH=	examples
-DRILL_CONFIGURE_WITH=		drill
-DRILL_INSTALL_TARGET=	install-drill
-EXAMPLES_INSTALL_TARGET=	install-examples
+DANETAUSAGE_CONFIGURE_ENABLE=		dane-ta-usage
+DANETAUSAGE_IMPLIES=			RRTYPETA
+GOST_CONFIGURE_ENABLE=			gost
+RRTYPENINFO_CONFIGURE_ENABLE=		rrtype-ninfo
+RRTYPERKEY_CONFIGURE_ENABLE=		rrtype-rkey
+RRTYPETA_CONFIGURE_ENABLE=		rrtype-ta
+RRTYPEAVC_CONFIGURE_ENABLE=		rrtype-avc
+RRTYPEAMTRELAY_CONFIGURE_ENABLE=	rrtype-amtrelay
+EXAMPLES_CONFIGURE_WITH=		examples
+DRILL_CONFIGURE_WITH=			drill
+DRILL_INSTALL_TARGET=			install-drill
+EXAMPLES_INSTALL_TARGET=		install-examples
 
 .if defined(BUILD_PYLDNS)
 USES+=		python
@@ -64,11 +66,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 ALL_TARGET=	pyldns
 INSTALL_TARGET=	install-pyldns
 
-CONFIGURE_ARGS+=--with-pyldns
-LIB_DEPENDS+=	libldns.so:dns/ldns
-BUILD_DEPENDS+=	swig3.0:devel/swig30
-CFLAGS+=	-I${OPENSSLINC}
-BINARY_ALIAS=	swig=swig3.0
+CONFIGURE_ARGS+=	--with-pyldns
+LIB_DEPENDS+=		libldns.so:dns/ldns
+BUILD_DEPENDS+=		swig3.0:devel/swig30
+CFLAGS+=		-I${OPENSSLINC}
+BINARY_ALIAS=		swig=swig3.0
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -82,11 +84,11 @@ PKGNAMEPREFIX=	p5-DNS-
 ALL_TARGET=	p5-dns-ldns
 INSTALL_TARGET=	install-p5-dns-ldns
 
-CONFIGURE_ARGS+=--with-p5-dns-ldns
-LIB_DEPENDS+=	libldns.so:dns/ldns
-RUN_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
-		p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib
-BUILD_DEPENDS=${RUN_DEPENDS}
+CONFIGURE_ARGS+=	--with-p5-dns-ldns
+RUN_DEPENDS=		p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib \
+			p5-Test-Exception>=0:devel/p5-Test-Exception
+BUILD_DEPENDS=		${RUN_DEPENDS}
+LIB_DEPENDS+=		libldns.so:dns/ldns
 
 post-patch:
 	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
@@ -101,8 +103,9 @@ INSTALL_TARGET=	install-lib install-h install-config
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDANETAUSAGE} && ${SSL_DEFAULT} != openssl111
-BROKEN=		this option requires openssl >= 1.1.0
+.if ${PORT_OPTIONS:MDANETAUSAGE} && \
+    ((${OSVERSION} < 1200084 && ${SSL_DEFAULT} == base))
+BROKEN=		this option requires openssl >= 1.1.0 ${OSVERSION} ${SSL_DEFAULT}
 .endif
 
 .if ! ${PORT_OPTIONS:MGOST}
@@ -113,7 +116,7 @@ NO_GOST=	--disable-gost
 
 post-build:
 .if ${PORT_OPTIONS:MDOXYGEN}
-	@(cd  ${WRKSRC}; ${MAKE_CMD} doxygen)
+	@(cd ${WRKSRC}; ${MAKE_CMD} doxygen)
 .endif
 
 post-install:
@@ -123,7 +126,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/ldns_*.3 \
 		${STAGEDIR}${PREFIX}/man/man3
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.2
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.3
 .if ${PORT_OPTIONS:MDRILL}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/drill
 .endif
diff --git a/dns/ldns/distinfo b/dns/ldns/distinfo
index 1ccd2370e39e..670a64e60cb5 100644
--- a/dns/ldns/distinfo
+++ b/dns/ldns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488235641
-SHA256 (ldns-1.7.0.tar.gz) = c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc
-SIZE (ldns-1.7.0.tar.gz) = 1304424
+TIMESTAMP = 1565861297
+SHA256 (ldns-1.7.1.tar.gz) = 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
+SIZE (ldns-1.7.1.tar.gz) = 1244394
diff --git a/dns/ldns/files/patch-drill_Makefile.in b/dns/ldns/files/patch-drill_Makefile.in
deleted file mode 100644
index 1f47900a29ee..000000000000
--- a/dns/ldns/files/patch-drill_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- drill/Makefile.in.orig	2014-01-10 21:04:41 UTC
-+++ drill/Makefile.in
-@@ -98,7 +98,7 @@ doc:	
- 
- install: all
- 	$(INSTALL) -d $(DESTDIR)$(bindir)
--	$(INSTALL) drill $(DESTDIR)$(bindir)/drill
-+	$(INSTALL) -s drill $(DESTDIR)$(bindir)/drill
- 	$(INSTALL) -m 644 drill.1 $(DESTDIR)$(mandir)/man1/drill.1
- 
- uninstall:
diff --git a/dns/ldns/files/patch-examples_Makefile.in b/dns/ldns/files/patch-examples_Makefile.in
deleted file mode 100644
index 15dc6e203863..000000000000
--- a/dns/ldns/files/patch-examples_Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- examples/Makefile.in.orig	2014-01-10 21:04:41 UTC
-+++ examples/Makefile.in
-@@ -169,7 +169,7 @@ install:	$(PROGRAMS) $(SSL_PROGRAMS)
- 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
- 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
- 		for i in $(PROGRAMS) $(SSL_PROGRAMS); do \
--			$(libtool) --tag=CC --mode=install ${INSTALL} -c $$i $(DESTDIR)$(bindir) ; \
-+			$(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i $(DESTDIR)$(bindir) ; \
- 			if test -f $$i.1 ; \
- 			then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
- 			else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
-@@ -182,14 +182,14 @@ install-static:	all-static
- 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
- 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
- 		for i in $(PROGRAMS); do \
--			$(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc $(DESTDIR)$(bindir) ; \
-+			$(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc $(DESTDIR)$(bindir) ; \
- 			if test -f $$i.1 ; \
- 			then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
- 			else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
- 			fi ; \
- 			done
- 		for i in $(SSL_PROGRAMS); do \
--			$(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
-+			$(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
- 			if test -f $$i.1 ; \
- 			then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
- 			else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
diff --git a/dns/ldns/files/patch-examples_configure.ac b/dns/ldns/files/patch-examples_configure.ac
deleted file mode 100644
index bac79cebfc59..000000000000
--- a/dns/ldns/files/patch-examples_configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/configure.ac.orig	2014-01-10 21:04:41 UTC
-+++ examples/configure.ac
-@@ -207,6 +207,8 @@ case "$enable_dane" in
-       ;;
- esac
- 
-+AC_CHECK_FUNCS(ENGINE_load_cryptodev)
-+
- LDFLAGS="$tmp_LDFLAGS"
- LIBS="$tmp_LIBS"
- 
diff --git a/dns/ldns/files/patch-examples_ldns-signzone.c b/dns/ldns/files/patch-examples_ldns-signzone.c
deleted file mode 100644
index f14a920c00ba..000000000000
--- a/dns/ldns/files/patch-examples_ldns-signzone.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- examples/ldns-signzone.c.orig	2014-01-10 21:04:41 UTC
-+++ examples/ldns-signzone.c
-@@ -470,6 +470,7 @@ main(int argc, char *argv[])
- 		case 'A':
- 			signflags |= LDNS_SIGN_DNSKEY_WITH_ZSK;
- 			break;
-+#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
- 		case 'E':
- 			ENGINE_load_builtin_engines();
- 			ENGINE_load_dynamic();
-@@ -494,6 +495,7 @@ main(int argc, char *argv[])
- 				ENGINE_set_default(engine, 0);
- 			}
- 			break;
-+#endif
- 		case 'k':
- 			eng_key_l = strchr(optarg, ',');
- 			if (eng_key_l && strlen(eng_key_l) > 1) {
diff --git a/dns/ldns/pkg-plist b/dns/ldns/pkg-plist
index 63aa47882bfd..5829fb8b7a5b 100644
--- a/dns/ldns/pkg-plist
+++ b/dns/ldns/pkg-plist
@@ -59,8 +59,8 @@ include/ldns/wire2host.h
 include/ldns/zone.h
 lib/libldns.a
 lib/libldns.so
-lib/libldns.so.2
-lib/libldns.so.2.0.0
+lib/libldns.so.3
+lib/libldns.so.3.0.0
 libdata/pkgconfig/libldns.pc
 %%DRILL%%man/man1/drill.1.gz
 %%EXAMPLES%%man/man1/ldns-chaos.1.gz