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

Approved by: krion@ PR: ports/88711 (related)
author: Edwin Groothuis <edwin@FreeBSD.org> 2006-01-22 03:01:03 +0000
committer: Edwin Groothuis <edwin@FreeBSD.org> 2006-01-22 03:01:03 +0000
commit: 508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
tree: f7810d4887e5297c7b7788225e906b99c81d709b /net
parent: 4008c7e23fe847e2c8ade0ecb5d86f943d84c917 (diff)
download: ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.tar.gz
ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.zip
137 files changed, 518 insertions, 518 deletions
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
index 4c7324be4788..356d8fdfb327 100644
--- a/net/DarwinStreamingServer/pkg-plist
+++ b/net/DarwinStreamingServer/pkg-plist
@@ -156,11 +156,11 @@ etc/streaming/streamingserver.xml-dist
 @dirrm %%DATADIR%%/AdminHtml/images
 @dirrm %%DATADIR%%/AdminHtml/html_en
 @dirrm %%DATADIR%%/AdminHtml
-@unexec rmdir %D/%%DATADIR%%/movies             2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%                    2>/dev/null || true
-@unexec rmdir %D/libexec/StreamingServerModules 2>/dev/null || true
+@dirrmtry %%DATADIR%%/movies            
+@dirrmtry %%DATADIR%%                   
+@dirrmtry libexec/StreamingServerModules
 @exec   mkdir %D/libexec/StreamingServerModules 2>/dev/null || true
-@unexec rmdir %D/etc/streaming                  2>/dev/null || true
+@dirrmtry etc/streaming                 
 @unexec rmdir /var/spool/streaming.playlists    2>/dev/null || true
 @exec   mkdir /var/spool/streaming.playlists    2>/dev/null || true
 @unexec rmdir /var/log/streaming                2>/dev/null || true
diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist
index 649ee10630f5..642a853d2dd1 100644
--- a/net/GeoIP/pkg-plist
+++ b/net/GeoIP/pkg-plist
@@ -13,4 +13,4 @@ lib/libGeoIPUpdate.a
 lib/libGeoIPUpdate.so
 lib/libGeoIPUpdate.so.0
 %%DATADIR%%/GeoIP.dat
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/net/amule1/pkg-plist b/net/amule1/pkg-plist
index 72e8096fc80d..69e7a99512d6 100644
--- a/net/amule1/pkg-plist
+++ b/net/amule1/pkg-plist
@@ -74,8 +74,8 @@ share/locale/pl/LC_MESSAGES/amule.mo
 share/locale/pt_BR/LC_MESSAGES/amule.mo
 share/locale/ru/LC_MESSAGES/amule.mo
 @dirrm share/gnome/doc/aMule-1.2.8
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
+@dirrmtry share/gnome/doc
+@dirrmtry share/locale/ee/LC_MESSAGES
+@dirrmtry share/locale/ee
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
diff --git a/net/amule2/pkg-plist b/net/amule2/pkg-plist
index aec2e898ca9b..b579ccf62f0d 100644
--- a/net/amule2/pkg-plist
+++ b/net/amule2/pkg-plist
@@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo
 share/locale/pt_PT/LC_MESSAGES/amule.mo
 share/locale/hr/LC_MESSAGES/amule.mo
 share/locale/sl/LC_MESSAGES/amule.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_US 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/et_EE/LC_MESSAGES
+@dirrmtry share/locale/et_EE
+@dirrmtry share/locale/it_CH/LC_MESSAGES
+@dirrmtry share/locale/it_CH
+@dirrmtry share/locale/ko_KR/LC_MESSAGES
+@dirrmtry share/locale/ko_KR
 share/gnome/doc/aMule-2.1.0/ABOUT-NLS
 share/gnome/doc/aMule-2.1.0/amulesig.txt
 share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt
@@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README
 share/gnome/doc/aMule-2.1.0/TODO
 share/gnome/doc/aMule-2.1.0/EC_Protocol.txt
 share/gnome/doc/aMule-2.1.0/socks4.protocol
-@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true
-@unexec rmdir %D/share/gnome/doc 2>/dev/null || true
+@dirrmtry share/gnome/doc/aMule-2.1.0
+@dirrmtry share/gnome/doc
 %%PL_CAS%%share/gnome/cas/tmp.html
 %%PL_CAS%%share/gnome/cas/stat.png
 %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
 %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
 %%PL_ALC%%share/gnome/pixmaps/alc.xpm
 share/gnome/pixmaps/amule.xpm
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
 %%PL_CAS%%share/gnome/applications/wxcas.desktop
 %%PL_ALC%%share/gnome/applications/alc.desktop
 share/gnome/applications/amule.desktop
@@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
 %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
 lib/xchat/plugins/xas.pl
-@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xchat 2>/dev/null || true
+@dirrmtry lib/xchat/plugins
+@dirrmtry lib/xchat
 %%PL_CAS%%bin/cas
 %%PL_CAS%%bin/wxcas
 %%PL_ALC%%bin/alc
diff --git a/net/apache-soap/pkg-plist b/net/apache-soap/pkg-plist
index d1f0968e3d9c..b3d705cb00f6 100644
--- a/net/apache-soap/pkg-plist
+++ b/net/apache-soap/pkg-plist
@@ -676,5 +676,5 @@ share/doc/apache-soap
 @dirrm %%T%%/docs/trouble
 @dirrm %%T%%/docs
 @dirrm %%T%%
-@unexec rmdir %D/share/java/classes 2>/dev/null || true
-@unexec rmdir %D/share/java 2>/dev/null || true
+@dirrmtry share/java/classes
+@dirrmtry share/java
diff --git a/net/apollon/pkg-plist b/net/apollon/pkg-plist
index cc482ed5dbe9..f096221ec703 100644
--- a/net/apollon/pkg-plist
+++ b/net/apollon/pkg-plist
@@ -53,28 +53,28 @@ share/applnk/Applications/Apollon.desktop
 %%PORTDOCS%%share/doc/HTML/en/apollon/credits.docbook
 %%PORTDOCS%%share/doc/HTML/en/apollon/index.cache.bz2
 %%PORTDOCS%%share/doc/HTML/en/apollon/common
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_br/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_br 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128/filesystems 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/pt_br/LC_MESSAGES
+@dirrmtry share/locale/pt_br
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/crystalsvg/64x64/filesystems
+@dirrmtry share/icons/crystalsvg/64x64/apps
+@dirrmtry share/icons/crystalsvg/48x48/filesystems
+@dirrmtry share/icons/crystalsvg/48x48/apps
+@dirrmtry share/icons/crystalsvg/32x32/filesystems
+@dirrmtry share/icons/crystalsvg/32x32/apps
+@dirrmtry share/icons/crystalsvg/22x22/apps
+@dirrmtry share/icons/crystalsvg/16x16/filesystems
+@dirrmtry share/icons/crystalsvg/16x16/apps
+@dirrmtry share/icons/crystalsvg/128x128/filesystems
+@dirrmtry share/icons/crystalsvg/128x128/apps
+@dirrmtry share/applnk/Applications
 %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon
 %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
diff --git a/net/arla/pkg-plist b/net/arla/pkg-plist
index 9d33df6c1380..5c5879f5150e 100644
--- a/net/arla/pkg-plist
+++ b/net/arla/pkg-plist
@@ -111,4 +111,4 @@ share/gnats/stacken
 @dirrm include/rxkad
 @dirrm include/ss
 @dirrm share/gnats
-@unexec rmdir %D/cache 2>/dev/null || true
+@dirrmtry cache
diff --git a/net/beacon/pkg-plist b/net/beacon/pkg-plist
index e34c01a04f27..5c1f285a6f26 100644
--- a/net/beacon/pkg-plist
+++ b/net/beacon/pkg-plist
@@ -4,9 +4,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/Beacon.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
 www/beacon-%%VERSION%%/beacon
 @dirrm www/beacon-%%VERSION%%
 etc/beacon.conf.sample
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
index 6159826c77e4..7e493c757313 100644
--- a/net/blam/pkg-plist
+++ b/net/blam/pkg-plist
@@ -51,8 +51,8 @@ share/locale/tr/LC_MESSAGES/blam.mo
 share/locale/uk/LC_MESSAGES/blam.mo
 share/locale/zh_CN/LC_MESSAGES/blam.mo
 share/locale/zh_TW/LC_MESSAGES/blam.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrm share/gnome/blam/images
 @dirrm share/gnome/blam
 @dirrm lib/blam
diff --git a/net/bnbt/pkg-plist b/net/bnbt/pkg-plist
index 16496f2e9a49..7d52743957b0 100644
--- a/net/bnbt/pkg-plist
+++ b/net/bnbt/pkg-plist
@@ -1,4 +1,4 @@
 bin/bnbt
 @exec mkdir -p /var/log/bnbt
 @exec mkdir -p %D/etc/bnbt
-@unexec rmdir %D/etc/bnbt 2>/dev/null || true
+@dirrmtry etc/bnbt
diff --git a/net/c3270/pkg-plist b/net/c3270/pkg-plist
index a7d3c04376fa..b18aa5613a08 100644
--- a/net/c3270/pkg-plist
+++ b/net/c3270/pkg-plist
@@ -6,4 +6,4 @@ etc/x3270/ibm_hosts
 %%DBCS%%etc/x3270/icudt28l_ibm-1027_P100-1995.cnv
 %%DBCS%%etc/x3270/icudt28l_ibm-300_P110-1997.cnv
 %%DBCS%%etc/x3270/icudt28l_ibm-837_P100-2000.cnv
