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

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

40 files changed, 263 insertions, 263 deletions

diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 609f0b6366ab..4a77453661f4 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -95,4 +95,4 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm lib/audacious/Effect
 @dirrm lib/audacious
 @dirrm include/audacious
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 609f0b6366ab..4a77453661f4 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -95,4 +95,4 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm lib/audacious/Effect
 @dirrm lib/audacious
 @dirrm include/audacious
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 239bfa7835a2..68f9b96cfd58 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -112,6 +112,6 @@ share/avifile/pixmaps/up.ppm
 @dirrm share/doc/avifile
 @dirrm share/avifile/pixmaps
 @dirrm share/avifile
-@unexec rmdir %D/lib/avifile/vidix 2>/dev/null || true
+@dirrmtry lib/avifile/vidix
 @dirrm lib/avifile
 @dirrm include/avifile
diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist
index af8ef0027d11..8793d118f6ab 100644
--- a/multimedia/beep-media-player/pkg-plist
+++ b/multimedia/beep-media-player/pkg-plist
@@ -71,7 +71,7 @@ share/locale/ru/LC_MESSAGES/bmp.mo
 share/locale/sk/LC_MESSAGES/bmp.mo
 share/locale/sv/LC_MESSAGES/bmp.mo
 share/locale/zh_CN/LC_MESSAGES/bmp.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @exec mkdir -p %D/share/beep/Skins
 @dirrm share/beep/Skins
 @dirrm share/beep
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index a9a99f770950..e1aad616c0cb 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -221,6 +221,6 @@ share/locale/ru/LC_MESSAGES/bmpx.mo
 @dirrm include/bmpx
 %%PYTHON%%@dirrm share/bmpx-clients/pygtk
 %%PYTHON%%@dirrm share/bmpx-clients
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 3ef440842b22..5c4fd96ffbac 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -102,7 +102,7 @@ bin/dvdrip-master
 %%SITE_PERL%%/LocaleData/sr/LC_MESSAGES/video.dvdrip.mo
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
 @dirrm %%SITE_PERL%%/Video/DVDRip/RPC
 @dirrm %%SITE_PERL%%/Video/DVDRip/Job
 @dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Setting
@@ -113,17 +113,17 @@ bin/dvdrip-master
 @dirrm %%SITE_PERL%%/Video/DVDRip/Cluster
 @dirrm %%SITE_PERL%%/Video/DVDRip/CPAN
 @dirrm %%SITE_PERL%%/Video/DVDRip
-@unexec rmdir %D/%%SITE_PERL%%/Video 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/cs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/de 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/es 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/fr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/it 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/sr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Video
+@dirrmtry %%SITE_PERL%%/LocaleData/cs/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/de/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/es/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/fr/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/it/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/sr/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/cs
+@dirrmtry %%SITE_PERL%%/LocaleData/de
+@dirrmtry %%SITE_PERL%%/LocaleData/es
+@dirrmtry %%SITE_PERL%%/LocaleData/fr
+@dirrmtry %%SITE_PERL%%/LocaleData/it
+@dirrmtry %%SITE_PERL%%/LocaleData/sr
+@dirrmtry %%SITE_PERL%%/LocaleData
diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist
index ddc541906a72..34aa164812f5 100644
--- a/multimedia/dvdstyler/pkg-plist
+++ b/multimedia/dvdstyler/pkg-plist
@@ -70,4 +70,4 @@ share/locale/sr/LC_MESSAGES/dvdstyler.mo
 @dirrm %%DATADIR%%/backgrounds
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/multimedia/gstreamer-editor/pkg-plist b/multimedia/gstreamer-editor/pkg-plist
index f17f5f92a5cd..a6ffc5d56ff5 100644
--- a/multimedia/gstreamer-editor/pkg-plist
+++ b/multimedia/gstreamer-editor/pkg-plist
@@ -39,16 +39,16 @@ share/gnome/omf/gst-editor/gst-editor-manual-C.omf
 share/gnome/pixmaps/gst-editor.png
 share/gnome/pixmaps/gst-inspect.png
 share/gnome/pixmaps/gst-launch.png
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
 @dirrm share/gnome/omf/gst-editor
