From owner-svn-ports-head@FreeBSD.ORG Sat Apr 12 19:43:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D67FE14; Sat, 12 Apr 2014 19:43:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 019611830; Sat, 12 Apr 2014 19:43:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CJhXpM009061; Sat, 12 Apr 2014 19:43:33 GMT (envelope-from sem@svn.freebsd.org) Received: (from sem@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CJhXLw009059; Sat, 12 Apr 2014 19:43:33 GMT (envelope-from sem@svn.freebsd.org) Message-Id: <201404121943.s3CJhXLw009059@svn.freebsd.org> From: Sergey Matveychuk Date: Sat, 12 Apr 2014 19:43:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351128 - in head/dns/unbound: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Apr 2014 19:43:34 -0000 Author: sem Date: Sat Apr 12 19:43:33 2014 New Revision: 351128 URL: http://svnweb.freebsd.org/changeset/ports/351128 QAT: https://qat.redports.org/buildarchive/r351128/ Log: - Really fix unbound_anchorflags - New LIB_DEPENDS format - Strip binaries Modified: head/dns/unbound/Makefile head/dns/unbound/files/unbound.in Modified: head/dns/unbound/Makefile ============================================================================== --- head/dns/unbound/Makefile Sat Apr 12 19:43:17 2014 (r351127) +++ head/dns/unbound/Makefile Sat Apr 12 19:43:33 2014 (r351128) @@ -3,17 +3,17 @@ PORTNAME= unbound PORTVERSION= 1.4.22 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://unbound.net/downloads/ MAINTAINER= sem@FreeBSD.org COMMENT= A validating, recursive, and caching DNS resolver -LICENSE= BSD +LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USE_GMAKE= yes +USES+= gmake USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} --with-libexpat=${LOCALBASE} @@ -44,8 +44,11 @@ MUNIN_DESC= Install Munin plugin .include -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.4 unbound-checkconf unbound \ + unbound-control .libs/unbound-host .libs/unbound-anchor .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes @@ -81,10 +84,10 @@ MUNIN= "@comment " .endif .if ${PORT_OPTIONS:MLIBEVENT14} -LIB_DEPENDS+= event-1:${PORTSDIR}/devel/libevent +LIB_DEPENDS+= libevent-1.4:${PORTSDIR}/devel/libevent CONFIGURE_ARGS+=--with-libevent=${LOCALBASE} .elif ${PORT_OPTIONS:MLIBEVENT20} -LIB_DEPENDS+= event-2:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS+= libevent-2.0.so:${PORTSDIR}/devel/libevent2 USES+= pkgconfig CONFIGURE_ARGS+=--with-libevent=${NONEXISTENT} CONFIGURE_ENV+= found_libevent=yes @@ -102,6 +105,9 @@ post-patch: @${MKDIR} ${WRKSRC}/balancer @${RM} ${WRKSRC}/util/configlexer.c +post-build: + @for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done + post-install: .if ${PORT_OPTIONS:MMUNIN} @${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins Modified: head/dns/unbound/files/unbound.in ============================================================================== --- head/dns/unbound/files/unbound.in Sat Apr 12 19:43:17 2014 (r351127) +++ head/dns/unbound/files/unbound.in Sat Apr 12 19:43:33 2014 (r351128) @@ -35,7 +35,11 @@ start_precmd() { %%PREFIX%%/sbin/unbound-checkconf > /dev/null && \ echo -n "Obtaining a trust anchor:" && \ - su -m unbound -c "%%PREFIX%%/sbin/unbound-anchor ${unbound_anchorflags}" && \ + if [ "${unbound_anchorflags}T" = "T" ]; then \ + su -m unbound -c %%PREFIX%%/sbin/unbound-anchor; \ + else + su -m unbound -c "%%PREFIX%%/sbin/unbound-anchor ${unbound_anchorflags}"; \ + fi && echo . }