aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authoredwin <edwin@FreeBSD.org>2006-01-22 10:30:01 +0800
committeredwin <edwin@FreeBSD.org>2006-01-22 10:30:01 +0800
commitfeafe637a586a81fbc65a23660b6e82c87d90f07 (patch)
tree236a81a898bb37fc1877a514deec3f6192b95260 /misc
parentffa6a89c602bab7fc1470e34b05dcfe64ce87369 (diff)
downloadfreebsd-ports-gnome-feafe637a586a81fbc65a23660b6e82c87d90f07.tar.gz
freebsd-ports-gnome-feafe637a586a81fbc65a23660b6e82c87d90f07.tar.zst
freebsd-ports-gnome-feafe637a586a81fbc65a23660b6e82c87d90f07.zip
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Diffstat (limited to 'misc')
-rw-r--r--misc/bibletime-devel/pkg-plist44
-rw-r--r--misc/bibletime-kde3/pkg-plist44
-rw-r--r--misc/bibletime-kde4/pkg-plist44
-rw-r--r--misc/bibletime/pkg-plist44
-rw-r--r--misc/compat3x/pkg-plist2
-rw-r--r--misc/compat5x/pkg-plist2
-rw-r--r--misc/cuecat/pkg-plist2
-rw-r--r--misc/flyway/pkg-plist2
-rw-r--r--misc/fortune-mod-bible/pkg-plist4
-rw-r--r--misc/fortune-mod-bofh/pkg-plist4
-rw-r--r--misc/freeguide/pkg-plist4
-rw-r--r--misc/gman/pkg-plist2
-rw-r--r--misc/gnome-icon-theme/pkg-plist8
-rw-r--r--misc/gnome-mime-data/pkg-plist8
-rw-r--r--misc/gnome-osd/pkg-plist4
-rw-r--r--misc/gnomemimedata/pkg-plist8
-rw-r--r--misc/gnomesword/pkg-plist4
-rw-r--r--misc/k3b-i18n/pkg-plist44
-rw-r--r--misc/katalog/pkg-plist38
-rw-r--r--misc/kcd-devel/pkg-plist8
-rw-r--r--misc/kcd/pkg-plist8
-rw-r--r--misc/kwatch/pkg-plist26
-rw-r--r--misc/lifelines/pkg-plist36
-rw-r--r--misc/man.el/pkg-plist8
-rw-r--r--misc/nagios-base-logos/pkg-plist6
-rw-r--r--misc/p5-Array-Compare/pkg-plist2
-rw-r--r--misc/p5-Array-IntSpan/pkg-plist4
-rw-r--r--misc/p5-Array-PrintCols/pkg-plist4
-rw-r--r--misc/p5-Array-RefElem/pkg-plist4
-rw-r--r--misc/p5-Business-ISBN-Data/pkg-plist6
-rw-r--r--misc/p5-Business-ISIN/pkg-plist6
-rw-r--r--misc/p5-Business-ISSN/pkg-plist4
-rw-r--r--misc/p5-Business-UPS/pkg-plist10
-rw-r--r--misc/p5-File-CounterFile/pkg-plist4
-rw-r--r--misc/p5-File-Sort/pkg-plist4
-rw-r--r--misc/p5-Geo-Weather/pkg-plist4
-rw-r--r--misc/p5-Geography-Countries/pkg-plist6
-rw-r--r--misc/p5-I18N-Charset/pkg-plist4
-rw-r--r--misc/p5-I18N-LangTags/pkg-plist4
-rw-r--r--misc/p5-List-Compare/pkg-plist4
-rw-r--r--misc/p5-Locale-SubCountry/pkg-plist4
-rw-r--r--misc/p5-Net-vCard/pkg-plist4
-rw-r--r--misc/p5-Norge/pkg-plist4
-rw-r--r--misc/p5-Text-FIGlet/pkg-plist4
-rw-r--r--misc/p5-Tie-DxHash/pkg-plist6
-rw-r--r--misc/proxyper/pkg-plist2
-rw-r--r--misc/quick-lounge-applet/pkg-plist4
-rw-r--r--misc/seizedesktop/pkg-plist2
-rw-r--r--misc/shared-mime-info/pkg-plist22
-rw-r--r--misc/smssend/pkg-plist4
-rw-r--r--misc/tellico-kde4/pkg-plist30
-rw-r--r--misc/tellico/pkg-plist30
-rw-r--r--misc/utf8locale/pkg-plist2
-rw-r--r--misc/xfce4-appfinder/pkg-plist18
-rw-r--r--misc/xfce4-iconbox/pkg-plist16
-rw-r--r--misc/xfce4-weather-plugin/pkg-plist12
-rw-r--r--misc/xfce4-wm-themes/pkg-plist160
-rw-r--r--misc/xiphos/pkg-plist4
58 files changed, 401 insertions, 401 deletions
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@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/actions 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/actions 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/actions 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/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/bibletime-kde3/pkg-plist b/misc/bibletime-kde3/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime-kde3/pkg-plist
+++ b/misc/bibletime-kde3/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@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/actions 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/actions 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/actions 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/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime-kde4/pkg-plist
+++ b/misc/bibletime-kde4/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@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/actions 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/actions 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/actions 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/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@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/actions 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/actions 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/actions 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/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/compat3x/pkg-plist b/misc/compat3x/pkg-plist
index ff4c811bb652..c930698f2840 100644
--- a/misc/compat3x/pkg-plist
+++ b/misc/compat3x/pkg-plist
@@ -26,4 +26,4 @@ lib/compat/libutil.so.2
lib/compat/libvgl.so.1
lib/compat/libwrap.so.2
lib/compat/libxpg4.so.2
-@unexec rmdir %D/lib/compat 2>/dev/null || true
+@dirrmtry lib/compat
diff --git a/misc/compat5x/pkg-plist b/misc/compat5x/pkg-plist
index 6fbca14168d8..3328a8c1b48a 100644
--- a/misc/compat5x/pkg-plist
+++ b/misc/compat5x/pkg-plist
@@ -206,4 +206,4 @@ lib/compat/snmp_netgraph.so.2
%%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
%%AMD64%%@unexec rmdir %D/lib32/compat 2>/dev/null || true
%%AMD64%%@unexec rmdir %D/lib32 2>/dev/null || true
-@unexec rmdir %D/lib/compat 2>/dev/null || true
+@dirrmtry lib/compat
diff --git a/misc/cuecat/pkg-plist b/misc/cuecat/pkg-plist
index 4faa0df92b00..d36288bb23a1 100644
--- a/misc/cuecat/pkg-plist
+++ b/misc/cuecat/pkg-plist
@@ -4,4 +4,4 @@ lib/%%PYTHON_VERSION%%/site-packages/barcode.py
lib/%%PYTHON_VERSION%%/site-packages/barcode.pyo
lib/%%PYTHON_VERSION%%/site-packages/cuecat.py
lib/%%PYTHON_VERSION%%/site-packages/cuecat.pyo
-@unexec rmdir %D/lib/%%PYTHON_VERSION%%/site-packages 2>/dev/null || true
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
diff --git a/misc/flyway/pkg-plist b/misc/flyway/pkg-plist
index 35733e1e0c10..e4cb57c10c3f 100644
--- a/misc/flyway/pkg-plist
+++ b/misc/flyway/pkg-plist
@@ -58,4 +58,4 @@ share/icons/flyway_lg.png
share/icons/flyway_sm.png
@dirrm share/flyway
@dirrm lib/flyway
-@unexec rmdir %D/share/icons 2> /dev/null || true
+@dirrmtry share/icons
diff --git a/misc/fortune-mod-bible/pkg-plist b/misc/fortune-mod-bible/pkg-plist
index c77d709e5c46..bc456c180de9 100644
--- a/misc/fortune-mod-bible/pkg-plist
+++ b/misc/fortune-mod-bible/pkg-plist
@@ -1,4 +1,4 @@
share/games/fortune/bible
share/games/fortune/bible.dat
-@unexec rmdir %D/share/games/fortune 2>/dev/null || true
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games/fortune
+@dirrmtry share/games
diff --git a/misc/fortune-mod-bofh/pkg-plist b/misc/fortune-mod-bofh/pkg-plist
index 51f21261e84a..80ee1a9bde21 100644
--- a/misc/fortune-mod-bofh/pkg-plist
+++ b/misc/fortune-mod-bofh/pkg-plist
@@ -1,4 +1,4 @@
share/games/fortune/bofh
share/games/fortune/bofh.dat
-@unexec rmdir %D/share/games/fortune 2>/dev/null || true
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games/fortune
+@dirrmtry share/games
diff --git a/misc/freeguide/pkg-plist b/misc/freeguide/pkg-plist
index 630dd0287878..c9a2cba80164 100644
--- a/misc/freeguide/pkg-plist
+++ b/misc/freeguide/pkg-plist
@@ -26,6 +26,6 @@ share/applications/freeguide.desktop
%%JAVASHAREDIR%%/pixmaps/freeguide/logo-72x72.png
%%JAVASHAREDIR%%/pixmaps/freeguide/logo-96x96.png
@dirrm %%JAVASHAREDIR%%/pixmaps/freeguide
-@unexec rmdir %D/%%JAVASHAREDIR%%/pixmaps 2>/dev/null || true
+@dirrmtry %%JAVASHAREDIR%%/pixmaps
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/misc/gman/pkg-plist b/misc/gman/pkg-plist
index 98fc1f23c910..6dabe70a5c14 100644
--- a/misc/gman/pkg-plist
+++ b/misc/gman/pkg-plist
@@ -1,4 +1,4 @@
bin/gman
bin/gman.cgi
www/cgi-bin/gman.pl
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index e38a60a99716..033bb0a6770c 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -2707,10 +2707,10 @@ share/icons/hicolor/96x96/apps/gnome-globe.png
share/icons/hicolor/96x96/apps/gnome-starthere.png
share/icons/hicolor/scalable/apps/evolution.svg
share/icons/hicolor/scalable/apps/volume-knob.svg
-@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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@unexec /bin/rmdir %D/share/icons/hicolor/96x96 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/icons/hicolor/72x72 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || /usr/bin/true
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index c789c2f1bf90..a7b6babf339e 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -73,7 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi 2>/dev/null || true
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index f5ff07d2eadb..00c2427ddb89 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -35,7 +35,7 @@ share/locale/ja/LC_MESSAGES/gnome-osd.mo
share/locale/pt/LC_MESSAGES/gnome-osd.mo
@dirrm share/gnome/gnome-osd
@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
@comment only remove the dbus directories if dbus is not installed
@unexec if ! [ -e %%LOCALBASE%%/bin/dbus-daemon ]; then rmdir %D/share/dbus-1/services 2>/dev/null; rmdir %D/share/dbus-1 2>/dev/null; fi
diff --git a/misc/gnomemimedata/pkg-plist b/misc/gnomemimedata/pkg-plist
index c789c2f1bf90..a7b6babf339e 100644
--- a/misc/gnomemimedata/pkg-plist
+++ b/misc/gnomemimedata/pkg-plist
@@ -73,7 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi 2>/dev/null || true
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index b08c8a0b7ee8..b58325062c34 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -63,6 +63,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/k3b-i18n/pkg-plist b/misc/k3b-i18n/pkg-plist
index 3d011994483b..7054c354a094 100644
--- a/misc/k3b-i18n/pkg-plist
+++ b/misc/k3b-i18n/pkg-plist
@@ -270,28 +270,28 @@ share/locale/zh_CN/LC_MESSAGES/k3b.mo
share/locale/zh_CN/LC_MESSAGES/k3bsetup.mo
share/locale/zh_CN/LC_MESSAGES/libk3b.mo
share/locale/zh_CN/LC_MESSAGES/libk3bdevice.mo
-@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/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 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/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 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_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/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@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/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@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 share/doc/HTML/sv/k3b
@dirrm share/doc/HTML/ru/k3b
@dirrm share/doc/HTML/pt_BR/k3b
diff --git a/misc/katalog/pkg-plist b/misc/katalog/pkg-plist
index e1e3f9f015fc..4b39f99a6ac9 100644
--- a/misc/katalog/pkg-plist
+++ b/misc/katalog/pkg-plist
@@ -30,22 +30,22 @@ share/mimelnk/inode/katalog-directory.desktop
share/services/katalogdcop.desktop
share/services/katalogslave.protocol
share/services/kfile_katalog.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/mimetypes 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
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/mimelnk/inode
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/crystalsvg/64x64/mimetypes
+@dirrmtry share/icons/crystalsvg/64x64
+@dirrmtry share/icons/crystalsvg/48x48/mimetypes
+@dirrmtry share/icons/crystalsvg/48x48
+@dirrmtry share/icons/crystalsvg/32x32/mimetypes
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/mimetypes
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/mimetypes
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
+@dirrmtry share/apps
diff --git a/misc/kcd-devel/pkg-plist b/misc/kcd-devel/pkg-plist
index db5dfc1dae4e..ab84fab3b7e4 100644
--- a/misc/kcd-devel/pkg-plist
+++ b/misc/kcd-devel/pkg-plist
@@ -9,7 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_GB.UTF-8
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
diff --git a/misc/kcd/pkg-plist b/misc/kcd/pkg-plist
index db5dfc1dae4e..ab84fab3b7e4 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -9,7 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_GB.UTF-8
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
diff --git a/misc/kwatch/pkg-plist b/misc/kwatch/pkg-plist
index e128890e3e5d..f3fd4af66ea4 100644
--- a/misc/kwatch/pkg-plist
+++ b/misc/kwatch/pkg-plist
@@ -10,18 +10,18 @@ share/icons/locolor/16x16/apps/kwatch.png
share/icons/locolor/32x32/apps/kwatch.png
share/locale/de/LC_MESSAGES/kwatch.mo
@comment directories
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 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/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/default/kwatch
-@unexec rmdir %D/share/doc/HTML/default 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/default
+@dirrmtry share/doc/HTML
@dirrm share/apps/kwatch
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@dirrmtry share/applnk/Utilities
diff --git a/misc/lifelines/pkg-plist b/misc/lifelines/pkg-plist
index dfe21ba02f42..4db7f4f884b8 100644
--- a/misc/lifelines/pkg-plist
+++ b/misc/lifelines/pkg-plist
@@ -22,24 +22,24 @@ bin/llines
%%NLS%%share/locale/pl/LC_MESSAGES/lifelines.mo
%%NLS%%share/locale/nl/LC_MESSAGES/lifelines.mo
%%NLS%%share/locale/rw/LC_MESSAGES/lifelines.mo
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/da 2> /dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de 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/fr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr 2> /dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/it 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv 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/nl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl 2> /dev/null || true
-@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/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
%%DATADIR%%/2ppage.ll
%%DATADIR%%/4gen1.ll
%%DATADIR%%/6gen1.ll
diff --git a/misc/man.el/pkg-plist b/misc/man.el/pkg-plist
index f8801570ccc6..d730fde576fa 100644
--- a/misc/man.el/pkg-plist
+++ b/misc/man.el/pkg-plist
@@ -15,8 +15,8 @@ share/doc/i18n-man/byte-compile
@dirrm lib/xemacs/site-packages/lisp/i18n-man-de
@dirrm lib/xemacs/site-packages/lisp/i18n-man-en
@dirrm lib/xemacs/site-packages/lisp/i18n-man-ja
-@unexec rmdir %D/lib/xemacs/site-packages/lisp 2> /dev/null || true
-@unexec rmdir %D/lib/xemacs/site-packages/pkginfo 2> /dev/null || true
-@unexec rmdir %D/lib/xemacs/site-packages 2> /dev/null || true
-@unexec rmdir %D/lib/xemacs 2> /dev/null || true
+@dirrmtry lib/xemacs/site-packages/lisp
+@dirrmtry lib/xemacs/site-packages/pkginfo
+@dirrmtry lib/xemacs/site-packages
+@dirrmtry lib/xemacs
@dirrm share/doc/i18n-man
diff --git a/misc/nagios-base-logos/pkg-plist b/misc/nagios-base-logos/pkg-plist
index 4342c468b446..99eec2b0f4fa 100644
--- a/misc/nagios-base-logos/pkg-plist
+++ b/misc/nagios-base-logos/pkg-plist
@@ -124,6 +124,6 @@
%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif
%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg
%%NAGIOSWWWDIR%%/images/logos/yellowdog.png
-@unexec rmdir %D/%%NAGIOSWWWDIR%%/images/logos 2>/dev/null || true
-@unexec rmdir %D/%%NAGIOSWWWDIR%%/images 2>/dev/null || true
-@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOSWWWDIR%%/images/logos
+@dirrmtry %%NAGIOSWWWDIR%%/images
+@dirrmtry %%NAGIOSWWWDIR%%
diff --git a/misc/p5-Array-Compare/pkg-plist b/misc/p5-Array-Compare/pkg-plist
index f3eea451285a..1553ed97757c 100644
--- a/misc/p5-Array-Compare/pkg-plist
+++ b/misc/p5-Array-Compare/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Array/Compare.pm
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-IntSpan/pkg-plist b/misc/p5-Array-IntSpan/pkg-plist
index 18bd53ddcdab..c6bdf94c886a 100644
--- a/misc/p5-Array-IntSpan/pkg-plist
+++ b/misc/p5-Array-IntSpan/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Array/IntSpan/Fields.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
@dirrm %%SITE_PERL%%/Array/IntSpan
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-PrintCols/pkg-plist b/misc/p5-Array-PrintCols/pkg-plist
index b0e1ed2ee54e..cff1411ae715 100644
--- a/misc/p5-Array-PrintCols/pkg-plist
+++ b/misc/p5-Array-PrintCols/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Array/PrintCols.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-RefElem/pkg-plist b/misc/p5-Array-RefElem/pkg-plist
index f62a7a4a6b1b..3d062ee1fc15 100644
--- a/misc/p5-Array-RefElem/pkg-plist
+++ b/misc/p5-Array-RefElem/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Array
diff --git a/misc/p5-Business-ISBN-Data/pkg-plist b/misc/p5-Business-ISBN-Data/pkg-plist
index fb066ea6071d..b63f7a16fcc9 100644
--- a/misc/p5-Business-ISBN-Data/pkg-plist
+++ b/misc/p5-Business-ISBN-Data/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Business/ISBN/Data.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/Data/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/Data
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
@dirrm %%SITE_PERL%%/Business/ISBN
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-ISIN/pkg-plist b/misc/p5-Business-ISIN/pkg-plist
index 36e91d9130af..31f6772b07ac 100644
--- a/misc/p5-Business-ISIN/pkg-plist
+++ b/misc/p5-Business-ISIN/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN/.packlist
%%SITE_PERL%%/Business/ISIN.pm
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
diff --git a/misc/p5-Business-ISSN/pkg-plist b/misc/p5-Business-ISSN/pkg-plist
index f1b8dd227624..0ca0dd0884af 100644
--- a/misc/p5-Business-ISSN/pkg-plist
+++ b/misc/p5-Business-ISSN/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Business/ISSN.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist
index 2b24cebe717c..0ef2fcc238da 100644
--- a/misc/p5-Business-UPS/pkg-plist
+++ b/misc/p5-Business-UPS/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Business/UPS.pm
%%SITE_PERL%%/auto/Business/UPS/autosplit.ix
%%PORTDOCS%%share/examples/Business-UPS/test.pl
-@unexec rmdir %D/%%SITE_PERL%%/auto/Business/UPS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Business/UPS
+@dirrmtry %%SITE_PERL%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
%%PORTDOCS%%@unexec rmdir %D/share/examples/Business-UPS 2>/dev/null || true
diff --git a/misc/p5-File-CounterFile/pkg-plist b/misc/p5-File-CounterFile/pkg-plist
index f9212e5ad3e3..d43c7f63fd94 100644
--- a/misc/p5-File-CounterFile/pkg-plist
+++ b/misc/p5-File-CounterFile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/CounterFile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CounterFile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CounterFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/misc/p5-File-Sort/pkg-plist b/misc/p5-File-Sort/pkg-plist
index b164ce1a8eae..309daedb4849 100644
--- a/misc/p5-File-Sort/pkg-plist
+++ b/misc/p5-File-Sort/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Sort.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/misc/p5-Geo-Weather/pkg-plist b/misc/p5-Geo-Weather/pkg-plist
index a6af6ea5fac6..672b27122a93 100644
--- a/misc/p5-Geo-Weather/pkg-plist
+++ b/misc/p5-Geo-Weather/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Geo/Weather.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather
-@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/misc/p5-Geography-Countries/pkg-plist b/misc/p5-Geography-Countries/pkg-plist
index 9d96ec041572..e0b646028685 100644
--- a/misc/p5-Geography-Countries/pkg-plist
+++ b/misc/p5-Geography-Countries/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Geography/Countries.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geography 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography
+@dirrmtry %%SITE_PERL%%/Geography
diff --git a/misc/p5-I18N-Charset/pkg-plist b/misc/p5-I18N-Charset/pkg-plist
index 575343d35b80..0109723b0ab4 100644
--- a/misc/p5-I18N-Charset/pkg-plist
+++ b/misc/p5-I18N-Charset/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/I18N/Charset.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/Charset/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/Charset
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/I18N 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry %%SITE_PERL%%/I18N
diff --git a/misc/p5-I18N-LangTags/pkg-plist b/misc/p5-I18N-LangTags/pkg-plist
index 52bd2921bb10..011e80da7802 100644
--- a/misc/p5-I18N-LangTags/pkg-plist
+++ b/misc/p5-I18N-LangTags/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/I18N/LangTags/Detect.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/LangTags/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/LangTags
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
@dirrm %%SITE_PERL%%/I18N/LangTags
-@unexec rmdir %D/%%SITE_PERL%%/I18N 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/I18N
diff --git a/misc/p5-List-Compare/pkg-plist b/misc/p5-List-Compare/pkg-plist
index cc9811657296..6f7d441ef736 100644
--- a/misc/p5-List-Compare/pkg-plist
+++ b/misc/p5-List-Compare/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/List/Compare/Functional.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Compare/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Compare
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
@dirrm %%SITE_PERL%%/List/Compare/Base
@dirrm %%SITE_PERL%%/List/Compare
-@unexec rmdir %D/%%SITE_PERL%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/List
diff --git a/misc/p5-Locale-SubCountry/pkg-plist b/misc/p5-Locale-SubCountry/pkg-plist
index 89e4168afa57..2a63e51557fc 100644
--- a/misc/p5-Locale-SubCountry/pkg-plist
+++ b/misc/p5-Locale-SubCountry/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Locale/SubCountry.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/SubCountry/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/SubCountry
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/misc/p5-Net-vCard/pkg-plist b/misc/p5-Net-vCard/pkg-plist
index a8c50603ea83..28e5c560c493 100644
--- a/misc/p5-Net-vCard/pkg-plist
+++ b/misc/p5-Net-vCard/pkg-plist
@@ -5,5 +5,5 @@ bin/vCard2label
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vCard/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vCard
@dirrm %%SITE_PERL%%/Net/vCard
-@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/misc/p5-Norge/pkg-plist b/misc/p5-Norge/pkg-plist
index 98e05ef8bd05..f942d6ce0234 100644
--- a/misc/p5-Norge/pkg-plist
+++ b/misc/p5-Norge/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/No/PersonNr.pm
%%SITE_PERL%%/No/Sort.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/No/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/No 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/No 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/No
+@dirrmtry %%SITE_PERL%%/No
diff --git a/misc/p5-Text-FIGlet/pkg-plist b/misc/p5-Text-FIGlet/pkg-plist
index 04c2e323d0fd..a1fe82fe9a16 100644
--- a/misc/p5-Text-FIGlet/pkg-plist
+++ b/misc/p5-Text-FIGlet/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/Text/showfigfonts.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/misc/p5-Tie-DxHash/pkg-plist b/misc/p5-Tie-DxHash/pkg-plist
index e270f94f6e5d..124ca199dbbd 100644
--- a/misc/p5-Tie-DxHash/pkg-plist
+++ b/misc/p5-Tie-DxHash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash/.packlist
%%SITE_PERL%%/Tie/DxHash.pm
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tie
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
diff --git a/misc/proxyper/pkg-plist b/misc/proxyper/pkg-plist
index 0d42044ac326..de53c256b953 100644
--- a/misc/proxyper/pkg-plist
+++ b/misc/proxyper/pkg-plist
@@ -6,4 +6,4 @@ distributed.net/proxy/proxyper.ini.sample
@exec [ -f %B/proxyper.ini ] || cp %B/%f %B/proxyper.ini
etc/rc.d/proxyper.sh
@dirrm distributed.net/proxy
-@unexec rmdir %D/distributed.net 2>/dev/null || true
+@dirrmtry distributed.net
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index d02687becd48..5d527b5c491d 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -136,8 +136,8 @@ share/locale/sr@Latn/LC_MESSAGES/quick-lounge-applet.mo
share/locale/sv/LC_MESSAGES/quick-lounge-applet.mo
share/locale/uk/LC_MESSAGES/quick-lounge-applet.mo
share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.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/quick-lounge/glade
@dirrm share/gnome/quick-lounge
@dirrm share/gnome/omf/quick-lounge-applet
diff --git a/misc/seizedesktop/pkg-plist b/misc/seizedesktop/pkg-plist
index fecde8ac7165..37a6f4214386 100644
--- a/misc/seizedesktop/pkg-plist
+++ b/misc/seizedesktop/pkg-plist
@@ -138,4 +138,4 @@ bin/SeizeDesktop.app
@dirrm JDE/SeizeDesktop/WindowMaker/screenshot
@dirrm JDE/SeizeDesktop/WindowMaker
@dirrm JDE/SeizeDesktop
-@unexec rmdir %D/JDE 2>/dev/null || true
+@dirrmtry JDE
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 3c570d5fc430..03d6bd767eb3 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -418,17 +418,17 @@ share/mime/video/x-msvideo.xml
share/mime/video/x-nsv.xml
share/mime/video/x-real-video.xml
share/mime/video/x-sgi-movie.xml
-@unexec rmdir %D/share/mime/video 2>/dev/null || true
-@unexec rmdir %D/share/mime/text 2>/dev/null || true
-@unexec rmdir %D/share/mime/packages 2>/dev/null || true
-@unexec rmdir %D/share/mime/multipart 2>/dev/null || true
-@unexec rmdir %D/share/mime/model 2>/dev/null || true
-@unexec rmdir %D/share/mime/message 2>/dev/null || true
-@unexec rmdir %D/share/mime/inode 2>/dev/null || true
-@unexec rmdir %D/share/mime/image 2>/dev/null || true
-@unexec rmdir %D/share/mime/audio 2>/dev/null || true
-@unexec rmdir %D/share/mime/application 2>/dev/null || true
-@unexec rmdir %D/share/mime 2>/dev/null || true
+@dirrmtry share/mime/video
+@dirrmtry share/mime/text
+@dirrmtry share/mime/packages
+@dirrmtry share/mime/multipart
+@dirrmtry share/mime/model
+@dirrmtry share/mime/message
+@dirrmtry share/mime/inode
+@dirrmtry share/mime/image
+@dirrmtry share/mime/audio
+@dirrmtry share/mime/application
+@dirrmtry share/mime
@unexec [ -f %%X11BASE%%/share/mime/XMLnamespaces ] && rm -f %%X11BASE%%/share/mime/XMLnamespaces || true
@unexec [ -f %%X11BASE%%/share/mime/globs ] && rm -f %%X11BASE%%/share/mime/globs || true
@unexec [ -f %%X11BASE%%/share/mime/magic ] && rm -f %%X11BASE%%/share/mime/magic || true
diff --git a/misc/smssend/pkg-plist b/misc/smssend/pkg-plist
index 0a282769544e..f7921c945280 100644
--- a/misc/smssend/pkg-plist
+++ b/misc/smssend/pkg-plist
@@ -132,6 +132,6 @@ bin/smssend
%%DATADIR%%/vizzaviuk.sms
%%DATADIR%%/vodacom.sms
%%DATADIR%%/yab.sms
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
@dirrm %%DATADIR%%
diff --git a/misc/tellico-kde4/pkg-plist b/misc/tellico-kde4/pkg-plist
index 4c2064842125..e6fc09e17074 100644
--- a/misc/tellico-kde4/pkg-plist
+++ b/misc/tellico-kde4/pkg-plist
@@ -133,23 +133,23 @@ share/locale/pt/LC_MESSAGES/tellico.mo
share/locale/ro/LC_MESSAGES/tellico.mo
share/locale/sv/LC_MESSAGES/tellico.mo
share/mimelnk/application/x-tellico.desktop
-@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/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 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/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/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@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 share/doc/HTML/en/tellico
@dirrm share/apps/tellico/report-templates
@dirrm share/apps/tellico/pics
@dirrm share/apps/tellico/entry-templates
@dirrm share/apps/tellico
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
diff --git a/misc/tellico/pkg-plist b/misc/tellico/pkg-plist
index 4c2064842125..e6fc09e17074 100644
--- a/misc/tellico/pkg-plist
+++ b/misc/tellico/pkg-plist
@@ -133,23 +133,23 @@ share/locale/pt/LC_MESSAGES/tellico.mo
share/locale/ro/LC_MESSAGES/tellico.mo
share/locale/sv/LC_MESSAGES/tellico.mo
share/mimelnk/application/x-tellico.desktop
-@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/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 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/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/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@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 share/doc/HTML/en/tellico
@dirrm share/apps/tellico/report-templates
@dirrm share/apps/tellico/pics
@dirrm share/apps/tellico/entry-templates
@dirrm share/apps/tellico
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
diff --git a/misc/utf8locale/pkg-plist b/misc/utf8locale/pkg-plist
index 870e3cc70185..8f12aca3ab94 100644
--- a/misc/utf8locale/pkg-plist
+++ b/misc/utf8locale/pkg-plist
@@ -1,6 +1,6 @@
share/locale/la_LN.UTF-8/LC_COLLATE
share/locale/la_LN.UTF-8/LC_CTYPE
@dirrm share/locale/la_LN.UTF-8
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale
@exec for lang in %%LANGS%%; do ln -sf %D/share/locale/$lang.UTF-8 %%BASELOCALEDIR%%/; done
@unexec for lang in %%LANGS%%; do rm -f %%BASELOCALEDIR%%/$lang.UTF-8; done
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 2650d9d41ec0..5d632837b961 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -13,13 +13,13 @@ share/xfce4/doc/he/images/appfinder-handle-popup.png
share/xfce4/doc/he/images/appfinder-item-popup.png
share/xfce4/doc/he/images/default_appfinder.png
share/xfce4/doc/he/xfce4-appfinder.html
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
index f27ea0bc1f01..ec35fc321013 100644
--- a/misc/xfce4-iconbox/pkg-plist
+++ b/misc/xfce4-iconbox/pkg-plist
@@ -48,11 +48,11 @@ share/locale/uk/LC_MESSAGES/xfce4-iconbox.mo
share/locale/vi/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 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/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
diff --git a/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist
index 9366e9f1e0ea..7d432f36c90c 100644
--- a/misc/xfce4-weather-plugin/pkg-plist
+++ b/misc/xfce4-weather-plugin/pkg-plist
@@ -47,9 +47,9 @@ share/xfce4/weather/icons/liquid/6.png
share/xfce4/weather/icons/liquid/7.png
share/xfce4/weather/icons/liquid/8.png
share/xfce4/weather/icons/liquid/9.png
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/weather/icons/liquid 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/weather/icons 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/weather 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4/weather/icons/liquid
+@dirrmtry share/xfce4/weather/icons
+@dirrmtry share/xfce4/weather
+@dirrmtry share/xfce4
diff --git a/misc/xfce4-wm-themes/pkg-plist b/misc/xfce4-wm-themes/pkg-plist
index b51b31f85844..e96a35dace48 100644
--- a/misc/xfce4-wm-themes/pkg-plist
+++ b/misc/xfce4-wm-themes/pkg-plist
@@ -3632,161 +3632,161 @@ share/themes/Xfce/xfwm4/top-left-inactive.xpm
share/themes/Xfce/xfwm4/top-right-active.xpm
share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Adept/xfwm4
-@unexec rmdir %D/share/themes/Adept 2>/dev/null || true
+@dirrmtry share/themes/Adept
@dirrm share/themes/Agua/xfwm4
-@unexec rmdir %D/share/themes/Agua 2>/dev/null || true
+@dirrmtry share/themes/Agua
@dirrm share/themes/Agualemon/xfwm4
-@unexec rmdir %D/share/themes/Agualemon 2>/dev/null || true
+@dirrmtry share/themes/Agualemon
@dirrm share/themes/Alternate/xfwm4
-@unexec rmdir %D/share/themes/Alternate 2>/dev/null || true
+@dirrmtry share/themes/Alternate
@dirrm share/themes/Atlanta/xfwm4
-@unexec rmdir %D/share/themes/Atlanta 2>/dev/null || true
+@dirrmtry share/themes/Atlanta
@dirrm share/themes/Atlanta2/xfwm4
-@unexec rmdir %D/share/themes/Atlanta2 2>/dev/null || true
+@dirrmtry share/themes/Atlanta2
@dirrm share/themes/B5/xfwm4
-@unexec rmdir %D/share/themes/B5 2>/dev/null || true
+@dirrmtry share/themes/B5
@dirrm share/themes/B6/xfwm4
-@unexec rmdir %D/share/themes/B6 2>/dev/null || true
+@dirrmtry share/themes/B6
@dirrm share/themes/BBS/xfwm4
-@unexec rmdir %D/share/themes/BBS 2>/dev/null || true
+@dirrmtry share/themes/BBS
@dirrm share/themes/Basix/xfwm4
-@unexec rmdir %D/share/themes/Basix 2>/dev/null || true
+@dirrmtry share/themes/Basix
@dirrm share/themes/Beastie/xfwm4
-@unexec rmdir %D/share/themes/Beastie 2>/dev/null || true
+@dirrmtry share/themes/Beastie
@dirrm share/themes/Biz/xfwm4
-@unexec rmdir %D/share/themes/Biz 2>/dev/null || true
+@dirrmtry share/themes/Biz
@dirrm share/themes/Blackwall/xfwm4
-@unexec rmdir %D/share/themes/Blackwall 2>/dev/null || true
+@dirrmtry share/themes/Blackwall
@dirrm share/themes/Buzz/xfwm4
-@unexec rmdir %D/share/themes/Buzz 2>/dev/null || true
+@dirrmtry share/themes/Buzz
@dirrm share/themes/Coldsteel/xfwm4
-@unexec rmdir %D/share/themes/Coldsteel 2>/dev/null || true
+@dirrmtry share/themes/Coldsteel
@dirrm share/themes/Coolclean/xfwm4
-@unexec rmdir %D/share/themes/Coolclean 2>/dev/null || true
+@dirrmtry share/themes/Coolclean
@dirrm share/themes/Crux/xfwm4
-@unexec rmdir %D/share/themes/Crux 2>/dev/null || true
+@dirrmtry share/themes/Crux
@dirrm share/themes/Cruxish/xfwm4
-@unexec rmdir %D/share/themes/Cruxish 2>/dev/null || true
+@dirrmtry share/themes/Cruxish
@dirrm share/themes/Curve/xfwm4
-@unexec rmdir %D/share/themes/Curve 2>/dev/null || true
+@dirrmtry share/themes/Curve
@dirrm share/themes/Defcon-IV/xfwm4
-@unexec rmdir %D/share/themes/Defcon-IV 2>/dev/null || true
+@dirrmtry share/themes/Defcon-IV
@dirrm share/themes/Eazel-blue/xfwm4
-@unexec rmdir %D/share/themes/Eazel-blue 2>/dev/null || true
+@dirrmtry share/themes/Eazel-blue
@dirrm share/themes/Elberg/xfwm4
-@unexec rmdir %D/share/themes/Elberg 2>/dev/null || true
+@dirrmtry share/themes/Elberg
@dirrm share/themes/Exocet/xfwm4
-@unexec rmdir %D/share/themes/Exocet 2>/dev/null || true
+@dirrmtry share/themes/Exocet
@dirrm share/themes/Fbx/xfwm4
-@unexec rmdir %D/share/themes/Fbx 2>/dev/null || true
+@dirrmtry share/themes/Fbx
@dirrm share/themes/G2/xfwm4
-@unexec rmdir %D/share/themes/G2 2>/dev/null || true
+@dirrmtry share/themes/G2
@dirrm share/themes/Galaxy/xfwm4
-@unexec rmdir %D/share/themes/Galaxy 2>/dev/null || true
+@dirrmtry share/themes/Galaxy
@dirrm share/themes/Gaudy/xfwm4
-@unexec rmdir %D/share/themes/Gaudy 2>/dev/null || true
+@dirrmtry share/themes/Gaudy
@dirrm share/themes/Gelly/xfwm4
-@unexec rmdir %D/share/themes/Gelly 2>/dev/null || true
+@dirrmtry share/themes/Gelly
@dirrm share/themes/Gnububble/xfwm4
-@unexec rmdir %D/share/themes/Gnububble 2>/dev/null || true
+@dirrmtry share/themes/Gnububble
@dirrm share/themes/Gorilla/xfwm4
-@unexec rmdir %D/share/themes/Gorilla 2>/dev/null || true
+@dirrmtry share/themes/Gorilla
@dirrm share/themes/Gtk/xfwm4
-@unexec rmdir %D/share/themes/Gtk 2>/dev/null || true
+@dirrmtry share/themes/Gtk
@dirrm share/themes/Iceg/xfwm4
-@unexec rmdir %D/share/themes/Iceg 2>/dev/null || true
+@dirrmtry share/themes/Iceg
@dirrm share/themes/Kde/xfwm4
-@unexec rmdir %D/share/themes/Kde 2>/dev/null || true
+@dirrmtry share/themes/Kde
@dirrm share/themes/Kde1/xfwm4
-@unexec rmdir %D/share/themes/Kde1 2>/dev/null || true
+@dirrmtry share/themes/Kde1
@dirrm share/themes/Keramik/xfwm4
-@unexec rmdir %D/share/themes/Keramik 2>/dev/null || true
+@dirrmtry share/themes/Keramik
@dirrm share/themes/Kindaker/xfwm4
-@unexec rmdir %D/share/themes/Kindaker 2>/dev/null || true
+@dirrmtry share/themes/Kindaker
@dirrm share/themes/Kleanux/xfwm4
-@unexec rmdir %D/share/themes/Kleanux 2>/dev/null || true
+@dirrmtry share/themes/Kleanux
@dirrm share/themes/Koynacity/xfwm4
-@unexec rmdir %D/share/themes/Koynacity 2>/dev/null || true
+@dirrmtry share/themes/Koynacity
@dirrm share/themes/LineArt/xfwm4
-@unexec rmdir %D/share/themes/LineArt 2>/dev/null || true
+@dirrmtry share/themes/LineArt
@dirrm share/themes/Linea/xfwm4
-@unexec rmdir %D/share/themes/Linea 2>/dev/null || true
+@dirrmtry share/themes/Linea
@dirrm share/themes/Meenee/xfwm4
-@unexec rmdir %D/share/themes/Meenee 2>/dev/null || true
+@dirrmtry share/themes/Meenee
@dirrm share/themes/Metabox/xfwm4
-@unexec rmdir %D/share/themes/Metabox 2>/dev/null || true
+@dirrmtry share/themes/Metabox
@dirrm share/themes/Microcurve/xfwm4
-@unexec rmdir %D/share/themes/Microcurve 2>/dev/null || true
+@dirrmtry share/themes/Microcurve
@dirrm share/themes/Microdeck/xfwm4
-@unexec rmdir %D/share/themes/Microdeck 2>/dev/null || true
+@dirrmtry share/themes/Microdeck
@dirrm share/themes/Microdeck2/xfwm4
-@unexec rmdir %D/share/themes/Microdeck2 2>/dev/null || true
+@dirrmtry share/themes/Microdeck2
@dirrm share/themes/Microdeck3/xfwm4
-@unexec rmdir %D/share/themes/Microdeck3 2>/dev/null || true
+@dirrmtry share/themes/Microdeck3
@dirrm share/themes/Microgui/xfwm4
-@unexec rmdir %D/share/themes/Microgui 2>/dev/null || true
+@dirrmtry share/themes/Microgui
@dirrm share/themes/Mofit/xfwm4
-@unexec rmdir %D/share/themes/Mofit 2>/dev/null || true
+@dirrmtry share/themes/Mofit
@dirrm share/themes/Next/xfwm4
-@unexec rmdir %D/share/themes/Next 2>/dev/null || true
+@dirrmtry share/themes/Next
@dirrm share/themes/Ops/xfwm4
-@unexec rmdir %D/share/themes/Ops 2>/dev/null || true
+@dirrmtry share/themes/Ops
@dirrm share/themes/Oroborus/xfwm4
-@unexec rmdir %D/share/themes/Oroborus 2>/dev/null || true
+@dirrmtry share/themes/Oroborus
@dirrm share/themes/Perl/xfwm4
-@unexec rmdir %D/share/themes/Perl 2>/dev/null || true
+@dirrmtry share/themes/Perl
@dirrm share/themes/Pills/xfwm4
-@unexec rmdir %D/share/themes/Pills 2>/dev/null || true
+@dirrmtry share/themes/Pills
@dirrm share/themes/Piranha/xfwm4
-@unexec rmdir %D/share/themes/Piranha 2>/dev/null || true
+@dirrmtry share/themes/Piranha
@dirrm share/themes/Platinum/xfwm4
-@unexec rmdir %D/share/themes/Platinum 2>/dev/null || true
+@dirrmtry share/themes/Platinum
@dirrm share/themes/Prune/xfwm4
-@unexec rmdir %D/share/themes/Prune 2>/dev/null || true
+@dirrmtry share/themes/Prune
@dirrm share/themes/Quiet-purple/xfwm4
-@unexec rmdir %D/share/themes/Quiet-purple 2>/dev/null || true
+@dirrmtry share/themes/Quiet-purple
@dirrm share/themes/Quinx/xfwm4
-@unexec rmdir %D/share/themes/Quinx 2>/dev/null || true
+@dirrmtry share/themes/Quinx
@dirrm share/themes/R9X/xfwm4
-@unexec rmdir %D/share/themes/R9X 2>/dev/null || true
+@dirrmtry share/themes/R9X
@dirrm share/themes/Redmond/xfwm4
-@unexec rmdir %D/share/themes/Redmond 2>/dev/null || true
+@dirrmtry share/themes/Redmond
@dirrm share/themes/RedmondXP/xfwm4
-@unexec rmdir %D/share/themes/RedmondXP 2>/dev/null || true
+@dirrmtry share/themes/RedmondXP
@dirrm share/themes/Retro/xfwm4
-@unexec rmdir %D/share/themes/Retro 2>/dev/null || true
+@dirrmtry share/themes/Retro
@dirrm share/themes/Silverado/xfwm4
-@unexec rmdir %D/share/themes/Silverado 2>/dev/null || true
+@dirrmtry share/themes/Silverado
@dirrm share/themes/Slick/xfwm4
-@unexec rmdir %D/share/themes/Slick 2>/dev/null || true
+@dirrmtry share/themes/Slick
@dirrm share/themes/Slimline/xfwm4
-@unexec rmdir %D/share/themes/Slimline 2>/dev/null || true
+@dirrmtry share/themes/Slimline
@dirrm share/themes/Smallscreen/xfwm4
-@unexec rmdir %D/share/themes/Smallscreen 2>/dev/null || true
+@dirrmtry share/themes/Smallscreen
@dirrm share/themes/Smoothwall/xfwm4
-@unexec rmdir %D/share/themes/Smoothwall 2>/dev/null || true
+@dirrmtry share/themes/Smoothwall
@dirrm share/themes/Synthetic/xfwm4
-@unexec rmdir %D/share/themes/Synthetic 2>/dev/null || true
+@dirrmtry share/themes/Synthetic
@dirrm share/themes/TUX/xfwm4
-@unexec rmdir %D/share/themes/TUX 2>/dev/null || true
+@dirrmtry share/themes/TUX
@dirrm share/themes/Tabs/xfwm4
-@unexec rmdir %D/share/themes/Tabs 2>/dev/null || true
+@dirrmtry share/themes/Tabs
@dirrm share/themes/Tgc-large/xfwm4
-@unexec rmdir %D/share/themes/Tgc-large 2>/dev/null || true
+@dirrmtry share/themes/Tgc-large
@dirrm share/themes/Tgc/xfwm4
-@unexec rmdir %D/share/themes/Tgc 2>/dev/null || true
+@dirrmtry share/themes/Tgc
@dirrm share/themes/Today/xfwm4
-@unexec rmdir %D/share/themes/Today 2>/dev/null || true
+@dirrmtry share/themes/Today
@dirrm share/themes/Totem/xfwm4
-@unexec rmdir %D/share/themes/Totem 2>/dev/null || true
+@dirrmtry share/themes/Totem
@dirrm share/themes/Trench/xfwm4
-@unexec rmdir %D/share/themes/Trench 2>/dev/null || true
+@dirrmtry share/themes/Trench
@dirrm share/themes/Triviality/xfwm4
-@unexec rmdir %D/share/themes/Triviality 2>/dev/null || true
+@dirrmtry share/themes/Triviality
@dirrm share/themes/Tubular/xfwm4
-@unexec rmdir %D/share/themes/Tubular 2>/dev/null || true
+@dirrmtry share/themes/Tubular
@dirrm share/themes/Variation/xfwm4
-@unexec rmdir %D/share/themes/Variation 2>/dev/null || true
+@dirrmtry share/themes/Variation
@dirrm share/themes/Xfce/xfwm4
-@unexec rmdir %D/share/themes/Xfce 2>/dev/null || true
-@unexec rmdir %D/share/themes 2>/dev/null || true
+@dirrmtry share/themes/Xfce
+@dirrmtry share/themes
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index b08c8a0b7ee8..b58325062c34 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -63,6 +63,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
%%PORTDOCS%%@dirrm %%DOCSDIR%%