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

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

40 files changed, 194 insertions, 194 deletions

diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist
index 01e7b0b9ed7c..a0595dd6da26 100644
--- a/x11-toolkits/bakery/pkg-plist
+++ b/x11-toolkits/bakery/pkg-plist
@@ -41,8 +41,8 @@ share/locale/sv/LC_MESSAGES/bakery.mo
 share/locale/uk/LC_MESSAGES/bakery.mo
 share/locale/zh_CN/LC_MESSAGES/bakery.mo
 share/locale/zh_TW/LC_MESSAGES/bakery.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 include/bakery-%%API_VERSION%%/bakery/View
 @dirrm include/bakery-%%API_VERSION%%/bakery/Utilities
 @dirrm include/bakery-%%API_VERSION%%/bakery/Document
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 901b8bff6687..135bed40338f 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -121,13 +121,13 @@ share/locale/wa/LC_MESSAGES/eel-2.0.mo
 share/locale/xh/LC_MESSAGES/eel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/eel-2.0.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/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 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/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
 @dirrm include/eel-2/eel
 @dirrm include/eel-2
diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist
index 76e10555e0c1..a9ee5b4a1fc0 100644
--- a/x11-toolkits/gtk-sharp10/pkg-plist
+++ b/x11-toolkits/gtk-sharp10/pkg-plist
@@ -75,33 +75,33 @@ share/gapi/gtkhtml-api.xml
 share/gapi/pango-api.xml
 share/gapi/rsvg-api.xml
 share/gapi/vte-api.xml
-@unexec rmdir %D/share/gapi 2> /dev/null || true
+@dirrmtry share/gapi
 @dirrm lib/mono/gtk-sharp
 @dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/vte-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/vte-sharp
 @dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/rsvg-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/rsvg-sharp
 @dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/pango-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/pango-sharp
 @dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gtkhtml-sharp
 @dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gtk-sharp
 @dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gnome-sharp
 @dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/glib-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/glib-sharp
 @dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/glade-sharp
 @dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gdk-sharp
 @dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f
 @dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true
-@unexec rmdir %D/lib/mono/gac/gconf-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gconf-sharp-peditors
+@dirrmtry lib/mono/gac/gconf-sharp
 @dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/atk-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/atk-sharp
 @dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/art-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/art-sharp
 @exec mkdir -p %%LOCALBASE%%/share/gapi
 @unexec rmdir %%LOCALBASE%%/share/gapi 2>/dev/null || true
diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist
index b8ffdbbdd670..02feba0b8ae3 100644
--- a/x11-toolkits/gtk-sharp20/pkg-plist
+++ b/x11-toolkits/gtk-sharp20/pkg-plist
@@ -85,38 +85,38 @@ share/gapi-2.0/gtkhtml-api.xml
 share/gapi-2.0/pango-api.xml
 share/gapi-2.0/rsvg-api.xml
 share/gapi-2.0/vte-api.xml
-@unexec rmdir %D/share/gapi-2.0 2> /dev/null || true
-@unexec rmdir %D/lib/gtk-sharp-2.0 2> /dev/null || true
+@dirrmtry share/gapi-2.0
+@dirrmtry lib/gtk-sharp-2.0
 @dirrm lib/mono/gtk-sharp-2.0
 @dirrm lib/mono/gac/vte-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/vte-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/vte-sharp
 @dirrm lib/mono/gac/rsvg-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/rsvg-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/rsvg-sharp
 @dirrm lib/mono/gac/pango-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/pango-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/pango-sharp
 @dirrm lib/mono/gac/gtkhtml-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gtkhtml-sharp
 @dirrm lib/mono/gac/gtk-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gtk-sharp
 @dirrm lib/mono/gac/gtk-dotnet/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gtk-dotnet 2> /dev/null || true
+@dirrmtry lib/mono/gac/gtk-dotnet
 @dirrm lib/mono/gac/gnome-vfs-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gnome-vfs-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gnome-vfs-sharp
 @dirrm lib/mono/gac/gnome-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gnome-sharp
 @dirrm lib/mono/gac/glib-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/glib-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/glib-sharp
 @dirrm lib/mono/gac/glade-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/glade-sharp
 @dirrm lib/mono/gac/gdk-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gdk-sharp
 @dirrm lib/mono/gac/gconf-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gconf-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/gconf-sharp
 @dirrm lib/mono/gac/gconf-sharp-peditors/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true
+@dirrmtry lib/mono/gac/gconf-sharp-peditors
 @dirrm lib/mono/gac/atk-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/atk-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/atk-sharp
 @dirrm lib/mono/gac/art-sharp/2.4.0.0__35e10195dab3c99f
