summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/atk/pkg-plist120
-rw-r--r--accessibility/dasher/pkg-plist12
-rw-r--r--archivers/file-roller/pkg-plist28
-rw-r--r--archivers/fileroller/pkg-plist28
-rw-r--r--audio/goobox/pkg-plist2
-rw-r--r--databases/evolution-data-server/pkg-plist12
-rw-r--r--deskutils/gnome-utils/pkg-plist4
-rw-r--r--deskutils/gnomeutils2/pkg-plist4
-rw-r--r--devel/bug-buddy/pkg-plist20
-rw-r--r--devel/bugbuddy/pkg-plist20
-rw-r--r--devel/gconf2/pkg-plist8
-rw-r--r--devel/glib20/pkg-plist40
-rw-r--r--devel/gnome-vfs/pkg-plist16
-rw-r--r--devel/gnomevfs2/pkg-plist16
-rw-r--r--devel/libgtop2/pkg-plist20
-rw-r--r--games/gnome-games/pkg-plist8
-rw-r--r--games/gnomegames2/pkg-plist8
-rw-r--r--graphics/eog/pkg-plist24
-rw-r--r--graphics/libgnomecanvas/pkg-plist12
-rw-r--r--mail/evolution-exchange/pkg-plist4
-rw-r--r--mail/evolution/pkg-plist4
-rw-r--r--net/vino/pkg-plist4
-rw-r--r--palm/synce-trayicon/pkg-plist2
-rw-r--r--sysutils/gnome-control-center/pkg-plist22
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist4
-rw-r--r--sysutils/gnome-system-tools/pkg-plist4
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist22
-rw-r--r--sysutils/gnomesystemmonitor/pkg-plist4
-rw-r--r--sysutils/gnomesystemtools/pkg-plist4
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist12
-rw-r--r--sysutils/serpentine/pkg-plist8
-rw-r--r--www/epiphany-extensions/pkg-plist4
-rw-r--r--www/epiphany/pkg-plist4
-rw-r--r--www/gtkhtml3/pkg-plist4
-rw-r--r--www/gtkhtml38/pkg-plist4
-rw-r--r--x11-fm/nautilus/pkg-plist8
-rw-r--r--x11-fm/nautilus2/pkg-plist8
-rw-r--r--x11-themes/gnome-themes/pkg-plist8
-rw-r--r--x11-toolkits/eel/pkg-plist16
-rw-r--r--x11-toolkits/gtksourceview/pkg-plist8
-rw-r--r--x11-toolkits/gtksourceview2/pkg-plist8
-rw-r--r--x11-toolkits/libbonoboui/pkg-plist8
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist16
-rw-r--r--x11-toolkits/libwnck/pkg-plist4
-rw-r--r--x11/gdm/pkg-plist28
-rw-r--r--x11/gnome-desktop/pkg-plist20
-rw-r--r--x11/gnomedesktop/pkg-plist20
-rw-r--r--x11/libgnome/pkg-plist8
-rw-r--r--x11/yelp/pkg-plist24
-rw-r--r--x11/zenity/pkg-plist8
50 files changed, 352 insertions, 352 deletions
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 79090f85f..33b6f0036 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -139,66 +139,66 @@ share/locale/yi/LC_MESSAGES/atk10.mo
share/locale/zh_CN/LC_MESSAGES/atk10.mo
share/locale/zh_HK/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/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/uk/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/uk 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/tt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt 2> /dev/null || true
-@unexec rmdir %D/share/locale/tk/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tk 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/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/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/no/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/no 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/ne/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ne 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/li/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/li 2> /dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ko 2> /dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gl 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/locale/be/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/be 2> /dev/null || true
-@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/as 2> /dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@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/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@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/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
@dirrm %%DOCSDIR%%
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index f12cf694b..6f284e822 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -257,12 +257,12 @@ share/locale/uk/LC_MESSAGES/dasher.mo
share/locale/zh_CN/LC_MESSAGES/dasher.mo
share/locale/zh_HK/LC_MESSAGES/dasher.mo
share/locale/zh_TW/LC_MESSAGES/dasher.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/ky/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrm share/gnome/omf/dasher
@dirrm share/gnome/help/dasher/eu/figures
@dirrm share/gnome/help/dasher/eu
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 6bceb685b..6326cd8c3 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -175,20 +175,20 @@ share/locale/xh/LC_MESSAGES/file-roller.mo
share/locale/zh_CN/LC_MESSAGES/file-roller.mo
share/locale/zh_HK/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/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/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrm share/gnome/omf/file-roller
@dirrm share/gnome/help/file-roller/zh_TW/figures
@dirrm share/gnome/help/file-roller/zh_TW
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 6bceb685b..6326cd8c3 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -175,20 +175,20 @@ share/locale/xh/LC_MESSAGES/file-roller.mo
share/locale/zh_CN/LC_MESSAGES/file-roller.mo
share/locale/zh_HK/LC_MESSAGES/file-roller.mo
share/locale/zh_TW/LC_MESSAGES/file-roller.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/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/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrm share/gnome/omf/file-roller
@dirrm share/gnome/help/file-roller/zh_TW/figures
@dirrm share/gnome/help/file-roller/zh_TW
diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist
index 258b86715..8d517a482 100644
--- a/audio/goobox/pkg-plist
+++ b/audio/goobox/pkg-plist
@@ -39,7 +39,7 @@ share/locale/sq/LC_MESSAGES/goobox.mo
share/locale/sv/LC_MESSAGES/goobox.mo
share/locale/zh_CN/LC_MESSAGES/goobox.mo
share/locale/zh_TW/LC_MESSAGES/goobox.mo
-@unexec rmdir %D/share/locale/ar 2> /dev/null || true
+@dirrmtry share/locale/ar
@dirrm share/gnome/omf/goobox
@dirrm share/gnome/help/goobox/C
@dirrm share/gnome/help/goobox
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index eb4dd97ce..63f2c7316 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -909,12 +909,12 @@ share/locale/wa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.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
-@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/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index a10ac39b3..5e46b2736 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -139,8 +139,8 @@ share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/gsearchtool
@dirrm share/gnome/omf/gnome-system-log
@dirrm share/gnome/omf/gnome-search-tool
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index a10ac39b3..5e46b2736 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -139,8 +139,8 @@ share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/gsearchtool
@dirrm share/gnome/omf/gnome-system-log
@dirrm share/gnome/omf/gnome-search-tool
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index b108f48b3..213017678 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -99,16 +99,16 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.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/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 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
+@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrm share/gnome/omf/bug-buddy
@dirrm share/gnome/help/bug-buddy/uk
@dirrm share/gnome/help/bug-buddy/sr
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index b108f48b3..213017678 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -99,16 +99,16 @@ share/locale/xh/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.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/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 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
+@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrm share/gnome/omf/bug-buddy
@dirrm share/gnome/help/bug-buddy/uk
@dirrm share/gnome/help/bug-buddy/sr
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 27502dd56..4aaba71f5 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -113,10 +113,10 @@ share/locale/zh_HK/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
share/sgml/gconf/gconf-1.0.dtd
@dirrm share/sgml/gconf
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/doc/gconf
%%LDAP%%@dirrm share/GConf/schema
%%LDAP%%@dirrm share/GConf
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index cf9818f0b..f4ed3cde5 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -172,26 +172,26 @@ share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@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/ne/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ne 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/sr@ije/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt 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/tl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tl 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/yi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/yi 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 7615046f8..a9fda693f 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -220,11 +220,11 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0/libgnomevfs
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 7615046f8..a9fda693f 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -220,11 +220,11 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0/libgnomevfs
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index a3da509e3..7670b7db0 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -115,13 +115,13 @@ share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrm include/libgtop-2.0/glibtop
@dirrm include/libgtop-2.0
-@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
-@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/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/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 7a5990ba4..2c0dd4606 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -703,10 +703,10 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo
share/locale/xh/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.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/sounds/iagno
@dirrm share/gnome/sounds/gnometris
@dirrm share/gnome/sounds/gnobots2
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 7a5990ba4..2c0dd4606 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -703,10 +703,10 @@ share/locale/wa/LC_MESSAGES/gnome-games.mo
share/locale/xh/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.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/sounds/iagno
@dirrm share/gnome/sounds/gnometris
@dirrm share/gnome/sounds/gnobots2
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index a2207977c..252cfbde4 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -138,18 +138,18 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_HK/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
share/locale/zu/LC_MESSAGES/eog.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 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/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/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 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/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@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/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/eog
@dirrm share/gnome/omf/eog
@dirrm share/gnome/help/eog/zh_TW/figures
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 62a6da036..a754a25cc 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -116,12 +116,12 @@ share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-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/tt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt 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/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
@dirrm %%DOCSDIR%%
@dirrm include/libgnomecanvas-2.0/libgnomecanvas
@dirrm include/libgnomecanvas-2.0
diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist
index 51d6d9383..1468431e3 100644
--- a/mail/evolution-exchange/pkg-plist
+++ b/mail/evolution-exchange/pkg-plist
@@ -69,8 +69,8 @@ share/locale/xh/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-exchange-%%VERSION%%.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/gnome/evolution-exchange/%%VERSION%%/ui
@dirrm share/gnome/evolution-exchange/%%VERSION%%/images
@dirrm share/gnome/evolution-exchange/%%VERSION%%/glade
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 69488a806..816ed3f3f 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -652,8 +652,8 @@ share/locale/wa/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/omf/evolution
@dirrm share/gnome/idl/evolution-%%VERSION%%
@dirrm share/gnome/help/evolution-%%VERSION%%/C/figures
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 9f6344623..7138e41d3 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -68,5 +68,5 @@ share/locale/xh/LC_MESSAGES/vino.mo
share/locale/zh_CN/LC_MESSAGES/vino.mo
share/locale/zh_TW/LC_MESSAGES/vino.mo
@dirrm share/gnome/vino
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
diff --git a/palm/synce-trayicon/pkg-plist b/palm/synce-trayicon/pkg-plist
index ceeb07051..165fb37ed 100644
--- a/palm/synce-trayicon/pkg-plist
+++ b/palm/synce-trayicon/pkg-plist
@@ -5,4 +5,4 @@ share/pixmaps/synce/synce-color-small.png
share/pixmaps/synce/synce-gray-small.png
share/synce/synce_trayicon_properties.glade
@dirrm share/pixmaps/synce
-@unexec rmdir %D/share/synce 2> /dev/null || true
+@dirrmtry share/synce
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 65c31d629..4b7eab955 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -214,16 +214,16 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
share/locale/zu/LC_MESSAGES/control-center-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
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/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
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
@dirrm share/gnome/omf/control-center
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
@@ -233,7 +233,7 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@dirrm share/gnome/control-center-2.0/xrdb
@dirrm share/gnome/control-center-2.0/pixmaps
@dirrm share/gnome/control-center-2.0/interfaces
-@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
+@dirrmtry share/gnome/control-center-2.0/icons
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index d67c24c77..d6ff5f71c 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -81,8 +81,8 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrm share/gnome/omf/gnome-system-monitor
@dirrm share/gnome/help/gnome-system-monitor/C/figures
@dirrm share/gnome/help/gnome-system-monitor/C
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index bfbac3c97..00bea1a6c 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -163,8 +163,8 @@ share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/omf/users-admin
@dirrm share/gnome/omf/time-admin
@dirrm share/gnome/omf/services-admin
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 65c31d629..4b7eab955 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -214,16 +214,16 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
share/locale/zu/LC_MESSAGES/control-center-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
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/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
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
@dirrm share/gnome/omf/control-center
@dirrm share/gnome/help/control-center/C
@dirrm share/gnome/help/control-center
@@ -233,7 +233,7 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@dirrm share/gnome/control-center-2.0/xrdb
@dirrm share/gnome/control-center-2.0/pixmaps
@dirrm share/gnome/control-center-2.0/interfaces
-@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
+@dirrmtry share/gnome/control-center-2.0/icons
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index d67c24c77..d6ff5f71c 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -81,8 +81,8 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrm share/gnome/omf/gnome-system-monitor
@dirrm share/gnome/help/gnome-system-monitor/C/figures
@dirrm share/gnome/help/gnome-system-monitor/C
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index bfbac3c97..00bea1a6c 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -163,8 +163,8 @@ share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/omf/users-admin
@dirrm share/gnome/omf/time-admin
@dirrm share/gnome/omf/services-admin
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index e08a3235f..ca9447638 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -89,11 +89,11 @@ share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 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/te/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/te 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
@dirrm share/gnome/nautilus-cd-burner
@dirrm include/libnautilus-burn
diff --git a/sysutils/serpentine/pkg-plist b/sysutils/serpentine/pkg-plist
index 7c6b4d70b..27f966110 100644
--- a/sysutils/serpentine/pkg-plist
+++ b/sysutils/serpentine/pkg-plist
@@ -81,9 +81,9 @@ bin/serpentine
share/applications/serpentine.desktop
%%DATADIR%%/serpentine.glade
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
@dirrm %%PYTHON_SITELIBDIR%%/serpentine/plugins
@dirrm %%PYTHON_SITELIBDIR%%/serpentine
-%%MUINE%%@unexec rmdir %D/lib/muine/plugins 2> /dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true
+%%MUINE%%@dirrmtry lib/muine/plugins
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 27db476e2..adce46a5c 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -73,8 +73,8 @@ share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.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/epiphany-extensions/xml
@dirrm share/gnome/epiphany-extensions/glade
@dirrm share/gnome/epiphany-extensions
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index f959cb5bd..74d7c1c0c 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -184,8 +184,8 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/gnome/omf/epiphany
@dirrm share/gnome/help/epiphany/uk/figures
@dirrm share/gnome/help/epiphany/uk
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 18ba415dc..ffa062b25 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/pkg-plist
@@ -144,8 +144,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 18ba415dc..ffa062b25 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -144,8 +144,8 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/gtkhtml-%%VERSION%%/icons
@dirrm share/gnome/gtkhtml-%%VERSION%%
@dirrm lib/gtkhtml
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 0b59c9c9a..bf22d24bc 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -156,10 +156,10 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
share/locale/zu/LC_MESSAGES/nautilus.mo
share/mime/application/x-gnome-saved-search.xml
share/mime/packages/nautilus.xml
-@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/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 0b59c9c9a..bf22d24bc 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -156,10 +156,10 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
share/locale/zu/LC_MESSAGES/nautilus.mo
share/mime/application/x-gnome-saved-search.xml
share/mime/packages/nautilus.xml
-@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-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 63bb18801..01dd96648 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1942,10 +1942,10 @@ share/themes/Traditional/index.theme
@dirrm share/themes/Glider
@dirrm share/themes/Crux
@dirrm share/themes/Clearlooks
-@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
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrm share/icons/Smokey-Red/96x96/filesystems
@dirrm share/icons/Smokey-Red/96x96
@dirrm share/icons/Smokey-Red/72x72/filesystems
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index efe7d6519..4891919d7 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -123,13 +123,13 @@ share/locale/xh/LC_MESSAGES/eel-2.0.mo
share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo
share/locale/zh_HK/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/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist
index 327d95f66..0404f96b8 100644
--- a/x11-toolkits/gtksourceview/pkg-plist
+++ b/x11-toolkits/gtksourceview/pkg-plist
@@ -133,10 +133,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/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index 327d95f66..0404f96b8 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -133,10 +133,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 24a0dd998..f931f4ed1 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -155,10 +155,10 @@ share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
share/locale/zh_HK/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
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@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 6f2c0784b..0f64517cf 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -232,14 +232,14 @@ share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_HK/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/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt 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/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@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 07b9c46e5..ca206a11f 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -117,8 +117,8 @@ share/locale/xh/LC_MESSAGES/libwnck.mo
share/locale/zh_CN/LC_MESSAGES/libwnck.mo
share/locale/zh_HK/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
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
@dirrm %%DOCSDIR%%
@dirrm include/libwnck-1.0/libwnck
@dirrm include/libwnck-1.0
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 42de96fb4..07612dc35 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -220,20 +220,20 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 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/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
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@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
@dirrm share/gnome/xsessions
@dirrm share/gnome/omf/gdm
@dirrm share/gnome/help/gdm/zh_TW/figures
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index dd50b7e8c..8ace1ca4c 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -196,16 +196,16 @@ share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/yo 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/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
-@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/hy 2> /dev/null || true
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrm share/gnome/omf/lgpl
@dirrm share/gnome/omf/gpl
@dirrm share/gnome/omf/gnome-feedback
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index dd50b7e8c..8ace1ca4c 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -196,16 +196,16 @@ share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/yo 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/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
-@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/hy 2> /dev/null || true
+@dirrmtry share/locale/yo/LC_MESSAGES
+@dirrmtry share/locale/yo
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
@dirrm share/gnome/omf/lgpl
@dirrm share/gnome/omf/gpl
@dirrm share/gnome/omf/gnome-feedback
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index b86252456..79b1362f6 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -119,10 +119,10 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index cd4c57dea..c35a6a9de 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -110,18 +110,18 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
share/locale/zh_HK/LC_MESSAGES/yelp.mo
share/locale/zh_TW/LC_MESSAGES/yelp.mo
share/locale/zu/LC_MESSAGES/yelp.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 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/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/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/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/yelp/xslt
@dirrm share/gnome/yelp/ui
@dirrm share/gnome/yelp/icons
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index abef90c41..fa365af32 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -136,10 +136,10 @@ share/locale/vi/LC_MESSAGES/zenity-0.1.mo
share/locale/xh/LC_MESSAGES/zenity-0.1.mo
share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo
share/locale/zh_TW/LC_MESSAGES/zenity-0.1.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/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/zenity/clothes
@dirrm share/gnome/zenity
@dirrm share/gnome/omf/zenity