Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by:    krion@
PR:             ports/88711 (related)

40 files changed, 101 insertions, 101 deletions

diff --git a/net-mgmt/bandwidthd/pkg-plist b/net-mgmt/bandwidthd/pkg-plist
index ecacdc36a557..490c5e9a77b2 100644
--- a/net-mgmt/bandwidthd/pkg-plist
+++ b/net-mgmt/bandwidthd/pkg-plist
@@ -4,6 +4,6 @@ bandwidthd/bandwidthd
 bandwidthd/htdocs/legend.gif
 bandwidthd/htdocs/logo.gif
 etc/rc.d/bandwidthd.sh.sample
-@unexec rmdir %D/bandwidthd/etc 2> /dev/null || true
-@unexec rmdir %D/bandwidthd/htdocs 2> /dev/null || true
+@dirrmtry bandwidthd/etc
+@dirrmtry bandwidthd/htdocs
 @unexec rmdir %D/bandwidthd 2> /dev/null || echo "If you do not plan on reinstalling bandwidthd, you can safely remove %D/bandwidthd"
diff --git a/net-mgmt/bpft/pkg-plist b/net-mgmt/bpft/pkg-plist
index d91739088830..66e9b0b1d808 100644
--- a/net-mgmt/bpft/pkg-plist
+++ b/net-mgmt/bpft/pkg-plist
@@ -10,6 +10,6 @@ etc/rc.d/trafd.sh
 etc/traflog.format
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WhatsNew
-@unexec rmdir %D/var/bpft 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/bpft
+@dirrmtry var
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/check_snmp_pkgvuln/pkg-plist b/net-mgmt/check_snmp_pkgvuln/pkg-plist
index f17dd8c006b8..515c1fd26d40 100644
--- a/net-mgmt/check_snmp_pkgvuln/pkg-plist
+++ b/net-mgmt/check_snmp_pkgvuln/pkg-plist
@@ -1,2 +1,2 @@
 %%NAGIOS_PLUGIN_DIR%%/check_snmp_pkgvuln
-@unexec rmdir %D/%%NAGIOS_PLUGIN_DIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOS_PLUGIN_DIR%%
diff --git a/net-mgmt/flowscan/pkg-plist b/net-mgmt/flowscan/pkg-plist
index f7cc316fe16f..9f65ba96a377 100644
--- a/net-mgmt/flowscan/pkg-plist
+++ b/net-mgmt/flowscan/pkg-plist
@@ -26,6 +26,6 @@ share/doc/flowscan/flowscan.sample
 @dirrm var/db/flows/graphs
 @dirrm var/db/flows/bin
 @dirrm var/db/flows
-@unexec rmdir %D/var/db 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/db
+@dirrmtry var
 @dirrm share/doc/flowscan
diff --git a/net-mgmt/ifgraph/pkg-plist b/net-mgmt/ifgraph/pkg-plist
index 9f7fc5035436..5be709646661 100644
--- a/net-mgmt/ifgraph/pkg-plist
+++ b/net-mgmt/ifgraph/pkg-plist
@@ -23,9 +23,9 @@ ifgraph/templates/pt-br/main-trailer.html
 @dirrm ifgraph/templates/pt-br/
 @dirrm ifgraph/templates
 @dirrm ifgraph/htdocs
-@unexec rmdir %D/ifgraph 2>/dev/null || true
-@unexec rmdir %D/var/ifgraph 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry ifgraph
+@dirrmtry var/ifgraph
+@dirrmtry var
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/INSTALACAO
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
diff --git a/net-mgmt/iog/pkg-plist b/net-mgmt/iog/pkg-plist
index 599f74e62128..01aba84a50f6 100644
--- a/net-mgmt/iog/pkg-plist
+++ b/net-mgmt/iog/pkg-plist
@@ -11,5 +11,5 @@ iog/iog-%%VERSION%%/iog.cfg.sample
 iog/iog-%%VERSION%%/ioglogo.gif
 iog/iog-%%VERSION%%/out.gif
 iog/iog
-@unexec rmdir %D/iog/iog-%%VERSION%% 2>/dev/null || true
-@unexec rmdir %D/iog 2>/dev/null || true
+@dirrmtry iog/iog-%%VERSION%%
+@dirrmtry iog
diff --git a/net-mgmt/nagios-plugins/pkg-plist b/net-mgmt/nagios-plugins/pkg-plist
index 6799bcdf7a02..3b39940b97d0 100644
--- a/net-mgmt/nagios-plugins/pkg-plist
+++ b/net-mgmt/nagios-plugins/pkg-plist
@@ -61,7 +61,7 @@ libexec/nagios/negate
 libexec/nagios/urlize
 libexec/nagios/utils.pm
 libexec/nagios/utils.sh
-@unexec rmdir %D/libexec/nagios 2>/dev/null || true
+@dirrmtry libexec/nagios
 share/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo
 share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
 @dirrm share/nagios/locale/de/LC_MESSAGES
@@ -69,4 +69,4 @@ share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
 @dirrm share/nagios/locale/de
 @dirrm share/nagios/locale/fr
 @dirrm share/nagios/locale
-@unexec rmdir %D/share/nagios 2>/dev/null || true
+@dirrmtry share/nagios
diff --git a/net-mgmt/nagios-silfreed-plugins/pkg-plist b/net-mgmt/nagios-silfreed-plugins/pkg-plist
index 32aa4fbfd4fd..70b831d31376 100644
--- a/net-mgmt/nagios-silfreed-plugins/pkg-plist
+++ b/net-mgmt/nagios-silfreed-plugins/pkg-plist
@@ -12,7 +12,7 @@ libexec/nagios/gen_check_snmp_if_services
 %%EXPECTTOOLS%%libexec/nagios/pm3.exp
 %%EXPECTTOOLS%%libexec/nagios/tnt
 %%EXPECTTOOLS%%libexec/nagios/tnt.exp
-@unexec rmdir %D/libexec/nagios 2>/dev/null || true
+@dirrmtry libexec/nagios
 %%EXAMPLESDIR%%/services-check_snmp_if.template
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/check_snmp_counter-0.5.0.README
diff --git a/net-mgmt/nagios-snmp-plugins/pkg-plist b/net-mgmt/nagios-snmp-plugins/pkg-plist
index 7269ac2333b0..c05e0cfbe1c4 100644
--- a/net-mgmt/nagios-snmp-plugins/pkg-plist
+++ b/net-mgmt/nagios-snmp-plugins/pkg-plist
@@ -1,5 +1,5 @@
 libexec/nagios/check_snmp_disk
 libexec/nagios/check_snmp_proc
-@unexec rmdir %D/libexec/nagios 2>/dev/null || true
+@dirrmtry libexec/nagios
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist
index 098d6696861e..f2b4d4334ddf 100644
--- a/net-mgmt/nagios/pkg-plist
+++ b/net-mgmt/nagios/pkg-plist
@@ -286,7 +286,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/stylesheets/summary.css
 %%NAGIOSWWWDIR%%/stylesheets/tac.css
 %%NAGIOSWWWDIR%%/stylesheets/trends.css
-@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrmtry etc/nagios
 @dirrm %%NAGIOSWWWDIR%%/cgi-bin
 @dirrm %%NAGIOSWWWDIR%%/contexthelp
 @dirrm %%NAGIOSWWWDIR%%/docs/images
@@ -296,7 +296,7 @@ etc/nagios/resource.cfg-sample
 @dirrm %%NAGIOSWWWDIR%%/media
 @dirrm %%NAGIOSWWWDIR%%/ssi
 @dirrm %%NAGIOSWWWDIR%%/stylesheets
-@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOSWWWDIR%%
 @unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
 @unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
 @unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true
diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist
index 0da4352e5755..471ff25a1211 100644
--- a/net-mgmt/nagios12/pkg-plist
+++ b/net-mgmt/nagios12/pkg-plist
@@ -298,7 +298,7 @@ share/nagios/stylesheets/statusmap.css
 share/nagios/stylesheets/summary.css
 share/nagios/stylesheets/tac.css
 share/nagios/stylesheets/trends.css
-@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrmtry etc/nagios
 @dirrm share/nagios/cgi-bin
 @dirrm share/nagios/contexthelp
 @dirrm share/nagios/docs/images
diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist
index 098d6696861e..f2b4d4334ddf 100644
--- a/net-mgmt/nagios2/pkg-plist
+++ b/net-mgmt/nagios2/pkg-plist
@@ -286,7 +286,7 @@ etc/nagios/resource.cfg-sample
 %%NAGIOSWWWDIR%%/stylesheets/summary.css
 %%NAGIOSWWWDIR%%/stylesheets/tac.css
 %%NAGIOSWWWDIR%%/stylesheets/trends.css
-@unexec rmdir %D/etc/nagios 2>/dev/null || true
+@dirrmtry etc/nagios
 @dirrm %%NAGIOSWWWDIR%%/cgi-bin
 @dirrm %%NAGIOSWWWDIR%%/contexthelp
 @dirrm %%NAGIOSWWWDIR%%/docs/images
@@ -296,7 +296,7 @@ etc/nagios/resource.cfg-sample
 @dirrm %%NAGIOSWWWDIR%%/media
 @dirrm %%NAGIOSWWWDIR%%/ssi
 @dirrm %%NAGIOSWWWDIR%%/stylesheets
-@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOSWWWDIR%%
 @unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true
 @unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true
 @unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true
