diff --git a/net/hsflowd/pkg-plist b/net/hsflowd/pkg-plist
index ea91f25937e8..fd9f4fad6e4f 100644
--- a/net/hsflowd/pkg-plist
+++ b/net/hsflowd/pkg-plist
@@ -1,5 +1,3 @@
-@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
-@exec if [ ! -f %D/%%ETCDIR%%/hsflowd.conf ]; then cp -p %D/%F %B/hsflowd.conf; fi
+@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
diff --git a/net/nss_ldap/pkg-plist b/net/nss_ldap/pkg-plist
index 3da0ec815f7c..1ba99561fa22 100644
--- a/net/nss_ldap/pkg-plist
+++ b/net/nss_ldap/pkg-plist
@@ -1,5 +1,3 @@
 lib/nss_ldap.so.1
-@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
-@exec if [ ! -f %D/etc/nss_ldap.conf ]; then cp %B/%f %D/etc/nss_ldap.conf; fi
+@sample etc/nss_ldap.conf.sample
 man/man5/nss_ldap.5.gz
diff --git a/ports-mgmt/portshaker-config/Makefile b/ports-mgmt/portshaker-config/Makefile
index 16fa5557f90d..5df1f14aa7f7 100644
--- a/ports-mgmt/portshaker-config/Makefile
+++ b/ports-mgmt/portshaker-config/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	portshaker-config
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	romain@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"
diff --git a/ports-mgmt/portshaker-config/pkg-plist b/ports-mgmt/portshaker-config/pkg-plist
index 10b8010fb72e..b8c6863f7dc3 100644
--- a/ports-mgmt/portshaker-config/pkg-plist
+++ b/ports-mgmt/portshaker-config/pkg-plist
@@ -1,6 +1,4 @@
-@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
-@exec if [ ! -f %D/etc/portshaker.conf ] ; then cp -p %D/%F %B/portshaker.conf; fi
+@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
diff --git a/security/nikto/pkg-plist b/security/nikto/pkg-plist
index 949f14fed083..80e8d62f44e3 100644
--- a/security/nikto/pkg-plist
+++ b/security/nikto/pkg-plist
@@ -1,7 +1,5 @@
 bin/nikto
-@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
-@exec if [ ! -f %D/etc/nikto.conf ] ; then cp -p %D/%F %B/nikto.conf; fi
+@sample etc/nikto.conf.sample
 man/man1/nikto.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt