9 files changed, 18 insertions, 60 deletions

diff --git a/ports-mgmt/portshaker-config/pkg-plist b/ports-mgmt/portshaker-config/pkg-plist
index 10b8010fb72e..e17f71b8c52e 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-config etc/portshaker.conf
 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/broccoli/pkg-plist b/security/broccoli/pkg-plist
index 359c8ac37830..e81a95469ea1 100644
--- a/security/broccoli/pkg-plist
+++ b/security/broccoli/pkg-plist
@@ -1,7 +1,5 @@
 bin/broccoli-config
-@unexec cmp -s %D/etc/broccoli.conf.example %D/etc/broccoli.conf && rm -f %D/etc/broccoli.conf || true
-etc/broccoli.conf.example
-@exec test -f %D/etc/broccoli.conf || cp -p %D/etc/broccoli.conf.example %D/etc/broccoli.conf
+@sample etc/broccoli.conf.example etc/broccoli.conf
 include/broccoli.h
 lib/libbroccoli.a
 lib/libbroccoli.so
diff --git a/security/john/pkg-plist b/security/john/pkg-plist
index 557410507863..d7207edcfd59 100644
--- a/security/john/pkg-plist
+++ b/security/john/pkg-plist
@@ -1,9 +1,7 @@
 bin/john
 bin/unshadow
 bin/xtract
-@unexec if cmp -s %D/etc/john.conf %D/etc/john.conf.default; then rm -f %D/etc/john.conf; fi
-etc/john.conf.default
-@exec [ -f %B/john.conf ] || cp %B/%f %B/john.conf
+@sample etc/john.conf.default etc/john.conf
 %%DATADIR%%/all.chr
 %%DATADIR%%/alnum.chr
 %%DATADIR%%/alpha.chr
diff --git a/security/scanhill/pkg-plist b/security/scanhill/pkg-plist
index 1ce54800e5c1..8f533f64748c 100644
--- a/security/scanhill/pkg-plist
+++ b/security/scanhill/pkg-plist
@@ -1,4 +1,2 @@
 bin/scanhill
-@unexec if cmp -s %D/etc/scanhill.conf-dist %D/etc/scanhill.conf; then rm -f %D/etc/scanhill.conf; fi
-etc/scanhill.conf-dist
-@exec [ -f %B/scanhill.conf ] || cp -f %B/%f %B/scanhill.conf
+@sample etc/scanhill.conf-dist etc/scanhill.conf
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index 7a6dd93976d4..e7499fb78c6e 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -4,36 +4,16 @@ bin/u2boat
 bin/u2spewfoo
 %%APPID%%bin/u2openappid
 %%APPID%%bin/u2streamer
-@unexec if cmp  -s %D/etc/snort/classification.config-sample %D/etc/snort/classification.config; then rm -f %D/etc/snort/classification.config; fi
-etc/snort/classification.config-sample
-@exec if [ ! -f %D/etc/snort/classification.config ] ; then cp -p %D/%F %B/classification.config; fi
-@unexec if cmp  -s %D/etc/snort/gen-msg.map-sample %D/etc/snort/gen-msg.map; then rm -f %D/etc/snort/gen-msg.map; fi
-etc/snort/gen-msg.map-sample
-@exec if [ ! -f %D/etc/snort/gen-msg.map ] ; then cp -p %D/%F %B/gen-msg.map; fi
-@unexec if cmp  -s %D/etc/snort/preproc_rules/decoder.rules %D/etc/snort/preproc_rules/decoder.rules; then rm -f %D/etc/snort/preproc_rules/decoder.rules;fi
-etc/snort/preproc_rules/decoder.rules-sample
-@exec if [ ! -f %D/etc/snort/preproc_rules/decoder.rules ] ; then cp -p %D/%F %B/decoder.rules; fi
-@unexec if cmp  -s %D/etc/snort/preproc_rules/preprocessor.rules %D/etc/snort/preproc_rules/preprocessor.rules; then rm -f %D/etc/snort/preproc_rules/preprocessor.rules;fi
-etc/snort/preproc_rules/preprocessor.rules-sample
-@exec if [ ! -f %D/etc/snort/preproc_rules/preprocessor.rules ] ; then cp -p %D/%F %B/preprocessor.rules; fi
-@unexec if cmp  -s %D/etc/snort/preproc_rules/sensitive-data.rules %D/etc/snort/preproc_rules/sensitive-data.rules; then rm -f %D/etc/snort/preproc_rules/sensitive-data.rules;fi
-etc/snort/preproc_rules/sensitive-data.rules-sample
-@exec if [ ! -f %D/etc/snort/preproc_rules/decoder.rules ] ; then cp -p %D/%F %B/; fi
-@unexec if cmp  -s %D/etc/snort/reference.config-sample %D/etc/snort/reference.config; then rm -f %D/etc/snort/reference.config; fi
-etc/snort/reference.config-sample
-@exec if [ ! -f %D/etc/snort/reference.config ] ; then cp -p %D/%F %B/reference.config; fi
-@unexec if cmp  -s %D/etc/snort/snort.conf-sample %D/etc/snort/snort.conf; then rm -f %D/etc/snort/snort.conf; fi
-etc/snort/snort.conf-sample
-@exec if [ ! -f %D/etc/snort/snort.conf ] ; then cp -p %D/%F %B/snort.conf; fi
-@unexec if cmp  -s %D/etc/snort/threshold.conf-sample %D/etc/snort/threshold.conf; then rm -f %D/etc/snort/threshold.conf; fi
-etc/snort/threshold.conf-sample
-@exec if [ ! -f %D/etc/snort/threshold.conf ] ; then cp -p %D/%F %B/threshold.conf; fi
-@unexec if cmp  -s %D/etc/snort/unicode.map-sample %D/etc/snort/unicode.map; then rm -f %D/etc/snort/unicode.map; fi
-etc/snort/unicode.map-sample
-@exec if [ ! -f %D/etc/snort/unicode.map ] ; then cp -p %D/%F %B/unicode.map; fi
-@unexec if cmp  -s %D/etc/snort/file_magic.conf-sample %D/etc/snort/file_magic.conf; then rm -f %D/etc/snort/file_magic.conf; fi
-etc/snort/file_magic.conf-sample
-@exec if [ ! -f %D/etc/snort/file_magic.conf ] ; then cp -p %D/%F %B/file_magic.conf; fi
+@sample etc/snort/classification.config-sample etc/snort/classification.config
+@sample etc/snort/gen-msg.map-sample etc/snort/gen-msg.map
+@sample etc/snort/preproc_rules/decoder.rules-sample etc/snort/preproc_rules/decoder.rules
+@sample etc/snort/preproc_rules/preprocessor.rules-sample etc/snort/preproc_rules/preprocessor.rules
+@sample etc/snort/preproc_rules/sensitive-data.rules-sample etc/snort/preproc_rules/sensitive-data.rules
+@sample etc/snort/reference.config-sample etc/snort/reference.config
+@sample etc/snort/snort.conf-sample etc/snort/snort.conf
+@sample etc/snort/threshold.conf-sample etc/snort/threshold.conf
+@sample etc/snort/unicode.map-sample etc/snort/unicode.map
+@sample etc/snort/file_magic.conf-sample etc/snort/file_magic.conf
 include/snort/dynamic_output/bitop.h
 include/snort/dynamic_output/ipv6_port.h
 include/snort/dynamic_output/obfuscation.h