-@unexec rmdir %D/lib/mono/gac/art-sharp 2> /dev/null || true
+@dirrmtry lib/mono/gac/art-sharp
 @exec mkdir -p %%LOCALBASE%%/share/gapi-2.0
 @unexec rmdir %%LOCALBASE%%/share/gapi-2.0 2>/dev/null || true
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 3bfdce0aa244..3a77b08247cb 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -498,34 +498,34 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
 @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/yi 2> /dev/null || true
-@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/te/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/te 2> /dev/null || true
-@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true
-@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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 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/mi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mi 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
-@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ia 2> /dev/null || true
-@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/hy 2> /dev/null || true
-@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/br 2> /dev/null || true
-@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/uz@Latn/LC_MESSAGES
+@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
+@dirrmtry share/locale/az_IR/LC_MESSAGES
+@dirrmtry share/locale/az_IR
 @unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 3bfdce0aa244..3a77b08247cb 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -498,34 +498,34 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines
 @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/yi 2> /dev/null || true
-@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/te/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/te 2> /dev/null || true
-@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true
-@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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 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/mi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mi 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
-@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ia 2> /dev/null || true
-@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/hy 2> /dev/null || true
-@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/br 2> /dev/null || true
-@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/uz@Latn/LC_MESSAGES
+@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
+@dirrmtry share/locale/az_IR/LC_MESSAGES
+@dirrmtry share/locale/az_IR
 @unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index 185f1673872d..815a45a678ed 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -130,10 +130,10 @@ share/locale/vi/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo
 share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.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/gtksourceview-1.0/language-specs
 @dirrm share/gnome/gtksourceview-1.0
 @dirrm %%DOCSDIR%%
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 2851e8a93faa..fd8a93b24494 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -152,8 +152,8 @@ share/locale/yi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
 @dirrm lib/bonobo-2.0/samples
 @dirrm lib/bonobo-2.0
 @dirrm include/libbonoboui-2.0/bonobo
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 0ee38ebceff8..75d9aeeec306 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -230,10 +230,10 @@ share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo
-@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/te 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
 @dirrm %%DOCSDIR%%
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 56fa9ac859fa..c621d488d3c1 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -115,10 +115,10 @@ share/locale/wa/LC_MESSAGES/libwnck.mo
 share/locale/xh/LC_MESSAGES/libwnck.mo
 share/locale/zh_CN/LC_MESSAGES/libwnck.mo
 share/locale/zh_TW/LC_MESSAGES/libwnck.mo
-@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
 @dirrm %%DOCSDIR%%
 @dirrm include/libwnck-1.0/libwnck
 @dirrm include/libwnck-1.0
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index f7f98e943c48..e0a959c6a830 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -86,12 +86,12 @@ share/gtk-doc/html/libxfcegui4/right.png
 share/gtk-doc/html/libxfcegui4/up.png
 share/xfce4/hicolor-index.theme
 @dirrm include/xfce4/libxfcegui4
-@unexec rmdir %D/include/xfce4/xfce4-modules 2>/dev/null || true
-@unexec rmdir %D/include/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/modules 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry include/xfce4/xfce4-modules
+@dirrmtry include/xfce4
+@dirrmtry lib/xfce4/modules
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4/mime
+@dirrmtry share/xfce4
 @dirrm share/gtk-doc/html/libxfcegui4
-@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
-@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
diff --git a/x11-toolkits/ocaml-lablgtk2/pkg-plist b/x11-toolkits/ocaml-lablgtk2/pkg-plist
index 320e6e630d33..6aa097ea11de 100644
--- a/x11-toolkits/ocaml-lablgtk2/pkg-plist
+++ b/x11-toolkits/ocaml-lablgtk2/pkg-plist
@@ -396,7 +396,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so
 %%GNOMECANVAS%%@dirrm %%EXAMPLESDIR%%/canvas
 @dirrm %%EXAMPLESDIR%%/GL
 @dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/share/examples/ocaml 2>/dev/null || true
-@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true
+@dirrmtry share/examples/ocaml
+@dirrmtry lib/ocaml/stublibs
 @dirrm lib/ocaml/lablgtk2
