diff options
| -rw-r--r-- | mail/isoqlog/pkg-plist | 8 | ||||
| -rw-r--r-- | mail/vpopmail/pkg-plist | 20 | ||||
| -rw-r--r-- | net/bird-devel/pkg-plist | 4 | ||||
| -rw-r--r-- | net/bird/pkg-plist | 4 | ||||
| -rw-r--r-- | net/bird6/pkg-plist | 4 | ||||
| -rw-r--r-- | net/iet/pkg-plist | 16 | ||||
| -rw-r--r-- | net/isc-dhcp43-client/pkg-plist | 4 | ||||
| -rw-r--r-- | net/phpldapadmin/pkg-plist-chunk | 8 | ||||
| -rw-r--r-- | net/tayga/pkg-plist | 4 | ||||
| -rw-r--r-- | net/trafshow/pkg-plist | 4 |
10 files changed, 18 insertions, 58 deletions
diff --git a/mail/isoqlog/pkg-plist b/mail/isoqlog/pkg-plist index 6e6e9d162ccc..4128e4e55ad1 100644 --- a/mail/isoqlog/pkg-plist +++ b/mail/isoqlog/pkg-plist @@ -1,10 +1,6 @@ bin/isoqlog -@unexec if cmp -s %D/etc/isoqlog.conf %D/etc/isoqlog.conf-dist; then rm -f %D/etc/isoqlog.conf; fi -etc/isoqlog.conf-dist -@exec [ -f %B/isoqlog.conf ] || cp %B/%f %B/isoqlog.conf -@unexec if cmp -s %D/etc/isoqlog.domains %D/etc/isoqlog.domains-dist; then rm -f %D/etc/isoqlog.domains; fi -etc/isoqlog.domains-dist -@exec [ -f %B/isoqlog.domains ] || cp %B/%f %B/isoqlog.domains +@sample etc/isoqlog.conf-dist etc/isoqlog.conf +@sample etc/isoqlog.domains-dist etc/isoqlog.domains %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/COPYING diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist index 84805b69c04b..aa96f1eb4a86 100644 --- a/mail/vpopmail/pkg-plist +++ b/mail/vpopmail/pkg-plist @@ -31,22 +31,12 @@ vpopmail/etc/inc_deps vpopmail/etc/lib_deps @exec if [ ! -f %D/vpopmail/etc/defaultdomain ]; then install -o vpopmail -g vchkpw /dev/null %D/vpopmail/etc/defaultdomain; fi @unexec if [ -f %D/vpopmail/etc/defaultdomain ] && [ ! -s %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi -@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi -vpopmail/etc/tcp.smtp-dist -@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi -@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi -vpopmail/etc/vlimits.default-dist -@exec if [ ! -f %D/vpopmail/etc/vlimits.default ] ; then cp -p %D/%F %B/vlimits.default; fi -%%LDAP%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.ldap %D/vpopmail/etc/vpopmail.ldap-dist; then rm -f %D/vpopmail/etc/vpopmail.ldap; fi -%%LDAP%%vpopmail/etc/vpopmail.ldap-dist -%%LDAP%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.ldap ] ; then cp -p %D/%F %B/vpopmail.ldap; fi +@sample vpopmail/etc/tcp.smtp-dist vpopmail/etc/tcp.smtp +@sample vpopmail/etc/vlimits.default-dist vpopmail/etc/vlimits.default +%%LDAP%%@sample vpopmail/etc/vpopmail.ldap-dist vpopmail/etc/vpopmail.ldap %%LDAP%%@exec echo "You need to specify the LDAP connection settings in the %D/vpopmail/etc/vpopmail.ldap file" | /usr/bin/fmt -%%MYSQL%%@unexec if cmp -s %D/vpopmail/etc/vpopmail.mysql %D/vpopmail/etc/vpopmail.mysql-dist; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi -%%MYSQL%%vpopmail/etc/vpopmail.mysql-dist -%%MYSQL%%@exec if [ ! -f %D/vpopmail/etc/vpopmail.mysql ] ; then cp -p %D/%F %B/vpopmail.mysql; fi -@unexec if cmp -s %D/vpopmail/etc/vusagec.conf %D/vpopmail/etc/vusagec.conf-dist; then rm -f %D/vpopmail/etc/vusagec.conf; fi -vpopmail/etc/vusagec.conf-dist -@exec if [ ! -f %D/vpopmail/etc/vusagec.conf ] ; then cp -p %D/%F %B/vusagec.conf; fi +%%MYSQL%%@sample vpopmail/etc/vpopmail.mysql-dist vpopmail/etc/vpopmail.mysql +@sample vpopmail/etc/vusagec.conf-dist vpopmail/etc/vusagec.conf @owner @group %%PORTDOCS%%vpopmail/doc/doc_html/vpopmail.html 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 |