-@unexec rmdir %D/share/gnome/omf 2>/dev/null || true
+@dirrmtry share/gnome/omf
 @dirrm share/gnome/gst-editor/gnome/help/gst-editor/C
 @dirrm share/gnome/gst-editor/gnome/help/gst-editor
 @dirrm share/gnome/gst-editor/gnome/help
 @dirrm share/gnome/gst-editor/gnome
 @dirrm share/gnome/gst-editor
-@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome/applications
+@dirrmtry share/gnome
 @dirrm include/gst-editor-%%VERSION%%/gst/element-ui
 @dirrm include/gst-editor-%%VERSION%%/gst/element-browser
 @dirrm include/gst-editor-%%VERSION%%/gst/editor
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index ce0f0adbf656..1162aed54b9c 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -182,7 +182,7 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/floatcast
 @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
-@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
-@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrmtry include/gstreamer-%%VERSION%%/gst
+@dirrmtry include/gstreamer-%%VERSION%%
 @exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
 @unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index ce0f0adbf656..1162aed54b9c 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -182,7 +182,7 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/floatcast
 @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
-@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
-@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrmtry include/gstreamer-%%VERSION%%/gst
+@dirrmtry include/gstreamer-%%VERSION%%
 @exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
 @unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 164854e15bff..2a5ed190aace 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -122,7 +122,7 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
 @dirrm share/gnome/cache/gstreamer-%%VERSION%%
-@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
+@dirrmtry share/gnome/cache
 @dirrm lib/gstreamer-%%VERSION%%
 @dirrm include/gstreamer-%%VERSION%%/gst/getbits
 @dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index 164854e15bff..2a5ed190aace 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -122,7 +122,7 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
 @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
 @dirrm share/gnome/cache/gstreamer-%%VERSION%%
-@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
+@dirrmtry share/gnome/cache
 @dirrm lib/gstreamer-%%VERSION%%
 @dirrm include/gstreamer-%%VERSION%%/gst/getbits
 @dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol
diff --git a/multimedia/gtksubtitler/pkg-plist b/multimedia/gtksubtitler/pkg-plist
index 3b0b9706aabb..09db786d5809 100644
--- a/multimedia/gtksubtitler/pkg-plist
+++ b/multimedia/gtksubtitler/pkg-plist
@@ -5,6 +5,6 @@ share/gnome/GTKsubtitler/lang.hu
 share/gnome/GTKsubtitler/lang.pl
 share/gnome/pixmaps/GTKsubtitler/GTKsubtitler.xpm
 @dirrm share/gnome/pixmaps/GTKsubtitler
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
 @dirrm share/gnome/GTKsubtitler
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome
diff --git a/multimedia/hayes/pkg-plist b/multimedia/hayes/pkg-plist
index c19f6431c255..487cacf9b020 100644
--- a/multimedia/hayes/pkg-plist
+++ b/multimedia/hayes/pkg-plist
@@ -7,15 +7,15 @@ share/apps/noatun/icons/hicolor/22x22/actions/noatunshuffle.png
 share/apps/noatun/icons/hicolor/32x32/actions/nextsection.png
 share/apps/noatun/icons/hicolor/32x32/actions/prevsection.png
 share/services/noatunhayessetcurrent.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun 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
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/apps/noatun/icons/hicolor/32x32/actions
+@dirrmtry share/apps/noatun/icons/hicolor/32x32
+@dirrmtry share/apps/noatun/icons/hicolor/22x22/actions
+@dirrmtry share/apps/noatun/icons/hicolor/22x22
+@dirrmtry share/apps/noatun/icons/hicolor
+@dirrmtry share/apps/noatun/icons
+@dirrmtry share/apps/noatun
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
+@dirrmtry share/apps
+@dirrmtry lib/kde3
diff --git a/multimedia/istanbul/pkg-plist b/multimedia/istanbul/pkg-plist
index 160dc8e26fa5..55dfc8b682e4 100644
--- a/multimedia/istanbul/pkg-plist
+++ b/multimedia/istanbul/pkg-plist
@@ -18,6 +18,6 @@ share/pixmaps/istanbul.png
 @dirrm %%PYTHON_SITELIBDIR%%/istanbul/extern
 @dirrm %%PYTHON_SITELIBDIR%%/istanbul/configure
 @dirrm %%PYTHON_SITELIBDIR%%/istanbul
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/applications
diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist
index be2c26bda647..d5747d97b9e6 100644
--- a/multimedia/kino/pkg-plist
+++ b/multimedia/kino/pkg-plist
@@ -144,5 +144,5 @@ share/mime/packages/kino.xml
 @dirrm share/gnome/kino/scripts/publish
 @dirrm share/gnome/kino/scripts
 @dirrm share/gnome/kino