-@unexec rmdir %D/lib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml
diff --git a/x11-toolkits/p5-GdkImlib/pkg-plist b/x11-toolkits/p5-GdkImlib/pkg-plist
index 6a82bac6790d..d9dae9e5e7b0 100644
--- a/x11-toolkits/p5-GdkImlib/pkg-plist
+++ b/x11-toolkits/p5-GdkImlib/pkg-plist
@@ -7,8 +7,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/ImlibImage.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk
diff --git a/x11-toolkits/p5-GdkPixbuf/pkg-plist b/x11-toolkits/p5-GdkPixbuf/pkg-plist
index 0c9cd916f5ef..c18f0a77e960 100644
--- a/x11-toolkits/p5-GdkPixbuf/pkg-plist
+++ b/x11-toolkits/p5-GdkPixbuf/pkg-plist
@@ -10,8 +10,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk
diff --git a/x11-toolkits/p5-Gnome2-Canvas/pkg-plist b/x11-toolkits/p5-Gnome2-Canvas/pkg-plist
index 619804b9b3e4..2451e5346606 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/pkg-plist
+++ b/x11-toolkits/p5-Gnome2-Canvas/pkg-plist
@@ -26,5 +26,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/Canvas
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
diff --git a/x11-toolkits/p5-Gnome2-VFS/pkg-plist b/x11-toolkits/p5-Gnome2-VFS/pkg-plist
index 924262ed32cb..fc4f2017af3e 100644
--- a/x11-toolkits/p5-Gnome2-VFS/pkg-plist
+++ b/x11-toolkits/p5-Gnome2-VFS/pkg-plist
@@ -35,5 +35,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Monitor
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/VFS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
diff --git a/x11-toolkits/p5-Gnome2/pkg-plist b/x11-toolkits/p5-Gnome2/pkg-plist
index 7efc59ea7107..af82444bd65d 100644
--- a/x11-toolkits/p5-Gnome2/pkg-plist
+++ b/x11-toolkits/p5-Gnome2/pkg-plist
@@ -58,5 +58,5 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Bonobo
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Config
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
index 2f50bd143ab7..290ca302d721 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist
@@ -4,4 +4,4 @@ bin/podviewer
 %%SITE_PERL%%/Gtk2/PodViewer/Parser.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer
 @dirrm %%SITE_PERL%%/Gtk2/PodViewer
-@unexec rmdir %D/%%SITE_PERL%%/Gtk2 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist
index 2f50bd143ab7..290ca302d721 100644
--- a/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist
@@ -4,4 +4,4 @@ bin/podviewer
 %%SITE_PERL%%/Gtk2/PodViewer/Parser.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer
 @dirrm %%SITE_PERL%%/Gtk2/PodViewer
-@unexec rmdir %D/%%SITE_PERL%%/Gtk2 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
index d70b3855757d..019ee762534d 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist
@@ -6,7 +6,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/trayicon.typemap
 %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/TrayIcon
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
diff --git a/x11-toolkits/p5-Gtk2/pkg-plist b/x11-toolkits/p5-Gtk2/pkg-plist
index 4ce20ded3996..6b016ec3ddfb 100644
--- a/x11-toolkits/p5-Gtk2/pkg-plist
+++ b/x11-toolkits/p5-Gtk2/pkg-plist
@@ -261,6 +261,6 @@
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeSortable
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2
diff --git a/x11-toolkits/p5-GtkXmHTML/pkg-plist b/x11-toolkits/p5-GtkXmHTML/pkg-plist
index dcb497a57285..d1115d76ab04 100644
--- a/x11-toolkits/p5-GtkXmHTML/pkg-plist
+++ b/x11-toolkits/p5-GtkXmHTML/pkg-plist
@@ -11,6 +11,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk
diff --git a/x11-toolkits/p5-Tcl-Tk/pkg-plist b/x11-toolkits/p5-Tcl-Tk/pkg-plist
index cea0dd9d11da..29720d211be3 100644
--- a/x11-toolkits/p5-Tcl-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tcl-Tk/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tcl
diff --git a/x11-toolkits/p5-TclTk/pkg-plist b/x11-toolkits/p5-TclTk/pkg-plist
index cea0dd9d11da..29720d211be3 100644
--- a/x11-toolkits/p5-TclTk/pkg-plist
+++ b/x11-toolkits/p5-TclTk/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tcl
diff --git a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
index 68758a4310f0..0334362f3c13 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
+++ b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tk/Autoscroll.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
index 776aa7758a92..d453ca6403cd 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
+++ b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tk/ColourChooser.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Date/pkg-plist b/x11-toolkits/p5-Tk-Date/pkg-plist
index a1ac370c536f..3b5b0aadebcd 100644
--- a/x11-toolkits/p5-Tk-Date/pkg-plist
+++ b/x11-toolkits/p5-Tk-Date/pkg-plist
@@ -1,8 +1,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Date.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/date.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
diff --git a/x11-toolkits/p5-Tk-Enscript/pkg-plist b/x11-toolkits/p5-Tk-Enscript/pkg-plist
index c3c30122d792..fca4f5355664 100644
--- a/x11-toolkits/p5-Tk-Enscript/pkg-plist
+++ b/x11-toolkits/p5-Tk-Enscript/pkg-plist
@@ -2,5 +2,5 @@
 %%SITE_PERL%%/Tk/enscript.cfg
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-FileDialog/pkg-plist b/x11-toolkits/p5-Tk-FileDialog/pkg-plist
index 1d1691894e83..11e0037b35af 100644
--- a/x11-toolkits/p5-Tk-FileDialog/pkg-plist
+++ b/x11-toolkits/p5-Tk-FileDialog/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog/.packlist
 %%SITE_PERL%%/Tk/FileDialog.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-GBARR/pkg-plist b/x11-toolkits/p5-Tk-GBARR/pkg-plist
