Date: Sat, 12 Apr 2014 19:23:10 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351124 - in head: deskutils/mirall dns/bind10 dns/bind910 dns/bind98 dns/bind99 dns/maradns net-mgmt/nagios net-mgmt/nagios4 Message-ID: <201404121923.s3CJNAXq000639@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sat Apr 12 19:23:10 2014 New Revision: 351124 URL: http://svnweb.freebsd.org/changeset/ports/351124 QAT: https://qat.redports.org/buildarchive/r351124/ Log: Use @sample for my port, cleanup an etc/PORTNAME into ETCDIR. Sponsored by: Absolight Modified: head/deskutils/mirall/pkg-plist head/dns/bind10/Makefile head/dns/bind10/pkg-plist head/dns/bind910/pkg-plist head/dns/bind98/pkg-plist head/dns/bind99/pkg-plist head/dns/maradns/pkg-plist head/net-mgmt/nagios/pkg-plist head/net-mgmt/nagios4/pkg-plist Modified: head/deskutils/mirall/pkg-plist ============================================================================== --- head/deskutils/mirall/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/deskutils/mirall/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -1,8 +1,6 @@ bin/owncloud bin/owncloudcmd -@unexec if cmp -s %D/etc/ownCloud/sync-exclude.lst.sample %D/etc/ownCloud/sync-exclude.lst; then rm -f %D/etc/ownCloud/sync-exclude.lst; fi -etc/ownCloud/sync-exclude.lst.sample -@exec if [ ! -f %D/etc/ownCloud/sync-exclude.lst ] ; then cp -p %D/%F %B/sync-exclude.lst; fi +@sample etc/ownCloud/sync-exclude.lst.sample include/owncloudsync/creds/abstractcredentials.h include/owncloudsync/creds/httpcredentials.h include/owncloudsync/mirall/account.h Modified: head/dns/bind10/Makefile ============================================================================== --- head/dns/bind10/Makefile Sat Apr 12 19:17:41 2014 (r351123) +++ head/dns/bind10/Makefile Sat Apr 12 19:23:10 2014 (r351124) @@ -43,10 +43,10 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} + @${MKDIR} ${STAGEDIR}${PREFIX}/${ETCDIR} ${INSTALL_DATA} -m 640 ${WRKSRC}/src/bin/cmdctl/cmdctl-certfile.pem \ - ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/cmdctl-certfile.pem.sample + ${STAGEDIR}${PREFIX}/${ETCDIR}/cmdctl-certfile.pem.sample ${INSTALL_DATA} -m 640 ${WRKSRC}/src/bin/cmdctl/cmdctl-keyfile.pem \ - ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/cmdctl-keyfile.pem.sample + ${STAGEDIR}${PREFIX}/${ETCDIR}/cmdctl-keyfile.pem.sample .include <bsd.port.mk> Modified: head/dns/bind10/pkg-plist ============================================================================== --- head/dns/bind10/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/dns/bind10/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -4,12 +4,8 @@ bin/b10-certgen bin/bindctl bin/isc-sysinfo bin/perfdhcp -@unexec if cmp -s %D/etc/%%PORTNAME%%/cmdctl-certfile.pem.sample %D/etc/%%PORTNAME%%/cmdctl-certfile.pem; then rm -f %D/etc/%%PORTNAME%%/cmdctl-certfile.pem; fi -etc/%%PORTNAME%%/cmdctl-certfile.pem.sample -@exec if [ ! -f %D/etc/%%PORTNAME%%/cmdctl-certfile.pem ] ; then cp -p %D/%F %B/cmdctl-certfile.pem; fi -@unexec if cmp -s %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem.sample %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem; then rm -f %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem; fi -etc/%%PORTNAME%%/cmdctl-keyfile.pem.sample -@exec if [ ! -f %D/etc/%%PORTNAME%%/cmdctl-keyfile.pem ] ; then cp -p %D/%F %B/cmdctl-keyfile.pem; fi +@sample %%ETCDIR%%/cmdctl-certfile.pem.sample +@sample %%ETCDIR%%/cmdctl-keyfile.pem.sample include/%%PORTNAME%%/dns/dns_fwd.h include/%%PORTNAME%%/dns/edns.h include/%%PORTNAME%%/dns/exceptions.h @@ -470,4 +466,4 @@ share/%%PORTNAME%%/zonemgr.spec @dirrm include/%%PORTNAME%%/exceptions @dirrm include/%%PORTNAME%%/dns @dirrm include/%%PORTNAME%% -@dirrmtry etc/%%PORTNAME%% +@dirrmtry %%ETCDIR%% Modified: head/dns/bind910/pkg-plist ============================================================================== --- head/dns/bind910/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/dns/bind910/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -403,12 +403,8 @@ sbin/rndc sbin/rndc-confgen sbin/tsig-keygen %%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample -%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/rndc.conf.sample %D/%%ETCDIR%%/rndc.conf; then rm -f %D/%%ETCDIR%%/rndc.conf; fi -%%NOBASE%%%%ETCDIR%%/rndc.conf.sample -%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/rndc.conf ] ; then cp -p %D/%F %B/rndc.conf; fi -%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi -%%NOBASE%%%%ETCDIR%%/named.conf.sample -%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi +%%NOBASE%%@sample %%ETCDIR%%/rndc.conf.sample +%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db Modified: head/dns/bind98/pkg-plist ============================================================================== --- head/dns/bind98/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/dns/bind98/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -337,12 +337,8 @@ sbin/nsec3hash sbin/rndc sbin/rndc-confgen %%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample -%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/rndc.conf.sample %D/%%ETCDIR%%/rndc.conf; then rm -f %D/%%ETCDIR%%/rndc.conf; fi -%%NOBASE%%%%ETCDIR%%/rndc.conf.sample -%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/rndc.conf ] ; then cp -p %D/%F %B/rndc.conf; fi -%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi -%%NOBASE%%%%ETCDIR%%/named.conf.sample -%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi +%%NOBASE%%@sample %%ETCDIR%%/rndc.conf.sample +%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db Modified: head/dns/bind99/pkg-plist ============================================================================== --- head/dns/bind99/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/dns/bind99/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -343,12 +343,8 @@ sbin/nsec3hash sbin/rndc sbin/rndc-confgen %%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample -%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/rndc.conf.sample %D/%%ETCDIR%%/rndc.conf; then rm -f %D/%%ETCDIR%%/rndc.conf; fi -%%NOBASE%%%%ETCDIR%%/rndc.conf.sample -%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/rndc.conf ] ; then cp -p %D/%F %B/rndc.conf; fi -%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi -%%NOBASE%%%%ETCDIR%%/named.conf.sample -%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi +%%NOBASE%%@sample %%ETCDIR%%/rndc.conf.sample +%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db Modified: head/dns/maradns/pkg-plist ============================================================================== --- head/dns/maradns/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/dns/maradns/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -2,15 +2,9 @@ bin/askmara bin/duende bin/fetchzone bin/getzone -@unexec if cmp -s %D/%%ETCDIR%%/csv2.sample %D/%%ETCDIR%%/csv2; then rm -f %D/%%ETCDIR%%/csv2; fi -%%ETCDIR%%/csv2.sample -@exec if [ ! -f %D/%%ETCDIR%%/csv2 ] ; then cp -p %D/%F %B/csv2; fi -@unexec if cmp -s %D/%%ETCDIR%%/dwood3rc.sample %D/%%ETCDIR%%/dwood3rc; then rm -f %D/%%ETCDIR%%/dwood3rc; fi -%%ETCDIR%%/dwood3rc.sample -@exec if [ ! -f %D/%%ETCDIR%%/dwood3rc ] ; then cp -p %D/%F %B/dwood3rc; fi -@unexec if cmp -s %D/%%ETCDIR%%/mararc.sample %D/%%ETCDIR%%/mararc; then rm -f %D/%%ETCDIR%%/mararc; fi -%%ETCDIR%%/mararc.sample -@exec if [ ! -f %D/%%ETCDIR%%/mararc ] ; then cp -p %D/%F %B/mararc; fi +@sample %%ETCDIR%%/csv2.sample +@sample %%ETCDIR%%/dwood3rc.sample +@sample %%ETCDIR%%/mararc.sample man/man1/Deadwood.1.gz man/man1/askmara.1.gz man/man1/fetchzone.1.gz Modified: head/net-mgmt/nagios/pkg-plist ============================================================================== --- head/net-mgmt/nagios/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/net-mgmt/nagios/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -33,9 +33,7 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi -@unexec if cmp -s %D/%%NAGIOSWWWDIR%%/config.inc.php.sample %D/%%NAGIOSWWWDIR%%/config.inc.php; then rm -f %D/%%NAGIOSWWWDIR%%/config.inc.php; fi -%%NAGIOSWWWDIR%%/config.inc.php.sample -@exec if [ ! -f %D/%%NAGIOSWWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi +@sample %%NAGIOSWWWDIR%%/config.inc.php.sample %%NAGIOSWWWDIR%%/contexthelp/A1.html %%NAGIOSWWWDIR%%/contexthelp/A2.html %%NAGIOSWWWDIR%%/contexthelp/A3.html Modified: head/net-mgmt/nagios4/pkg-plist ============================================================================== --- head/net-mgmt/nagios4/pkg-plist Sat Apr 12 19:17:41 2014 (r351123) +++ head/net-mgmt/nagios4/pkg-plist Sat Apr 12 19:23:10 2014 (r351124) @@ -32,9 +32,7 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/cgi-bin/summary.cgi %%NAGIOSWWWDIR%%/cgi-bin/tac.cgi %%NAGIOSWWWDIR%%/cgi-bin/trends.cgi -@unexec if cmp -s %D/%%NAGIOSWWWDIR%%/config.inc.php.sample %D/%%NAGIOSWWWDIR%%/config.inc.php; then rm -f %D/%%NAGIOSWWWDIR%%/config.inc.php; fi -%%NAGIOSWWWDIR%%/config.inc.php.sample -@exec if [ ! -f %D/%%NAGIOSWWWDIR%%/config.inc.php ] ; then cp -p %D/%F %B/config.inc.php; fi +@sample %%NAGIOSWWWDIR%%/config.inc.php.sample %%NAGIOSWWWDIR%%/contexthelp/A1.html %%NAGIOSWWWDIR%%/contexthelp/A2.html %%NAGIOSWWWDIR%%/contexthelp/A3.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404121923.s3CJNAXq000639>