-@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/applications
+@dirrmtry share/gnome/pixmaps
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index e27c9ba1bb8d..c8b47a0789b6 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -93,71 +93,71 @@ share/locale/tr/LC_MESSAGES/kmplayer.mo
 share/locale/xx/LC_MESSAGES/kmplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
 share/services/kmplayer_part.desktop
-@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/xx/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx 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/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 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
-@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/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 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
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 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/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xx/LC_MESSAGES
+@dirrmtry share/locale/xx
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@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/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@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
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@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/kmplayer
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/ru/kmplayer
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
 @dirrm share/doc/HTML/pt/kmplayer
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/it/kmplayer
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/kmplayer
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/et/kmplayer
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/es/kmplayer
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kmplayer
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kmplayer
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
 @dirrm share/doc/HTML/da/kmplayer
-@unexec rmdir %D/share/doc/HTML/da 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/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
 @dirrm share/apps/kmplayer
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
+@dirrmtry lib/kde3
diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist
index e27c9ba1bb8d..c8b47a0789b6 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -93,71 +93,71 @@ share/locale/tr/LC_MESSAGES/kmplayer.mo
 share/locale/xx/LC_MESSAGES/kmplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
 share/services/kmplayer_part.desktop
-@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/xx/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx 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/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 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
-@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/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 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
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 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/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xx/LC_MESSAGES
+@dirrmtry share/locale/xx
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@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/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@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
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@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/kmplayer
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/ru/kmplayer
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
 @dirrm share/doc/HTML/pt/kmplayer
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/it/kmplayer
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/fr/kmplayer
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
 @dirrm share/doc/HTML/et/kmplayer
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/es/kmplayer
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
 @dirrm share/doc/HTML/en/kmplayer
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/de/kmplayer
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
 @dirrm share/doc/HTML/da/kmplayer
-@unexec rmdir %D/share/doc/HTML/da 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/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
 @dirrm share/apps/kmplayer
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
+@dirrmtry lib/kde3
diff --git a/multimedia/konverter/pkg-plist b/multimedia/konverter/pkg-plist
index 87df46264c40..3aefb5205334 100644
--- a/multimedia/konverter/pkg-plist
+++ b/multimedia/konverter/pkg-plist
@@ -6,16 +6,16 @@ share/doc/HTML/en/konverter/index.cache.bz2
 share/doc/HTML/en/konverter/index.docbook
 share/icons/hicolor/16x16/apps/konverter.png
 share/icons/hicolor/32x32/apps/konverter.png
-@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
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@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
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/konverter
-@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
 @dirrm share/apps/konverter
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/multimedia/ksubeditor/pkg-plist b/multimedia/ksubeditor/pkg-plist
index bf76ba58bbed..2d27756e591a 100644
--- a/multimedia/ksubeditor/pkg-plist
+++ b/multimedia/ksubeditor/pkg-plist
@@ -3,13 +3,13 @@ share/applnk/Applications/ksubeditor.desktop
 share/apps/ksubeditor/ksubeditorui.rc
 share/icons/locolor/16x16/apps/ksubeditor.png
 share/icons/locolor/32x32/apps/ksubeditor.png