-@unexec rmdir %D/etc/x3270 2>/dev/null || true
+@dirrmtry etc/x3270
diff --git a/net/cnupm/pkg-plist b/net/cnupm/pkg-plist
index 297e7d1236e4..6074f09129e5 100644
--- a/net/cnupm/pkg-plist
+++ b/net/cnupm/pkg-plist
@@ -6,4 +6,4 @@ sbin/cnupmstat
 @exec pw usershow %%CNUPM_OWN%% 2>/dev/null || pw useradd -n %%CNUPM_OWN%% -c 'Cnupm traffic collector' -g %%CNUPM_GRP%% -s /sbin/nologin
 @exec install -o %%CNUPM_OWN%% -g %%CNUPM_GRP%% -m 750 -d %D/var/cnupm
 @exec pw usermod -n %%CNUPM_OWN%% -d %D/var/cnupm
-@unexec rmdir %D/var/cnupm 2>/dev/null || true
+@dirrmtry var/cnupm
diff --git a/net/ct/pkg-plist b/net/ct/pkg-plist
index 9efdfb660adc..4bf9ab2f6b19 100644
--- a/net/ct/pkg-plist
+++ b/net/ct/pkg-plist
@@ -2353,7 +2353,7 @@ v6eval/ct/tunnel/tunnel.pm
 v6eval/doc/00README.ct
 v6eval/doc/CHANGELOG.ct
 v6eval/doc/INSTALL.ct
-@unexec rmdir %D/v6eval/doc 2>/dev/null || true
+@dirrmtry v6eval/doc
 @dirrm v6eval/ct/dd
 @dirrm v6eval/ct/default-addr-select
 @dirrm v6eval/ct/icmp
diff --git a/net/dcd/pkg-plist b/net/dcd/pkg-plist
index fc4ed235eaf4..5a91762c0485 100644
--- a/net/dcd/pkg-plist
+++ b/net/dcd/pkg-plist
@@ -12,6 +12,6 @@ etc/dcd/dcd.welcome.default
 etc/dcd/nicks.allow.default
 @exec install -d -m 751 -o daemon -g daemon /var/log/dcd
 @unexec rmdir /var/log/dcd 2>/dev/null || true
-@unexec rmdir %D/etc/dcd 2>/dev/null || true
-@unexec rmdir %D/man/pl.ISO8859-2/man8 2>/dev/null || true
-@unexec rmdir %D/man/pl.ISO8859-2 2>/dev/null || true
+@dirrmtry etc/dcd
+@dirrmtry man/pl.ISO8859-2/man8
+@dirrmtry man/pl.ISO8859-2
diff --git a/net/dctc-gui/pkg-plist b/net/dctc-gui/pkg-plist
index 455c8cb1185d..6bccd6512052 100644
--- a/net/dctc-gui/pkg-plist
+++ b/net/dctc-gui/pkg-plist
@@ -28,11 +28,11 @@ share/locale/sv/LC_MESSAGES/dc_gui.mo
 @unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec %D/share/locale/de 2>/dev/null || true
 @dirrm share/gnome/pixmaps/dc_gui
-@unexec rmdir %D/share/gnome/help/dc_gui/nl/images 2>/dev/null || true
+@dirrmtry share/gnome/help/dc_gui/nl/images
 @dirrm share/gnome/help/dc_gui/nl
-@unexec rmdir %D/share/gnome/help/dc_gui/es/images 2>/dev/null || true
+@dirrmtry share/gnome/help/dc_gui/es/images
 @dirrm share/gnome/help/dc_gui/es
-@unexec rmdir %D/share/gnome/help/dc_gui/C/images 2>/dev/null || true
+@dirrmtry share/gnome/help/dc_gui/C/images
 @dirrm share/gnome/help/dc_gui/C
 @dirrm share/gnome/help/dc_gui
 %%PORTDOCS%%@dirrm share/doc/dctc-gui
diff --git a/net/diradmin/pkg-plist b/net/diradmin/pkg-plist
index c72ea42efb4a..c01186ec2b6d 100644
--- a/net/diradmin/pkg-plist
+++ b/net/diradmin/pkg-plist
@@ -20,4 +20,4 @@ share/gnome/pixmaps/directory_administrator/old-group-icon.xpm
 share/gnome/pixmaps/directory_administrator/old-user-icon.xpm
 share/gnome/pixmaps/directory_administrator/user-icon.xpm
 @dirrm share/gnome/pixmaps/directory_administrator
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist
index f8abae2cb945..32545a05ee48 100644
--- a/net/gnu-radius/pkg-plist
+++ b/net/gnu-radius/pkg-plist
@@ -110,7 +110,7 @@ share/locale/ru/LC_MESSAGES/radius.mo
 %%PORTDOCS%%%%EXAMPLESDIR%%/pam.conf
 %%PORTDOCS%%%%EXAMPLESDIR%%/radius.php
 @dirrm etc/raddb/dict
-@unexec rmdir %D/etc/raddb 2>/dev/null || true
+@dirrmtry etc/raddb
 @dirrm include/radius
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/%%PORTVERSION%%/scheme
@@ -118,7 +118,7 @@ share/locale/ru/LC_MESSAGES/radius.mo
 @dirrm %%DATADIR%%/%%PORTVERSION%%/modules
 @dirrm %%DATADIR%%/%%PORTVERSION%%
 @dirrm %%DATADIR%%
-@unexec rmdir %D/lib/security 2>/dev/null || true
+@dirrmtry lib/security
 @unexec rm -f /var/run/radiusd.pid
 @unexec rm -rf /var/log/radius
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone."
diff --git a/net/gtk-gnutella/pkg-plist b/net/gtk-gnutella/pkg-plist
index 6346d1147d2f..cb117c9078c4 100644
--- a/net/gtk-gnutella/pkg-plist
+++ b/net/gtk-gnutella/pkg-plist
@@ -50,7 +50,7 @@ share/locale/nl/LC_MESSAGES/gtk-gnutella.mo
 share/locale/hu/LC_MESSAGES/gtk-gnutella.mo
 share/locale/uk/LC_MESSAGES/gtk-gnutella.mo
 share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/el
 @dirrm %%DATADIR%%/en
diff --git a/net/javadc/pkg-plist b/net/javadc/pkg-plist
index 7ef9a72e99fd..306e674fde79 100644
--- a/net/javadc/pkg-plist
+++ b/net/javadc/pkg-plist
@@ -6,4 +6,4 @@ bin/javadc
 %%JAR_DIR%%/%%JAR_FILE%%
 @dirrm %%JAR_DIR%%
 %%PORTDOCS%%@dirrm share/doc/javadc
-@unexec rmdir %D/share/java/jar 2>/dev/null || true
+@dirrmtry share/java/jar
diff --git a/net/jwhois/pkg-plist b/net/jwhois/pkg-plist
index 525eb0f0be15..eb1d00673ee5 100644
--- a/net/jwhois/pkg-plist
+++ b/net/jwhois/pkg-plist
@@ -19,9 +19,9 @@ etc/jwhois.conf.sample
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/jwhois.mo
 @exec mkdir -p %D/var/jwhois 2>/dev/null || true
 @unexec rm -f %D/var/jwhois/jwhois.db 2>/dev/null || true
-@unexec rmdir %D/var/jwhois 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
-@unexec rmdir %D/man/sv/man1 2>/dev/null || true
-@unexec rmdir %D/man/sv 2>/dev/null || true
+@dirrmtry var/jwhois
+@dirrmtry var
+@dirrmtry man/sv/man1
+@dirrmtry man/sv
 @unexec rmdir %D/share/locale/rw/LC_MESSAGES
 @unexec rmdir %D/share/locale/rw
diff --git a/net/kmldonkey/pkg-plist b/net/kmldonkey/pkg-plist
index 192584d496d4..70903c3fd1d5 100644
--- a/net/kmldonkey/pkg-plist
+++ b/net/kmldonkey/pkg-plist
@@ -118,65 +118,65 @@ share/services/magnet.protocol
 share/services/mldonkey.protocol
 share/services/sig2dat.protocol
 share/servicetypes/kmldonkey_plugin.desktop
-@unexec rmdir %D/share/servicetypes 2>/dev/null || true
-@unexec rmdir %D/share/services/kded 2>/dev/null || true
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/servicetypes
+@dirrmtry share/services/kded
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/kmldonkey
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/ru/kmldonkey
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
 @dirrm share/doc/HTML/pt/kmldonkey
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/kmldonkey
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/kmldonkey
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/et/kmldonkey
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/en/kmldonkey-apidocs/src/html
 @dirrm share/doc/HTML/en/kmldonkey-apidocs/src
 @dirrm share/doc/HTML/en/kmldonkey-apidocs
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kmldonkey
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
 @dirrm share/apps/mldonkeyapplet/pics
 @dirrm share/apps/mldonkeyapplet
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
 @dirrm share/apps/kmldonkey/images/networks
 @dirrm share/apps/kmldonkey/images
 @dirrm share/apps/kmldonkey