index 392bdc6e6faf..d7edf91662e2 100644
--- a/x11-toolkits/p5-Tk-GBARR/pkg-plist
+++ b/x11-toolkits/p5-Tk-GBARR/pkg-plist
@@ -10,7 +10,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/tframe.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
diff --git a/x11-toolkits/p5-Tk-Getopt/pkg-plist b/x11-toolkits/p5-Tk-Getopt/pkg-plist
index 0648f843ccf3..1fc3c40e349a 100644
--- a/x11-toolkits/p5-Tk-Getopt/pkg-plist
+++ b/x11-toolkits/p5-Tk-Getopt/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tk/Getopt.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-HistEntry/pkg-plist b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
index b2b7ff69f8de..7b38876e0772 100644
--- a/x11-toolkits/p5-Tk-HistEntry/pkg-plist
+++ b/x11-toolkits/p5-Tk-HistEntry/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tk/HistEntry.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
index 2ad841f84cb8..eacce4402d5b 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
+++ b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Tk/ResizeButton.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-Splashscreen/pkg-plist b/x11-toolkits/p5-Tk-Splashscreen/pkg-plist
index f2a8d72b2cb5..d239745450dd 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/pkg-plist
+++ b/x11-toolkits/p5-Tk-Splashscreen/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/Tk/Splashscreen.pm
 %%SITE_PERL%%/Tk/waitVariableX.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
index d76279eae714..fbe1b74825fd 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
+++ b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist
@@ -11,10 +11,10 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/autosplit.ix
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%
diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist
index cbd9b8903048..bc03153dc984 100644
--- a/x11-toolkits/p5-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tk/pkg-plist
@@ -682,4 +682,4 @@ bin/widget
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Xlib
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/pTk
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tie
diff --git a/x11-toolkits/py-wxPython26-common/pkg-plist b/x11-toolkits/py-wxPython26-common/pkg-plist
index bec4e5ccf74f..e552fae8b5cf 100644
--- a/x11-toolkits/py-wxPython26-common/pkg-plist
+++ b/x11-toolkits/py-wxPython26-common/pkg-plist
@@ -755,9 +755,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/wxPython 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%/wxPython
+@dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrm include/wx-%%WX_VERSION%%/wx/wxPython/i_files
 @dirrm include/wx-%%WX_VERSION%%/wx/wxPython
-@unexec rmdir %D/include/wx-%%WX_VERSION%%/wx 2>/dev/null || true
-@unexec rmdir %D/include/wx-%%WX_VERSION%% 2>/dev/null || true
+@dirrmtry include/wx-%%WX_VERSION%%/wx
+@dirrmtry include/wx-%%WX_VERSION%%
diff --git a/x11-toolkits/py-wxPython28-common/pkg-plist b/x11-toolkits/py-wxPython28-common/pkg-plist
index bec4e5ccf74f..e552fae8b5cf 100644
--- a/x11-toolkits/py-wxPython28-common/pkg-plist
+++ b/x11-toolkits/py-wxPython28-common/pkg-plist
@@ -755,9 +755,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps
 @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/wxPython 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%/wxPython
+@dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrm include/wx-%%WX_VERSION%%/wx/wxPython/i_files
 @dirrm include/wx-%%WX_VERSION%%/wx/wxPython
-@unexec rmdir %D/include/wx-%%WX_VERSION%%/wx 2>/dev/null || true
-@unexec rmdir %D/include/wx-%%WX_VERSION%% 2>/dev/null || true
+@dirrmtry include/wx-%%WX_VERSION%%/wx
+@dirrmtry include/wx-%%WX_VERSION%%
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 5ece57b57460..4e703c1c95be 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -97,12 +97,12 @@ share/locale/wa/LC_MESSAGES/vte.mo
 share/locale/xh/LC_MESSAGES/vte.mo
 share/locale/zh_CN/LC_MESSAGES/vte.mo
 share/locale/zh_TW/LC_MESSAGES/vte.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
 @dirrm share/gnome/vte/termcap
 @dirrm share/gnome/vte
 @dirrm %%DOCSDIR%%
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index 481436e10b27..879263b73688 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -510,7 +510,7 @@ include/xview_private/xv_color.h
 include/xview_private/xv_debug.h
 include/xview_private/xv_list.h
 include/xview_private/xv_path_util.h
-@unexec rmdir %D/include/bitmaps 2>/dev/null || true
+@dirrmtry include/bitmaps
 @dirrm include/images
 @dirrm include/olgx
 @dirrm include/olgx_private