-@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 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
 @dirrm share/apps/ksubeditor
-@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
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/multimedia/libdivxdecore-devel/pkg-plist b/multimedia/libdivxdecore-devel/pkg-plist
index 605990654dcd..ef72d66788d7 100644
--- a/multimedia/libdivxdecore-devel/pkg-plist
+++ b/multimedia/libdivxdecore-devel/pkg-plist
@@ -3,4 +3,4 @@ lib/libdivxdecore.a
 lib/libdivxdecore.so
 lib/libdivxdecore.so.%%LIB_VERSION%%
 %%NOPROFILE%%lib/libdivxdecore_p.a
-@unexec rmdir %D/include/divx 2>/dev/null || true
+@dirrmtry include/divx
diff --git a/multimedia/libdivxencore/pkg-plist b/multimedia/libdivxencore/pkg-plist
index af46d29caa35..937d6fdcde18 100644
--- a/multimedia/libdivxencore/pkg-plist
+++ b/multimedia/libdivxencore/pkg-plist
@@ -3,4 +3,4 @@ lib/libdivxencore.a
 lib/libdivxencore.so
 lib/libdivxencore.so.%%LIB_VERSION%%
 %%NOPROFILE%%lib/libdivxencore_p.a
-@unexec rmdir %D/include/divx 2>/dev/null || true
+@dirrmtry include/divx
diff --git a/multimedia/libmovtar/pkg-plist b/multimedia/libmovtar/pkg-plist
index 3f5456d231c3..60fc111a1860 100644
--- a/multimedia/libmovtar/pkg-plist
+++ b/multimedia/libmovtar/pkg-plist
@@ -10,4 +10,4 @@ bin/rtjshow
 include/movtar.h
 lib/libmovtar.a
 share/aclocal/movtar.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@dirrmtry share/aclocal
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 024e38b2fff3..c1b8a7bc73ad 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -212,8 +212,8 @@ share/xine/libxine1/fonts/serif-64.xinefont.gz
 @dirrm %%DOCSDIR%%/hackersguide
 @dirrm %%DOCSDIR%%/faq
 @dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
 @dirrm share/xine/libxine1/fonts
 @dirrm share/xine/libxine1
 @dirrm share/xine
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index 3b0a7919ee6c..04d8ad37bc11 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -177,8 +177,8 @@ lib/linux-mozilla/plugins/nphelix.xpt
 @dirrm lib/RealPlayer/share/realplay
 @dirrm lib/RealPlayer/share
 @dirrm lib/RealPlayer
-@unexec rmdir %D/lib/linux-mozilla/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/linux-mozilla 2>/dev/null || true
+@dirrmtry lib/linux-mozilla/plugins
+@dirrmtry lib/linux-mozilla
 %%X11%%@cwd %%X11BASE%%
 %%GNOME%%share/gnome/application-registry/realplay.applications
 %%GNOME%%share/gnome/applications/realplay.desktop
diff --git a/multimedia/mplayer-skins/pkg-plist b/multimedia/mplayer-skins/pkg-plist
index 63ba33198b79..23a3ee1eb839 100644
--- a/multimedia/mplayer-skins/pkg-plist
+++ b/multimedia/mplayer-skins/pkg-plist
@@ -1730,4 +1730,4 @@ share/mplayer/Skin/%%PKGNAME%%
 %%ABYSS%%@dirrm share/mplayer/Skin/Abyss
 %%WINDOWSMEDIAPLAYER6%%@dirrm share/mplayer/Skin/WMP6
 @dirrm share/mplayer/Skin
