Date: Wed, 8 Jan 2014 22:52:19 +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: r339186 - in head/dns: bind98 bind99 Message-ID: <201401082252.s08MqJl2007607@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Jan 8 22:52:19 2014 New Revision: 339186 URL: http://svnweb.freebsd.org/changeset/ports/339186 Log: Fixup rndc.conf.sample installation Spotted by: antoine Modified: head/dns/bind98/Makefile head/dns/bind98/pkg-plist head/dns/bind99/Makefile head/dns/bind99/pkg-plist Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Wed Jan 8 22:43:21 2014 (r339185) +++ head/dns/bind98/Makefile Wed Jan 8 22:52:19 2014 (r339186) @@ -2,7 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -151,9 +151,9 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 -PLIST_SUB+= NOBASE="" +PLIST_SUB+= NOBASE="" BASE="@comment " .else -PLIST_SUB+= NOBASE="@comment " +PLIST_SUB+= NOBASE="@comment " BASE="" .endif post-patch: Modified: head/dns/bind98/pkg-plist ============================================================================== --- head/dns/bind98/pkg-plist Wed Jan 8 22:43:21 2014 (r339185) +++ head/dns/bind98/pkg-plist Wed Jan 8 22:52:19 2014 (r339186) @@ -332,8 +332,11 @@ sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen -@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample +%%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample %%NOBASE%%etc/rc.d/named +%%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 Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Wed Jan 8 22:43:21 2014 (r339185) +++ head/dns/bind99/Makefile Wed Jan 8 22:52:19 2014 (r339186) @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 8 +PORTREVISION?= 9 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -158,9 +158,9 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 -PLIST_SUB+= NOBASE="" +PLIST_SUB+= NOBASE="" BASE="@comment " .else -PLIST_SUB+= NOBASE="@comment " +PLIST_SUB+= NOBASE="@comment " BASE="" .endif .if !defined(BIND_TOOLS_SLAVE) Modified: head/dns/bind99/pkg-plist ============================================================================== --- head/dns/bind99/pkg-plist Wed Jan 8 22:43:21 2014 (r339185) +++ head/dns/bind99/pkg-plist Wed Jan 8 22:52:19 2014 (r339186) @@ -335,8 +335,11 @@ sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen -@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample +%%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample %%NOBASE%%etc/rc.d/named +%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401082252.s08MqJl2007607>