Install named.conf as named.conf.sample and don't overwrite on upgrade

Bullet hole in foot:	joeld
Pointy hat:		erwin

6 files changed, 23 insertions, 11 deletions

diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 9838947ff644..efdbacbe3138 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind96
 PORTVERSION=	9.6.3.2.ESV.R10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -235,7 +235,10 @@ post-install:
 .for DIR in dynamic slave working
 	${CHOWN} bind:bind ${BIND_DESTETC}/${DIR}
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf.sample
+.if !exists(${BIND_DESTETC}/named.conf)
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf
+.endif
 	${INSTALL_DATA} ${FILESDIR}/named.root ${BIND_DESTETC}
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${BIND_DESTETC}/master
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${BIND_DESTETC}/master
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index 2682f7c102ed..9bf30e6c8036 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -216,7 +216,8 @@ sbin/rndc-confgen
 %%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 %%NOBASE%%etc/rc.d/named
-%%NOBASE%%%%BIND_DESTETC%%/named.conf
+%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
+%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
 %%NOBASE%%%%BIND_DESTETC%%/named.root
 %%NOBASE%%%%BIND_DESTETC%%/master/empty.db
 %%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 2de9ad86531d..bca23051d427 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind98
 PORTVERSION=	9.8.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 CONFLICTS=	bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.*
 
-OPTIONS_DEFAULT=	IPV6 SSL XML THREADS
+OPTIONS_DEFAULT=	IPV6 SSL XML THREADS GSSAPI
 OPTIONS_DEFINE=		SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \
 			FIXED_RRSET RPZ_NSIP RPZ_NSDNAME RPZRRL_PATCH \
 			SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
@@ -272,7 +272,10 @@ post-install:
 .for DIR in dynamic slave working
 	${CHOWN} bind:bind ${BIND_DESTETC}/${DIR}
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf.sample
+.if !exists(${BIND_DESTETC}/named.conf)
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf
+.endif
 	${INSTALL_DATA} ${FILESDIR}/named.root ${BIND_DESTETC}
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${BIND_DESTETC}/master
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${BIND_DESTETC}/master
diff --git a/dns/bind98/pkg-plist b/dns/bind98/pkg-plist
index c409b36fd5f9..71fc3a5a1492 100644
--- a/dns/bind98/pkg-plist
+++ b/dns/bind98/pkg-plist
@@ -229,7 +229,8 @@ sbin/rndc-confgen
 %%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 %%NOBASE%%etc/rc.d/named
-%%NOBASE%%%%BIND_DESTETC%%/named.conf
+%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
+%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
 %%NOBASE%%%%BIND_DESTETC%%/named.root
 %%NOBASE%%%%BIND_DESTETC%%/master/empty.db
 %%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index be6ab5a6b1f1..88561f164685 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME?=	bind99
 PORTVERSION=	9.9.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
 
-OPTIONS_DEFAULT=	IPV6 SSL XML THREADS
+OPTIONS_DEFAULT=	IPV6 SSL XML THREADS GSSAPI
 OPTIONS_DEFINE=		SSL IDN REPLACE_BASE LARGE_FILE \
 			FIXED_RRSET SIGCHASE IPV6 THREADS GSSAPI FILTER_AAAA
 .if !defined(BIND_TOOLS_SLAVE)
@@ -283,7 +283,10 @@ post-install:
 .for DIR in dynamic slave working
 	${CHOWN} bind:bind ${BIND_DESTETC}/${DIR}
 .endfor
-	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf.sample
+.if !exists(${BIND_DESTETC}/named.conf)
+	${INSTALL_DATA} ${WRKDIR}/named.conf ${BIND_DESTETC}/named.conf
+.endif
 	${INSTALL_DATA} ${FILESDIR}/named.root ${BIND_DESTETC}
 	${INSTALL_DATA} ${FILESDIR}/empty.db ${BIND_DESTETC}/master
 	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${BIND_DESTETC}/master
diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist
index f42362e89c59..0d86c6c252af 100644
--- a/dns/bind99/pkg-plist
+++ b/dns/bind99/pkg-plist
@@ -231,7 +231,8 @@ sbin/rndc-confgen
 %%LINKS%%@unexec rmdir /var/named/usr 2>/dev/null || true
 @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
 %%NOBASE%%etc/rc.d/named
-%%NOBASE%%%%BIND_DESTETC%%/named.conf
+%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
+%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
 %%NOBASE%%%%BIND_DESTETC%%/named.root
 %%NOBASE%%%%BIND_DESTETC%%/master/empty.db
 %%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db