-@unexec rmdir %D/share/mplayer/ 2>/dev/null || true
+@dirrmtry share/mplayer/
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 6f4ada61318c..bae7c36327a0 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -96,7 +96,7 @@ bin/mplayer
 %%DATADIR%%/input.conf
 %%DATADIR%%/menu.conf
 @dirrm %%DATADIR%%/tools
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%VIDIX%%@dirrm lib/mplayer/vidix
 %%VIDIX%%@dirrm lib/mplayer
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 24b3ec5b4592..54127ed0efb0 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -28,18 +28,18 @@ share/locale/fr/LC_MESSAGES/ogle_gui.mo
 share/locale/nl/LC_MESSAGES/ogle_gui.mo
 share/locale/pt/LC_MESSAGES/ogle_gui.mo
 share/locale/sv/LC_MESSAGES/ogle_gui.mo
-@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/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 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/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 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/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale
 @dirrm share/gnome/ogle_gui
 @dirrm lib/ogle
diff --git a/multimedia/okle/pkg-plist b/multimedia/okle/pkg-plist
index 5a35741e98e6..4e64cde264cf 100644
--- a/multimedia/okle/pkg-plist
+++ b/multimedia/okle/pkg-plist
@@ -36,17 +36,17 @@ share/locale/es/LC_MESSAGES/okle.mo
 share/locale/hu/LC_MESSAGES/okle.mo
 share/locale/it/LC_MESSAGES/okle.mo
 share/locale/sv/LC_MESSAGES/okle.mo
-@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
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@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
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/okle
-@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
 @dirrm share/apps/okle/pics
 @dirrm share/apps/okle
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Multimedia
+@dirrmtry share/applnk
diff --git a/multimedia/p5-MP4-Info/pkg-plist b/multimedia/p5-MP4-Info/pkg-plist
index e7739b6522a8..b675e9333eb4 100644
--- a/multimedia/p5-MP4-Info/pkg-plist
+++ b/multimedia/p5-MP4-Info/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/MP4/Info.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4/Info/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4/Info
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MP4 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4
+@dirrmtry %%SITE_PERL%%/MP4
diff --git a/multimedia/p5-RIFF-Info/pkg-plist b/multimedia/p5-RIFF-Info/pkg-plist
index 896919ba951b..d2bf7698fc3c 100644
--- a/multimedia/p5-RIFF-Info/pkg-plist
+++ b/multimedia/p5-RIFF-Info/pkg-plist
@@ -3,6 +3,6 @@
 %%SITE_PERL%%/RIFF/Info/DivX.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF/Info/.packlist
 @dirrm %%SITE_PERL%%/RIFF/Info
-@unexec rmdir %D/%%SITE_PERL%%/RIFF 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/RIFF
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF/Info
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF
diff --git a/multimedia/p5-Video-Info/pkg-plist b/multimedia/p5-Video-Info/pkg-plist
index 6f54bec53c5a..b43c3fed1bc9 100644
--- a/multimedia/p5-Video-Info/pkg-plist
+++ b/multimedia/p5-Video-Info/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/Info/.packlist
 %%SITE_PERL%%/Video/Info.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/Info
-@unexec rmdir %D/%%SITE_PERL%%/Video 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Video
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
diff --git a/multimedia/p5-Video-OpenQuicktime/pkg-plist b/multimedia/p5-Video-OpenQuicktime/pkg-plist
index c6090cc7f2e2..838a751fab93 100644
--- a/multimedia/p5-Video-OpenQuicktime/pkg-plist
+++ b/multimedia/p5-Video-OpenQuicktime/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime/OpenQuicktime.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime/OpenQuicktime.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Video 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Video
diff --git a/multimedia/quodlibet/pkg-plist b/multimedia/quodlibet/pkg-plist
index 93cd2b3baf7a..aaec700d0c13 100644
--- a/multimedia/quodlibet/pkg-plist
+++ b/multimedia/quodlibet/pkg-plist
@@ -116,7 +116,7 @@ share/quodlibet/rhythmbox-volume-zero.png
 share/quodlibet/stock.py
 share/quodlibet/util.py
 share/quodlibet/widgets.py
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @exec mkdir -p %D/share/quodlibet/plugins
 @dirrm share/quodlibet/plugins
 @exec mkdir -p %D/lib/quodlibet
