Conver to @sample keyword

8 files changed, 11 insertions, 37 deletions

diff --git a/net/bird-devel/pkg-plist b/net/bird-devel/pkg-plist
index ec18be838b66..520ab20188bf 100644
--- a/net/bird-devel/pkg-plist
+++ b/net/bird-devel/pkg-plist
@@ -1,5 +1,3 @@
-@unexec if cmp -s %D/etc/bird.conf.example %D/etc/bird.conf; then rm -f %D/etc/bird.conf; fi
-etc/bird.conf.example
-@exec if [ ! -f %D/etc/bird.conf ] ; then cp -p %D/%F %B/bird.conf; fi
+@sample etc/bird.conf.example etc/bird.conf
 sbin/bird
 sbin/birdc
diff --git a/net/bird/pkg-plist b/net/bird/pkg-plist
index f1192a0ae734..552886f65419 100644
--- a/net/bird/pkg-plist
+++ b/net/bird/pkg-plist
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/bird%%VER%%.conf.example %D/etc/bird%%VER%%.conf; then rm -f %D/etc/bird%%VER%%.conf; fi
-etc/bird%%VER%%.conf.example
-@exec if [ ! -f %D/etc/bird%%VER%%.conf ] ; then cp -p %D/%F %B/bird%%VER%%.conf; fi
+@sample etc/bird%%VER%%.conf.example etc/bird%%VER%%.conf
 sbin/bird%%VER%%
 sbin/birdc%%VER%%
 sbin/birdcl%%VER%%
diff --git a/net/bird6/pkg-plist b/net/bird6/pkg-plist
index f18b9c399508..eae1c273252e 100644
--- a/net/bird6/pkg-plist
+++ b/net/bird6/pkg-plist
@@ -1,6 +1,4 @@
-@unexec if cmp -s %D/etc/bird6.conf.example %D/etc/bird6.conf; then rm -f %D/etc/bird6.conf; fi
-etc/bird6.conf.example
-@exec if [ ! -f %D/etc/bird6.conf ] ; then cp -p %D/%F %B/bird6.conf; fi
+@sample etc/bird6.conf.example etc/bird6.conf
 sbin/bird6
 sbin/birdc6
 sbin/birdcl6
diff --git a/net/iet/pkg-plist b/net/iet/pkg-plist
index 75ba699eaa49..6a2c63d243a8 100644
--- a/net/iet/pkg-plist
+++ b/net/iet/pkg-plist
@@ -1,16 +1,8 @@
 modules/iet.ko
-@unexec if cmp -s %D/%%DATADIR%%/ietd.conf %D/etc/iet/ietd.conf ; then rm -f %D/etc/iet/ietd.conf ; fi
-%%DATADIR%%/ietd.conf
-@exec if [ ! -f %D/etc/iet/ietd.conf ]; then cp -p %D/%F %D/etc/iet/ietd.conf; fi
-@unexec if cmp -s %D/%%DATADIR%%/initiators.allow %D/etc/iet/initiators.allow ; then rm -f %D/etc/iet/initiators.allow ; fi
-%%DATADIR%%/initiators.allow
-@exec if [ ! -f %D/etc/iet/initiators.allow ]; then cp -p %D/%F %D/etc/iet/initiators.allow; fi
-@unexec if cmp -s %D/%%DATADIR%%/initiators.deny %D/etc/iet/initiators.deny ; then rm -f %D/etc/iet/initiators.deny ; fi
-%%DATADIR%%/initiators.deny
-@exec if [ ! -f %D/etc/iet/initiators.deny ]; then cp -p %D/%F %D/etc/iet/initiators.deny; fi
-@unexec if cmp -s %D/%%DATADIR%%/targets.allow %D/etc/iet/targets.allow ; then rm -f %D/etc/iet/targets.allow ; fi
-%%DATADIR%%/targets.allow
-@exec if [ ! -f %D/etc/iet/targets.allow ]; then cp -p %D/%F %D/etc/iet/targets.allow; fi
+@sample %%DATADIR%%/ietd.conf etc/iet/ietd.conf
+@sample %%DATADIR%%/initiators.allow etc/iet/initiators.allow
+@sample %%DATADIR%%/initiators.deny etc/iet/initiators.deny
+@sample %%DATADIR%%/targets.allow etc/iet/targets.allow
 man/man5/ietd.conf.5.gz
 man/man8/ietadm.8.gz
 man/man8/ietd.8.gz
