svn commit: r397480 - head/dns/pdnsd

[Ashish SHUKLA]

Author: ashish
Date: Mon Sep 21 07:34:40 2015
New Revision: 397480
URL: https://svnweb.freebsd.org/changeset/ports/397480

Log:
  - Switch to @sample
  - Modernize vardir handling
  
  PR:		203197
  Submitted by:	amdmi3

Modified:
  head/dns/pdnsd/Makefile
  head/dns/pdnsd/pkg-install
  head/dns/pdnsd/pkg-plist

Modified: head/dns/pdnsd/Makefile
==============================================================================
--- head/dns/pdnsd/Makefile	Mon Sep 21 07:30:26 2015	(r397479)
+++ head/dns/pdnsd/Makefile	Mon Sep 21 07:34:40 2015	(r397480)
@@ -33,6 +33,9 @@ CFLAGS+=	-pthread
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
+post-install:
+	@${RM} ${STAGEDIR}${PDNSDB}/pdnsd.cache
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${DOC_FILES:S@^@${DOCSRCDIR}/@} ${STAGEDIR}${DOCSDIR}

Modified: head/dns/pdnsd/pkg-install
==============================================================================
--- head/dns/pdnsd/pkg-install	Mon Sep 21 07:30:26 2015	(r397479)
+++ head/dns/pdnsd/pkg-install	Mon Sep 21 07:34:40 2015	(r397480)
@@ -1,9 +1,8 @@
 #!/bin/sh
 PDNSDB=/var/db/pdnsd
 
-mkdir -p ${PDNSDB}
-chown nobody ${PDNSDB}
-chmod 755 ${PDNSDB}
-touch ${PDNSDB}/pdnsd.cache
-chown nobody ${PDNSDB}/pdnsd.cache
-chmod 640 ${PDNSDB}/pdnsd.cache
+if [ "${2}" = "POST-INSTALL" ] ; then
+	touch ${PDNSDB}/pdnsd.cache
+	chown nobody ${PDNSDB}/pdnsd.cache
+	chmod 640 ${PDNSDB}/pdnsd.cache
+fi

Modified: head/dns/pdnsd/pkg-plist
==============================================================================
--- head/dns/pdnsd/pkg-plist	Mon Sep 21 07:30:26 2015	(r397479)
+++ head/dns/pdnsd/pkg-plist	Mon Sep 21 07:34:40 2015	(r397480)
@@ -1,6 +1,4 @@
- at unexec if cmp -s %D/etc/pdnsd.conf %D/etc/pdnsd.conf.sample; then rm %D/etc/pdnsd.conf; fi
-etc/pdnsd.conf.sample
- at exec [ -f %D/etc/pdnsd.conf ] || install -m 644 %D/etc/pdnsd.conf.sample %D/etc/pdnsd.conf
+ at sample etc/pdnsd.conf.sample
 man/man5/pdnsd.conf.5.gz
 man/man8/pdnsd-ctl.8.gz
 man/man8/pdnsd.8.gz
@@ -13,4 +11,4 @@ sbin/pdnsd-ctl
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
 %%PORTDOCS%%%%DOCSDIR%%/intro.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
- at unexec rm -rf /var/db/pdnsd 2>&1 >/dev/null || true
+ at dir(nobody,,755) /var/db/pdnsd