-@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
+@dirrmtry share/applnk/Settings/Network
+@dirrmtry share/applnk/Settings
+@dirrmtry share/applnk/Internet
+@dirrmtry share/applnk
+@dirrmtry lib/kde3
 @dirrm include/kmldonkey
diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist
index 6b4b4b4d21b5..781728f2f7ee 100644
--- a/net/knemo-kde4/pkg-plist
+++ b/net/knemo-kde4/pkg-plist
@@ -45,18 +45,18 @@ share/locale/pt_BR/LC_MESSAGES/knemod.mo
 share/locale/ru/LC_MESSAGES/kcm_knemo.mo
 share/locale/ru/LC_MESSAGES/knemod.mo
 share/services/kded/knemod.desktop
-@unexec rmdir %D/share/services/kded 2>/dev/null || true
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services/kded
+@dirrmtry share/services
+@dirrmtry share/icons/crystalsvg/32x32/apps
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/actions
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/apps
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
 @dirrm share/apps/knemo
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Settings/Network
+@dirrmtry share/applnk/Settings
+@dirrmtry share/applnk
diff --git a/net/knemo/pkg-plist b/net/knemo/pkg-plist
index 6b4b4b4d21b5..781728f2f7ee 100644
--- a/net/knemo/pkg-plist
+++ b/net/knemo/pkg-plist
@@ -45,18 +45,18 @@ share/locale/pt_BR/LC_MESSAGES/knemod.mo
 share/locale/ru/LC_MESSAGES/kcm_knemo.mo
 share/locale/ru/LC_MESSAGES/knemod.mo
 share/services/kded/knemod.desktop
-@unexec rmdir %D/share/services/kded 2>/dev/null || true
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services/kded
+@dirrmtry share/services
+@dirrmtry share/icons/crystalsvg/32x32/apps
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/actions
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/apps
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
 @dirrm share/apps/knemo
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Settings/Network
+@dirrmtry share/applnk/Settings
+@dirrmtry share/applnk
diff --git a/net/ktorrent/pkg-plist b/net/ktorrent/pkg-plist
index f464420ded53..022059df4460 100644
--- a/net/ktorrent/pkg-plist
+++ b/net/ktorrent/pkg-plist
@@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop
 share/services/ktsearchplugin.desktop
 share/services/ktupnpplugin.desktop
 share/servicetypes/ktorrentplugin.desktop
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps
 @dirrm share/apps/ktorrent/icons/hicolor/scalable
 @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems
@@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop
 @dirrm share/apps/ktorrent/icons/hicolor
 @dirrm share/apps/ktorrent/icons
 @dirrm share/apps/ktorrent
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@dirrmtry share/applications/kde
diff --git a/net/ldapscripts/pkg-plist b/net/ldapscripts/pkg-plist
index aa2b5d8e83d6..06e6a9dc3f4a 100644
--- a/net/ldapscripts/pkg-plist
+++ b/net/ldapscripts/pkg-plist
@@ -5,7 +5,7 @@ etc/ldapscripts/CHANGELOG
 etc/ldapscripts/COPYING
 etc/ldapscripts/VERSION
 etc/ldapscripts/TODO
-@unexec rmdir %D/etc/ldapscripts 2>/dev/null || true
+@dirrmtry etc/ldapscripts
 bin/_ldapdeletemachine
 bin/_ldapinit
 bin/_lsldap
diff --git a/net/liberator/pkg-plist b/net/liberator/pkg-plist
index f3144e976b3c..75197217e8fb 100644
--- a/net/liberator/pkg-plist
+++ b/net/liberator/pkg-plist
@@ -24,4 +24,4 @@ lib/ocaml/hlfreenet.mli
 %%DATADIR%%/liber_mimetypes
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/lib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml
diff --git a/net/linux-nx-client/pkg-plist b/net/linux-nx-client/pkg-plist
index c49686389a83..3ceca9880521 100644
--- a/net/linux-nx-client/pkg-plist
+++ b/net/linux-nx-client/pkg-plist
@@ -70,15 +70,15 @@ share/gnome/pixmaps/nxclient-wizard.png
 @dirrm lib/linux-nx-client/share/images
 @dirrm lib/linux-nx-client/share
 @dirrm lib/linux-nx-client
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry share/gnome/pixmaps
+@dirrmtry share/gnome
 @cwd %%LOCALBASE%%
 share/icons/crystalsvg/48x48/nx-desktop.png
 share/icons/crystalsvg/32x32/nx.png
 share/icons/crystalsvg/32x32/nxclient-admin.png
 share/icons/crystalsvg/32x32/nxclient-wizard.png
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/48x48
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
diff --git a/net/openam/pkg-plist b/net/openam/pkg-plist
index 9b8b8802aa5f..f5c7503ca4a4 100644
--- a/net/openam/pkg-plist
+++ b/net/openam/pkg-plist
@@ -2,5 +2,5 @@ bin/openam
 share/doc/openh323/openam/ReadMe.txt
 share/doc/openh323/openam/sample_message.wav
 share/doc/openh323/openam/sample_message_g7231.wav
-@unexec rmdir %D/share/doc/openh323/openam 2>/dev/null || true
-@unexec rmdir %D/share/doc/openh323 2>/dev/null || true
+@dirrmtry share/doc/openh323/openam
+@dirrmtry share/doc/openh323
diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist
index baf21f640357..cef57dc538b9 100644
--- a/net/openldap23-server/pkg-plist
+++ b/net/openldap23-server/pkg-plist
@@ -45,7 +45,7 @@ etc/openldap/DB_CONFIG.example
 %%BACK_SQL%%libexec/openldap/back_sql-2.3.so.1
 libexec/slapd
 libexec/slurpd
-@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+@dirrmtry libexec/openldap
 sbin/slapacl
 sbin/slapadd
 sbin/slapauth
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index baf21f640357..cef57dc538b9 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -45,7 +45,7 @@ etc/openldap/DB_CONFIG.example
 %%BACK_SQL%%libexec/openldap/back_sql-2.3.so.1
 libexec/slapd
 libexec/slurpd
-@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+@dirrmtry libexec/openldap
 sbin/slapacl
 sbin/slapadd
 sbin/slapauth
diff --git a/net/openmcu/pkg-plist b/net/openmcu/pkg-plist
index 7e5c9a195c8f..43fe50d03d4f 100644
--- a/net/openmcu/pkg-plist
+++ b/net/openmcu/pkg-plist
@@ -1,4 +1,4 @@
 bin/openmcu
 share/doc/openh323/openmcu/ReadMe.txt
-@unexec rmdir %D/share/doc/openh323/openmcu 2>/dev/null || true
-@unexec rmdir %D/share/doc/openh323 2>/dev/null || true
+@dirrmtry share/doc/openh323/openmcu
+@dirrmtry share/doc/openh323
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 9693a918bf82..c3793d8ea71b 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -183,5 +183,5 @@
 @dirrm %%MPIDIR%%/include
 @dirrm %%MPIDIR%%/etc
 @dirrm %%MPIDIR%%/bin
-@unexec rmdir %D/%%MPIDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%MPIBASE%% 2>/dev/null || true
+@dirrmtry %%MPIDIR%%
+@dirrmtry %%MPIBASE%%
diff --git a/net/p5-EasyTCP/pkg-plist b/net/p5-EasyTCP/pkg-plist
index f3b8acec892c..38ad8f637783 100644
--- a/net/p5-EasyTCP/pkg-plist
+++ b/net/p5-EasyTCP/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Net/EasyTCP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net/EasyTCP 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
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Net/EasyTCP
+@dirrmtry %%SITE_PERL%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-File-Rsync/pkg-plist b/net/p5-File-Rsync/pkg-plist
index 36f0a4adb00f..bab2c396c8cb 100644
--- a/net/p5-File-Rsync/pkg-plist
+++ b/net/p5-File-Rsync/pkg-plist
@@ -2,6 +2,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync/Config.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Rsync/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Rsync
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
diff --git a/net/p5-File-RsyncP/pkg-plist b/net/p5-File-RsyncP/pkg-plist
index f8c7a333ac0a..690da5273f56 100644
--- a/net/p5-File-RsyncP/pkg-plist
+++ b/net/p5-File-RsyncP/pkg-plist
@@ -9,9 +9,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList/FileList.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
diff --git a/net/p5-Filesys-SmbClient/pkg-plist b/net/p5-Filesys-SmbClient/pkg-plist
index 4478c0bb5ea7..c3d4699486b5 100644
--- a/net/p5-Filesys-SmbClient/pkg-plist
+++ b/net/p5-Filesys-SmbClient/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/Filesys/SmbClient.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Filesys 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys
diff --git a/net/p5-Geo-IPfree/pkg-plist b/net/p5-Geo-IPfree/pkg-plist
index cd4cdf101233..9b19b518f5bf 100644
--- a/net/p5-Geo-IPfree/pkg-plist
+++ b/net/p5-Geo-IPfree/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/Geo/ipscountry.dat
 %%SITE_PERL%%/Geo/ipct2txt.pl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IPfree
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/Geo
diff --git a/net/p5-Gopher-Server/pkg-plist b/net/p5-Gopher-Server/pkg-plist
index 19c9d6a22064..96d13abfa83e 100644
--- a/net/p5-Gopher-Server/pkg-plist
+++ b/net/p5-Gopher-Server/pkg-plist
@@ -4,8 +4,8 @@
 %%SITE_PERL%%/Gopher/Server/TypeMapper.pm
 %%SITE_PERL%%/Gopher/Server/RequestHandler/DBI.pm
 %%SITE_PERL%%/Gopher/Server/RequestHandler/File.pm
-@unexec rmdir %D/%%SITE_PERL%%/Gopher 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gopher 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Gopher
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gopher
 @dirrm %%SITE_PERL%%/Gopher/Server/RequestHandler
 @dirrm %%SITE_PERL%%/Gopher/Server
-@unexec rmdir %D/%%SITE_PERL%%/Gopher 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Gopher
diff --git a/net/p5-IO-INET6/pkg-plist b/net/p5-IO-INET6/pkg-plist
index c55dad737f54..aea89e1b2ff9 100644
--- a/net/p5-IO-INET6/pkg-plist
+++ b/net/p5-IO-INET6/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/IO/Socket/INET6.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO/Socket
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/net/p5-IO-Interface/pkg-plist b/net/p5-IO-Interface/pkg-plist
index 26670440e552..e1f4c13c4380 100644
--- a/net/p5-IO-Interface/pkg-plist
+++ b/net/p5-IO-Interface/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist
index c55dad737f54..aea89e1b2ff9 100644
--- a/net/p5-IO-Socket-INET6/pkg-plist
+++ b/net/p5-IO-Socket-INET6/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/IO/Socket/INET6.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO/Socket
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/net/p5-IO-Socket-Multicast/pkg-plist b/net/p5-IO-Socket-Multicast/pkg-plist
index b9cca8662d50..83935f961e61 100644
--- a/net/p5-IO-Socket-Multicast/pkg-plist
+++ b/net/p5-IO-Socket-Multicast/pkg-plist
@@ -3,7 +3,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/net/p5-IP-Country/pkg-plist b/net/p5-IP-Country/pkg-plist
index 9e96d6fd0da6..478f93947a04 100644
--- a/net/p5-IP-Country/pkg-plist
+++ b/net/p5-IP-Country/pkg-plist
@@ -15,4 +15,4 @@ bin/ip2cc
 @dirrm %%SITE_PERL%%/IP/Country/Fast
 @dirrm %%SITE_PERL%%/IP/Country
 @dirrm %%SITE_PERL%%/IP/Authority
-@unexec rmdir %D/%%SITE_PERL%%/IP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IP
diff --git a/net/p5-Net-Amazon/pkg-plist b/net/p5-Net-Amazon/pkg-plist
index d82c489830db..a885318ee3e9 100644
--- a/net/p5-Net-Amazon/pkg-plist
+++ b/net/p5-Net-Amazon/pkg-plist
@@ -45,6 +45,6 @@
 @dirrm %%SITE_PERL%%/Net/Amazon/Request
 @dirrm %%SITE_PERL%%/Net/Amazon
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon
-@unexec rmdir %D/%%SITE_PERL%%/Net/Amazon 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/Amazon
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-BGP/pkg-plist b/net/p5-Net-BGP/pkg-plist
index 9d0f2fccdf1b..bb6298d89727 100644
--- a/net/p5-Net-BGP/pkg-plist
+++ b/net/p5-Net-BGP/pkg-plist
@@ -10,5 +10,5 @@
 %%SITE_PERL%%/Net/BGP/Update.pm
 @dirrm %%SITE_PERL%%/Net/BGP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BGP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Blogger/pkg-plist b/net/p5-Net-Blogger/pkg-plist
index 5f91c5026bb4..c393b2e93f10 100644
--- a/net/p5-Net-Blogger/pkg-plist
+++ b/net/p5-Net-Blogger/pkg-plist
@@ -1,5 +1,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Blogger
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 %%SITE_PERL%%/Net/Blogger.pm
 %%SITE_PERL%%/Net/Blogger/API/Extended.pm
 %%SITE_PERL%%/Net/Blogger/API/Core.pm
@@ -19,4 +19,4 @@
 @dirrm %%SITE_PERL%%/Net/Blogger/Engine/Userland
 @dirrm %%SITE_PERL%%/Net/Blogger/Engine
 @dirrm %%SITE_PERL%%/Net/Blogger
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-CIDR-Lite/pkg-plist b/net/p5-Net-CIDR-Lite/pkg-plist
index d0dca4469ed7..c10e92c21ca5 100644
--- a/net/p5-Net-CIDR-Lite/pkg-plist
+++ b/net/p5-Net-CIDR-Lite/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Net/CIDR/Lite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/Lite/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/CIDR
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-DHCPClient/pkg-plist b/net/p5-Net-DHCPClient/pkg-plist
index 54239328cedd..7c234fba84c1 100644
--- a/net/p5-Net-DHCPClient/pkg-plist
+++ b/net/p5-Net-DHCPClient/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/DHCPClient.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCPClient/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCPClient
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-DLookup/pkg-plist b/net/p5-Net-DLookup/pkg-plist
index b8c7bbff12c2..863d55235660 100644
--- a/net/p5-Net-DLookup/pkg-plist
+++ b/net/p5-Net-DLookup/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/DLookup.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup 2>/dev/null || true
-@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/DLookup
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Daemon/pkg-plist b/net/p5-Net-Daemon/pkg-plist
index 1259cfa1324a..e420a98eaff4 100644
--- a/net/p5-Net-Daemon/pkg-plist
+++ b/net/p5-Net-Daemon/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon/.packlist
 @dirrm %%SITE_PERL%%/Net/Daemon
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon
-@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/p5-Net-Delicious/pkg-plist b/net/p5-Net-Delicious/pkg-plist
index 1a8251b44cf8..e96453b794a7 100644
--- a/net/p5-Net-Delicious/pkg-plist
+++ b/net/p5-Net-Delicious/pkg-plist
@@ -10,7 +10,7 @@
 %%SITE_PERL%%/Net/Delicious/Subscription.pm
 %%SITE_PERL%%/Net/Delicious/Tag.pm
 %%SITE_PERL%%/Net/Delicious/User.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/Delicious/Constants
 @dirrm %%SITE_PERL%%/Net/Delicious
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Dict/pkg-plist b/net/p5-Net-Dict/pkg-plist
index 9fb70754470d..3295d55c0bf9 100644
--- a/net/p5-Net-Dict/pkg-plist
+++ b/net/p5-Net-Dict/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/Net/Dict.pm
 %%SITE_PERL%%/Net/Dict.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dict/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dict
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Divert/pkg-plist b/net/p5-Net-Divert/pkg-plist
index df9266792210..f7a936d0e630 100644
--- a/net/p5-Net-Divert/pkg-plist
+++ b/net/p5-Net-Divert/pkg-plist
@@ -2,7 +2,7 @@
 %%SITE_PERL%%/Net/Divert.pm
 %%SITE_PERL%%/auto/Net/Divert/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/auto/Net/Divert
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Finger/pkg-plist b/net/p5-Net-Finger/pkg-plist
index 70ec68021e50..2597a097ff9a 100644
--- a/net/p5-Net-Finger/pkg-plist
+++ b/net/p5-Net-Finger/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Finger.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Gnats/pkg-plist b/net/p5-Net-Gnats/pkg-plist
index 3dc9832bb9c7..9aee9e629f5f 100644
--- a/net/p5-Net-Gnats/pkg-plist
+++ b/net/p5-Net-Gnats/pkg-plist
@@ -7,6 +7,6 @@
 @dirrm %%SITE_PERL%%/auto/Net/Gnats/PR
 @dirrm %%SITE_PERL%%/auto/Net/Gnats
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gnats
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Google/pkg-plist b/net/p5-Net-Google/pkg-plist
index 2f218c778397..41112bfea147 100644
--- a/net/p5-Net-Google/pkg-plist
+++ b/net/p5-Net-Google/pkg-plist
@@ -6,4 +6,4 @@
 %%SITE_PERL%%/Net/Google/Service.pm
 %%SITE_PERL%%/Net/Google/Spelling.pm
 @dirrm %%SITE_PERL%%/Net/Google
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Gopher/pkg-plist b/net/p5-Net-Gopher/pkg-plist
index 46a1e11a2e87..385e64c265c6 100644
--- a/net/p5-Net-Gopher/pkg-plist
+++ b/net/p5-Net-Gopher/pkg-plist
@@ -8,9 +8,9 @@
 %%SITE_PERL%%/Net/Gopher/Response/MenuItem.pm
 %%SITE_PERL%%/Net/Gopher/Utility.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gopher/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gopher
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/Gopher/Response
 @dirrm %%SITE_PERL%%/Net/Gopher
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-HL7/pkg-plist b/net/p5-Net-HL7/pkg-plist
index 9b4abda54ff4..4c9f247f4bfe 100644
--- a/net/p5-Net-HL7/pkg-plist
+++ b/net/p5-Net-HL7/pkg-plist
@@ -11,5 +11,5 @@
 @dirrm %%SITE_PERL%%/mach/auto/Net-HL7/
 @dirrm %%SITE_PERL%%/Net/HL7/Segments
 @dirrm %%SITE_PERL%%/Net/HL7/Messages
-@unexec rmdir %D/%%SITE_PERL%%/Net/HL7 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/HL7
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Ident/pkg-plist b/net/p5-Net-Ident/pkg-plist
index 54fede5a8c44..534242a577f1 100644
--- a/net/p5-Net-Ident/pkg-plist
+++ b/net/p5-Net-Ident/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Ident.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ident/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ident
-@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/p5-Net-MovableType/pkg-plist b/net/p5-Net-MovableType/pkg-plist
index 01e19f66515a..5cabffa84004 100644
--- a/net/p5-Net-MovableType/pkg-plist
+++ b/net/p5-Net-MovableType/pkg-plist
@@ -3,5 +3,5 @@ bin/mt-upload
 %%SITE_PERL%%/Net/MovableType.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MovableType/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MovableType
-@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/p5-Net-OpenDHT/pkg-plist b/net/p5-Net-OpenDHT/pkg-plist
index 1c0bc0a52077..2be4c04d705b 100644
--- a/net/p5-Net-OpenDHT/pkg-plist
+++ b/net/p5-Net-OpenDHT/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/OpenDHT.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenDHT/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenDHT
-@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/p5-Net-Packet/pkg-plist b/net/p5-Net-Packet/pkg-plist
index 996c7d4a1862..0e2e8e51175a 100644
--- a/net/p5-Net-Packet/pkg-plist
+++ b/net/p5-Net-Packet/pkg-plist
@@ -31,5 +31,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-ParseWhois/pkg-plist b/net/p5-Net-ParseWhois/pkg-plist
index 263a943d2e11..58ca3813979a 100644
--- a/net/p5-Net-ParseWhois/pkg-plist
+++ b/net/p5-Net-ParseWhois/pkg-plist
@@ -15,8 +15,8 @@
 %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Unknown.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar
 @dirrm %%SITE_PERL%%/Net/ParseWhois/Domain
 @dirrm %%SITE_PERL%%/Net/ParseWhois
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Patricia/pkg-plist b/net/p5-Net-Patricia/pkg-plist
index 2b97bb53b1a8..09ff08e7f292 100644
--- a/net/p5-Net-Patricia/pkg-plist
+++ b/net/p5-Net-Patricia/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/Net/Patricia.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-Pcap/pkg-plist b/net/p5-Net-Pcap/pkg-plist
index 970c8f3558ca..b2345459c397 100644
--- a/net/p5-Net-Pcap/pkg-plist
+++ b/net/p5-Net-Pcap/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-PcapUtils/pkg-plist b/net/p5-Net-PcapUtils/pkg-plist
index d989b53e2bd4..4aecb5d1d138 100644
--- a/net/p5-Net-PcapUtils/pkg-plist
+++ b/net/p5-Net-PcapUtils/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PcapUtils/.packlist
 %%SITE_PERL%%/Net/PcapUtils.pm
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PcapUtils
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Ping-External/pkg-plist b/net/p5-Net-Ping-External/pkg-plist
index 70ef9a15c95c..324aba6cf583 100644
--- a/net/p5-Net-Ping-External/pkg-plist
+++ b/net/p5-Net-Ping-External/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Net/Ping/External.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/External/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/Ping
+@dirrmtry %%SITE_PERL%%/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/External
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Radius/pkg-plist b/net/p5-Net-Radius/pkg-plist
index 475275470ded..c65d3e457ae8 100644
--- a/net/p5-Net-Radius/pkg-plist
+++ b/net/p5-Net-Radius/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist
 @dirrm %%SITE_PERL%%/Net/Radius
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Random/pkg-plist b/net/p5-Net-Random/pkg-plist
index 6d1dd361bc66..d3bee6583c47 100644
--- a/net/p5-Net-Random/pkg-plist
+++ b/net/p5-Net-Random/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Random.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Random/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Random
-@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/p5-Net-RawIP/pkg-plist b/net/p5-Net-RawIP/pkg-plist
index 4e9ecf499d10..97feb74db01e 100644
--- a/net/p5-Net-RawIP/pkg-plist
+++ b/net/p5-Net-RawIP/pkg-plist
@@ -6,5 +6,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-RawSock/pkg-plist b/net/p5-Net-RawSock/pkg-plist
index a3aec16ca2f4..561385e4473d 100644
--- a/net/p5-Net-RawSock/pkg-plist
+++ b/net/p5-Net-RawSock/pkg-plist
@@ -2,9 +2,9 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.bs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/ 2>/dev/null || true
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
 %%PORTDOCS%%share/doc/p5-Net-RawSock/README
 %%PORTDOCS%%share/doc/p5-Net-RawSock/demo.pl
 %%PORTDOCS%%@dirrm share/doc/p5-Net-RawSock
diff --git a/net/p5-Net-Rendezvous/pkg-plist b/net/p5-Net-Rendezvous/pkg-plist
index d8cdc3664245..245451a2fb63 100644
--- a/net/p5-Net-Rendezvous/pkg-plist
+++ b/net/p5-Net-Rendezvous/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous
 @dirrm %%SITE_PERL%%/Net/Rendezvous
-@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/p5-Net-Rsh/pkg-plist b/net/p5-Net-Rsh/pkg-plist
index 5bf5a7d87d14..68ef4ba58749 100644
--- a/net/p5-Net-Rsh/pkg-plist
+++ b/net/p5-Net-Rsh/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Rsh.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rsh/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rsh
-@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/p5-Net-SAP/pkg-plist b/net/p5-Net-SAP/pkg-plist
index 75d827c34a31..28a06ca456e1 100644
--- a/net/p5-Net-SAP/pkg-plist
+++ b/net/p5-Net-SAP/pkg-plist
@@ -4,6 +4,6 @@ bin/psapd
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAP/SAP.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAP/SAP.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/SAP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-SCP/pkg-plist b/net/p5-Net-SCP/pkg-plist
index 2b1aeb85092a..187cb45fb985 100644
--- a/net/p5-Net-SCP/pkg-plist
+++ b/net/p5-Net-SCP/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/SCP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP
-@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/p5-Net-SDP/pkg-plist b/net/p5-Net-SDP/pkg-plist
index 5429fa62d48a..ba17eee4f026 100644
--- a/net/p5-Net-SDP/pkg-plist
+++ b/net/p5-Net-SDP/pkg-plist
@@ -3,4 +3,4 @@ bin/sdp2rat
 %%SITE_PERL%%/Net/SDP/Media.pm
 %%SITE_PERL%%/Net/SDP/Time.pm
 @dirrm %%SITE_PERL%%/Net/SDP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SFTP/pkg-plist b/net/p5-Net-SFTP/pkg-plist
index 30c4e0466b04..e5eb78cb7166 100644
--- a/net/p5-Net-SFTP/pkg-plist
+++ b/net/p5-Net-SFTP/pkg-plist
@@ -5,6 +5,6 @@
 %%SITE_PERL%%/Net/SFTP/Util.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/SFTP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SMPP/pkg-plist b/net/p5-Net-SMPP/pkg-plist
index e58ebb46e4c1..6c7c42f40142 100644
--- a/net/p5-Net-SMPP/pkg-plist
+++ b/net/p5-Net-SMPP/pkg-plist
@@ -7,5 +7,5 @@
 %%SITE_PERL%%/Net/esme.pl
 %%SITE_PERL%%/Net/bind-hammer.pl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP
-@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/p5-Net-SNPP/pkg-plist b/net/p5-Net-SNPP/pkg-plist
index 1895e2aa4057..e8a69e71eeb5 100644
--- a/net/p5-Net-SNPP/pkg-plist
+++ b/net/p5-Net-SNPP/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/Net/SNPP/HylaFAX.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP
 @dirrm %%SITE_PERL%%/Net/SNPP
-@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/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist
index 1c56d75bb460..c2da195efee5 100644
--- a/net/p5-Net-SSH-Perl/pkg-plist
+++ b/net/p5-Net-SSH-Perl/pkg-plist
@@ -46,8 +46,8 @@
 %%SITE_PERL%%/Net/SSH/Perl/Util/Term.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Util
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Key
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Kex
@@ -56,5 +56,5 @@
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Cipher
 @dirrm %%SITE_PERL%%/Net/SSH/Perl/Auth
 @dirrm %%SITE_PERL%%/Net/SSH/Perl
-@unexec rmdir %D/%%SITE_PERL%%/Net/SSH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/SSH
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-SSH/pkg-plist b/net/p5-Net-SSH/pkg-plist
index c7494f0c65e6..0e6402098c05 100644
--- a/net/p5-Net-SSH/pkg-plist
+++ b/net/p5-Net-SSH/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/SSH.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH
-@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/p5-Net-Server/pkg-plist b/net/p5-Net-Server/pkg-plist
index 222e9f284fdd..98bd17bb0c5a 100644
--- a/net/p5-Net-Server/pkg-plist
+++ b/net/p5-Net-Server/pkg-plist
@@ -15,7 +15,7 @@
 %%SITE_PERL%%/Net/Server/Single.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/Server/Proto
 @dirrm %%SITE_PERL%%/Net/Server
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Services/pkg-plist b/net/p5-Net-Services/pkg-plist
index f868261143b3..082563fce103 100644
--- a/net/p5-Net-Services/pkg-plist
+++ b/net/p5-Net-Services/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Services.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services
-@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/p5-Net-TCLink/pkg-plist b/net/p5-Net-TCLink/pkg-plist
index 4865f78281fa..edcf68c507a8 100644
--- a/net/p5-Net-TCLink/pkg-plist
+++ b/net/p5-Net-TCLink/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/TCLink.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/net/p5-Net-Telnet/pkg-plist b/net/p5-Net-Telnet/pkg-plist
index 6dd1cfd55f80..1c968f834005 100644
--- a/net/p5-Net-Telnet/pkg-plist
+++ b/net/p5-Net-Telnet/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Telnet.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet
-@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/p5-Net-Traceroute/pkg-plist b/net/p5-Net-Traceroute/pkg-plist
index 16b451b78c4e..b092b8962e5b 100644
--- a/net/p5-Net-Traceroute/pkg-plist
+++ b/net/p5-Net-Traceroute/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Traceroute.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute
-@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/p5-Net-Traceroute6/pkg-plist b/net/p5-Net-Traceroute6/pkg-plist
index 2c1eac3fcbe4..6e48ce90b209 100644
--- a/net/p5-Net-Traceroute6/pkg-plist
+++ b/net/p5-Net-Traceroute6/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Traceroute6.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6
-@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/p5-Net-Wake/pkg-plist b/net/p5-Net-Wake/pkg-plist
index 16b211c5a758..c7a27eb3f809 100644
--- a/net/p5-Net-Wake/pkg-plist
+++ b/net/p5-Net-Wake/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Wake.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake
-@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/p5-Net-Whois-RIPE/pkg-plist b/net/p5-Net-Whois-RIPE/pkg-plist
index af14c9a57094..a8ab4998366e 100644
--- a/net/p5-Net-Whois-RIPE/pkg-plist
+++ b/net/p5-Net-Whois-RIPE/pkg-plist
@@ -8,9 +8,9 @@
 %%SITE_PERL%%/Net/Whois/RIPE/Object/Template.pm
 @dirrm %%SITE_PERL%%/Net/Whois/RIPE/Object
 @dirrm %%SITE_PERL%%/Net/Whois/RIPE
-@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/Whois
+@dirrmtry %%SITE_PERL%%/Net
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Whois-Raw/pkg-plist b/net/p5-Net-Whois-Raw/pkg-plist
index 18fdbbe4a749..b7edda94dcb1 100644
--- a/net/p5-Net-Whois-Raw/pkg-plist
+++ b/net/p5-Net-Whois-Raw/pkg-plist
@@ -2,9 +2,9 @@ bin/pwhois
 %%SITE_PERL%%/Net/Whois/Raw.pm
 %%SITE_PERL%%/Net/Whois/Raw/Data.pm
 @dirrm %%SITE_PERL%%/Net/Whois/Raw
-@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/Whois
+@dirrmtry %%SITE_PERL%%/Net
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-Whois/pkg-plist b/net/p5-Net-Whois/pkg-plist
index 508cac6a217a..5b2833986685 100644
--- a/net/p5-Net-Whois/pkg-plist
+++ b/net/p5-Net-Whois/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/Whois.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois
-@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/p5-Net-XWhois/pkg-plist b/net/p5-Net-XWhois/pkg-plist
index 4ff57bc815a9..7b9e5eef1111 100644
--- a/net/p5-Net-XWhois/pkg-plist
+++ b/net/p5-Net-XWhois/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Net/XWhois.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois 2>/dev/null || true
-@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/XWhois
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-Net-Z3950-SimpleServer/pkg-plist b/net/p5-Net-Z3950-SimpleServer/pkg-plist
index d85bd035f2dd..6f26d0f6cf46 100644
--- a/net/p5-Net-Z3950-SimpleServer/pkg-plist
+++ b/net/p5-Net-Z3950-SimpleServer/pkg-plist
@@ -10,5 +10,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net-ext/pkg-plist b/net/p5-Net-ext/pkg-plist
index a39dcbafd6f9..6a673f2f826f 100644
--- a/net/p5-Net-ext/pkg-plist
+++ b/net/p5-Net-ext/pkg-plist
@@ -63,11 +63,11 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/net/p5-Net/pkg-plist b/net/p5-Net/pkg-plist
index 8d4d2cdbcd77..dd3759ba1739 100644
--- a/net/p5-Net/pkg-plist
+++ b/net/p5-Net/pkg-plist
@@ -15,6 +15,6 @@
 %%SITE_PERL%%/Net/libnet.cfg
 %%SITE_PERL%%/Net/libnetFAQ.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/FTP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/net/p5-NetAddr-IP-Count/pkg-plist b/net/p5-NetAddr-IP-Count/pkg-plist
index 22e5c2b9bb50..dfac41b9984b 100644
--- a/net/p5-NetAddr-IP-Count/pkg-plist
+++ b/net/p5-NetAddr-IP-Count/pkg-plist
@@ -2,4 +2,4 @@
 %%SITE_PERL%%/NetAddr/IP/sample.pl
 %%SITE_PERL%%/NetAddr/IP/Count.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count
-@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/NetAddr/IP
diff --git a/net/p5-POE-Component-Client-Keepalive/pkg-plist b/net/p5-POE-Component-Client-Keepalive/pkg-plist
index 28361142b8e5..50e569b865a7 100644
--- a/net/p5-POE-Component-Client-Keepalive/pkg-plist
+++ b/net/p5-POE-Component-Client-Keepalive/pkg-plist
@@ -2,9 +2,9 @@
 %%SITE_PERL%%/POE/Component/Connection/Keepalive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Keepalive/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Keepalive
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Connection 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@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%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component/Connection
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/net/p5-POE-Component-Client-Ping/pkg-plist b/net/p5-POE-Component-Client-Ping/pkg-plist
index b58ec262f1d1..ed90cd7e9329 100644
--- a/net/p5-POE-Component-Client-Ping/pkg-plist
+++ b/net/p5-POE-Component-Client-Ping/pkg-plist
@@ -1,9 +1,9 @@
 %%SITE_PERL%%/POE/Component/Client/Ping.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@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
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-POE-Component-Jabber/pkg-plist b/net/p5-POE-Component-Jabber/pkg-plist
index 0c5936c70473..e70d9883ff9b 100644
--- a/net/p5-POE-Component-Jabber/pkg-plist
+++ b/net/p5-POE-Component-Jabber/pkg-plist
@@ -21,12 +21,12 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/XMPPTester.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Jabber
-@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
 @dirrm %%SITE_PERL%%/POE/Component/Jabber/Server/Socket
 @dirrm %%SITE_PERL%%/POE/Component/Jabber/Server
 @dirrm %%SITE_PERL%%/POE/Component/Jabber/Client/XMPP
 @dirrm %%SITE_PERL%%/POE/Component/Jabber/Client
 @dirrm %%SITE_PERL%%/POE/Component/Jabber
-@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
diff --git a/net/p5-POE-Component-Pcap/pkg-plist b/net/p5-POE-Component-Pcap/pkg-plist
index 371401577a37..cef2433c907b 100644
--- a/net/p5-POE-Component-Pcap/pkg-plist
+++ b/net/p5-POE-Component-Pcap/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap/.packlist
 %%SITE_PERL%%/POE/Component/Pcap.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@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%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/net/p5-POE-Component-RRDTool/pkg-plist b/net/p5-POE-Component-RRDTool/pkg-plist
index ae6853c7d35f..529453770de0 100644
--- a/net/p5-POE-Component-RRDTool/pkg-plist
+++ b/net/p5-POE-Component-RRDTool/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist
 %%SITE_PERL%%/POE/Component/RRDTool.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/net/p5-POE-Component-Spread/pkg-plist b/net/p5-POE-Component-Spread/pkg-plist
index 77b334461c42..f62c8e0d3007 100644
--- a/net/p5-POE-Component-Spread/pkg-plist
+++ b/net/p5-POE-Component-Spread/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/POE/Component/Spread.pm
 %%SITE_PERL%%/POE/Driver/Spread.pm
 %%SITE_PERL%%/POE/Filter/Spread.pm
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Driver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE/Driver
+@dirrmtry %%SITE_PERL%%/POE/Filter
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/net/p5-Parallel-MPI/pkg-plist b/net/p5-Parallel-MPI/pkg-plist
index bad6f623ee8d..e1b6b2a1abfd 100644
--- a/net/p5-Parallel-MPI/pkg-plist
+++ b/net/p5-Parallel-MPI/pkg-plist
@@ -3,6 +3,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI/MPI.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI/MPI.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI/autosplit.ix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Parallel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Parallel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel
diff --git a/net/p5-Parallel-Pvm/pkg-plist b/net/p5-Parallel-Pvm/pkg-plist
index 425cfecc9e89..f2f14b26bd8e 100644
--- a/net/p5-Parallel-Pvm/pkg-plist
+++ b/net/p5-Parallel-Pvm/pkg-plist
@@ -6,5 +6,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/code2symbol.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/code2text.al
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Parallel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Parallel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel
diff --git a/net/p5-PlRPC/pkg-plist b/net/p5-PlRPC/pkg-plist
index 76a0f2d0c85b..a0259be6ead0 100644
--- a/net/p5-PlRPC/pkg-plist
+++ b/net/p5-PlRPC/pkg-plist
@@ -8,6 +8,6 @@
 @dirrm %%SITE_PERL%%/RPC/PlServer
 @dirrm %%SITE_PERL%%/RPC/PlClient
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/RPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/RPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC
diff --git a/net/p5-RPC-XML/pkg-plist b/net/p5-RPC-XML/pkg-plist
index c03b5df88354..ccecd8a6ae35 100644
--- a/net/p5-RPC-XML/pkg-plist
+++ b/net/p5-RPC-XML/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/XML/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/XML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC
 %%SITE_PERL%%/auto/RPC/XML/Server/timeout.al
 %%SITE_PERL%%/auto/RPC/XML/Server/share_procs.al
 %%SITE_PERL%%/auto/RPC/XML/Server/share_methods.al
@@ -42,7 +42,7 @@
 %%SITE_PERL%%/auto/RPC/XML/Function/autosplit.ix
 @dirrm %%SITE_PERL%%/auto/RPC/XML/Function
 @dirrm %%SITE_PERL%%/auto/RPC/XML
-@unexec rmdir %D/%%SITE_PERL%%/auto/RPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/RPC
 %%SITE_PERL%%/RPC/XML.pm
 %%SITE_PERL%%/RPC/XML/status.xpl
 %%SITE_PERL%%/RPC/XML/multicall.xpl
@@ -58,10 +58,10 @@
 %%SITE_PERL%%/RPC/XML/Function.pm
 %%SITE_PERL%%/RPC/XML/Client.pm
 @dirrm %%SITE_PERL%%/RPC/XML
-@unexec rmdir %D/%%SITE_PERL%%/RPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/RPC
 %%SITE_PERL%%/Apache/RPC/status.xpl
 %%SITE_PERL%%/Apache/RPC/Status.pm
 %%SITE_PERL%%/Apache/RPC/Server.pm
 @dirrm %%SITE_PERL%%/Apache/RPC
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
 bin/make_method
diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
index ea041a51d096..0d78152f7430 100644
--- a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
+++ b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist
@@ -5,8 +5,8 @@
 %%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pod
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource
 @dirrm %%SITE_PERL%%/ResourcePool/Resource/Net
-@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ResourcePool/Resource
 @dirrm %%SITE_PERL%%/ResourcePool/Factory/Net
-@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ResourcePool/Factory
diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
index 9f8f9dda7819..7fe4d497b9b1 100644
--- a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
+++ b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist
@@ -6,10 +6,10 @@
 %%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pod
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource
 @dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP/Lite
 @dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP
 @dirrm %%SITE_PERL%%/ResourcePool/Resource/SOAP
-@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ResourcePool/Resource
 @dirrm %%SITE_PERL%%/ResourcePool/Factory/SOAP
-@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ResourcePool/Factory
diff --git a/net/p5-SOAP-Data-Builder/pkg-plist b/net/p5-SOAP-Data-Builder/pkg-plist
index f8576169305a..5865accc2288 100644
--- a/net/p5-SOAP-Data-Builder/pkg-plist
+++ b/net/p5-SOAP-Data-Builder/pkg-plist
@@ -2,8 +2,8 @@
 %%SITE_PERL%%/SOAP/Data/Builder/Element.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data/Builder/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data/Builder
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
 @dirrm %%SITE_PERL%%/SOAP/Data/Builder
-@unexec rmdir %D/%%SITE_PERL%%/SOAP/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SOAP/Data
+@dirrmtry %%SITE_PERL%%/SOAP
diff --git a/net/p5-SOAP-Lite/pkg-plist b/net/p5-SOAP-Lite/pkg-plist
index d537be594310..6f01639d23b0 100644
--- a/net/p5-SOAP-Lite/pkg-plist
+++ b/net/p5-SOAP-Lite/pkg-plist
@@ -25,14 +25,14 @@ bin/stubmaker.pl
 %%SITE_PERL%%/XMLRPC/Transport/TCP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
 @dirrm %%SITE_PERL%%/Apache/XMLRPC
 @dirrm %%SITE_PERL%%/SOAP/Transport
 @dirrm %%SITE_PERL%%/UDDI
 @dirrm %%SITE_PERL%%/XMLRPC/Transport
 @dirrm %%SITE_PERL%%/XMLRPC
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/IO
+@dirrmtry %%SITE_PERL%%/SOAP
+@dirrmtry %%SITE_PERL%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/net/p5-SOAP/pkg-plist b/net/p5-SOAP/pkg-plist
index 65422beedb8b..aeca35825067 100644
--- a/net/p5-SOAP/pkg-plist
+++ b/net/p5-SOAP/pkg-plist
@@ -23,5 +23,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
 @dirrm %%SITE_PERL%%/SOAP/Transport/HTTP
 @dirrm %%SITE_PERL%%/SOAP/Transport
-@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SOAP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP
diff --git a/net/p5-Socks/pkg-plist b/net/p5-Socks/pkg-plist
index b1c97b391aba..be4b5baa9bfd 100644
--- a/net/p5-Socks/pkg-plist
+++ b/net/p5-Socks/pkg-plist
@@ -20,6 +20,6 @@
 %%SITE_PERL%%/auto/Net/SOCKS/_validate.al
 @dirrm %%SITE_PERL%%/auto/Net/SOCKS
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS
-@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/p5-Spread-Session/pkg-plist b/net/p5-Spread-Session/pkg-plist
index acb5bc782b78..b3474ef340d9 100644
--- a/net/p5-Spread-Session/pkg-plist
+++ b/net/p5-Spread-Session/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Spread/Session.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Spread 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
+@dirrmtry %%SITE_PERL%%/Spread
diff --git a/net/p5-Validate-Net/pkg-plist b/net/p5-Validate-Net/pkg-plist
index 02752c853ac3..ce0e56e82bb4 100644
--- a/net/p5-Validate-Net/pkg-plist
+++ b/net/p5-Validate-Net/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate/Net/.packlist
 %%SITE_PERL%%/Validate/Net.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate/Net
-@unexec rmdir %D/%%SITE_PERL%%/Validate 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Validate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate
diff --git a/net/p5-X500-DN/pkg-plist b/net/p5-X500-DN/pkg-plist
index eb8626490f13..531948b2e4ac 100644
--- a/net/p5-X500-DN/pkg-plist
+++ b/net/p5-X500-DN/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/X500/RDN.pm
 %%SITE_PERL%%/X500/RDN.pod
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X500/DN
-@unexec rmdir %D/%%SITE_PERL%%/X500 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/X500 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/X500
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X500
diff --git a/net/p5-pdonkey/pkg-plist b/net/p5-pdonkey/pkg-plist
index be125504d81b..d14d033d72ef 100644
--- a/net/p5-pdonkey/pkg-plist
+++ b/net/p5-pdonkey/pkg-plist
@@ -7,5 +7,5 @@
 @dirrm %%SITE_PERL%%/P2P/pDonkey
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey
-@unexec rmdir %D/%%SITE_PERL%%/P2P 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/P2P
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P
diff --git a/net/p5-perl-ldap/pkg-plist b/net/p5-perl-ldap/pkg-plist
index caf6e6dfbbf3..c6d8931b8325 100644
--- a/net/p5-perl-ldap/pkg-plist
+++ b/net/p5-perl-ldap/pkg-plist
@@ -47,7 +47,7 @@
 @dirrm %%SITE_PERL%%/Net/LDAP
 @dirrm %%SITE_PERL%%/Bundle/Net
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/perl-ldap
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LWP/Protocol 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/Net
+@dirrmtry %%SITE_PERL%%/LWP/Protocol
+@dirrmtry %%SITE_PERL%%/LWP
diff --git a/net/poptop/pkg-plist b/net/poptop/pkg-plist
index 8e9e8b623c1d..12de09d629f6 100644
--- a/net/poptop/pkg-plist
+++ b/net/poptop/pkg-plist
@@ -3,4 +3,4 @@ sbin/pptpd
 sbin/pptpctrl
 lib/pptpd/pptpd-logwtmp.so
 etc/pptpd.conf.sample
-@unexec rmdir %D/lib/pptpd 2> /dev/null || true
+@dirrmtry lib/pptpd
diff --git a/net/py-bittorrent-devel/pkg-plist b/net/py-bittorrent-devel/pkg-plist
index 4e772ea657c3..bcfa49a10b54 100644
--- a/net/py-bittorrent-devel/pkg-plist
+++ b/net/py-bittorrent-devel/pkg-plist
@@ -260,32 +260,32 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
 %%GUI%%@dirrm share/pixmaps/BitTorrent
 %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net/py-bittorrent/pkg-plist b/net/py-bittorrent/pkg-plist
index 7127a0489c16..f480ab4cef60 100644
--- a/net/py-bittorrent/pkg-plist
+++ b/net/py-bittorrent/pkg-plist
@@ -259,42 +259,42 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
 %%GUI%%@dirrm share/pixmaps/BitTorrent/logo
 %%GUI%%@dirrm share/pixmaps/BitTorrent       
 %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/tlh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tlh 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hy 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tlh/LC_MESSAGES