diff --git a/security/trousers/pkg-plist b/security/trousers/pkg-plist
index 5206c977de30..c70c820f5325 100644
--- a/security/trousers/pkg-plist
+++ b/security/trousers/pkg-plist
@@ -119,13 +119,5 @@ man/man3/Tspi_TPM_StirRandom.3.gz
 man/man3/Tspi_TPM_TakeOwnership.3.gz
 man/man5/tcsd.conf.5.gz
 man/man8/tcsd.8.gz
-@unexec cmp -s %D/etc/tcsd.conf %D/etc/tcsd.conf.dist && rm -f %D/etc/tcsd.conf || true
-@owner _tss
-@group _tss
-@mode 0600
-etc/tcsd.conf.dist
-@exec [ -f %D/etc/tcsd.conf ] || cp -p %D/etc/tcsd.conf.dist %D/etc/tcsd.conf
-@owner
-@group
-@mode
+@sample(_tss,_tss,0600) etc/tcsd.conf.dist etc/tcsd.conf
 @dir(_tss,_tss,0700) var/lib/tpm
diff --git a/sysutils/logstash-forwarder/pkg-plist b/sysutils/logstash-forwarder/pkg-plist
index e5cf0f38196e..de7e17ddb1f8 100644
--- a/sysutils/logstash-forwarder/pkg-plist
+++ b/sysutils/logstash-forwarder/pkg-plist
@@ -1,4 +1,2 @@
 bin/logstash-forwarder
-@unexec if cmp  -s %D/etc/logstash-forwarder.conf.example %D/etc/logstash-forwarder.conf; then rm -f %D/etc/logstash-forwarder.conf; fi
-etc/logstash-forwarder.conf.example
-@exec if [ ! -f %D/etc/logstash-forwarder.conf ] ; then cp -p %D/%F %B/logstash-forwarder.conf; fi
+@sample etc/logstash-forwarder.conf.example etc/logstash-forwarder.conf
diff --git a/sysutils/screen-legacy/pkg-plist b/sysutils/screen-legacy/pkg-plist
index 4a17ddf537d8..4e3bf9157b49 100644
--- a/sysutils/screen-legacy/pkg-plist
+++ b/sysutils/screen-legacy/pkg-plist
@@ -1,8 +1,6 @@
 bin/screen
 %%MAN%%man/man1/screen.1.gz
-@unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
-%%EXAMPLESDIR%%/screenrc
-@exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
+@sample %%EXAMPLESDIR%%/screenrc etc/screenrc
 %%DATADIR%%/utf8encodings/01
 %%DATADIR%%/utf8encodings/02
 %%DATADIR%%/utf8encodings/03
diff --git a/sysutils/wemux/pkg-plist b/sysutils/wemux/pkg-plist
index 3d8cb897320d..b904ba0d165e 100644
--- a/sysutils/wemux/pkg-plist
+++ b/sysutils/wemux/pkg-plist
@@ -1,4 +1,2 @@
 bin/wemux
-@unexec if cmp -s %D/etc/wemux.conf %D/etc/wemux.conf.example ; then rm -f %D/etc/wemux.conf ; fi
-etc/wemux.conf.example
-@exec if [ ! -f %D/etc/wemux.conf ]; then cp -p %D/%F %B/wemux.conf; fi
+@sample etc/wemux.conf.example etc/wemux.conf