[Midnightbsd-cvs] mports [19891] trunk/dns/unbound/Makefile: update

[laffer1 at midnightbsd.org]

Revision: 19891
          http://svnweb.midnightbsd.org/mports/?rev=19891
Author:   laffer1
Date:     2015-08-20 20:22:26 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/dns/unbound/Makefile

Modified: trunk/dns/unbound/Makefile
===================================================================
--- trunk/dns/unbound/Makefile	2015-08-21 00:22:01 UTC (rev 19890)
+++ trunk/dns/unbound/Makefile	2015-08-21 00:22:26 UTC (rev 19891)
@@ -2,6 +2,7 @@
 
 PORTNAME=	unbound
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
@@ -9,14 +10,17 @@
 COMMENT=	Validating, recursive, and caching DNS resolver
 
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake libtool
+USES+=		cpe gmake libtool
+CPE_VENDOR=	nlnetlabs
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-ssl=/usr --with-libexpat=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} --with-libexpat=${LOCALBASE}
 USE_LDCONFIG=	yes
 
 USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
 USE_RC_SUBR=	unbound
 
@@ -25,36 +29,43 @@
 		ietf67-design-02.pdf requirements.txt
 PLIST_SUB+=	PYTHON=${PYTHON} MUNIN=${MUNIN}
 
-OPTIONS_DEFINE=	THREADS PYTHON ECDSA MUNIN
+OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT FILTER_AAAA
 OPTIONS_DEFAULT=THREADS ECDSA
 
-OPTIONS_RADIO=	LIBEVENT
-OPTIONS_RADIO_LIBEVENT= LIBEVENT14 LIBEVENT20
-
-LIBEVENT_DESC=	Enable whenever using many (10000) outgoing ports
-LIBEVENT14_DESC=Build against libevent-1.4 (devel/libevent)
-LIBEVENT20_DESC=Build against libevent-2.0 (devel/libevent2)
-ECDSA_DESC=	Enable ECDSA (elliptic curve) support
+LIBEVENT_DESC=	Build against libevent
+GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
+ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
 MUNIN_DESC=	Install Munin plugin
+FILTER_AAAA_DESC=	Build with AAAA filter functionality (contrib)
 
 .include <bsd.mport.options.mk>
 
-LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2 \
-		ldns:${PORTSDIR}/dns/ldns
+LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libldns.so:${PORTSDIR}/dns/ldns
 
+STRIP_FILES=	.libs/libunbound.so unbound-checkconf unbound \
+		unbound-control .libs/unbound-host .libs/unbound-anchor
+
 .if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes
+USES+=		python:2
+CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
 BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
+STRIP_FILES+=	.libs/_unbound.so
 PYTHON=
 .else
 PYTHON=		"@comment "
 .endif
 
+.if ${PORT_OPTIONS:MGOST}
+
+WITH_OPENSSL_PORT=	yes
+
+DEPENDS_ARGS+=	WITH_GOST=yes
+.else
 CONFIGURE_ARGS+=--disable-gost
+.endif
 
 .if ${PORT_OPTIONS:MECDSA}
-WITH_OPENSSL_PORT=yes
 DEPENDS_ARGS+=	WITH_ECDSA=yes
 .else
 CONFIGURE_ARGS+=--disable-ecdsa
@@ -69,14 +80,10 @@
 MUNIN=		"@comment "
 .endif
 
-.if ${PORT_OPTIONS:MLIBEVENT14}
-LIB_DEPENDS+=	event-1:${PORTSDIR}/devel/libevent
-CONFIGURE_ARGS+=--with-libevent=${LOCALBASE}
-.elif ${PORT_OPTIONS:MLIBEVENT20}
-LIB_DEPENDS+=	event-2:${PORTSDIR}/devel/libevent2
+.if ${PORT_OPTIONS:MLIBEVENT}
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
 USES+=		pkgconfig
-CONFIGURE_ARGS+=--with-libevent=${NONEXISTENT}
-CONFIGURE_ENV+=	found_libevent=yes
+CONFIGURE_ARGS+=--with-libevent
 CPPFLAGS+=	$$(pkg-config libevent --cflags-only-I)
 LDFLAGS+=	$$(pkg-config libevent --libs-only-L)
 .else
@@ -90,17 +97,28 @@
 post-patch:
 	@${MKDIR} ${WRKSRC}/balancer
 	@${RM} ${WRKSRC}/util/configlexer.c
+	@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
+		s|$$(configfile); fi|$$(configfile).sample|' \
+		${WRKSRC}/Makefile.in
+.if ${PORT_OPTIONS:MFILTER_AAAA}
+	cat ${WRKSRC}/contrib/aaaa-filter-iterator.patch | ${PATCH} -d ${WRKSRC} -p1 -s
+.endif
 
+post-build:
+	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
+
 post-install:
-	@${CHOWN} ${USERS} ${ETCDIR}
+.if ${PORT_OPTIONS:MPYTHON}
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so
+.endif
 .if ${PORT_OPTIONS:MMUNIN}
-	@${MKDIR} ${PREFIX}/share/munin/plugins
-	@${MKDIR} ${PREFIX}/etc/munin/plugins
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins
 	@${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_\
-		${PREFIX}/share/munin/plugins/
+		${STAGEDIR}${PREFIX}/share/munin/plugins/
 	@for i in ${MUNIN_ALL}; do\
 		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_\
-			${PREFIX}/etc/munin/plugins/unbound_munin_$$i ;\
+			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i ;\
 	done
 	@${ECHO_MSG}
 	@${ECHO_MSG} "============================================================="
@@ -107,10 +125,10 @@
 	@${CAT} ${WRKDIR}/pkg-message
 	@${ECHO_MSG} "============================================================="
 .endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}; \
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
 	for f in ${PORTDOCS}; do \
-		cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${DOCSDIR}/; \
+		cd ${WRKSRC}/doc && ${INSTALL_DATA} $${f} ${STAGEDIR}${DOCSDIR}/; \
 	done
 .endif