+@dirrmtry share/locale/tlh
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/he_IL/LC_MESSAGES
+@dirrmtry share/locale/he_IL
+@dirrmtry share/locale/gr/LC_MESSAGES
+@dirrmtry share/locale/gr
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/khashmir
 @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net/py-kenosis-bittorrent/pkg-plist b/net/py-kenosis-bittorrent/pkg-plist
index 1976e19b5c6f..66bdeaf54f65 100644
--- a/net/py-kenosis-bittorrent/pkg-plist
+++ b/net/py-kenosis-bittorrent/pkg-plist
@@ -91,5 +91,5 @@ libexec/kenosis-BitTorrent/btunittest.py
 %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent/zurllib.pyo
 @dirrm libexec/kenosis-BitTorrent
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net/py-kenosis/pkg-plist b/net/py-kenosis/pkg-plist
index 551bbfa713e3..333ce43d1269 100644
--- a/net/py-kenosis/pkg-plist
+++ b/net/py-kenosis/pkg-plist
@@ -142,5 +142,5 @@
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis/ds
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis/dns
 @dirrm %%PYTHON_SITELIBDIR%%/kenosis
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/net/rdesktop/pkg-plist b/net/rdesktop/pkg-plist
index 95f26f69c523..65a18567161e 100644
--- a/net/rdesktop/pkg-plist
+++ b/net/rdesktop/pkg-plist
@@ -46,5 +46,5 @@ bin/rdesktop
 %%DATADIR%%/keymaps/sv
 %%DATADIR%%/keymaps/th
 %%DATADIR%%/keymaps/tr
-@unexec rmdir %D/%%DATADIR%%/keymaps 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/keymaps
+@dirrmtry %%DATADIR%%
diff --git a/net/roadrunner/pkg-plist b/net/roadrunner/pkg-plist
index fb767a49c658..aff260799abd 100644
--- a/net/roadrunner/pkg-plist
+++ b/net/roadrunner/pkg-plist
@@ -78,5 +78,5 @@ share/gtk-doc/html/roadrunner/x9.html
 @dirrm include/roadrunner-1.0/librr/message
 @dirrm include/roadrunner-1.0/librr
 @dirrm include/roadrunner-1.0
-@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
-@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index 7eb5cdb2e72b..d05d5ca2ed41 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -111,4 +111,4 @@ share/silc/scripts/silc-mime.pl
 @dirrm share/silc/scripts
 @dirrm share/silc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/silc 2>/dev/null || true
+@dirrmtry etc/silc
diff --git a/net/silc-server/pkg-plist b/net/silc-server/pkg-plist
index d356c60b7a91..7ff0db593ebd 100644
--- a/net/silc-server/pkg-plist
+++ b/net/silc-server/pkg-plist
@@ -10,5 +10,5 @@ etc/rc.d/silcd.sh-dist
 %%PORTDOCS%%%%EXAMPLESDIR%%/cell_server1.conf
 %%PORTDOCS%%%%EXAMPLESDIR%%/cell_server2.conf
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/etc/silc 2>/dev/null || true
-@unexec rmdir %D/var/log/silc 2>/dev/null || true
+@dirrmtry etc/silc
+@dirrmtry var/log/silc
diff --git a/net/smbldap-tools/pkg-plist b/net/smbldap-tools/pkg-plist
index f15b4e1398c2..4b23fc03a4ec 100644
--- a/net/smbldap-tools/pkg-plist
+++ b/net/smbldap-tools/pkg-plist
@@ -39,6 +39,6 @@ sbin/smbldap-usershow
 %%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools010.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/smbldap-tools 2> /dev/null || true
+@dirrmtry etc/smbldap-tools
 @dirrm %%EXAMPLESDIR%%/etc
 @dirrm %%EXAMPLESDIR%%
diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist
index c05739f99e48..564a10446dc3 100644
--- a/net/smokeping/pkg-plist
+++ b/net/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/spread/pkg-plist b/net/spread/pkg-plist
index c207bc6e1a48..c914635c6aa1 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -27,5 +27,5 @@ sbin/spread
 %%EXAMPLESDIR%%/test.pl
 @exec mkdir -p /var/run/spread %B/var/run
 @unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
+@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist
index c207bc6e1a48..c914635c6aa1 100644
--- a/net/spread4/pkg-plist
+++ b/net/spread4/pkg-plist
@@ -27,5 +27,5 @@ sbin/spread
 %%EXAMPLESDIR%%/test.pl
 @exec mkdir -p /var/run/spread %B/var/run
 @unexec rmdir /var/run/spread 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
+@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/ssltunnel-client/pkg-plist b/net/ssltunnel-client/pkg-plist
index b6b31712b259..b76fdea45a5c 100644
--- a/net/ssltunnel-client/pkg-plist
+++ b/net/ssltunnel-client/pkg-plist
@@ -4,4 +4,4 @@ etc/ssltunnel/client.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/LISEZ-MOI
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/ssltunnel 2>/dev/null || true
+@dirrmtry etc/ssltunnel
diff --git a/net/tcpick/pkg-plist b/net/tcpick/pkg-plist
index 81e4e11cdb05..0683581371cb 100644
--- a/net/tcpick/pkg-plist
+++ b/net/tcpick/pkg-plist
@@ -1,3 +1,3 @@
 bin/tcpick
-@unexec rmdir %D/man/it/man8 2>/dev/null || true
-@unexec rmdir %D/man/it 2>/dev/null || true
+@dirrmtry man/it/man8
+@dirrmtry man/it
diff --git a/net/torrentflux/pkg-plist b/net/torrentflux/pkg-plist
index 88f07382edca..633904dee2fc 100644
--- a/net/torrentflux/pkg-plist
+++ b/net/torrentflux/pkg-plist
@@ -5,6 +5,6 @@ etc/tfconfig.php.default
 etc/rc.d/torrentflux.sh
 libexec/btphptornado.py
 %%DATADIR%%/torrentflux.sqlite
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/install.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist
index 3386615d22e9..d92380046468 100644
--- a/net/tsclient/pkg-plist
+++ b/net/tsclient/pkg-plist
@@ -47,16 +47,16 @@ share/locale/se/LC_MESSAGES/tsclient.mo
 share/locale/xh/LC_MESSAGES/tsclient.mo
 share/locale/zh_CN/LC_MESSAGES/tsclient.mo
 share/locale/zh_TW/LC_MESSAGES/tsclient.mo
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xh 2>/dev/null || true
-@unexec rmdir %D/share/locale/se/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/se 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
-@unexec rmdir %D/share/locale/no_nb/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no_nb 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl_NL 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gr 2>/dev/null || true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/se/LC_MESSAGES
+@dirrmtry share/locale/se
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/no_nb/LC_MESSAGES
+@dirrmtry share/locale/no_nb
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/gr/LC_MESSAGES
+@dirrmtry share/locale/gr
 @dirrm share/gnome/pixmaps/tsclient
diff --git a/net/v6eval/pkg-plist b/net/v6eval/pkg-plist
index c20e597e9f7e..cd416d5e6a7a 100644
--- a/net/v6eval/pkg-plist
+++ b/net/v6eval/pkg-plist
@@ -133,7 +133,7 @@ v6eval/man/man1/pktsend.1.gz
 @dirrm v6eval/include
 @dirrm v6eval/man/man1
 @dirrm v6eval/man
-@unexec rmdir %D/v6eval/etc 2>/dev/null || true
+@dirrmtry v6eval/etc
 @dirrm v6eval
 lib/perl5/%%PERL_VERSION%%/man/man3/V6evalRemote.3
 lib/perl5/%%PERL_VERSION%%/man/man3/V6evalTool.3
@@ -143,6 +143,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/V6evalTool.3
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index c3823708470b..b0791a558051 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -67,5 +67,5 @@ share/locale/xh/LC_MESSAGES/vino.mo
 share/locale/zh_CN/LC_MESSAGES/vino.mo
 share/locale/zh_TW/LC_MESSAGES/vino.mo
 @dirrm share/gnome/vino
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
diff --git a/net/xmule/pkg-plist b/net/xmule/pkg-plist
index 07e8bdbe6030..d659dc5859ab 100644
--- a/net/xmule/pkg-plist
+++ b/net/xmule/pkg-plist
@@ -11,7 +11,7 @@ share/locale/it/LC_MESSAGES/xmule.mo
 share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
-@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ee 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/gnome/locale 2>/dev/null || true
+@dirrmtry share/locale/ee/LC_MESSAGES
+@dirrmtry share/locale/ee
+@dirrmtry share/locale
+@dirrmtry share/gnome/locale
author	Edwin Groothuis <edwin@FreeBSD.org>	2006-01-22 03:01:03 +0000
committer	Edwin Groothuis <edwin@FreeBSD.org>	2006-01-22 03:01:03 +0000
commit	508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
tree	f7810d4887e5297c7b7788225e906b99c81d709b /net
parent	4008c7e23fe847e2c8ade0ecb5d86f943d84c917 (diff)
download	ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.tar.gz ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.zip