From fc6130506071793536193cc6383de0d4ebaea5cd Mon Sep 17 00:00:00 2001
From: mat <mat@FreeBSD.org>
Date: Wed, 8 Jan 2014 22:52:19 +0000
Subject: Fixup rndc.conf.sample installation

Spotted by:	antoine
---
 dns/bind98/Makefile  | 6 +++---
 dns/bind98/pkg-plist | 5 ++++-
 dns/bind99/Makefile  | 6 +++---
 dns/bind99/pkg-plist | 5 ++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'dns')

diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 12be4645f25b..2bc1c440a64e 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -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:
diff --git a/dns/bind98/pkg-plist b/dns/bind98/pkg-plist
index a63c5308ac38..c71aabffa11a 100644
--- a/dns/bind98/pkg-plist
+++ b/dns/bind98/pkg-plist
@@ -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
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 28b3a615e966..4ac20d6f819a 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -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)
diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist
index 7ff64acb8d35..878cc7a7f4af 100644
--- a/dns/bind99/pkg-plist
+++ b/dns/bind99/pkg-plist
@@ -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
-- 
cgit