diff --git a/multimedia/rox-videothumbnail/pkg-plist b/multimedia/rox-videothumbnail/pkg-plist
index 19cbf9356ac2..4ca00f961a8b 100644
--- a/multimedia/rox-videothumbnail/pkg-plist
+++ b/multimedia/rox-videothumbnail/pkg-plist
@@ -15,4 +15,4 @@ apps/VideoThumbnail/vidthumb.py
 apps/VideoThumbnail/vidthumb.pyc
 @dirrm apps/VideoThumbnail/Help
 @dirrm apps/VideoThumbnail
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/multimedia/tovid/pkg-plist b/multimedia/tovid/pkg-plist
index 079e71673830..216e10583bc9 100644
--- a/multimedia/tovid/pkg-plist
+++ b/multimedia/tovid/pkg-plist
@@ -35,5 +35,5 @@ bin/tovidgui
 %%PYTHON_SITELIBDIR%%/libtovid/tools.pyc
 %%PYTHON_SITELIBDIR%%/libtovid/tools.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/libtovid
-@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/multimedia/xfce4-media/pkg-plist b/multimedia/xfce4-media/pkg-plist
index da2fe3c4cf56..c61564a2a1bc 100644
--- a/multimedia/xfce4-media/pkg-plist
+++ b/multimedia/xfce4-media/pkg-plist
@@ -13,5 +13,5 @@ share/icons/hicolor/22x22/actions/xfmedia-shuffle.png
 @dirrm include/xfmedia
 @dirrm lib/xfmedia/plugins
 @dirrm lib/xfmedia
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry etc/xdg
+@dirrmtry share/applications
diff --git a/multimedia/xfce4-xmms-controller-plugin/pkg-plist b/multimedia/xfce4-xmms-controller-plugin/pkg-plist
index 2756f78fbfdc..36924468a7c9 100644
--- a/multimedia/xfce4-xmms-controller-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-controller-plugin/pkg-plist
@@ -6,6 +6,6 @@ share/xfce4-xmms-controller-plugin/pause.png
 share/xfce4-xmms-controller-plugin/play.png
 share/xfce4-xmms-controller-plugin/prev.png
 share/xfce4-xmms-controller-plugin/icon.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-xmms-controller-plugin 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4-xmms-controller-plugin
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index 038799e69564..6a1b86463878 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -5,5 +5,5 @@ share/xfce4/xmms-plugin/xmms-plugin-pause.png
 share/xfce4/xmms-plugin/xmms-plugin-stop.png
 share/xfce4/xmms-plugin/xmms-plugin-next.png
 @dirrm share/xfce4/xmms-plugin
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index 9468ad453617..1d8a943a1f39 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -126,37 +126,37 @@ share/xine/skins/xinetic/SmallArrowDown.png
 share/xine/skins/xinetic/SmallArrowUp.png
 share/xine/skins/xinetic/skinconfig
 share/xine/visuals/default.avi
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de 2>/dev/null || true
-@unexec rmdir %D/man/es/man1 2>/dev/null || true
-@unexec rmdir %D/man/es 2>/dev/null || true
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/pl/man1 2>/dev/null || true
-@unexec rmdir %D/man/pl 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/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 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/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 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/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 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 2>/dev/null || true
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/pl/man1
+@dirrmtry man/pl
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale
 @dirrm share/xine/visuals
 @dirrm share/xine/skins/xinetic
 @dirrm share/xine/oxine
 @dirrm share/xine/desktop
 @dirrm share/xine/skins
-@unexec rmdir %D/share/xine 2>/dev/null || true
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/xine
+@dirrmtry share/pixmaps
 @dirrm share/doc/xine-ui
 @dirrm share/doc/xitk