5 files changed, 7 insertions, 22 deletions

diff --git a/devel/cl-asdf/pkg-plist b/devel/cl-asdf/pkg-plist
index 9f5cb1579d48..8aa46acbb18a 100644
--- a/devel/cl-asdf/pkg-plist
+++ b/devel/cl-asdf/pkg-plist
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/asdf-init.lisp.default %D/etc/asdf-init.lisp; then rm -f %D/etc/asdf-init.lisp; fi
-etc/asdf-init.lisp.default
-@exec [ -f %D/etc/asdf-init.lisp ] || cp %D/etc/asdf-init.lisp.default %D/etc/asdf-init.lisp
+@sample etc/asdf-init.lisp.default etc/asdf-init.lisp
 %%LIB32DIR%%/common-lisp/asdf/asdf-ecl.lisp
 %%LIB32DIR%%/common-lisp/asdf/asdf.asd
 %%LIB32DIR%%/common-lisp/asdf/asdf.lisp
diff --git a/dns/powerdns-recursor/pkg-plist b/dns/powerdns-recursor/pkg-plist
index 0464dd297b2f..14fc77b3d5d2 100644
--- a/dns/powerdns-recursor/pkg-plist
+++ b/dns/powerdns-recursor/pkg-plist
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/pdns/recursor.conf %D/etc/pdns/recursor.conf-dist; then rm -f %D/etc/pdns/recursor.conf; fi
-etc/pdns/recursor.conf-dist
-@exec [ -f %B/recursor.conf ] || cp %B/%f %B/recursor.conf
+@sample etc/pdns/recursor.conf-dist etc/pdns/recursor.conf
 bin/rec_control
 sbin/pdns_recursor
 man/man1/pdns_recursor.1.gz
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index e523680f9b3b..8d5143d420aa 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -37,9 +37,7 @@ man/man1/pdns_server.1.gz
 man/man1/pdnssec.1.gz
 man/man1/zone2ldap.1.gz
 man/man1/zone2sql.1.gz
-@unexec if cmp -s %D/etc/pdns/pdns.conf %D/etc/pdns/pdns.conf-dist; then rm -f %D/etc/pdns/pdns.conf; fi
-etc/pdns/pdns.conf-dist
-@exec [ -f %B/pdns.conf ] || cp %B/%f %B/pdns.conf
+@sample etc/pdns/pdns.conf-dist etc/pdns/pdns.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pdns.conf
 %%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dnssec-3.x_to_3.4.0_schema.mysql.sql
@@ -52,4 +50,3 @@ etc/pdns/pdns.conf-dist
 %%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.mysql.sql
 %%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/schema.pgsql.sql
 %%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/schema.sqlite3.sql
-@dir etc/pdns
diff --git a/emulators/visualboyadvance-m/pkg-plist b/emulators/visualboyadvance-m/pkg-plist
index 214a3217352c..b353fab9387a 100644
--- a/emulators/visualboyadvance-m/pkg-plist
+++ b/emulators/visualboyadvance-m/pkg-plist
@@ -1,8 +1,6 @@
 %%GVBAM%%bin/gvbam
 %%SDL%%bin/vbam
-@unexec if cmp -s %D/etc/vbam.cfg-example %D/etc/vbam.cfg; then rm -f %D/etc/vbam.cfg; fi
-etc/vbam.cfg-example
-@exec if [ ! -f %D/etc/vbam.cfg ] ; then cp -p %D/%F %B/vbam.cfg; fi
+@sample etc/vbam.cfg-example etc/vbam.cfg
 %%GVBAM%%share/applications/gvbam.desktop
 %%GVBAM%%share/icons/hicolor/16x16/apps/vbam.png
 %%GVBAM%%share/icons/hicolor/22x22/apps/vbam.png
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index 2b376aab0848..66ed7cc299ac 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -11,15 +11,9 @@ bin/rtmpget
 %%CYGNAL%%bin/flvdumper
 %%CYGNAL%%bin/soldumper
 %%NPAPI%%%%WEBPLUGIN_DIR%%/libgnashplugin.so
-%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
-%%CYGNAL%%etc/cygnalrc.dist
-%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
-@unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
-etc/gnashpluginrc.dist
-@exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
-@unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
-etc/gnashrc.dist
-@exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
+%%CYGNAL%%@sample etc/cygnalrc.dist etc/cygnalrc
+@sample etc/gnashpluginrc.dist etc/gnashpluginrc
+@sample etc/gnashrc.dist etc/gnashrc
 include/gnash/AMF.h
 include/gnash/BevelFilter_as.h
 include/gnash/BitmapData_as.h