From owner-svn-ports-head@FreeBSD.ORG Fri Apr 4 18:52:40 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 CFE9BAE7; Fri, 4 Apr 2014 18:52:40 +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 BCB852EC; Fri, 4 Apr 2014 18:52:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34IqeBP038948; Fri, 4 Apr 2014 18:52:40 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34Iqeh8038946; Fri, 4 Apr 2014 18:52:40 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404041852.s34Iqeh8038946@svn.freebsd.org> From: Pawel Pekala Date: Fri, 4 Apr 2014 18:52:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350148 - head/dns/dns_balance 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: Fri, 04 Apr 2014 18:52:41 -0000 Author: pawel Date: Fri Apr 4 18:52:40 2014 New Revision: 350148 URL: http://svnweb.freebsd.org/changeset/ports/350148 QAT: https://qat.redports.org/buildarchive/r350148/ Log: - Add staging support - Remove leading article from COMMENT - Don't define ETCDIR, it's done by ports framework - Define DOCS EXAMPLES options Modified: head/dns/dns_balance/Makefile head/dns/dns_balance/pkg-plist Modified: head/dns/dns_balance/Makefile ============================================================================== --- head/dns/dns_balance/Makefile Fri Apr 4 18:33:19 2014 (r350147) +++ head/dns/dns_balance/Makefile Fri Apr 4 18:52:40 2014 (r350148) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.netlab.is.tsuku DISTNAME= DNS-Balance-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= A dynamic load-balancing DNS server +COMMENT= Dynamic load-balancing DNS server USE_RUBY= yes USE_RC_SUBR= dns_balance @@ -21,7 +21,6 @@ RUBY_SHEBANG_FILES= ${WRKSRC}/dns_balanc ETCS= addrdb.rb \ namespace.rb -ETCDIR= ${PREFIX}/etc/${PORTNAME} LIBS= as_search.rb \ cache.rb \ datatype.rb \ @@ -32,7 +31,8 @@ LIBS= as_search.rb \ PLIST_SUB+= ETCDIR=${ETCDIR} SUB_LIST+= RUBY=${RUBY} -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + post-patch: ${SED} -E -e "s,%%PREFIX%%,${PREFIX},g" \ -e "s,%%PORTNAME%%,${PORTNAME},g" \ @@ -40,38 +40,17 @@ post-patch: ${WRKSRC}/dns_balance.rb > ${WRKSRC}/dns_balance do-install: -# -# Install main executable -# - ${INSTALL_SCRIPT} ${WRKSRC}/dns_balance ${PREFIX}/sbin/ -# -# Install sample configuration files -# - ${MKDIR} ${PREFIX}/etc/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/dns_balance ${STAGEDIR}${PREFIX}/sbin + @${MKDIR} ${STAGEDIR}${ETCDIR} .for FILE in ${ETCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${ETCDIR}/${FILE}.dist -. if !exists(${ETCDIR}/${FILE}) - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${ETCDIR}/${FILE} -. endif -.endfor - -# -# Install library files -# - ${MKDIR} ${PREFIX}/lib/${PORTNAME} -.for FILE in ${LIBS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/lib/${PORTNAME}/ + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${ETCDIR}/${FILE}.dist .endfor - -# -# Install port's documentation -# -.if !defined(NOPORTDOCS) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR} - - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README* ${WRKSRC}/Q_and_A* ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + (cd ${WRKSRC} && ${INSTALL_DATA} ${LIBS} \ + ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README* ${WRKSRC}/Q_and_A* ${STAGEDIR}${DOCSDIR} .include Modified: head/dns/dns_balance/pkg-plist ============================================================================== --- head/dns/dns_balance/pkg-plist Fri Apr 4 18:33:19 2014 (r350147) +++ head/dns/dns_balance/pkg-plist Fri Apr 4 18:52:40 2014 (r350148) @@ -20,13 +20,13 @@ lib/dns_balance/util.rb %%PORTDOCS%%%%DOCSDIR%%/README.dnsbalance+daemontools %%PORTDOCS%%%%DOCSDIR%%/README.dnsbalance+daemontools.eng %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%%%EXAMPLESDIR%%/addr -%%PORTDOCS%%%%EXAMPLESDIR%%/addr.ring -%%PORTDOCS%%%%EXAMPLESDIR%%/addr.ring.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/make_namespace.rb -%%PORTDOCS%%%%EXAMPLESDIR%%/makedb.rb -%%PORTDOCS%%%%EXAMPLESDIR%%/makeringdb.rb -%%PORTDOCS%%%%EXAMPLESDIR%%/namespace.rb -%%PORTDOCS%%%%EXAMPLESDIR%%/namespace.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/ringupdate.sh -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addr +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addr.ring +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addr.ring.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/make_namespace.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makedb.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makeringdb.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/namespace.rb +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/namespace.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringupdate.sh +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%