- Update ldns to 1.6.15 [1]

- Add an entry to UPDATING about binary incompatibility in previous version of ldns
- Fix OptionsNG
- Bump PORTREVISION for all ports dependent on dns/ldns
- Remove ABI version numbers from LIB_DEPENDS while I'm here

PR:	ports/173080 [1]
Submitted by:	Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer) [1]
Approved by:	portmgr (erwin)
Feature safe:	yes

9 files changed, 30 insertions, 14 deletions

diff --git a/UPDATING b/UPDATING
index 0c25c35a44fc..5ea30bb372ff 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20121031:
+  AFFECTS: users of dns/ldns
+  AUTHOR: ak@FreeBSD.org
+
+  There is a binary incompatibility in ldns 1.6.14 which is fixed with an
+  emergency release of ldns 1.6.15.
+
+  Warning!
+  If you have compiled ldns using software with ldns-1.6.14, then this new
+  version will be binary incompatible with your installed version. You
+  will have to recompile the software together with ldns-1.6.15.
+
+  Was the software compiled with ldns-1.6.13 or earlier, then you will not
+  have this problem and can safely install ldns-1.6.15.
+
 20121030:
   AFFECTS: users of www/squid31
   AUTHOR: flo@FreeBSD.org
diff --git a/dns/adsuck/Makefile b/dns/adsuck/Makefile
index 468798a30d55..e1e50590436e 100644
--- a/dns/adsuck/Makefile
+++ b/dns/adsuck/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	adsuck
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://opensource.conformal.com/snapshots/adsuck/ \
 		http://philpep.org/pub/
diff --git a/dns/autotrust/Makefile b/dns/autotrust/Makefile
index b2180ba87847..23b09a15cb22 100644
--- a/dns/autotrust/Makefile
+++ b/dns/autotrust/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	autotrust
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/autotrust/
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	A tool to automatically update DNSSEC trust anchors
 
-LIB_DEPENDS+=	ldns.1:${PORTSDIR}/dns/ldns \
-		unbound.3:${PORTSDIR}/dns/unbound
+LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns \
+		unbound:${PORTSDIR}/dns/unbound
 
 GNU_CONFIGURE=	yes
 CFLAGS=		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 34eded2dfee3..cf121265383f 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ldns
-PORTVERSION=	1.6.14
+PORTVERSION=	1.6.15
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/ \
 		CRITICAL
@@ -18,8 +18,7 @@ USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES DRILL GOST PYLDNS
-OPTIONS_SET=	EXAMPLES DRILL
-OPTIONS_UNSET=	DOCS GOST PYLDNS
+OPTIONS_DEFAULT=	EXAMPLES DRILL
 
 EXAMPLES_DESC=	"With example programs"
 DRILL_DESC=	"With drill program"
@@ -32,8 +31,6 @@ PYLDNS_DESC=	${PYTHON_DESC}
 USE_PYTHON=	yes
 .endif
 
-.include <bsd.port.pre.mk>
-
 ALL_TARGET=	all
 INSTALL_TARGET=	install-lib install-h install-config
 
@@ -299,4 +296,4 @@ post-install:
 	@(cd ${WRKSRC}/drill; ${GMAKE} install)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/ldns/distinfo b/dns/ldns/distinfo
index bbd0b98c413d..c87509eddf77 100644
--- a/dns/ldns/distinfo
+++ b/dns/ldns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ldns-1.6.14.tar.gz) = 4824f4b7d484d69f3a735a994c26b9d8699992e88631f680eac3907ce1a5e7d6
-SIZE (ldns-1.6.14.tar.gz) = 1109608
+SHA256 (ldns-1.6.15.tar.gz) = 0e9d3e8f52098a01780f1f747a1d382b8983fdb50c84603599e7b0613f51749b
+SIZE (ldns-1.6.15.tar.gz) = 1109667
diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile
index 34ee542066e9..8a6f6fdf64db 100644
--- a/dns/opendnssec/Makefile
+++ b/dns/opendnssec/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opendnssec
 PORTVERSION=	1.3.10
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.opendnssec.org/files/source/ \
 		http://dist.opendnssec.org/source/
@@ -14,7 +15,7 @@ MASTER_SITES=	http://www.opendnssec.org/files/source/ \
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
 
-BUILD_DEPENDS=	ldns>=1.6.12:${PORTSDIR}/dns/ldns
+BUILD_DEPENDS=	ldns>=1.6.15:${PORTSDIR}/dns/ldns
 LIB_DEPENDS=	ldns:${PORTSDIR}/dns/ldns
 
 GNU_CONFIGURE=	yes
diff --git a/dns/sshfp/Makefile b/dns/sshfp/Makefile
index 845476785a66..a0513a10664d 100644
--- a/dns/sshfp/Makefile
+++ b/dns/sshfp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sshfp
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	dns security
 MASTER_SITES=	ftp://ftp.xelerance.com/sshfp/ \
 		CRITICAL
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index a90d72cfa5eb..dc4cb2601d4d 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	unbound
 PORTVERSION=	1.4.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index 37ea71ef5b3f..d4ddfd10c63f 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enma
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORTVERSION}
 
@@ -53,7 +54,7 @@ CONFIGURE_ARGS+=	--with-resolver=libbind \
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libbind.a:${PORTSDIR}/dns/libbind
 .else
 CONFIGURE_ARGS+=	--with-resolver=ldns
-LIB_DEPENDS+=	ldns.1:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns
 .endif
 
 pre-configure: