svn commit: r397786 - in head: net/hsflowd net/nss_ldap ports-mgmt/portshaker-config security/nikto

[Baptiste Daroussin]

Author: bapt
Date: Thu Sep 24 23:03:44 2015
New Revision: 397786
URL: https://svnweb.freebsd.org/changeset/ports/397786

Log:
  Convert to @sample

Modified:
  head/net/hsflowd/pkg-plist
  head/net/nss_ldap/pkg-plist
  head/ports-mgmt/portshaker-config/Makefile
  head/ports-mgmt/portshaker-config/pkg-plist
  head/security/nikto/pkg-plist

Modified: head/net/hsflowd/pkg-plist
==============================================================================
--- head/net/hsflowd/pkg-plist	Thu Sep 24 22:57:57 2015	(r397785)
+++ head/net/hsflowd/pkg-plist	Thu Sep 24 23:03:44 2015	(r397786)
@@ -1,5 +1,3 @@
- at unexec if cmp -s %D/%%ETCDIR%%/hsflowd.conf %D/%%ETCDIR%%/hsflowd.conf.sample; then rm -f %D/%%ETCDIR%%/hsflowd.conf; fi
-%%ETCDIR%%/hsflowd.conf.sample
- at exec if [ ! -f %D/%%ETCDIR%%/hsflowd.conf ]; then cp -p %D/%F %B/hsflowd.conf; fi
+ at sample %%ETCDIR%%/hsflowd.conf.sample
 sbin/hsflowd
 @unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi

Modified: head/net/nss_ldap/pkg-plist
==============================================================================
--- head/net/nss_ldap/pkg-plist	Thu Sep 24 22:57:57 2015	(r397785)
+++ head/net/nss_ldap/pkg-plist	Thu Sep 24 23:03:44 2015	(r397786)
@@ -1,5 +1,3 @@
 lib/nss_ldap.so.1
- at unexec if cmp -s %D/etc/nss_ldap.conf %D/etc/nss_ldap.conf.sample; then rm -f %D/etc/nss_ldap.conf; fi
-etc/nss_ldap.conf.sample
- at exec if [ ! -f %D/etc/nss_ldap.conf ]; then cp %B/%f %D/etc/nss_ldap.conf; fi
+ at sample etc/nss_ldap.conf.sample
 man/man5/nss_ldap.5.gz

Modified: head/ports-mgmt/portshaker-config/Makefile
==============================================================================
--- head/ports-mgmt/portshaker-config/Makefile	Thu Sep 24 22:57:57 2015	(r397785)
+++ head/ports-mgmt/portshaker-config/Makefile	Thu Sep 24 23:03:44 2015	(r397786)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	portshaker-config
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	romain at FreeBSD.org
@@ -22,6 +22,6 @@ pre-install:
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/portshaker.conf \
-		${STAGEDIR}${PREFIX}/etc/portshaker.conf.sample-config
+		${STAGEDIR}${PREFIX}/etc/portshaker.conf.sample
 
 .include "${MASTERDIR}/Makefile"

Modified: head/ports-mgmt/portshaker-config/pkg-plist
==============================================================================
--- head/ports-mgmt/portshaker-config/pkg-plist	Thu Sep 24 22:57:57 2015	(r397785)
+++ head/ports-mgmt/portshaker-config/pkg-plist	Thu Sep 24 23:03:44 2015	(r397786)
@@ -1,6 +1,4 @@
- at unexec if cmp -s %D/etc/portshaker.conf.sample-config %D/etc/portshaker.conf; then rm -f %D/etc/portshaker.conf; fi
-etc/portshaker.conf.sample-config
- at exec if [ ! -f %D/etc/portshaker.conf ] ; then cp -p %D/%F %B/portshaker.conf; fi
+ at sample etc/portshaker.conf.sample
 etc/portshaker.d/bsd_sharp
 etc/portshaker.d/bsd_sharp_releng_2_0
 etc/portshaker.d/bsd_sharp_releng_2_2

Modified: head/security/nikto/pkg-plist
==============================================================================
--- head/security/nikto/pkg-plist	Thu Sep 24 22:57:57 2015	(r397785)
+++ head/security/nikto/pkg-plist	Thu Sep 24 23:03:44 2015	(r397786)
@@ -1,7 +1,5 @@
 bin/nikto
- at unexec if cmp -s %D/etc/nikto.conf %D/etc/nikto.conf.sample; then rm -f %D/etc/nikto.conf; fi
-etc/nikto.conf.sample
- at exec if [ ! -f %D/etc/nikto.conf ] ; then cp -p %D/%F %B/nikto.conf; fi
+ at sample etc/nikto.conf.sample
 man/man1/nikto.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt