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

24 files changed, 66 insertions, 66 deletions

diff --git a/archivers/deepforest/pkg-plist b/archivers/deepforest/pkg-plist
index 3740b699a31f..0aaa5b0d4880 100644
--- a/archivers/deepforest/pkg-plist
+++ b/archivers/deepforest/pkg-plist
@@ -10,10 +10,10 @@ JDE/DeepForest/docs/Japanese/README.sjis
 JDE/DeepForest/install.sh
 bin/DeepForest.app
 %%PIXMAP_PATH%%/DeepForest.xpm
-@unexec rmdir %D/share/WindowMaker/Pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/WindowMaker 2>/dev/null || true
+@dirrmtry share/WindowMaker/Pixmaps
+@dirrmtry share/WindowMaker
 @dirrm JDE/DeepForest/docs/English
 @dirrm JDE/DeepForest/docs/Japanese
 @dirrm JDE/DeepForest/docs
 @dirrm JDE/DeepForest
-@unexec rmdir %D/JDE 2>/dev/null || true
+@dirrmtry JDE
diff --git a/archivers/fpc-paszlib/pkg-plist b/archivers/fpc-paszlib/pkg-plist
index 61c1c2a14c59..ad979ce0e501 100644
--- a/archivers/fpc-paszlib/pkg-plist
+++ b/archivers/fpc-paszlib/pkg-plist
@@ -32,7 +32,7 @@
 %%INSTDIR%%/zutil.o
 %%INSTDIR%%/zutil.ppu
 @dirrm %%INSTDIR%%
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units/freebsd 2>/dev/null || true
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units 2>/dev/null || true
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/fpc 2>/dev/null || true
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
diff --git a/archivers/rpm/pkg-plist b/archivers/rpm/pkg-plist
index c73cbd990547..a9532a2f07be 100644
--- a/archivers/rpm/pkg-plist
+++ b/archivers/rpm/pkg-plist
@@ -69,20 +69,20 @@ share/locale/sv/LC_MESSAGES/rpm.mo
 share/locale/tr/LC_MESSAGES/rpm.mo
 @dirrm lib/rpm
 @dirrm include/rpm
-@unexec rmdir %D/src/redhat/SRPMS 2>/dev/null || true
-@unexec rmdir %D/src/redhat/SPECS 2>/dev/null || true
-@unexec rmdir %D/src/redhat/SOURCES 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/noarch 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/amd64 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/athlon 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/i686 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/i586 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/i486 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS/i386 2>/dev/null || true
-@unexec rmdir %D/src/redhat/RPMS 2>/dev/null || true
-@unexec rmdir %D/src/redhat/BUILD 2>/dev/null || true
-@unexec rmdir %D/src/redhat 2>/dev/null || true
-@unexec rmdir %D/src 2>/dev/null || true
+@dirrmtry src/redhat/SRPMS
+@dirrmtry src/redhat/SPECS
+@dirrmtry src/redhat/SOURCES
+@dirrmtry src/redhat/RPMS/noarch
+@dirrmtry src/redhat/RPMS/amd64
+@dirrmtry src/redhat/RPMS/athlon
+@dirrmtry src/redhat/RPMS/i686
+@dirrmtry src/redhat/RPMS/i586
+@dirrmtry src/redhat/RPMS/i486
+@dirrmtry src/redhat/RPMS/i386
+@dirrmtry src/redhat/RPMS
+@dirrmtry src/redhat/BUILD
+@dirrmtry src/redhat
+@dirrmtry src
 @unexec rmdir /var/lib/rpm 2>/dev/null || true
 @unexec rmdir /var/lib 2>/dev/null || true
 @exec mkdir -p /var/lib
diff --git a/astro/nova/pkg-plist b/astro/nova/pkg-plist
index f81c390eb774..04646675982c 100644
--- a/astro/nova/pkg-plist
+++ b/astro/nova/pkg-plist
@@ -20,4 +20,4 @@ bin/catbuilder
 %%DATADIR%%/pixmaps/venus-small.xpm
 %%DATADIR%%/pixmaps/nova_logo.png
 @dirrm %%DATADIR%%/pixmaps
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/astro/p5-Astro-ADS/pkg-plist b/astro/p5-Astro-ADS/pkg-plist
index 6ca9252efbee..475967cd5812 100644
--- a/astro/p5-Astro-ADS/pkg-plist
+++ b/astro/p5-Astro-ADS/pkg-plist
@@ -5,7 +5,7 @@ bin/adsquery
 %%SITE_PERL%%/Astro/ADS/Result/Paper.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/ADS/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/ADS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
 @dirrm %%SITE_PERL%%/Astro/ADS/Result
 @dirrm %%SITE_PERL%%/Astro/ADS
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Catalog/pkg-plist b/astro/p5-Astro-Catalog/pkg-plist
index 276ff06132c8..f5aa00afeef9 100644
--- a/astro/p5-Astro-Catalog/pkg-plist
+++ b/astro/p5-Astro-Catalog/pkg-plist
@@ -43,6 +43,6 @@ etc/skycat.cfg.default
 @dirrm %%SITE_PERL%%/Astro/Catalog/Star
 @dirrm %%SITE_PERL%%/Astro/Catalog/Transport
 @dirrm %%SITE_PERL%%/Astro/Catalog
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Astro
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/astro/p5-Astro-DSS/pkg-plist b/astro/p5-Astro-DSS/pkg-plist
index d4b95d240514..0377bef1be26 100644
--- a/astro/p5-Astro-DSS/pkg-plist
+++ b/astro/p5-Astro-DSS/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Astro/DSS.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-FITS-Header/pkg-plist b/astro/p5-Astro-FITS-Header/pkg-plist
index 1abf037e369d..7b7bb606bc78 100644
--- a/astro/p5-Astro-FITS-Header/pkg-plist
+++ b/astro/p5-Astro-FITS-Header/pkg-plist
@@ -4,9 +4,9 @@
 %%SITE_PERL%%/Astro/FITS/Header/Item.pm
 %%SITE_PERL%%/Astro/FITS/Header/NDF.pm
 @dirrm %%SITE_PERL%%/Astro/FITS/Header
-@unexec rmdir %D/%%SITE_PERL%%/Astro/FITS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Astro/FITS
+@dirrmtry %%SITE_PERL%%/Astro
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/Header/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/Header
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
diff --git a/astro/p5-Astro-SIMBAD/pkg-plist b/astro/p5-Astro-SIMBAD/pkg-plist
index 4c032bf7d396..c4c3a361e42f 100644
--- a/astro/p5-Astro-SIMBAD/pkg-plist
+++ b/astro/p5-Astro-SIMBAD/pkg-plist
@@ -7,5 +7,5 @@
 @dirrm %%SITE_PERL%%/Astro/SIMBAD
 @dirrm %%SITE_PERL%%/Astro
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-SunTime/pkg-plist b/astro/p5-Astro-SunTime/pkg-plist
index 39cbd9c6aa2b..f4d5e7cae908 100644
--- a/astro/p5-Astro-SunTime/pkg-plist
+++ b/astro/p5-Astro-SunTime/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Astro/SunTime.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/sky2000/pkg-plist b/astro/sky2000/pkg-plist
index f101f2e2401a..d84727b181d7 100644
--- a/astro/sky2000/pkg-plist
+++ b/astro/sky2000/pkg-plist
@@ -16,4 +16,4 @@
 %%DATADIR%%/catalogs/sky2000.ncd
 @dirrm %%DATADIR%%/catalogs/sky2000
 @dirrm %%DATADIR%%/catalogs
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/audio/blop/pkg-plist b/audio/blop/pkg-plist
index bf599bcff8ea..728ad40a18d3 100644
--- a/audio/blop/pkg-plist
+++ b/audio/blop/pkg-plist
@@ -29,5 +29,5 @@ lib/ladspa/tracker_2025.so
 lib/ladspa/triangle_1649.so
 %%NLS%%share/locale/de/LC_MESSAGES/blop.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/blop.mo
-@unexec rmdir %D/lib/ladspa 2>/dev/null || true
+@dirrmtry lib/ladspa
 @dirrm lib/ladspa/blop_files/
diff --git a/audio/gnump3d/pkg-plist b/audio/gnump3d/pkg-plist
index 5e38d7f23aaa..22c5742f1a32 100644
--- a/audio/gnump3d/pkg-plist
+++ b/audio/gnump3d/pkg-plist
@@ -403,6 +403,6 @@ etc/gnump3d/mime.types
 @dirrm %%SITE_PERL%%/gnump3d/plugins
 @dirrm %%SITE_PERL%%/gnump3d/lang
 @dirrm %%SITE_PERL%%/gnump3d
-@unexec rmdir %D/etc/gnump3d 2>/dev/null || true
+@dirrmtry etc/gnump3d
 @unexec rmdir /var/log/gnump3d 2>/dev/null || true
 @exec mkdir -p /var/log/gnump3d
diff --git a/audio/p5-Audio-CD/pkg-plist b/audio/p5-Audio-CD/pkg-plist
index 4a1f39b1c319..972a296aedc3 100644
--- a/audio/p5-Audio-CD/pkg-plist
+++ b/audio/p5-Audio-CD/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/CD.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Audio 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio
diff --git a/audio/p5-Audio/pkg-plist b/audio/p5-Audio/pkg-plist
index 6884fbfd8c56..266e0a7fc4df 100644
--- a/audio/p5-Audio/pkg-plist
+++ b/audio/p5-Audio/pkg-plist
@@ -36,7 +36,7 @@ bin/tkscope
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Play
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Data
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Audio/Play
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Audio
diff --git a/audio/p5-MP3-ID3v1Tag/pkg-plist b/audio/p5-MP3-ID3v1Tag/pkg-plist
index a7049fcc1e08..5271028aab42 100644
--- a/audio/p5-MP3-ID3v1Tag/pkg-plist
+++ b/audio/p5-MP3-ID3v1Tag/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/MP3/ID3v1Tag.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3
+@dirrmtry %%SITE_PERL%%/MP3
diff --git a/audio/p5-tagged/pkg-plist b/audio/p5-tagged/pkg-plist
index 54e17a922ec3..68b2a9ba90ef 100644
--- a/audio/p5-tagged/pkg-plist
+++ b/audio/p5-tagged/pkg-plist
@@ -4,6 +4,6 @@
 %%SITE_PERL%%/MP3/Tag/ID3v2.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MP3/Tag 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3
+@dirrmtry %%SITE_PERL%%/MP3/Tag
+@dirrmtry %%SITE_PERL%%/MP3
diff --git a/audio/shout/pkg-plist b/audio/shout/pkg-plist
index c176ab73f6f9..2a73a2227a26 100644
--- a/audio/shout/pkg-plist
+++ b/audio/shout/pkg-plist
@@ -1,5 +1,5 @@
 bin/shout
 etc/icecast/shout.conf.dist
-@unexec rmdir %D/etc/icecast 2>/dev/null || true
-@unexec rmdir %D/share/icecast/log 2>/dev/null || true
-@unexec rmdir %D/share/icecast 2>/dev/null || true
+@dirrmtry etc/icecast
+@dirrmtry share/icecast/log
+@dirrmtry share/icecast
diff --git a/audio/swhplugins/pkg-plist b/audio/swhplugins/pkg-plist
index aff39a29747f..ac514fd5f605 100644
--- a/audio/swhplugins/pkg-plist
+++ b/audio/swhplugins/pkg-plist
@@ -97,6 +97,6 @@ share/ladspa/rdf/swh-aux.rdf
 share/ladspa/rdf/swh-plugins.rdf
 share/ladspa/rdf/swh-scales.rdf
 %%NLS%%share/locale/en_GB/LC_MESSAGES/swh-plugins.mo
