13 files changed, 47 insertions, 47 deletions

diff --git a/x11-fm/asfiles/pkg-plist b/x11-fm/asfiles/pkg-plist
index eb83e0c90062..8350ac4a850e 100644
--- a/x11-fm/asfiles/pkg-plist
+++ b/x11-fm/asfiles/pkg-plist
@@ -225,4 +225,4 @@ lib/X11/app-defaults/Files.ad
 share/OffiX/FilesMagic
 share/OffiX/Filesrc
 @dirrm share/OffiX
-@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+@dirrmtry include/bitmaps
diff --git a/x11-fm/binder/pkg-plist b/x11-fm/binder/pkg-plist
index 4b0c564a9c3c..23aaf09a89fb 100644
--- a/x11-fm/binder/pkg-plist
+++ b/x11-fm/binder/pkg-plist
@@ -183,4 +183,4 @@ bin/Processes.app
 @dirrm JDE/Binder/modules
 @dirrm JDE/Binder/tools
 @dirrm JDE/Binder
-@unexec rmdir %D/JDE 2>/dev/null || true
+@dirrmtry JDE
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 2e738f0a6fbe..60edb891ab2a 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -156,10 +156,10 @@ share/locale/yi/LC_MESSAGES/nautilus.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 share/locale/zu/LC_MESSAGES/nautilus.mo
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
-@unexec rmdir %D/share/locale/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
 @dirrm share/gnome/pixmaps/nautilus
 @dirrm share/gnome/nautilus/ui
 @dirrm share/gnome/nautilus/patterns
diff --git a/x11-fm/offix-files/pkg-plist b/x11-fm/offix-files/pkg-plist
index addf7df17062..35c95f4f8c9d 100644
--- a/x11-fm/offix-files/pkg-plist
+++ b/x11-fm/offix-files/pkg-plist
@@ -273,4 +273,4 @@ include/bitmaps/zoo.xbm
 share/OffiX/Files.ad
 share/OffiX/FilesMagic
 share/OffiX/Filesrc
-@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+@dirrmtry include/bitmaps
diff --git a/x11-fm/rox-filer/pkg-plist b/x11-fm/rox-filer/pkg-plist
index 4e9ca0f95492..4e7c0841002c 100644
--- a/x11-fm/rox-filer/pkg-plist
+++ b/x11-fm/rox-filer/pkg-plist
@@ -147,6 +147,6 @@ share/mime/packages/rox.xml
 @dirrm apps/ROX-Filer/Messages
 @dirrm apps/ROX-Filer/Help
 @dirrm apps/ROX-Filer
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
 @exec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime
diff --git a/x11-fm/rox-mime-editor/pkg-plist b/x11-fm/rox-mime-editor/pkg-plist
index 499f9270877c..12ebd3591f68 100644
--- a/x11-fm/rox-mime-editor/pkg-plist
+++ b/x11-fm/rox-mime-editor/pkg-plist
@@ -29,4 +29,4 @@ apps/MIME-Editor/type.pyo
 @dirrm apps/MIME-Editor/Messages
 @dirrm apps/MIME-Editor/Help
 @dirrm apps/MIME-Editor
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist
index d3392909f853..3ebdee1b662f 100644
--- a/x11-fm/rox-session/pkg-plist
+++ b/x11-fm/rox-session/pkg-plist
@@ -74,4 +74,4 @@ bin/rox-session
 @dirrm apps/ROX-Session/Help
 @dirrm apps/ROX-Session/%%BINARIES%%
 @dirrm apps/ROX-Session
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/x11-fm/worker/pkg-plist b/x11-fm/worker/pkg-plist
index e51b62606717..31905f2c5b3f 100644
--- a/x11-fm/worker/pkg-plist
+++ b/x11-fm/worker/pkg-plist
@@ -31,7 +31,7 @@ share/pixmaps/WorkerIcon.xpm
 share/pixmaps/WorkerIcon16.xpm
 share/pixmaps/WorkerIcon32.xpm
 share/pixmaps/WorkerIcon48.xpm
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
 @dirrm share/worker/catalogs
 @dirrm share/worker/scripts
 @dirrm share/worker
diff --git a/x11-fm/workplace/pkg-plist b/x11-fm/workplace/pkg-plist
index befc7fd2f6fd..94ce8f7001d3 100644
--- a/x11-fm/workplace/pkg-plist
+++ b/x11-fm/workplace/pkg-plist
@@ -69,4 +69,4 @@ share/examples/workplace/WPPref
 share/examples/workplace/WPSuffix
 @dirrm share/doc/workplace
 @dirrm share/examples/workplace
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/x11-fm/x-files/pkg-plist b/x11-fm/x-files/pkg-plist
index bd07baf74971..a32fd52c2fe6 100644
--- a/x11-fm/x-files/pkg-plist
+++ b/x11-fm/x-files/pkg-plist
@@ -23,4 +23,4 @@ lib/X11/X-Files/xfiles.user_pophelp
 lib/X11/X-Files/xfilesrc
 lib/X11/X-Files/xflogo.gif
 @dirrm lib/X11/X-Files
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
index 69b066870766..cedf356029b6 100644
--- a/x11-fm/xfce4-fm/pkg-plist
+++ b/x11-fm/xfce4-fm/pkg-plist
@@ -313,29 +313,29 @@ share/xfce4/xffm/AUTHORS.vi
 share/xfce4/xffm/xffm.spec
 share/xfce4/xffm/xffm.spec.in
 @dirrm lib/xfce4/xffm
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/stock 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@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/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/mime 2>/dev/null || true
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/48x48/stock/generic
+@dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@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 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/mime
 @dirrm share/xfce4/xffm
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry share/xfce4
 @dirrm share/xffm/pixmaps
 @dirrm share/xffm
diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist
index d25651ddb5cd..f63364721382 100644
--- a/x11-fm/xfe/pkg-plist
+++ b/x11-fm/xfe/pkg-plist
@@ -165,6 +165,6 @@ share/pixmaps/xfv.png
 @dirrm lib/foxicons
 @dirrm lib/foxrc
 @dirrm share/pixmaps
-@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_AR 2> /dev/null || true
-@unexec rmdir %D/share/locale/pt_PT 2> /dev/null || true
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/pt_PT
diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist
index ee79f3be41c6..075323292851 100644
--- a/x11-fm/xnc/pkg-plist
+++ b/x11-fm/xnc/pkg-plist
@@ -43,14 +43,14 @@ share/doc/xnc/doc6.html
 share/doc/xnc/doc7.html
 share/doc/xnc/doc8.html
 share/doc/xnc/index.html
-@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sp 2> /dev/null || true
-@unexec rmdir %D/share/gnome/apps/Applications 2> /dev/null || true
-@unexec rmdir %D/share/gnome/apps 2> /dev/null || true
-@unexec rmdir %D/share/gnome 2> /dev/null || true
-@unexec rmdir %D/share/applnk/System 2> /dev/null || true
-@unexec rmdir %D/share/applnk 2> /dev/null || true
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/locale/sp/LC_MESSAGES
+@dirrmtry share/locale/sp
+@dirrmtry share/gnome/apps/Applications
+@dirrmtry share/gnome/apps
+@dirrmtry share/gnome
+@dirrmtry share/applnk/System
+@dirrmtry share/applnk
+@dirrmtry share/applications
 @dirrm share/pixmaps
 @dirrm share/doc/xnc
 @dirrm lib/xnc