From owner-svn-ports-all@FreeBSD.ORG Tue Nov 11 22:11:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E094C718; Tue, 11 Nov 2014 22:11:56 +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 CC4776AD; Tue, 11 Nov 2014 22:11:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABMBuvU043461; Tue, 11 Nov 2014 22:11:56 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABMBuBJ043459; Tue, 11 Nov 2014 22:11:56 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201411112211.sABMBuBJ043459@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 11 Nov 2014 22:11:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372469 - head/net/openslp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 22:11:57 -0000 Author: antoine Date: Tue Nov 11 22:11:55 2014 New Revision: 372469 URL: https://svnweb.freebsd.org/changeset/ports/372469 QAT: https://qat.redports.org/buildarchive/r372469/ Log: - Use option helpers - Use @sample keyword - Use COPYTREE_SHARE instead of handrolling - Cleanup plist Modified: head/net/openslp/Makefile head/net/openslp/pkg-plist Modified: head/net/openslp/Makefile ============================================================================== --- head/net/openslp/Makefile Tue Nov 11 22:01:11 2014 (r372468) +++ head/net/openslp/Makefile Tue Nov 11 22:11:55 2014 (r372469) @@ -3,7 +3,7 @@ PORTNAME= openslp PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/OpenSLP/${PORTVERSION} @@ -24,15 +24,8 @@ OPTIONS_DEFINE= SLP_SECURITY ASYNC_API D SLP_SECURITY_DESC= Turn on SLPv2 security support ASYNC_API_DESC= Enable asynchronous communication API -.include - -.if ${PORT_OPTIONS:MSLP_SECURITY} -CONFIGURE_ARGS+= --enable-slpv2-security -.endif - -.if ${PORT_OPTIONS:MASYNC_API} -CONFIGURE_ARGS+= --enable-async-api -.endif +SLP_SECURITY_CONFIGURE_ENABLE= slpv2-security +ASYNC_API_CONFIGURE_ENABLE= async-api post-extract: @(cd ${WRKSRC}; \ @@ -41,12 +34,9 @@ post-extract: post-install: .for FILE in slp.conf slp.reg slp.spi - ${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${STAGEDIR}${PREFIX}/etc/openslp/${FILE}.default + ${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${STAGEDIR}${PREFIX}/etc/openslp/${FILE}.sample .endfor - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${INSTALL_WRKSRC}/doc; \ - ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; ;\ - ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;) + (cd ${INSTALL_WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Modified: head/net/openslp/pkg-plist ============================================================================== --- head/net/openslp/pkg-plist Tue Nov 11 22:01:11 2014 (r372468) +++ head/net/openslp/pkg-plist Tue Nov 11 22:11:55 2014 (r372469) @@ -1,14 +1,7 @@ bin/slptool -@unexec if cmp -s %D/etc/openslp/slp.reg %D/etc/openslp/slp.reg.default; then rm -f %D/etc/openslp/slp.reg; fi -etc/openslp/slp.reg.default -@exec [ -f %B/slp.reg ] || cp %B/%f %B/slp.reg -@unexec if cmp -s %D/etc/openslp/slp.conf %D/etc/openslp/slp.conf.default; then rm -f %D/etc/openslp/slp.conf; fi -etc/openslp/slp.conf.default -@exec [ -f %B/slp.conf ] || cp %B/%f %B/slp.conf -@unexec if cmp -s %D/etc/openslp/slp.spi %D/etc/openslp/slp.spi.default; then rm -f %D/etc/openslp/slp.spi; fi -etc/openslp/slp.spi.default -@exec [ -f %B/slp.spi ] || cp %B/%f %B/slp.spi -@dirrm etc/openslp +@sample etc/openslp/slp.conf.sample +@sample etc/openslp/slp.reg.sample +@sample etc/openslp/slp.spi.sample include/slp.h lib/libslp.a lib/libslp.so @@ -72,9 +65,3 @@ sbin/slpd %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/index.html %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/smalllogo.jpg %%PORTDOCS%%%%DOCSDIR%%/html/faq.html -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/UsersGuide -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/IntroductionToSLP -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ProgrammersGuide -%%PORTDOCS%%@dirrm %%DOCSDIR%%/html -%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc -%%PORTDOCS%%@dirrm %%DOCSDIR%%