diff --git a/net/isc-dhcp43-client/pkg-plist b/net/isc-dhcp43-client/pkg-plist
index 4eb1147a2138..4e7c506d69c1 100644
--- a/net/isc-dhcp43-client/pkg-plist
+++ b/net/isc-dhcp43-client/pkg-plist
@@ -4,8 +4,6 @@ man/man5/dhclient.conf.5.gz
 man/man5/dhclient.leases.5.gz
 man/man8/dhclient.8.gz
 man/man8/dhclient-script.8.gz
-@unexec if cmp -s %D/etc/dhclient.conf.example %D/etc/dhclient.conf; then rm -f %D/etc/dhclient.conf; fi
-etc/dhclient.conf.example
-@exec if [ ! -f %D/etc/dhclient.conf ] ; then cp -p %D/%F %B/dhclient.conf; fi
+@sample etc/dhclient.conf.example etc/dhclient.conf
 @exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases
 @unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases
diff --git a/net/phpldapadmin/pkg-plist-chunk b/net/phpldapadmin/pkg-plist-chunk
index cde3f0c85ca3..aeffdb4a9c9c 100644
--- a/net/phpldapadmin/pkg-plist-chunk
+++ b/net/phpldapadmin/pkg-plist-chunk
@@ -1,7 +1 @@
-@mode 640
-@group %%PLA_GRP%%
-@unexec if cmp -s %D/%%WWWDIR%%/config/config.php.example %D/%%WWWDIR%%/config/config.php ; then rm -f %D/%%WWWDIR%%/config/config.php ; fi
-%%WWWDIR%%/config/config.php.example
-@exec [ ! -f %B/config.php ] && cp -p %B/%f %B/config.php || true
-@mode
-@group
+@sample(,%%PLA_GRP%%,640) %%WWWDIR%%/config/config.php.example %%WWWDIR%%/config/config.php
diff --git a/net/tayga/pkg-plist b/net/tayga/pkg-plist
index ac5d3cccf310..b36c6e63be9c 100644
--- a/net/tayga/pkg-plist
+++ b/net/tayga/pkg-plist
@@ -1,6 +1,4 @@
 man/man5/tayga.conf.5.gz
 man/man8/tayga.8.gz
-@unexec if cmp -s %D/etc/tayga.conf.example %D/etc/tayga.conf; then rm -f %D/etc/tayga.conf; fi
-etc/tayga.conf.example
-@exec if [ ! -f %D/etc/tayga.conf ] ; then cp -p %B/tayga.conf.example %D/etc/tayga.conf; fi
+@sample etc/tayga.conf.example etc/tayga.conf
 sbin/tayga
diff --git a/net/trafshow/pkg-plist b/net/trafshow/pkg-plist
index e9fdd8028216..e08dbf9c2b4c 100644
--- a/net/trafshow/pkg-plist
+++ b/net/trafshow/pkg-plist
@@ -1,5 +1,3 @@
 bin/trafshow
-@unexec if cmp -s %D/etc/trafshow %D/etc/trafshow.dist; then rm -f %D/etc/trafshow; fi
-etc/trafshow.dist
-@exec if [ ! -e %D/etc/trafshow ]; then cp -p %D/%F %B/trafshow; fi
+@sample etc/trafshow.dist etc/trafshow
 man/man1/trafshow.1.gz