-@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true
-@unexec rmdir %D/share/ladspa 2>/dev/null || true
-@unexec rmdir %D/lib/ladspa 2>/dev/null || true
+@dirrmtry share/ladspa/rdf
+@dirrmtry share/ladspa
+@dirrmtry lib/ladspa
diff --git a/audio/tap-plugins/pkg-plist b/audio/tap-plugins/pkg-plist
index bc049fe3aff4..ae031c6d6237 100644
--- a/audio/tap-plugins/pkg-plist
+++ b/audio/tap-plugins/pkg-plist
@@ -18,6 +18,6 @@ lib/ladspa/tap_tremolo.so
 lib/ladspa/tap_tubewarmth.so
 lib/ladspa/tap_vibrato.so
 share/ladspa/rdf/tap-plugins.rdf
-@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true
-@unexec rmdir %D/share/ladspa 2>/dev/null || true
-@unexec rmdir %D/lib/ladspa 2>/dev/null || true
+@dirrmtry share/ladspa/rdf
+@dirrmtry share/ladspa
+@dirrmtry lib/ladspa
diff --git a/audio/timidity++-xaw/pkg-plist b/audio/timidity++-xaw/pkg-plist
index 12bb12876dc9..0e6de2396553 100644
--- a/audio/timidity++-xaw/pkg-plist
+++ b/audio/timidity++-xaw/pkg-plist
@@ -19,5 +19,5 @@ lib/timidity/interface_a.so
 %%PORTDOCS%%share/doc/ja/timidity++/README.xaw
 @dirrm lib/timidity/bitmaps
 @cwd /usr/X11R6
-@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%%/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%% 2>/dev/null || true
+@dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults
+@dirrmtry lib/X11/%%EUCJP_LOCALE%%
diff --git a/audio/xmms-kde/pkg-plist b/audio/xmms-kde/pkg-plist
index e05153154dcf..1ab91ed4d4d6 100644
--- a/audio/xmms-kde/pkg-plist
+++ b/audio/xmms-kde/pkg-plist
@@ -96,5 +96,5 @@ share/locale/es/LC_MESSAGES/xmms-kde.mo
 share/locale/fr/LC_MESSAGES/xmms-kde.mo
 share/locale/nl/LC_MESSAGES/xmms-kde.mo
 @dirrm share/apps/xmms-kde
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
diff --git a/audio/zinf/pkg-plist b/audio/zinf/pkg-plist
index f33d89094ad9..c7243913ba75 100644
--- a/audio/zinf/pkg-plist
+++ b/audio/zinf/pkg-plist
@@ -38,7 +38,7 @@ share/zinf/themes/ZinfClassic.fat
 @dirrm share/zinf
 @dirrm lib/zinf/plugins
 @dirrm lib/zinf
-@unexec rmdir %D/etc/sdr/plugins 2>/dev/null || true
-@unexec rmdir %D/etc/sdr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca_ES/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ca_ES 2> /dev/null || true
+@dirrmtry etc/sdr/plugins
+@dirrmtry etc/sdr
+@dirrmtry share/locale/ca_ES/LC_MESSAGES
+@dirrmtry share/locale/ca_ES
diff --git a/biology/distribfold/pkg-plist b/biology/distribfold/pkg-plist
index 634c59a42173..868f34107dac 100644
--- a/biology/distribfold/pkg-plist
+++ b/biology/distribfold/pkg-plist
@@ -23,6 +23,6 @@ distribfold/cpu0/toph19_eef1.inp
 distribfold/cpu0/whatsnew.txt
 distribfold/cpu0/zhangatm.txt
 distribfold/cpu0/zhangeij.txt
-@unexec rmdir %D/distribfold/cpu0 2>/dev/null || true
+@dirrmtry distribfold/cpu0
 etc/rc.d/distribfold.sh
 @unexec rmdir %D/distribfold 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/distribfold`` to remove any binary, configuration and log files left." | fmt