diff --git a/net-mgmt/nav/pkg-plist b/net-mgmt/nav/pkg-plist
index fbbdcb37cee0..89bad457af25 100644
--- a/net-mgmt/nav/pkg-plist
+++ b/net-mgmt/nav/pkg-plist
@@ -578,12 +578,12 @@ nav/lib/python/rotater.py
 @exec install -d -m 0755 -o navcron -g nav %D/nav/var/rrd %D/nav/var/run %D/nav/var/pg_backup %D/nav/var/log
 @unexec rm %D/nav/var/log/thresholdMon.log 2>/dev/null || true
 @unexec rm %D/nav/var/run/*.pid 2>/dev/null || true
-@unexec rmdir %D/nav/var/log/* 2>/dev/null || true
-@unexec rmdir %D/nav/var/log 2>/dev/null || true
-@unexec rmdir %D/nav/var/rrd 2>/dev/null || true
-@unexec rmdir %D/nav/var/run 2>/dev/null || true
-@unexec rmdir %D/nav/var/pg_backup 2>/dev/null || true
-@unexec rmdir %D/nav/var 2>/dev/null || true
+@dirrmtry nav/var/log/*
+@dirrmtry nav/var/log
+@dirrmtry nav/var/rrd
+@dirrmtry nav/var/run
+@dirrmtry nav/var/pg_backup
+@dirrmtry nav/var
 @unexec find %D/nav/lib/python/nav -type f -name "*.pyc" -delete 2>/dev/null || true
 @dirrm nav/apache/tools
 @dirrm nav/apache/webapps
@@ -675,5 +675,5 @@ nav/lib/python/rotater.py
 @dirrm nav/lib/python/nav
 @dirrm nav/lib/python
 @dirrm nav/lib
-@unexec rmdir %D/nav 2>/dev/null || true
+@dirrmtry nav
 @unexec echo "Some files/directories may be left in %D/nav/var."
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index 48a1d50bf3cb..34b9322dbe6c 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -404,8 +404,8 @@ sbin/snmptrapd
 @dirrm %%DATADIR%%/snmpconf-data/snmpd-data
 @dirrm %%DATADIR%%/snmpconf-data/snmp-data
 @dirrm %%DATADIR%%/snmpconf-data
-@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/mibs
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
@@ -425,4 +425,4 @@ sbin/snmptrapd
 @dirrm include/net-snmp/library
 @dirrm include/net-snmp/agent
 @dirrm include/net-snmp
-@unexec rmdir %D/etc/snmp 2>/dev/null || true
+@dirrmtry etc/snmp
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 48a1d50bf3cb..34b9322dbe6c 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -404,8 +404,8 @@ sbin/snmptrapd
 @dirrm %%DATADIR%%/snmpconf-data/snmpd-data
 @dirrm %%DATADIR%%/snmpconf-data/snmp-data
 @dirrm %%DATADIR%%/snmpconf-data
-@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/mibs
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
@@ -425,4 +425,4 @@ sbin/snmptrapd
 @dirrm include/net-snmp/library
 @dirrm include/net-snmp/agent
 @dirrm include/net-snmp
-@unexec rmdir %D/etc/snmp 2>/dev/null || true
+@dirrmtry etc/snmp
diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist
index 9afa3688e2d0..75c49651f610 100644
--- a/net-mgmt/net-snmp4/pkg-plist
+++ b/net-mgmt/net-snmp4/pkg-plist
@@ -143,4 +143,4 @@ share/snmp/snmpconf/snmptrapd.conf/traphandle
 @dirrm share/snmp/snmpconf/snmpd.conf
 @dirrm share/snmp/snmpconf/snmptrapd.conf
 @dirrm share/snmp/snmpconf
-@unexec rmdir %D/share/snmp 2>/dev/null || true
+@dirrmtry share/snmp
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index 48a1d50bf3cb..34b9322dbe6c 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -404,8 +404,8 @@ sbin/snmptrapd
 @dirrm %%DATADIR%%/snmpconf-data/snmpd-data
 @dirrm %%DATADIR%%/snmpconf-data/snmp-data
 @dirrm %%DATADIR%%/snmpconf-data
-@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/mibs
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store
@@ -425,4 +425,4 @@ sbin/snmptrapd
 @dirrm include/net-snmp/library
 @dirrm include/net-snmp/agent
 @dirrm include/net-snmp
-@unexec rmdir %D/etc/snmp 2>/dev/null || true
+@dirrmtry etc/snmp
diff --git a/net-mgmt/netsaint/pkg-plist b/net-mgmt/netsaint/pkg-plist
index 577913c6eba7..5aa3f5f888c3 100644
--- a/net-mgmt/netsaint/pkg-plist
+++ b/net-mgmt/netsaint/pkg-plist
@@ -280,7 +280,7 @@ share/netsaint/stylesheets/status.css
 share/netsaint/stylesheets/statusmap.css
 share/netsaint/stylesheets/tac.css
 share/netsaint/stylesheets/trends.css
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
+@dirrmtry etc/netsaint
 @dirrm share/netsaint/docs/developer/images
 @dirrm share/netsaint/docs/developer
 @dirrm share/netsaint/docs/images
@@ -291,7 +291,7 @@ share/netsaint/stylesheets/trends.css
 @dirrm share/netsaint/sbin
 @dirrm share/netsaint/stylesheets
 @dirrm share/netsaint
-@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true
-@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true
-@unexec rmdir %D/var/netsaint 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/netsaint/archives
+@dirrmtry var/netsaint/rw
+@dirrmtry var/netsaint
+@dirrmtry var
diff --git a/net-mgmt/nfsen-devel/pkg-plist b/net-mgmt/nfsen-devel/pkg-plist
index 8d36389bb8f1..3b824342b6b2 100644
--- a/net-mgmt/nfsen-devel/pkg-plist
+++ b/net-mgmt/nfsen-devel/pkg-plist
@@ -99,9 +99,9 @@ var/%%PORTNAME%%/profiles/live/profile.dat
 @exec mkdir -p %D/var/%%PORTNAME%%/filters
 @dirrm var/%%PORTNAME%%/run
 @dirrm var/%%PORTNAME%%/filters
-@unexec rmdir %D/var/%%PORTNAME%%/profiles/live/upstream1 2>/dev/null || true
-@unexec rmdir %D/var/%%PORTNAME%%/profiles/live 2>/dev/null || true
-@unexec rmdir %D/var/%%PORTNAME%%/profiles 2>/dev/null || true
-@unexec rmdir %D/var/%%PORTNAME%% 2>/dev/null || true
+@dirrmtry var/%%PORTNAME%%/profiles/live/upstream1
+@dirrmtry var/%%PORTNAME%%/profiles/live
+@dirrmtry var/%%PORTNAME%%/profiles
+@dirrmtry var/%%PORTNAME%%
 @dirrm libexec/%%PORTNAME%%/plugins
 @dirrm libexec/%%PORTNAME%%
diff --git a/net-mgmt/nfsen/pkg-plist b/net-mgmt/nfsen/pkg-plist
index 8d36389bb8f1..3b824342b6b2 100644
--- a/net-mgmt/nfsen/pkg-plist
+++ b/net-mgmt/nfsen/pkg-plist
@@ -99,9 +99,9 @@ var/%%PORTNAME%%/profiles/live/profile.dat
 @exec mkdir -p %D/var/%%PORTNAME%%/filters
 @dirrm var/%%PORTNAME%%/run
 @dirrm var/%%PORTNAME%%/filters
-@unexec rmdir %D/var/%%PORTNAME%%/profiles/live/upstream1 2>/dev/null || true
-@unexec rmdir %D/var/%%PORTNAME%%/profiles/live 2>/dev/null || true
-@unexec rmdir %D/var/%%PORTNAME%%/profiles 2>/dev/null || true
-@unexec rmdir %D/var/%%PORTNAME%% 2>/dev/null || true
+@dirrmtry var/%%PORTNAME%%/profiles/live/upstream1
+@dirrmtry var/%%PORTNAME%%/profiles/live
+@dirrmtry var/%%PORTNAME%%/profiles
+@dirrmtry var/%%PORTNAME%%
 @dirrm libexec/%%PORTNAME%%/plugins
 @dirrm libexec/%%PORTNAME%%
diff --git a/net-mgmt/ng_ipacct/pkg-plist b/net-mgmt/ng_ipacct/pkg-plist
index 5e24ce8b1465..1c1bb2cc8b04 100644
--- a/net-mgmt/ng_ipacct/pkg-plist
+++ b/net-mgmt/ng_ipacct/pkg-plist
@@ -1,6 +1,6 @@
 include/netgraph/ng_ipacct.h
 etc/ng_ipacct.conf
 sbin/ipacctctl
-@unexec rmdir %D/include/netgraph 2>/dev/null || true
+@dirrmtry include/netgraph
 @cwd /
 %%KMODDIR%%/ng_ipacct.ko
diff --git a/net-mgmt/nrpep/pkg-plist b/net-mgmt/nrpep/pkg-plist
index f480a40ce910..ab66806f93bc 100644
--- a/net-mgmt/nrpep/pkg-plist
+++ b/net-mgmt/nrpep/pkg-plist
@@ -4,5 +4,5 @@ libexec/netsaint/check_nrpep
 etc/netsaint/check_nrpep.cfg
 share/doc/nrpep/README
 @dirrm share/doc/nrpep
-@unexec rmdir %D/libexec/netsaint 2>/dev/null || true
-@unexec rmdir %D/etc/netsaint 2>/dev/null || true
+@dirrmtry libexec/netsaint
+@dirrmtry etc/netsaint
diff --git a/net-mgmt/p5-NSNMP/pkg-plist b/net-mgmt/p5-NSNMP/pkg-plist
index 35eaf7af1611..dd3e4ef5f214 100644
--- a/net-mgmt/p5-NSNMP/pkg-plist
+++ b/net-mgmt/p5-NSNMP/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/NSNMP/Mapper.pm
 %%SITE_PERL%%/NSNMP/Simple.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/NSNMP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP
+@dirrmtry %%SITE_PERL%%/NSNMP
diff --git a/net-mgmt/p5-Net-CIDR/pkg-plist b/net-mgmt/p5-Net-CIDR/pkg-plist
index cb70ad77e5a0..9948997b2120 100644
--- a/net-mgmt/p5-Net-CIDR/pkg-plist
+++ b/net-mgmt/p5-Net-CIDR/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/CIDR.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IP/pkg-plist b/net-mgmt/p5-Net-IP/pkg-plist
index 2845219738ab..216c811f7ba3 100644
--- a/net-mgmt/p5-Net-IP/pkg-plist
+++ b/net-mgmt/p5-Net-IP/pkg-plist
@@ -2,6 +2,6 @@ bin/iptab
 bin/ipcount
 %%SITE_PERL%%/Net/IP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
index 44e353284e09..e318a3dd047f 100644
--- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist
@@ -4,6 +4,6 @@ bin/ipv4calc
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr
 @dirrm %%SITE_PERL%%/auto/Net/IPv4Addr
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-IPv6Addr/pkg-plist b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
index a572beffdd37..1d0cf77ed40c 100644
--- a/net-mgmt/p5-Net-IPv6Addr/pkg-plist
+++ b/net-mgmt/p5-Net-IPv6Addr/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/IPv6Addr.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-Netmask/pkg-plist b/net-mgmt/p5-Net-Netmask/pkg-plist
index 99bfc80a6892..e7967d6f58de 100644
--- a/net-mgmt/p5-Net-Netmask/pkg-plist
+++ b/net-mgmt/p5-Net-Netmask/pkg-plist
@@ -2,5 +2,5 @@
 %%SITE_PERL%%/Net/Netmask.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-SNMP/pkg-plist b/net-mgmt/p5-Net-SNMP/pkg-plist
index 8150f3eff2b8..68dae4d4af92 100644
--- a/net-mgmt/p5-Net-SNMP/pkg-plist
+++ b/net-mgmt/p5-Net-SNMP/pkg-plist
@@ -14,8 +14,8 @@ bin/snmpkey
 %%SITE_PERL%%/Net/SNMP/Transport/UDP6.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/SNMP/Transport
 @dirrm %%SITE_PERL%%/Net/SNMP/Security
 @dirrm %%SITE_PERL%%/Net/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-Net-SNMP3/pkg-plist b/net-mgmt/p5-Net-SNMP3/pkg-plist
index a78720eea4eb..57d20de75059 100644
--- a/net-mgmt/p5-Net-SNMP3/pkg-plist
+++ b/net-mgmt/p5-Net-SNMP3/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/Net/SNMP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net-mgmt/p5-POE-Component-SNMP/pkg-plist b/net-mgmt/p5-POE-Component-SNMP/pkg-plist
index 3585d42a87f2..b6bc259f77b6 100644
--- a/net-mgmt/p5-POE-Component-SNMP/pkg-plist
+++ b/net-mgmt/p5-POE-Component-SNMP/pkg-plist
@@ -2,8 +2,8 @@
 %%SITE_PERL%%/POE/Component/SNMP.pm
 %%SITE_PERL%%/POE/Component/SNMP/Dispatcher.pm
 @dirrm %%SITE_PERL%%/POE/Component/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
index b8538a087372..7d754ba6d348 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist
@@ -10,4 +10,4 @@ bin/mibcompiler
 @dirrm %%SITE_PERL%%/SNMP
 @dirrm %%SITE_PERL%%/Bundle/SNMP/MIB
 @dirrm %%SITE_PERL%%/Bundle/SNMP
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/net-mgmt/p5-Telnet-Cisco/pkg-plist b/net-mgmt/p5-Telnet-Cisco/pkg-plist
index a47cbba36307..1efc6f4ad99e 100644
--- a/net-mgmt/p5-Telnet-Cisco/pkg-plist
+++ b/net-mgmt/p5-Telnet-Cisco/pkg-plist
@@ -2,10 +2,10 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist
 %%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet/Cisco 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/Telnet
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/auto/Net/Telnet/Cisco
+@dirrmtry %%SITE_PERL%%/auto/Net/Telnet
+@dirrmtry %%SITE_PERL%%/auto/Net
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist b/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist
index 4e9c26fc9341..120c772bad33 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist
+++ b/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP/.packlist
 %%SITE_PERL%%/Tie/NetAddr/IP.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie/NetAddr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie/NetAddr
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/net-mgmt/pancho/pkg-plist b/net-mgmt/pancho/pkg-plist
index 857919ea67bd..bd86cf06fd9a 100644
--- a/net-mgmt/pancho/pkg-plist
+++ b/net-mgmt/pancho/pkg-plist
@@ -14,9 +14,9 @@ etc/pancho.conf.sample
 %%SITE_PERL%%/Pancho/Plugins/Baystack.pm
 %%SITE_PERL%%/Pancho/Plugins/Passport.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Pancho/Plugins 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pancho 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pancho/Plugins
+@dirrmtry %%SITE_PERL%%/Pancho
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.plugins
 %%PORTDOCS%%%%DOCSDIR%%/Plugin.sample
diff --git a/net-mgmt/pfpro/pkg-plist b/net-mgmt/pfpro/pkg-plist
index 2c2848d0e5dc..f06014b0f4d4 100644
--- a/net-mgmt/pfpro/pkg-plist
+++ b/net-mgmt/pfpro/pkg-plist
@@ -12,7 +12,7 @@ share/xml/pfpro/firewall.xsd
 share/xsl/pfpro/001to010.xsl
 share/xsl/pfpro/xml2pf.xsl
 @dirrm share/xsl/pfpro
-@unexec rmdir %D/share/xsl 2>/dev/null || true
+@dirrmtry share/xsl
 @dirrm share/xml/pfpro
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DOCSDIR%%
diff --git a/net-mgmt/rancid-devel/pkg-plist b/net-mgmt/rancid-devel/pkg-plist
index 5566b9b79d16..30e9fdf886e2 100644
--- a/net-mgmt/rancid-devel/pkg-plist
+++ b/net-mgmt/rancid-devel/pkg-plist
@@ -1,6 +1,6 @@
 @exec mkdir -p %D/var/rancid
 @exec chmod 775 %D/var/rancid
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var
 bin/rancid-cvs
 bin/rancid-run
 libexec/rancid/alogin
diff --git a/net-mgmt/rancid/pkg-plist b/net-mgmt/rancid/pkg-plist
index 5566b9b79d16..30e9fdf886e2 100644
--- a/net-mgmt/rancid/pkg-plist
+++ b/net-mgmt/rancid/pkg-plist
@@ -1,6 +1,6 @@
 @exec mkdir -p %D/var/rancid
 @exec chmod 775 %D/var/rancid
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var
 bin/rancid-cvs
 bin/rancid-run
 libexec/rancid/alogin
diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist
index c05739f99e48..564a10446dc3 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -145,13 +145,13 @@ smokeping/lib/Smokeping/probes/skel.pm
 smokeping/lib/Smokeping/Examples.pm
 smokeping/lib/Smokeping/RRDtools.pm
 smokeping/lib/Config/Grammar.pm
-@unexec rmdir %D/etc/smokeping 2>/dev/null || true
+@dirrmtry etc/smokeping
 @exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img
 @unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true
 @exec mkdir -p %D/var/smokeping
 @exec chown smokeping:smokeping %D/var/smokeping
-@unexec rmdir %D/var/smokeping 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/smokeping
+@dirrmtry var
 @dirrm smokeping/htdocs
 @dirrm smokeping/lib/Config
 @dirrm smokeping/lib/Smokeping/probes
@@ -164,4 +164,4 @@ smokeping/lib/Config/Grammar.pm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/smokeping 2>/dev/null || true
+@dirrmtry smokeping
diff --git a/net-mgmt/trafd/pkg-plist b/net-mgmt/trafd/pkg-plist
index b0d384d59596..48ef0926ea94 100644
--- a/net-mgmt/trafd/pkg-plist
+++ b/net-mgmt/trafd/pkg-plist
@@ -13,6 +13,6 @@ etc/rc.d/trafd.sh.sample
 @exec mkdir %D/var 2>/dev/null || true
 @exec mkdir %D/var/log 2>/dev/null || true
 @exec mkdir %D/var/trafd 2>/dev/null || true
-@unexec rmdir %D/var/trafd 2>/dev/null || true
-@unexec rmdir %D/var/log 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/trafd
+@dirrmtry var/log
+@dirrmtry var