summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 06:28:59 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 06:28:59 +0000
commit186c2e326cb8f9a0f44b44cdbf6314e0999b346e (patch)
treed6ef0b4cb3c1fa6a810fcdd9bfa232d1cf549823
parentBack out previous commit, it was fixed in the master port (diff)
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Notes
Notes: svn path=/head/; revision=154137
-rw-r--r--net-im/gajim-devel/pkg-plist2
-rw-r--r--net-im/gajim/pkg-plist2
-rw-r--r--net-im/psi/pkg-plist20
-rw-r--r--net-mgmt/argus-clients/pkg-plist2
-rw-r--r--net-mgmt/argus/pkg-plist2
-rw-r--r--net-mgmt/net-snmp-devel/pkg-plist4
-rw-r--r--net-mgmt/net-snmp/pkg-plist4
-rw-r--r--net-mgmt/net-snmp53/pkg-plist4
-rw-r--r--net-p2p/amule-devel/pkg-plist12
-rw-r--r--net-p2p/amule/pkg-plist12
-rw-r--r--net-p2p/amule2/pkg-plist12
-rw-r--r--net-p2p/apollon/pkg-plist2
-rw-r--r--net-p2p/py-bittorrent-devel/pkg-plist2
-rw-r--r--net-p2p/py-bittorrent/pkg-plist2
-rw-r--r--net/amule2/pkg-plist12
-rw-r--r--net/apollon/pkg-plist2
-rw-r--r--net/openldap22-server/Makefile4
-rw-r--r--net/openldap22-server/pkg-plist2
-rw-r--r--net/openldap22-server/pkg-plist.client2
-rw-r--r--net/openldap23-server/pkg-plist.client4
-rw-r--r--net/openldap24-server/pkg-plist.client4
-rw-r--r--net/openmpi/Makefile4
-rw-r--r--net/py-bittorrent-devel/pkg-plist2
-rw-r--r--net/py-bittorrent/pkg-plist2
-rw-r--r--net/spread-j/pkg-plist2
-rw-r--r--net/vnc/Makefile6
-rw-r--r--news/papercut/pkg-plist6
-rw-r--r--news/tin/pkg-plist4
-rw-r--r--palm/gnome-pilot/pkg-plist8
-rw-r--r--palm/gnomepilot2/pkg-plist8
-rw-r--r--palm/p5-Palm-PalmDoc/pkg-plist6
-rw-r--r--print/gimp-print/pkg-plist36
-rw-r--r--print/gutenprint-base/pkg-plist36
-rw-r--r--print/gutenprint/pkg-plist36
-rw-r--r--print/pkfonts300/pkg-plist.1182
-rw-r--r--print/pkfonts300/pkg-plist.2402
-rw-r--r--print/pkfonts300/pkg-plist.3002
-rw-r--r--print/pkfonts300/pkg-plist.3602
-rw-r--r--print/pkfonts300/pkg-plist.4002
-rw-r--r--print/pkfonts300/pkg-plist.6002
-rw-r--r--print/yatex/pkg-plist.mule4
-rw-r--r--print/yatex/pkg-plist.xemacs2
-rw-r--r--print/yatex/pkg-plist.xemacs-mule2
-rw-r--r--security/courier-authlib/pkg-plist-base2
-rw-r--r--security/courier-authlib/pkg-plist-ldap4
-rw-r--r--security/libpreludedb/pkg-plist4
-rw-r--r--security/mcrypt/Makefile4
-rw-r--r--security/nmap/pkg-plist.fe2
-rw-r--r--security/poly1305aes/pkg-plist2
-rw-r--r--security/xca/pkg-plist2
-rw-r--r--sysutils/LPRng/pkg-plist4
-rw-r--r--sysutils/apcupsd/pkg-plist2
-rw-r--r--sysutils/bbapm/Makefile3
-rw-r--r--sysutils/coreutils/pkg-plist68
-rw-r--r--sysutils/gkrellm2/pkg-plist8
-rw-r--r--sysutils/lavaps/pkg-plist4
-rw-r--r--sysutils/linux-afaapps/pkg-plist.i3862
-rw-r--r--sysutils/relaxconf/pkg-plist8
-rw-r--r--sysutils/serpentine/pkg-plist2
-rw-r--r--sysutils/xcdroast/pkg-plist8
-rw-r--r--textproc/aspell/pkg-plist32
-rw-r--r--textproc/docbook-430/Makefile2
-rw-r--r--textproc/docbook-xml-430/Makefile2
-rw-r--r--textproc/docbook-xml-440/Makefile4
-rw-r--r--textproc/docbook-xsl/pkg-plist2
-rw-r--r--textproc/iiimf-client-lib/pkg-plist2
-rw-r--r--textproc/iiimf-csconv/pkg-plist2
-rw-r--r--textproc/iiimf-gnome-im-switcher/pkg-plist6
-rw-r--r--textproc/iiimf-gtk/pkg-plist20
-rw-r--r--textproc/iiimf-headers/pkg-plist2
-rw-r--r--textproc/iiimf-le-unit/pkg-plist2
-rw-r--r--textproc/iiimf-protocol-lib/pkg-plist2
-rw-r--r--textproc/iiimf-server/pkg-plist4
-rw-r--r--textproc/iiimf-x-lib/pkg-plist2
-rw-r--r--textproc/jdictionary/pkg-plist.plugin2
-rw-r--r--textproc/ocaml-yaxpo/pkg-plist2
-rw-r--r--textproc/p5-Text-BibTeX/pkg-plist2
-rw-r--r--textproc/p5-YAPE-HTML/pkg-plist4
-rw-r--r--textproc/p5-YAPE-Regex-Explain/pkg-plist6
-rw-r--r--textproc/p5-YAPE-Regex/pkg-plist4
-rw-r--r--textproc/scim-table-imengine/pkg-plist8
-rw-r--r--textproc/xhtml-modularization/Makefile3
-rw-r--r--www/coppermine/Makefile3
-rw-r--r--www/drupal/pkg-plist4
-rw-r--r--www/drupal4/pkg-plist4
-rw-r--r--www/drupal5/pkg-plist4
-rw-r--r--www/drupal6/pkg-plist4
-rw-r--r--www/drupal7/pkg-plist4
-rw-r--r--www/horde-base/pkg-plist2
-rw-r--r--www/horde/pkg-plist2
-rw-r--r--www/horde4-base/pkg-plist2
-rw-r--r--www/iwebcal/pkg-plist4
-rw-r--r--www/libapreq2/pkg-plist22
-rw-r--r--www/lynx-current/pkg-plist4
-rw-r--r--www/mplayer-plugin/pkg-plist2
-rw-r--r--www/p5-HTML-FillInForm/pkg-plist2
-rw-r--r--www/p5-WWW-Wikipedia/pkg-plist4
-rw-r--r--www/xaraya/Makefile2
-rw-r--r--x11-clocks/bbdate/Makefile3
-rw-r--r--x11-fm/gentoo/pkg-plist28
-rw-r--r--x11-themes/gtk-bluecurve-theme/Makefile2
-rw-r--r--x11-themes/icon-bluecurve-theme/Makefile2
-rw-r--r--x11-themes/kde-icons-noia/Makefile.icons3
-rw-r--r--x11-themes/linux-gtk-bluecurve-theme/Makefile4
-rw-r--r--x11-toolkits/gtk12/pkg-plist4
-rw-r--r--x11-toolkits/hs-frantk/pkg-plist2
-rw-r--r--x11-toolkits/linux-f10-gtk/pkg-plist.alpha152
-rw-r--r--x11-toolkits/linux-f10-gtk/pkg-plist.i386156
-rw-r--r--x11-toolkits/linux-f10-gtk2/pkg-plist312
-rw-r--r--x11-toolkits/linux-f8-gtk/pkg-plist.alpha152
-rw-r--r--x11-toolkits/linux-f8-gtk/pkg-plist.i386156
-rw-r--r--x11-toolkits/linux-f8-gtk2/pkg-plist312
-rw-r--r--x11-toolkits/linux-gtk/pkg-plist.alpha152
-rw-r--r--x11-toolkits/linux-gtk/pkg-plist.i386156
-rw-r--r--x11-toolkits/linux-gtk2/pkg-plist312
-rw-r--r--x11-wm/openbox/Makefile3
-rw-r--r--x11-wm/xfce4/pkg-plist4
-rw-r--r--x11/libexo/pkg-plist10
-rw-r--r--x11/linux-gnomelibs/pkg-plist.i38624
-rw-r--r--x11/xdialog/pkg-plist8
120 files changed, 1275 insertions, 1283 deletions
diff --git a/net-im/gajim-devel/pkg-plist b/net-im/gajim-devel/pkg-plist
index 735f57e798b1..c867d8acb090 100644
--- a/net-im/gajim-devel/pkg-plist
+++ b/net-im/gajim-devel/pkg-plist
@@ -388,4 +388,4 @@ share/pixmaps/gajim_about.png
@dirrm %%DATADIR%%/data/sounds
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications > /dev/null 2>&1 | true
+@dirrmtry share/applications
diff --git a/net-im/gajim/pkg-plist b/net-im/gajim/pkg-plist
index 735f57e798b1..c867d8acb090 100644
--- a/net-im/gajim/pkg-plist
+++ b/net-im/gajim/pkg-plist
@@ -388,4 +388,4 @@ share/pixmaps/gajim_about.png
@dirrm %%DATADIR%%/data/sounds
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications > /dev/null 2>&1 | true
+@dirrmtry share/applications
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index 60429303ce72..14958ad4c049 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -246,13 +246,13 @@ bin/psi
%%KDE%%share/icons/hicolor/16x16/apps/psi.png
%%KDE%%share/icons/hicolor/32x32/apps/psi.png
%%KDE%%share/icons/hicolor/48x48/apps/psi.png
-%%KDE%%@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/applnk 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons 2>/dev/null || true
+%%KDE%%@dirrmtry share/applnk/Internet
+%%KDE%%@dirrmtry share/applnk
+%%KDE%%@dirrmtry share/icons/hicolor/16x16/apps
+%%KDE%%@dirrmtry share/icons/hicolor/16x16
+%%KDE%%@dirrmtry share/icons/hicolor/32x32/apps
+%%KDE%%@dirrmtry share/icons/hicolor/32x32
+%%KDE%%@dirrmtry share/icons/hicolor/48x48/apps
+%%KDE%%@dirrmtry share/icons/hicolor/48x48
+%%KDE%%@dirrmtry share/icons/hicolor
+%%KDE%%@dirrmtry share/icons
diff --git a/net-mgmt/argus-clients/pkg-plist b/net-mgmt/argus-clients/pkg-plist
index 4ae427f646dc..e6f99575f72b 100644
--- a/net-mgmt/argus-clients/pkg-plist
+++ b/net-mgmt/argus-clients/pkg-plist
@@ -68,4 +68,4 @@ lib/argus_parse.a
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/man
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/argus/archive %D/argus >/dev/null 2>&1 || true
+@dirrmtry argus/archive %D/argus
diff --git a/net-mgmt/argus/pkg-plist b/net-mgmt/argus/pkg-plist
index fd82fb59035e..93cbedfb180b 100644
--- a/net-mgmt/argus/pkg-plist
+++ b/net-mgmt/argus/pkg-plist
@@ -3,4 +3,4 @@ sbin/argus
%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.5.html
%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.8.html
%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.conf.5.html
-@unexec rmdir %D/argus/archive %D/argus >/dev/null 2>&1 || true
+@dirrmtry argus/archive %D/argus
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index 34b9322dbe6c..03ad12a09fa5 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -416,10 +416,10 @@ sbin/snmptrapd
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@dirrm include/net-snmp/system
@dirrm include/net-snmp/machine
@dirrm include/net-snmp/library
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 34b9322dbe6c..03ad12a09fa5 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -416,10 +416,10 @@ sbin/snmptrapd
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@dirrm include/net-snmp/system
@dirrm include/net-snmp/machine
@dirrm include/net-snmp/library
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index 34b9322dbe6c..03ad12a09fa5 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -416,10 +416,10 @@ sbin/snmptrapd
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/ASN
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/NetSNMP
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP/agent
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/NetSNMP
-%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@dirrm include/net-snmp/system
@dirrm include/net-snmp/machine
@dirrm include/net-snmp/library
diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist
index b579ccf62f0d..6059a3f4976c 100644
--- a/net-p2p/amule-devel/pkg-plist
+++ b/net-p2p/amule-devel/pkg-plist
@@ -57,7 +57,7 @@ share/gnome/doc/aMule-2.1.0/socks4.protocol
@dirrmtry share/gnome/doc
%%PL_CAS%%share/gnome/cas/tmp.html
%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
+%%PL_CAS%%@dirrmtry share/gnome/cas
%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
%%PL_ALC%%share/gnome/pixmaps/alc.xpm
share/gnome/pixmaps/amule.xpm
@@ -225,11 +225,11 @@ share/gnome/applications/amule.desktop
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.html
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/php-default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/chicane 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
lib/xchat/plugins/xas.pl
@dirrmtry lib/xchat/plugins
@dirrmtry lib/xchat
diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist
index b579ccf62f0d..6059a3f4976c 100644
--- a/net-p2p/amule/pkg-plist
+++ b/net-p2p/amule/pkg-plist
@@ -57,7 +57,7 @@ share/gnome/doc/aMule-2.1.0/socks4.protocol
@dirrmtry share/gnome/doc
%%PL_CAS%%share/gnome/cas/tmp.html
%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
+%%PL_CAS%%@dirrmtry share/gnome/cas
%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
%%PL_ALC%%share/gnome/pixmaps/alc.xpm
share/gnome/pixmaps/amule.xpm
@@ -225,11 +225,11 @@ share/gnome/applications/amule.desktop
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.html
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/php-default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/chicane 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
lib/xchat/plugins/xas.pl
@dirrmtry lib/xchat/plugins
@dirrmtry lib/xchat
diff --git a/net-p2p/amule2/pkg-plist b/net-p2p/amule2/pkg-plist
index b579ccf62f0d..6059a3f4976c 100644
--- a/net-p2p/amule2/pkg-plist
+++ b/net-p2p/amule2/pkg-plist
@@ -57,7 +57,7 @@ share/gnome/doc/aMule-2.1.0/socks4.protocol
@dirrmtry share/gnome/doc
%%PL_CAS%%share/gnome/cas/tmp.html
%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
+%%PL_CAS%%@dirrmtry share/gnome/cas
%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
%%PL_ALC%%share/gnome/pixmaps/alc.xpm
share/gnome/pixmaps/amule.xpm
@@ -225,11 +225,11 @@ share/gnome/applications/amule.desktop
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.html
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/php-default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/chicane 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
lib/xchat/plugins/xas.pl
@dirrmtry lib/xchat/plugins
@dirrmtry lib/xchat
diff --git a/net-p2p/apollon/pkg-plist b/net-p2p/apollon/pkg-plist
index f096221ec703..1f9b3faf634b 100644
--- a/net-p2p/apollon/pkg-plist
+++ b/net-p2p/apollon/pkg-plist
@@ -77,4 +77,4 @@ share/applnk/Applications/Apollon.desktop
@dirrmtry share/icons/crystalsvg/128x128/apps
@dirrmtry share/applnk/Applications
%%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon
-%%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry share/doc/HTML/en
diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist
index bcfa49a10b54..f6e9ca29d9cb 100644
--- a/net-p2p/py-bittorrent-devel/pkg-plist
+++ b/net-p2p/py-bittorrent-devel/pkg-plist
@@ -259,7 +259,7 @@ share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%GUI%%@dirrmtry share/pixmaps
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist
index f480ab4cef60..ae5babc2777a 100644
--- a/net-p2p/py-bittorrent/pkg-plist
+++ b/net-p2p/py-bittorrent/pkg-plist
@@ -258,7 +258,7 @@ share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%GUI%%@dirrmtry share/pixmaps
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
diff --git a/net/amule2/pkg-plist b/net/amule2/pkg-plist
index b579ccf62f0d..6059a3f4976c 100644
--- a/net/amule2/pkg-plist
+++ b/net/amule2/pkg-plist
@@ -57,7 +57,7 @@ share/gnome/doc/aMule-2.1.0/socks4.protocol
@dirrmtry share/gnome/doc
%%PL_CAS%%share/gnome/cas/tmp.html
%%PL_CAS%%share/gnome/cas/stat.png
-%%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true
+%%PL_CAS%%@dirrmtry share/gnome/cas
%%PL_CAS%%share/gnome/pixmaps/wxcas.xpm
%%PL_ALC%%share/gnome/pixmaps/alc.xpm
share/gnome/pixmaps/amule.xpm
@@ -225,11 +225,11 @@ share/gnome/applications/amule.desktop
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/stat_tree.php
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/login.html
%%PL_AMULEWEBSRV%%share/gnome/amule/webserver/chicane/index.php
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/php-default 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver/chicane 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true
-%%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/php-default
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver/chicane
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule/webserver
+%%PL_AMULEWEBSRV%%@dirrmtry share/gnome/amule
lib/xchat/plugins/xas.pl
@dirrmtry lib/xchat/plugins
@dirrmtry lib/xchat
diff --git a/net/apollon/pkg-plist b/net/apollon/pkg-plist
index f096221ec703..1f9b3faf634b 100644
--- a/net/apollon/pkg-plist
+++ b/net/apollon/pkg-plist
@@ -77,4 +77,4 @@ share/applnk/Applications/Apollon.desktop
@dirrmtry share/icons/crystalsvg/128x128/apps
@dirrmtry share/applnk/Applications
%%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon
-%%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry share/doc/HTML/en
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 1231a39daa64..c09dfa86cb0b 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -414,8 +414,8 @@ post-install:
${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default"; \
${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || cp %B/%f %B/$${schema}.schema"; \
done >>${TMPPLIST}
- @${ECHO_CMD} "@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
- @${ECHO_CMD} "@unexec rmdir %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
+ @${ECHO_CMD} "@dirrmtry etc/openldap/schema" >>${TMPPLIST}
+ @${ECHO_CMD} "@dirrmtry %D/etc/openldap" >>${TMPPLIST}
@[ "${RC_DIR:S/\/$//}" = "${PREFIX}" ] || ${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST}
.for script in slapd slurpd
@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${RC_DIR:S/\/$//}/etc/rc.d/${script}${RC_SUFX}
diff --git a/net/openldap22-server/pkg-plist b/net/openldap22-server/pkg-plist
index 193acee2941d..eb0c3d0cbd75 100644
--- a/net/openldap22-server/pkg-plist
+++ b/net/openldap22-server/pkg-plist
@@ -40,7 +40,7 @@ etc/openldap/slapd.conf.default
%%BACK_SQL%%libexec/openldap/back_sql.so
%%BACK_SQL%%libexec/openldap/back_sql-2.2.so
%%BACK_SQL%%libexec/openldap/back_sql-2.2.so.7
-%%MODULES%%@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+%%MODULES%%@dirrmtry libexec/openldap
libexec/slapd
libexec/slurpd
@comment sbin/slapacl
diff --git a/net/openldap22-server/pkg-plist.client b/net/openldap22-server/pkg-plist.client
index dc0a65c63837..952e599924b9 100644
--- a/net/openldap22-server/pkg-plist.client
+++ b/net/openldap22-server/pkg-plist.client
@@ -10,7 +10,7 @@ bin/ldapwhoami
@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
etc/openldap/ldap.conf.default
@exec [ -f %B/ldap.conf ] || cp %B/%f %B/ldap.conf
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
+@dirrmtry etc/openldap
include/lber.h
include/lber_types.h
include/ldap.h
diff --git a/net/openldap23-server/pkg-plist.client b/net/openldap23-server/pkg-plist.client
index 483572128391..0a759e9ef9dd 100644
--- a/net/openldap23-server/pkg-plist.client
+++ b/net/openldap23-server/pkg-plist.client
@@ -10,7 +10,7 @@ bin/ldapwhoami
@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
etc/openldap/ldap.conf.default
@exec [ -f %B/ldap.conf ] || cp %B/%f %B/ldap.conf
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
+@dirrmtry etc/openldap
include/lber.h
include/lber_types.h
include/ldap.h
@@ -40,4 +40,4 @@ lib/libldap_r-2.3.so.1
@comment share/openldap/ucdata/num.dat
@comment @dirrm share/openldap/ucdata
@comment @dirrm share/openldap
-@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+@dirrmtry libexec/openldap
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 483572128391..0a759e9ef9dd 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -10,7 +10,7 @@ bin/ldapwhoami
@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
etc/openldap/ldap.conf.default
@exec [ -f %B/ldap.conf ] || cp %B/%f %B/ldap.conf
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
+@dirrmtry etc/openldap
include/lber.h
include/lber_types.h
include/ldap.h
@@ -40,4 +40,4 @@ lib/libldap_r-2.3.so.1
@comment share/openldap/ucdata/num.dat
@comment @dirrm share/openldap/ucdata
@comment @dirrm share/openldap
-@unexec rmdir %D/libexec/openldap 2>/dev/null || true
+@dirrmtry libexec/openldap
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 9bf58d24b226..b58aad05dd32 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -67,9 +67,9 @@ build-plist: Makefile
${FIND} ${PREFIX}/${MPIDIR}/* -type d | \
${SED} -e 's|${PREFIX}/${MPIDIR}|@dirrm %%MPIDIR%%|' | \
${SORT} -r >> pkg-plist
- ${ECHO} "@unexec rmdir %D/%%MPIDIR%% 2>/dev/null || true" \
+ ${ECHO} "@dirrmtry %%MPIDIR%%" \
>> pkg-plist
- ${ECHO} "@unexec rmdir %D/%%MPIBASE%% 2>/dev/null || true" \
+ ${ECHO} "@dirrmtry %D/%%MPIBASE%%" \
>> pkg-plist
.include <bsd.port.post.mk>
diff --git a/net/py-bittorrent-devel/pkg-plist b/net/py-bittorrent-devel/pkg-plist
index bcfa49a10b54..f6e9ca29d9cb 100644
--- a/net/py-bittorrent-devel/pkg-plist
+++ b/net/py-bittorrent-devel/pkg-plist
@@ -259,7 +259,7 @@ share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%GUI%%@dirrmtry share/pixmaps
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
diff --git a/net/py-bittorrent/pkg-plist b/net/py-bittorrent/pkg-plist
index f480ab4cef60..ae5babc2777a 100644
--- a/net/py-bittorrent/pkg-plist
+++ b/net/py-bittorrent/pkg-plist
@@ -258,7 +258,7 @@ share/locale/zh_CN/LC_MESSAGES/bittorrent.mo
share/locale/zh_TW/LC_MESSAGES/bittorrent.mo
%%GUI%%@dirrm share/pixmaps/BitTorrent/logo
%%GUI%%@dirrm share/pixmaps/BitTorrent
-%%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%GUI%%@dirrmtry share/pixmaps
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_CN/LC_MESSAGES
diff --git a/net/spread-j/pkg-plist b/net/spread-j/pkg-plist
index a45877cac486..562d47dc3e4e 100644
--- a/net/spread-j/pkg-plist
+++ b/net/spread-j/pkg-plist
@@ -3,4 +3,4 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/java/recThread.java
%%PORTDOCS%%%%EXAMPLESDIR%%/java/User.java
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java
-%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 04a713fa9f6d..5974fb544eaf 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -113,9 +113,9 @@ pre-install:
@if [ -f ${WRKSRC}/xc/programs/Xserver/vnc/module/vnc.so ]; then \
${ECHO_CMD} @cwd ${X11BASE} >> ${PLIST} ; \
${ECHO_CMD} lib/modules/extensions/vnc.so >> ${PLIST} ; \
- ${ECHO_CMD} "@unexec rmdir %D/lib/modules/extensions 2>/dev/null || true" >> ${PLIST} ; \
- ${ECHO_CMD} "@unexec rmdir %D/lib/modules 2>/dev/null || true" >> ${PLIST} ; \
- ${ECHO_CMD} "@unexec rmdir %D/lib 2>/dev/null || true" >> ${PLIST} ; \
+ ${ECHO_CMD} "@dirrmtry lib/modules/extensions" >> ${PLIST} ; \
+ ${ECHO_CMD} "@dirrmtry lib/modules" >> ${PLIST} ; \
+ ${ECHO_CMD} "@dirrmtry lib" >> ${PLIST} ; \
fi
.endif
diff --git a/news/papercut/pkg-plist b/news/papercut/pkg-plist
index 117bd3e771bc..6e0d0c96574a 100644
--- a/news/papercut/pkg-plist
+++ b/news/papercut/pkg-plist
@@ -49,9 +49,7 @@ bin/papercut
@unexec [ -f %D/%%DATADIR%%/storage/phpbb_mysql.pyc ] && rm %D/%%DATADIR%%/storage/phpbb_mysql.pyc || true
@unexec [ -f %D/%%DATADIR%%/storage/strutil.pyc ] && rm %D/%%DATADIR%%/storage/strutil.pyc || true
@dirrm %%DATADIR%%/auth
-@unexec [ -d %D/%%DATADIR%%/cache ] && rmdir %%DATADIR%%/cache 2>/dev/null || true
-@unexec [ -d %D/%%DATADIR%%/logs ] && rmdir %%DATADIR%%/logs 2>/dev/null || true
@dirrm %%DATADIR%%/storage
-@unexec rmdir %D/%%DATADIR%%/cache || true
-@unexec rmdir %D/%%DATADIR%%/logs || true
+@dirrmtry %%DATADIR%%/cache
+@dirrmtry %%DATADIR%%/logs
@unexec rmdir %D/%%DATADIR%% 2> /dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf %D/%%DATADIR%%`` to remove any files left." | fmt
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 6b1d0f28a262..9e82296189d6 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -19,5 +19,5 @@ share/locale/fr/LC_MESSAGES/tin.mo
share/locale/ru/LC_MESSAGES/tin.mo
share/locale/rw/LC_MESSAGES/tin.mo
share/locale/tr/LC_MESSAGES/tin.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/rw > /dev/null 2>&1 || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index bd489640ce98..3e65cd35ef30 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -99,7 +99,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
@dirrm share/gnome/gnome-pilot/glade
@dirrm include/libgpilotdCM
@dirrm include/gpilotd
-@unexec rmdir %D/share/gnome/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/gnome/gnome-pilot 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/lib/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/lib/gnome-pilot 2>/dev/null || /usr/bin/true
+@dirrmtry share/gnome/gnome-pilot/conduits
+@dirrmtry share/gnome/gnome-pilot
+@dirrmtry lib/gnome-pilot/conduits
+@dirrmtry lib/gnome-pilot
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index bd489640ce98..3e65cd35ef30 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -99,7 +99,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
@dirrm share/gnome/gnome-pilot/glade
@dirrm include/libgpilotdCM
@dirrm include/gpilotd
-@unexec rmdir %D/share/gnome/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/gnome/gnome-pilot 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/lib/gnome-pilot/conduits 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/lib/gnome-pilot 2>/dev/null || /usr/bin/true
+@dirrmtry share/gnome/gnome-pilot/conduits
+@dirrmtry share/gnome/gnome-pilot
+@dirrmtry lib/gnome-pilot/conduits
+@dirrmtry lib/gnome-pilot
diff --git a/palm/p5-Palm-PalmDoc/pkg-plist b/palm/p5-Palm-PalmDoc/pkg-plist
index 62177278e187..96504bc21338 100644
--- a/palm/p5-Palm-PalmDoc/pkg-plist
+++ b/palm/p5-Palm-PalmDoc/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/PalmDoc/.packlist
%%SITE_PERL%%/Palm/PalmDoc.pm
-@unexec rmdir %D%/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/PalmDoc 2>/dev/null || true
-@unexec rmdir %D%/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm 2>/dev/null || true
-@unexec rmdir %D%/%%SITE_PERL%%/Palm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm/PalmDoc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Palm
+@dirrmtry %%SITE_PERL%%/Palm
diff --git a/print/gimp-print/pkg-plist b/print/gimp-print/pkg-plist
index b17889131a6e..e95bd54adbd7 100644
--- a/print/gimp-print/pkg-plist
+++ b/print/gimp-print/pkg-plist
@@ -4360,22 +4360,22 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figures
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CUPS%%@unexec rmdir %D/share/cups/model/uk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sv 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pt 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/no 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nb 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/ja 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/hu 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/fr 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/es 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/en_GB 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/el 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/de 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/da 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/cs 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/C 2>/dev/null || true
+%%CUPS%%@dirrmtry share/cups/model/uk
+%%CUPS%%@dirrmtry share/cups/model/sv
+%%CUPS%%@dirrmtry share/cups/model/sk
+%%CUPS%%@dirrmtry share/cups/model/pt
+%%CUPS%%@dirrmtry share/cups/model/pl
+%%CUPS%%@dirrmtry share/cups/model/no
+%%CUPS%%@dirrmtry share/cups/model/nl
+%%CUPS%%@dirrmtry share/cups/model/nb
+%%CUPS%%@dirrmtry share/cups/model/ja
+%%CUPS%%@dirrmtry share/cups/model/hu
+%%CUPS%%@dirrmtry share/cups/model/fr
+%%CUPS%%@dirrmtry share/cups/model/es
+%%CUPS%%@dirrmtry share/cups/model/en_GB
+%%CUPS%%@dirrmtry share/cups/model/el
+%%CUPS%%@dirrmtry share/cups/model/de
+%%CUPS%%@dirrmtry share/cups/model/da
+%%CUPS%%@dirrmtry share/cups/model/cs
+%%CUPS%%@dirrmtry share/cups/model/C
@dirrm include/gimp-print
diff --git a/print/gutenprint-base/pkg-plist b/print/gutenprint-base/pkg-plist
index b17889131a6e..e95bd54adbd7 100644
--- a/print/gutenprint-base/pkg-plist
+++ b/print/gutenprint-base/pkg-plist
@@ -4360,22 +4360,22 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figures
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CUPS%%@unexec rmdir %D/share/cups/model/uk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sv 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pt 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/no 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nb 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/ja 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/hu 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/fr 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/es 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/en_GB 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/el 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/de 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/da 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/cs 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/C 2>/dev/null || true
+%%CUPS%%@dirrmtry share/cups/model/uk
+%%CUPS%%@dirrmtry share/cups/model/sv
+%%CUPS%%@dirrmtry share/cups/model/sk
+%%CUPS%%@dirrmtry share/cups/model/pt
+%%CUPS%%@dirrmtry share/cups/model/pl
+%%CUPS%%@dirrmtry share/cups/model/no
+%%CUPS%%@dirrmtry share/cups/model/nl
+%%CUPS%%@dirrmtry share/cups/model/nb
+%%CUPS%%@dirrmtry share/cups/model/ja
+%%CUPS%%@dirrmtry share/cups/model/hu
+%%CUPS%%@dirrmtry share/cups/model/fr
+%%CUPS%%@dirrmtry share/cups/model/es
+%%CUPS%%@dirrmtry share/cups/model/en_GB
+%%CUPS%%@dirrmtry share/cups/model/el
+%%CUPS%%@dirrmtry share/cups/model/de
+%%CUPS%%@dirrmtry share/cups/model/da
+%%CUPS%%@dirrmtry share/cups/model/cs
+%%CUPS%%@dirrmtry share/cups/model/C
@dirrm include/gimp-print
diff --git a/print/gutenprint/pkg-plist b/print/gutenprint/pkg-plist
index b17889131a6e..e95bd54adbd7 100644
--- a/print/gutenprint/pkg-plist
+++ b/print/gutenprint/pkg-plist
@@ -4360,22 +4360,22 @@ share/locale/uk/LC_MESSAGES/gimp-print.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/figures
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CUPS%%@unexec rmdir %D/share/cups/model/uk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sv 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/sk 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pt 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/pl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/no 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nl 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/nb 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/ja 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/hu 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/fr 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/es 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/en_GB 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/el 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/de 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/da 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/cs 2>/dev/null || true
-%%CUPS%%@unexec rmdir %D/share/cups/model/C 2>/dev/null || true
+%%CUPS%%@dirrmtry share/cups/model/uk
+%%CUPS%%@dirrmtry share/cups/model/sv
+%%CUPS%%@dirrmtry share/cups/model/sk
+%%CUPS%%@dirrmtry share/cups/model/pt
+%%CUPS%%@dirrmtry share/cups/model/pl
+%%CUPS%%@dirrmtry share/cups/model/no
+%%CUPS%%@dirrmtry share/cups/model/nl
+%%CUPS%%@dirrmtry share/cups/model/nb
+%%CUPS%%@dirrmtry share/cups/model/ja
+%%CUPS%%@dirrmtry share/cups/model/hu
+%%CUPS%%@dirrmtry share/cups/model/fr
+%%CUPS%%@dirrmtry share/cups/model/es
+%%CUPS%%@dirrmtry share/cups/model/en_GB
+%%CUPS%%@dirrmtry share/cups/model/el
+%%CUPS%%@dirrmtry share/cups/model/de
+%%CUPS%%@dirrmtry share/cups/model/da
+%%CUPS%%@dirrmtry share/cups/model/cs
+%%CUPS%%@dirrmtry share/cups/model/C
@dirrm include/gimp-print
diff --git a/print/pkfonts300/pkg-plist.118 b/print/pkfonts300/pkg-plist.118
index 978a83ef2df2..ee25e7233df8 100644
--- a/print/pkfonts300/pkg-plist.118
+++ b/print/pkfonts300/pkg-plist.118
@@ -900,4 +900,4 @@ lib/fonts/pk118/msym9.118pk
lib/fonts/pk118/msym9.129pk
lib/fonts/pk118/msym9.142pk
@dirrm lib/fonts/pk118
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.240 b/print/pkfonts300/pkg-plist.240
index 0c4882783e4d..54986780f426 100644
--- a/print/pkfonts300/pkg-plist.240
+++ b/print/pkfonts300/pkg-plist.240
@@ -726,4 +726,4 @@ lib/fonts/pk240/linew10.415pk
lib/fonts/pk240/linew10.498pk
lib/fonts/pk240/linew10.597pk
@dirrm lib/fonts/pk240
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.300 b/print/pkfonts300/pkg-plist.300
index be5ddfedbef0..aac75d05ac6d 100644
--- a/print/pkfonts300/pkg-plist.300
+++ b/print/pkfonts300/pkg-plist.300
@@ -1282,4 +1282,4 @@ lib/fonts/pk300/msym9.240pk
lib/fonts/pk300/msym9.263pk
lib/fonts/pk300/msym9.288pk
@dirrm lib/fonts/pk300
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.360 b/print/pkfonts300/pkg-plist.360
index ac3f192a1de5..df67a73efcde 100644
--- a/print/pkfonts300/pkg-plist.360
+++ b/print/pkfonts300/pkg-plist.360
@@ -624,4 +624,4 @@ lib/fonts/pk360/linew10.622pk
lib/fonts/pk360/linew10.746pk
lib/fonts/pk360/linew10.896pk
@dirrm lib/fonts/pk360
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.400 b/print/pkfonts300/pkg-plist.400
index 9e366cd0df58..e89d3698b7a8 100644
--- a/print/pkfonts300/pkg-plist.400
+++ b/print/pkfonts300/pkg-plist.400
@@ -696,4 +696,4 @@ lib/fonts/pk400/linew10.829pk
lib/fonts/pk400/linew10.995pk
lib/fonts/pk400/logo50.400pk
@dirrm lib/fonts/pk400
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/pkfonts300/pkg-plist.600 b/print/pkfonts300/pkg-plist.600
index e78751f34b3d..1592e23ab38a 100644
--- a/print/pkfonts300/pkg-plist.600
+++ b/print/pkfonts300/pkg-plist.600
@@ -552,4 +552,4 @@ lib/fonts/pk600/linew10.657pk
lib/fonts/pk600/linew10.720pk
lib/fonts/pk600/linew10.864pk
@dirrm lib/fonts/pk600
-@unexec rmdir %D/lib/fonts 2>/dev/null || true
+@dirrmtry lib/fonts
diff --git a/print/yatex/pkg-plist.mule b/print/yatex/pkg-plist.mule
index af860d68ab92..752eeba7fd19 100644
--- a/print/yatex/pkg-plist.mule
+++ b/print/yatex/pkg-plist.mule
@@ -37,6 +37,6 @@ share/doc/yatex/yatexgen.doc
share/doc/yatex/yatexj.tex
share/doc/yatex/yatexref.eng
@dirrm share/mule/site-lisp/yatex
-@unexec rmdir %D/share/mule/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/mule 2>/dev/null || true
+@dirrmtry share/mule/site-lisp
+@dirrmtry share/mule
@dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.xemacs b/print/yatex/pkg-plist.xemacs
index abc90e2e90b1..97ae7b3a16fd 100644
--- a/print/yatex/pkg-plist.xemacs
+++ b/print/yatex/pkg-plist.xemacs
@@ -25,5 +25,5 @@ share/doc/yatex/yahtmle.tex
share/doc/yatex/yatexe.tex
share/doc/yatex/yatexref.eng
@dirrm lib/xemacs/site-packages/lisp/yatex
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
@dirrm share/doc/yatex
diff --git a/print/yatex/pkg-plist.xemacs-mule b/print/yatex/pkg-plist.xemacs-mule
index a4b94e6c21cc..e052b6b406df 100644
--- a/print/yatex/pkg-plist.xemacs-mule
+++ b/print/yatex/pkg-plist.xemacs-mule
@@ -38,5 +38,5 @@ share/doc/yatex/yatexgen.doc
share/doc/yatex/yatexj.tex
share/doc/yatex/yatexref.eng
@dirrm lib/xemacs/site-packages/lisp/yatex
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
@dirrm share/doc/yatex
diff --git a/security/courier-authlib/pkg-plist-base b/security/courier-authlib/pkg-plist-base
index 3a3b3f9e7bf2..b6e8a39df5da 100644
--- a/security/courier-authlib/pkg-plist-base
+++ b/security/courier-authlib/pkg-plist-base
@@ -43,6 +43,6 @@ sbin/courierlogger
%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec rm -rf %%AUTHDAEMONVAR%% 2>/dev/null || true
-@unexec rmdir %D/etc/authlib 2>/dev/null || true
+@dirrmtry etc/authlib
@dirrm libexec/courier-authlib
@dirrm lib/courier-authlib
diff --git a/security/courier-authlib/pkg-plist-ldap b/security/courier-authlib/pkg-plist-ldap
index 9cad26f3545f..45a091162a3c 100644
--- a/security/courier-authlib/pkg-plist-ldap
+++ b/security/courier-authlib/pkg-plist-ldap
@@ -7,5 +7,5 @@ etc/openldap/schema/authldap.schema.default
lib/courier-authlib/libauthldap.so
lib/courier-authlib/libauthldap.so.0
%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
+@dirrmtry etc/openldap/schema
+@dirrmtry etc/openldap
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index ccc72efe59ad..a5bd8d19782c 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -14,9 +14,9 @@ lib/libpreludedb.so
lib/libpreludedb.a
lib/libpreludedb/plugins/formats/classic.so
%%WITH_MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
-%%WITH_MYSQL%%@unexec rmdir %D/lib/libpreludedb/plugins/sql 2> /dev/null || true
+%%WITH_MYSQL%%@dirrmtry lib/libpreludedb/plugins/sql
%%WITH_PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
-%%WITH_PGSQL%%@unexec rmdir %D/lib/libpreludedb/plugins/sql 2> /dev/null || true
+%%WITH_PGSQL%%@dirrmtry lib/libpreludedb/plugins/sql
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeDB.pm
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/.packlist
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.bs
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 7835f9b3a5f0..fae910f8be1e 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -44,8 +44,8 @@ pre-install:
${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
.for i in cs de el es_AR pl
${ECHO_CMD} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
- ${ECHO_CMD} @unexec rmdir %D/share/locale/${i}/LC_MESSAGES '2>/dev/null | true' >> ${PLIST}
- ${ECHO_CMD} @unexec rmdir %D/share/locale/${i} '2>/dev/null | true' >> ${PLIST}
+ ${ECHO_CMD} @dirrmtry share/locale/${i}/LC_MESSAGES >> ${PLIST}
+ ${ECHO_CMD} @dirrmtry share/locale/${i} >> ${PLIST}
.endfor
.if !defined(NOPORTDOCS)
${ECHO_CMD} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
diff --git a/security/nmap/pkg-plist.fe b/security/nmap/pkg-plist.fe
index 5f9a0cc1b98c..9f6f1f4aea16 100644
--- a/security/nmap/pkg-plist.fe
+++ b/security/nmap/pkg-plist.fe
@@ -2,5 +2,5 @@ bin/nmapfe
bin/xnmap
@cwd %%X11BASE%%
share/applications/nmapfe.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@cwd %%REALPREFIX%%
diff --git a/security/poly1305aes/pkg-plist b/security/poly1305aes/pkg-plist
index a7a0dd799678..9fda8377ffa3 100644
--- a/security/poly1305aes/pkg-plist
+++ b/security/poly1305aes/pkg-plist
@@ -30,4 +30,4 @@ include/poly1305/poly1305aes_ppro.h
include/poly1305/poly1305aes_sparc.h
lib/cpucycles.a
lib/poly1305aes.a
-@unexec rmdir %D/include/poly1305 || true
+@dirrmtry include/poly1305
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index 963638407a46..f72fbb211388 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -36,5 +36,5 @@ share/xca/xca-8.html
share/xca/xca-9.html
share/xca/xca.html
@dirrm share/xca
-@unexec rmdir %D/share/pixmaps || true
+@dirrmtry share/pixmaps
@dirrmtry share/applications
diff --git a/sysutils/LPRng/pkg-plist b/sysutils/LPRng/pkg-plist
index a53362fcb891..784ecb1e40ae 100644
--- a/sysutils/LPRng/pkg-plist
+++ b/sysutils/LPRng/pkg-plist
@@ -62,5 +62,5 @@ sbin/lprng_index_certs
%%SYSCONFDIR%%/lpd.conf.sample
%%SYSCONFDIR%%/lpd.perms.sample
%%SYSCONFDIR%%/printcap.sample
-%%CWD%%@unexec rmdir %D/etc/rc.d 2> /dev/null || true
-%%CWD%%@unexec rmdir %D/etc 2> /dev/null || true
+%%CWD%%@dirrmtry etc/rc.d
+%%CWD%%@dirrmtry etc
diff --git a/sysutils/apcupsd/pkg-plist b/sysutils/apcupsd/pkg-plist
index af4dffe59064..07b3266b8e2b 100644
--- a/sysutils/apcupsd/pkg-plist
+++ b/sysutils/apcupsd/pkg-plist
@@ -28,4 +28,4 @@ etc/apcupsd/onbattery
%%CGI%%etc/apcupsd/cgi/upsstats.cgi
etc/rc.d/%%STARTUP_SCRIPT%%
%%CGI%%@dirrm etc/apcupsd/cgi
-@unexec rmdir %D/etc/apcupsd 2>/dev/null || /usr/bin/true
+@dirrmtry etc/apcupsd
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 108b0cb81a35..a51575cba33f 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -38,7 +38,6 @@ do-install:
.endfor
post-install:
- @${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
- >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrmtry share/bbtools" >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist
index b542c7656883..fcc724b966ec 100644
--- a/sysutils/coreutils/pkg-plist
+++ b/sysutils/coreutils/pkg-plist
@@ -152,37 +152,37 @@ bin/gyes
%%NLS%%share/locale/zh_CN/LC_TIME/coreutils.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/coreutils.mo
%%NLS%%share/locale/zh_TW/LC_TIME/coreutils.mo
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tr/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sl/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sk/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt_BR/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pl/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/no/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nl/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nb/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ms/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/lg/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ko/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/it/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hu/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/gl/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ga/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fi/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/et/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/el/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/da/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ca/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/be/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/af/LC_TIME 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_TIME
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_TIME
+%%NLS%%@dirrmtry share/locale/tr/LC_TIME
+%%NLS%%@dirrmtry share/locale/sv/LC_TIME
+%%NLS%%@dirrmtry share/locale/sl/LC_TIME
+%%NLS%%@dirrmtry share/locale/sk/LC_TIME
+%%NLS%%@dirrmtry share/locale/ru/LC_TIME
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_TIME
+%%NLS%%@dirrmtry share/locale/pt/LC_TIME
+%%NLS%%@dirrmtry share/locale/pl/LC_TIME
+%%NLS%%@dirrmtry share/locale/no/LC_TIME
+%%NLS%%@dirrmtry share/locale/nl/LC_TIME
+%%NLS%%@dirrmtry share/locale/nb/LC_TIME
+%%NLS%%@dirrmtry share/locale/ms/LC_TIME
+%%NLS%%@dirrmtry share/locale/lg/LC_TIME
+%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lg
+%%NLS%%@dirrmtry share/locale/ko/LC_TIME
+%%NLS%%@dirrmtry share/locale/ja/LC_TIME
+%%NLS%%@dirrmtry share/locale/it/LC_TIME
+%%NLS%%@dirrmtry share/locale/hu/LC_TIME
+%%NLS%%@dirrmtry share/locale/gl/LC_TIME
+%%NLS%%@dirrmtry share/locale/ga/LC_TIME
+%%NLS%%@dirrmtry share/locale/fr/LC_TIME
+%%NLS%%@dirrmtry share/locale/fi/LC_TIME
+%%NLS%%@dirrmtry share/locale/et/LC_TIME
+%%NLS%%@dirrmtry share/locale/es/LC_TIME
+%%NLS%%@dirrmtry share/locale/el/LC_TIME
+%%NLS%%@dirrmtry share/locale/de/LC_TIME
+%%NLS%%@dirrmtry share/locale/da/LC_TIME
+%%NLS%%@dirrmtry share/locale/cs/LC_TIME
+%%NLS%%@dirrmtry share/locale/ca/LC_TIME
+%%NLS%%@dirrmtry share/locale/be/LC_TIME
+%%NLS%%@dirrmtry share/locale/af/LC_TIME
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 76eb7e40a054..39258c14ff8b 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -31,8 +31,8 @@ sbin/gkrellmd
%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo
%%CLIENT%%@exec mkdir -p %D/libexec/gkrellm2/plugins
%%CLIENT%%@exec mkdir -p %D/share/gkrellm2/themes
-%%CLIENT%%@unexec rmdir %D/libexec/gkrellm2/plugins 2>/dev/null || true
-%%CLIENT%%@unexec rmdir %D/libexec/gkrellm2 2>/dev/null || true
-%%CLIENT%%@unexec rmdir %D/share/gkrellm2/themes 2>/dev/null || true
-%%CLIENT%%@unexec rmdir %D/share/gkrellm2 2>/dev/null || true
+%%CLIENT%%@dirrmtry libexec/gkrellm2/plugins
+%%CLIENT%%@dirrmtry libexec/gkrellm2
+%%CLIENT%%@dirrmtry share/gkrellm2/themes
+%%CLIENT%%@dirrmtry share/gkrellm2
@cwd %%PREFIX%%
diff --git a/sysutils/lavaps/pkg-plist b/sysutils/lavaps/pkg-plist
index 2718f187f78d..38f86415c02d 100644
--- a/sysutils/lavaps/pkg-plist
+++ b/sysutils/lavaps/pkg-plist
@@ -1,7 +1,7 @@
bin/lavaps
%%NLS%%share/locale/es/LC_MESSAGES/lavaps.mo
%%NLS%%share/locale/ru/LC_MESSAGES/lavaps.mo
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
@exec chgrp kmem %D/bin/lavaps
@exec chmod g+s %D/bin/lavaps
diff --git a/sysutils/linux-afaapps/pkg-plist.i386 b/sysutils/linux-afaapps/pkg-plist.i386
index e05a4168499f..cad4b48b9591 100644
--- a/sysutils/linux-afaapps/pkg-plist.i386
+++ b/sysutils/linux-afaapps/pkg-plist.i386
@@ -1,4 +1,4 @@
dev/MAKEDEV.afa
usr/sbin/afacli
usr/sbin/getcfg.afa
-@unexec rmdir %D/dev 2>/dev/null || true
+@dirrmtry dev
diff --git a/sysutils/relaxconf/pkg-plist b/sysutils/relaxconf/pkg-plist
index 7fcda445e684..307204cb631a 100644
--- a/sysutils/relaxconf/pkg-plist
+++ b/sysutils/relaxconf/pkg-plist
@@ -14,10 +14,10 @@ bin/relaxwebinstaller
bin/relaxxconf
%%NLS%%share/locale/zh_CN/LC_MESSAGES/relaxconf.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/relaxconf.mo
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
%%DATADIR%%/COPYRIGHT
%%DATADIR%%/COPYRIGHT.RelaxBSD
%%DATADIR%%/README
diff --git a/sysutils/serpentine/pkg-plist b/sysutils/serpentine/pkg-plist
index 1a7d46465988..27f966110f16 100644
--- a/sysutils/serpentine/pkg-plist
+++ b/sysutils/serpentine/pkg-plist
@@ -84,6 +84,6 @@ share/applications/serpentine.desktop
@dirrmtry share/applications
@dirrm %%PYTHON_SITELIBDIR%%/serpentine/plugins
@dirrm %%PYTHON_SITELIBDIR%%/serpentine
-%%MUINE%%@unexec rmdir %D/lib/muine/plugins 2> /dev/null || true
+%%MUINE%%@dirrmtry lib/muine/plugins
@dirrmtry %%PYTHON_SITELIBDIR%%
@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/sysutils/xcdroast/pkg-plist b/sysutils/xcdroast/pkg-plist
index fbc3e7898cd6..030c052fe796 100644
--- a/sysutils/xcdroast/pkg-plist
+++ b/sysutils/xcdroast/pkg-plist
@@ -50,7 +50,7 @@ lib/xcdroast-0.98/sound/test.wav
@dirrm lib/xcdroast-0.98/sound
@dirrm lib/xcdroast-0.98
@unexec if pw groupshow -n xcdwrite 2>/dev/null 1>&2; then pw groupdel -n xcdwrite; fi
-%%NLS%%@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sq_AL/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sq_AL 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/el_GR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el_GR
+%%NLS%%@dirrmtry share/locale/sq_AL/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sq_AL
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 5be071135b40..c741da3b0c72 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -107,19 +107,19 @@ lib/libpspell.so.16
%%NLS%%share/locale/vi/LC_MESSAGES/aspell.mo
%%NLS%%share/locale/wa/LC_MESSAGES/aspell.mo
@dirrm include/pspell
-%%NLS%%@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/be 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/rw 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tg/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tg 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/uk 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr
+%%NLS%%@dirrmtry share/locale/tg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tg
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
diff --git a/textproc/docbook-430/Makefile b/textproc/docbook-430/Makefile
index 354f665f499a..841521d9385e 100644
--- a/textproc/docbook-430/Makefile
+++ b/textproc/docbook-430/Makefile
@@ -50,7 +50,7 @@ pre-install:
${ECHO_CMD} "${DTDDIR}/$${F}"; \
done;\
${ECHO_CMD} "@dirrm ${DTDDIR}";\
- ${ECHO_CMD} "@unexec rmdir %D/${SGMLCATBASE}/${DTD_NAME} 2> /dev/null || true"; ) > ${PLIST}
+ ${ECHO_CMD} "@dirrmtry ${SGMLCATBASE}/${DTD_NAME}"; ) > ${PLIST}
.if !defined(NOPORTDOCS)
(for F in ${DOC_FILES}; do \
${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \
diff --git a/textproc/docbook-xml-430/Makefile b/textproc/docbook-xml-430/Makefile
index 905183f2fd2f..5f8228456dc2 100644
--- a/textproc/docbook-xml-430/Makefile
+++ b/textproc/docbook-xml-430/Makefile
@@ -52,7 +52,7 @@ pre-install:
${ECHO_CMD} "${DTDDIR}/$${F}"; \
done;\
${ECHO_CMD} "@dirrm ${DTDDIR}";\
- ${ECHO_CMD} "@unexec rmdir %D/${XMLCATBASE}/${DTD_NAME} 2> /dev/null || true"; ) >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry ${XMLCATBASE}/${DTD_NAME}"; ) >> ${PLIST}
.if !defined(NOPORTDOCS)
(for F in ${DOC_FILES}; do \
${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \
diff --git a/textproc/docbook-xml-440/Makefile b/textproc/docbook-xml-440/Makefile
index 7dee7d58dcfe..a0d7a73dd45f 100644
--- a/textproc/docbook-xml-440/Makefile
+++ b/textproc/docbook-xml-440/Makefile
@@ -53,12 +53,12 @@ pre-install:
@${ECHO_CMD} "${DTDDIR}/${F}" >> ${PLIST}
.endfor
@${ECHO_CMD} "@dirrm ${DTDDIR}" >> ${PLIST}
- @${ECHO_CMD} "@unexec rmdir %D/${XMLCATBASE}/${DTD_NAME} 2> /dev/null || true" >> ${PLIST}
+ @${ECHO_CMD} "@dirrmtry ${XMLCATBASE}/${DTD_NAME}" >> ${PLIST}
.ifndef NOPORTDOCS
.for F in ${DOC_FILES}
@${ECHO_CMD} "${DOCSDIR:S!^${PREFIX}/!!}/${F}.${PORTVERSION}" >> ${PLIST}
.endfor
- @${ECHO_CMD} "@unexec rmdir %D/${DOCSDIR:S!^${PREFIX}/!!} 2> /dev/null || true" >> ${PLIST}
+ @${ECHO_CMD} "@dirrmtry ${DOCSDIR:S!^${PREFIX}/!!}" >> ${PLIST}
.endif
@${ECHO_CMD} "@exec ${XMLCATMGR} ${REGIST_CAT_FLAGS_XML}" >> ${PLIST}
@${ECHO_CMD} "@unexec ${XMLCATMGR} ${UNREGIST_CAT_FLAGS_XML}" >> ${PLIST}
diff --git a/textproc/docbook-xsl/pkg-plist b/textproc/docbook-xsl/pkg-plist
index edd20714f888..a98e1ca46958 100644
--- a/textproc/docbook-xsl/pkg-plist
+++ b/textproc/docbook-xsl/pkg-plist
@@ -1755,7 +1755,7 @@ share/xsl/docbook/xhtml/xref.xsl
@dirrm share/xsl/docbook/extensions
@dirrm share/xsl/docbook/common
@dirrm share/xsl/docbook
-@unexec rmdir %D/share/xsl || true
+@dirrmtry share/xsl
%%PORTDOCS%%@dirrm %%DOCSDIR%%/website
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tools
%%PORTDOCS%%@dirrm %%DOCSDIR%%/template
diff --git a/textproc/iiimf-client-lib/pkg-plist b/textproc/iiimf-client-lib/pkg-plist
index ee9b429303d4..2615f4bb5809 100644
--- a/textproc/iiimf-client-lib/pkg-plist
+++ b/textproc/iiimf-client-lib/pkg-plist
@@ -7,4 +7,4 @@ lib/libiiimcf.so
lib/libiiimcf.la
lib/libiiimcf.a
libdata/pkgconfig/iiimf-lib-client.pc
-@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
+@dirrmtry include/iiim
diff --git a/textproc/iiimf-csconv/pkg-plist b/textproc/iiimf-csconv/pkg-plist
index 32d6596f9bad..8e58bb489737 100644
--- a/textproc/iiimf-csconv/pkg-plist
+++ b/textproc/iiimf-csconv/pkg-plist
@@ -2,4 +2,4 @@ lib/iiim/csconv/csconv.la
lib/iiim/csconv/csconv.so
lib/iiim/csconv/encoding.norm
@dirrm lib/iiim/csconv
-@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
+@dirrmtry lib/iiim
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index eed25201edff..e8643cb990c5 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -21,8 +21,8 @@ share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
share/icons/hicolor/48x48/apps/gnome-settings-im.png
share/gnome/pixmaps/gnome-settings-im.png
share/gnome/pixmaps/gimlet-off.png
@@ -30,7 +30,7 @@ share/gnome/pixmaps/gimlet-on.png
share/gnome/pixmaps/gimlet-disable.png
share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
-@unexec rmdir %D/share/gnome/control-center-2.0/interfaces > /dev/null 2>&1 || true
+@dirrmtry share/gnome/control-center-2.0/interfaces
share/gnome/help/imswitcher/C/legal.xml
share/gnome/help/imswitcher/C/imswitcher.xml
@dirrm share/gnome/help/imswitcher/C
diff --git a/textproc/iiimf-gtk/pkg-plist b/textproc/iiimf-gtk/pkg-plist
index 4aa087166452..ba9b38b4047b 100644
--- a/textproc/iiimf-gtk/pkg-plist
+++ b/textproc/iiimf-gtk/pkg-plist
@@ -2,17 +2,17 @@ lib/gtk-2.0/2.4.0/immodules/im-iiim.so
@exec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
share/locale/ja/LC_MESSAGES/iiimgcf.mo
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/ja > /dev/null 2>&1 || true
+@dirrmtry share/locale/ja/LC_MESSAGES
+@dirrmtry share/locale/ja
share/locale/ko/LC_MESSAGES/iiimgcf.mo
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/ko > /dev/null 2>&1 || true
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
share/locale/zh_CN/LC_MESSAGES/iiimgcf.mo
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_CN > /dev/null 2>&1 || true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
share/locale/zh_TW/LC_MESSAGES/iiimgcf.mo
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_TW > /dev/null 2>&1 || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
share/locale/zh_HK/LC_MESSAGES/iiimgcf.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/zh_HK > /dev/null 2>&1 || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
diff --git a/textproc/iiimf-headers/pkg-plist b/textproc/iiimf-headers/pkg-plist
index 170f9e84f1fb..c0715699d1a1 100644
--- a/textproc/iiimf-headers/pkg-plist
+++ b/textproc/iiimf-headers/pkg-plist
@@ -13,4 +13,4 @@ include/iiim/iml/SunIMProt.h
include/iiim/iml/SunIMPub.h
include/iiim/iml/iml_fop.h
@dirrm include/iiim/iml
-@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
+@dirrmtry include/iiim
diff --git a/textproc/iiimf-le-unit/pkg-plist b/textproc/iiimf-le-unit/pkg-plist
index ffee886cf218..779b7bc31511 100644
--- a/textproc/iiimf-le-unit/pkg-plist
+++ b/textproc/iiimf-le-unit/pkg-plist
@@ -89,4 +89,4 @@ lib/iiim/le/unitle/AM_ET/data/amharic.data
@dirrm lib/iiim/le/unitle/AM_ET/data
@dirrm lib/iiim/le/unitle/AM_ET
@dirrm lib/iiim/le/unitle
-@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
+@dirrmtry lib/iiim/le
diff --git a/textproc/iiimf-protocol-lib/pkg-plist b/textproc/iiimf-protocol-lib/pkg-plist
index c8734aec63bf..fa2a456b10db 100644
--- a/textproc/iiimf-protocol-lib/pkg-plist
+++ b/textproc/iiimf-protocol-lib/pkg-plist
@@ -8,4 +8,4 @@ lib/libiiimp.so
lib/libiiimp.la
lib/libiiimp.a
libdata/pkgconfig/iiimf-lib-protocol.pc
-@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
+@dirrmtry include/iiim
diff --git a/textproc/iiimf-server/pkg-plist b/textproc/iiimf-server/pkg-plist
index a6a3bb8e50a8..72dff9656067 100644
--- a/textproc/iiimf-server/pkg-plist
+++ b/textproc/iiimf-server/pkg-plist
@@ -12,8 +12,8 @@ include/iiim/lexmlconf.h
share/iiim/gdbcmd
@dirrm etc/iiim
@dirrm share/iiim
-@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
-@unexec rmdir %D/include/iiim > /dev/null 2>&1 || true
+@dirrmtry lib/iiim
+@dirrmtry include/iiim
@exec mkdir -p /var/log/iiim
@unexec rm -f /var/log/iiim/*.log
@unexec rmdir /var/log/iiim > /dev/null 2>&1 || true
diff --git a/textproc/iiimf-x-lib/pkg-plist b/textproc/iiimf-x-lib/pkg-plist
index 45fc6f1991b8..55cb5c22cc1d 100644
--- a/textproc/iiimf-x-lib/pkg-plist
+++ b/textproc/iiimf-x-lib/pkg-plist
@@ -2,4 +2,4 @@ lib/iiim/xiiimp.a
lib/iiim/xiiimp.la
lib/iiim/xiiimp.so
lib/iiim/xiiimp.so.2
-@unexec rmdir %D/lib/iiim > /dev/null 2>&1 || true
+@dirrmtry lib/iiim
diff --git a/textproc/jdictionary/pkg-plist.plugin b/textproc/jdictionary/pkg-plist.plugin
index 8f731b35b7cc..4fcc81bb348c 100644
--- a/textproc/jdictionary/pkg-plist.plugin
+++ b/textproc/jdictionary/pkg-plist.plugin
@@ -1,3 +1,3 @@
@comment $FreeBSD$
%%DATADIR%%/%%DISTNAME%%
-@unexec rmdir %D/%%DATADIR%% || true
+@dirrmtry %%DATADIR%%
diff --git a/textproc/ocaml-yaxpo/pkg-plist b/textproc/ocaml-yaxpo/pkg-plist
index d095a34279fd..cb13bd02bd92 100644
--- a/textproc/ocaml-yaxpo/pkg-plist
+++ b/textproc/ocaml-yaxpo/pkg-plist
@@ -7,4 +7,4 @@ lib/ocaml/yaxpo.cmi
lib/ocaml/yaxpo.cmxa
lib/ocaml/yaxpodom.cmi
lib/ocaml/yaxposax.cmi
-@unexec rmdir %Dlib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml
diff --git a/textproc/p5-Text-BibTeX/pkg-plist b/textproc/p5-Text-BibTeX/pkg-plist
index cb5fa428d9cb..98aa299c9448 100644
--- a/textproc/p5-Text-BibTeX/pkg-plist
+++ b/textproc/p5-Text-BibTeX/pkg-plist
@@ -15,5 +15,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX
@dirrmtry %%SITE_PERL%%/Text
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-YAPE-HTML/pkg-plist b/textproc/p5-YAPE-HTML/pkg-plist
index 7d7bb7de8af6..9d6daa51d2e1 100644
--- a/textproc/p5-YAPE-HTML/pkg-plist
+++ b/textproc/p5-YAPE-HTML/pkg-plist
@@ -5,5 +5,5 @@
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
@dirrm %%SITE_PERL%%/YAPE/HTML
@dirrmtry %%SITE_PERL%%/YAPE
-@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
-@unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
+@dirrmtry %%SITE_PERL%%/YAPE
diff --git a/textproc/p5-YAPE-Regex-Explain/pkg-plist b/textproc/p5-YAPE-Regex-Explain/pkg-plist
index c33eece8d906..30c5e7086fc7 100644
--- a/textproc/p5-YAPE-Regex-Explain/pkg-plist
+++ b/textproc/p5-YAPE-Regex-Explain/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain
@dirrmtry %%SITE_PERL%%/YAPE/Regex
-@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex 2>/dev/null || true
-@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
-@unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
+@dirrmtry %%SITE_PERL%%/YAPE
diff --git a/textproc/p5-YAPE-Regex/pkg-plist b/textproc/p5-YAPE-Regex/pkg-plist
index a10e0b62383e..73e06a7c8f54 100644
--- a/textproc/p5-YAPE-Regex/pkg-plist
+++ b/textproc/p5-YAPE-Regex/pkg-plist
@@ -6,5 +6,5 @@
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
@dirrm %%SITE_PERL%%/YAPE/Regex
@dirrmtry %%SITE_PERL%%/YAPE
-@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
-@unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
+@dirrmtry %%SITE_PERL%%/YAPE
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index 5711d78a0204..2702f2de285e 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -22,10 +22,10 @@ share/locale/it/LC_MESSAGES/scim-tables.mo
%%SKIM%%share/locale/it/LC_MESSAGES/skim-scim-tables.mo
%%SKIM%%share/locale/ko/LC_MESSAGES/skim-scim-tables.mo
%%SKIM%%share/apps/skim/pics/scim-tables.png
-%%SKIM%%@unexec rmdir %D/share/apps/skim/pics 2>/dev/null || true
-%%SKIM%%@unexec rmdir %D/share/apps/skim 2>/dev/null || true
-%%SKIM%%@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
-%%SKIM%%@unexec rmdir %D/share/services/skimconfiguredialog 2>/dev/null || true
+%%SKIM%%@dirrmtry share/apps/skim/pics
+%%SKIM%%@dirrmtry share/apps/skim
+%%SKIM%%@dirrmtry share/config.kcfg
+%%SKIM%%@dirrmtry share/services/skimconfiguredialog
%%SKIM%%@cwd %%X11BASE%%
@dirrmtry lib/scim-1.0/IMEngine
@dirrmtry lib/scim-1.0/SetupUI
diff --git a/textproc/xhtml-modularization/Makefile b/textproc/xhtml-modularization/Makefile
index 256f597aa3d9..50c2fdbe63db 100644
--- a/textproc/xhtml-modularization/Makefile
+++ b/textproc/xhtml-modularization/Makefile
@@ -70,8 +70,7 @@ pre-install:
${ECHO} "@unexec ${SGMLCAT_RM}" >> ${PLIST}
${ECHO} "@exec ${SGMLCAT_ADD}" >> ${PLIST}
${ECHO} "@dirrm ${dir_DTD}" >> ${PLIST}
- ${ECHO} '@unexec rmdir %D/share/xml/dtd 2>/dev/null || true' >> \
- ${PLIST}
+ ${ECHO} '@dirrmtry share/xml/dtd' >> ${PLIST}
${ECHO} "@dirrm ${dir_DOC}/images" >> ${PLIST}
${ECHO} "@dirrm ${dir_DOC}" >> ${PLIST}
${ECHO} "@dirrm ${dir_TEMPLATES}" >> ${PLIST}
diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 7e890c0c3938..82d53e89e924 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -87,7 +87,6 @@ build-plist:
${FIND} ${DOCSDIR} -type d | \
${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%@dirrm %%DOCSDIR%%|' | \
${SORT} -r >> pkg-plist
- ${ECHO} "@unexec rmdir %D/%%CPGDIR%% 2>/dev/null || true" \
- >> pkg-plist
+ ${ECHO} "@dirrmtry %%CPGDIR%%" >> pkg-plist
.include <bsd.port.mk>
diff --git a/www/drupal/pkg-plist b/www/drupal/pkg-plist
index f2a4397544bf..734e8b5dee00 100644
--- a/www/drupal/pkg-plist
+++ b/www/drupal/pkg-plist
@@ -142,8 +142,8 @@
@dirrm %%DRUPDIR%%/themes/chameleon
@dirrm %%DRUPDIR%%/themes/bluemarine
@dirrm %%DRUPDIR%%/themes
-@unexec rmdir %D/%%DRUPDIR%%/sites/default 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/%%DRUPDIR%%/sites 2>/dev/null || /usr/bin/true
+@dirrmtry %%DRUPDIR%%/sites/default
+@dirrmtry %%DRUPDIR%%/sites
@dirrm %%DRUPDIR%%/scripts
@dirrm %%DRUPDIR%%/modules
@dirrm %%DRUPDIR%%/misc
diff --git a/www/drupal4/pkg-plist b/www/drupal4/pkg-plist
index f2a4397544bf..734e8b5dee00 100644
--- a/www/drupal4/pkg-plist
+++ b/www/drupal4/pkg-plist
@@ -142,8 +142,8 @@
@dirrm %%DRUPDIR%%/themes/chameleon
@dirrm %%DRUPDIR%%/themes/bluemarine
@dirrm %%DRUPDIR%%/themes
-@unexec rmdir %D/%%DRUPDIR%%/sites/default 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/%%DRUPDIR%%/sites 2>/dev/null || /usr/bin/true
+@dirrmtry %%DRUPDIR%%/sites/default
+@dirrmtry %%DRUPDIR%%/sites
@dirrm %%DRUPDIR%%/scripts
@dirrm %%DRUPDIR%%/modules
@dirrm %%DRUPDIR%%/misc
diff --git a/www/drupal5/pkg-plist b/www/drupal5/pkg-plist
index f2a4397544bf..734e8b5dee00 100644
--- a/www/drupal5/pkg-plist
+++ b/www/drupal5/pkg-plist
@@ -142,8 +142,8 @@
@dirrm %%DRUPDIR%%/themes/chameleon
@dirrm %%DRUPDIR%%/themes/bluemarine
@dirrm %%DRUPDIR%%/themes
-@unexec rmdir %D/%%DRUPDIR%%/sites/default 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/%%DRUPDIR%%/sites 2>/dev/null || /usr/bin/true
+@dirrmtry %%DRUPDIR%%/sites/default
+@dirrmtry %%DRUPDIR%%/sites
@dirrm %%DRUPDIR%%/scripts
@dirrm %%DRUPDIR%%/modules
@dirrm %%DRUPDIR%%/misc
diff --git a/www/drupal6/pkg-plist b/www/drupal6/pkg-plist
index f2a4397544bf..734e8b5dee00 100644
--- a/www/drupal6/pkg-plist
+++ b/www/drupal6/pkg-plist
@@ -142,8 +142,8 @@
@dirrm %%DRUPDIR%%/themes/chameleon
@dirrm %%DRUPDIR%%/themes/bluemarine
@dirrm %%DRUPDIR%%/themes
-@unexec rmdir %D/%%DRUPDIR%%/sites/default 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/%%DRUPDIR%%/sites 2>/dev/null || /usr/bin/true
+@dirrmtry %%DRUPDIR%%/sites/default
+@dirrmtry %%DRUPDIR%%/sites
@dirrm %%DRUPDIR%%/scripts
@dirrm %%DRUPDIR%%/modules
@dirrm %%DRUPDIR%%/misc
diff --git a/www/drupal7/pkg-plist b/www/drupal7/pkg-plist
index f2a4397544bf..734e8b5dee00 100644
--- a/www/drupal7/pkg-plist
+++ b/www/drupal7/pkg-plist
@@ -142,8 +142,8 @@
@dirrm %%DRUPDIR%%/themes/chameleon
@dirrm %%DRUPDIR%%/themes/bluemarine
@dirrm %%DRUPDIR%%/themes
-@unexec rmdir %D/%%DRUPDIR%%/sites/default 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/%%DRUPDIR%%/sites 2>/dev/null || /usr/bin/true
+@dirrmtry %%DRUPDIR%%/sites/default
+@dirrmtry %%DRUPDIR%%/sites
@dirrm %%DRUPDIR%%/scripts
@dirrm %%DRUPDIR%%/modules
@dirrm %%DRUPDIR%%/misc
diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist
index e3902824891b..e33cd965cad1 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde-base/pkg-plist
@@ -1590,4 +1590,4 @@
@dirrm %%HORDEDIR%%/admin
@dirrmtry %%HORDEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true
+%%RMDIRINC%%@dirrmtry %%HORDE_INC%%
diff --git a/www/horde/pkg-plist b/www/horde/pkg-plist
index e3902824891b..e33cd965cad1 100644
--- a/www/horde/pkg-plist
+++ b/www/horde/pkg-plist
@@ -1590,4 +1590,4 @@
@dirrm %%HORDEDIR%%/admin
@dirrmtry %%HORDEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true
+%%RMDIRINC%%@dirrmtry %%HORDE_INC%%
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index e3902824891b..e33cd965cad1 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -1590,4 +1590,4 @@
@dirrm %%HORDEDIR%%/admin
@dirrmtry %%HORDEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true
+%%RMDIRINC%%@dirrmtry %%HORDE_INC%%
diff --git a/www/iwebcal/pkg-plist b/www/iwebcal/pkg-plist
index a78a83cc0bd7..dd432dba1dab 100644
--- a/www/iwebcal/pkg-plist
+++ b/www/iwebcal/pkg-plist
@@ -41,5 +41,5 @@
@dirrm %%IWEBCAL%%/img
@dirrm %%IWEBCAL%%/class
@dirrm %%IWEBCAL%%/base
-@unexec rmdir %D/%%IWEBCAL%%/cache 2>&1 >/dev/null || true
-@unexec rmdir %D/%%IWEBCAL%% 2>&1 >/dev/null || true
+@dirrmtry %%IWEBCAL%%/cache
+@dirrmtry %%IWEBCAL%%
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 183e92bf0d2b..f35fe7815e55 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -49,17 +49,17 @@ libexec/apache2/mod_apreq2.so
%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.bs
%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Request.so
%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/APR/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/ 2>/dev/null || true
-%%WITH_MODPERL2%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/ 2>/dev/null || true
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/APR/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Apache2/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/CGI/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Cookie/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Error/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Hook/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Param/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/Parser/
+%%WITH_MODPERL2%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Request/
%%WITH_MODPERL2%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
@dirrm include/apache2/apreq2
@dirrm include/apreq2
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index 4992359da225..4cbba6dfe9ea 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -118,5 +118,5 @@ share/lynx_help/lynx_url_support.html
@dirrm %%DOCSDIR%%
@dirrm share/lynx_help/keystrokes
@dirrm share/lynx_help
-%%NLS%%@unexec rmdir %D/share/locale/rw/LC_MESSAGES > /dev/null 2>&1 || true
-%%NLS%%@unexec rmdir %D/share/locale/rw > /dev/null 2>&1 || true
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index 92dba19e7082..d0b33ad7ac67 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -26,4 +26,4 @@ share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo
share/locale/ru/LC_MESSAGES/mplayerplug-in.mo
@dirrmtry share/locale/en_US/LC_MESSAGES
@dirrmtry share/locale/en_US
-@unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true
+@dirrmtry lib/browser_plugins
diff --git a/www/p5-HTML-FillInForm/pkg-plist b/www/p5-HTML-FillInForm/pkg-plist
index d6b35483fe33..4a4ec6d88478 100644
--- a/www/p5-HTML-FillInForm/pkg-plist
+++ b/www/p5-HTML-FillInForm/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm/.packlist
@dirrmtry %%SITE_PERL%%/HTML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null|| true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-WWW-Wikipedia/pkg-plist b/www/p5-WWW-Wikipedia/pkg-plist
index b7a402d313fa..005ebf830930 100644
--- a/www/p5-WWW-Wikipedia/pkg-plist
+++ b/www/p5-WWW-Wikipedia/pkg-plist
@@ -4,5 +4,5 @@ bin/wikipedia
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wikipedia/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Wikipedia
@dirrm %%SITE_PERL%%/WWW/Wikipedia
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>&1 || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>&1 || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/xaraya/Makefile b/www/xaraya/Makefile
index eb4d3ebd1ce6..85fa9e0605c4 100644
--- a/www/xaraya/Makefile
+++ b/www/xaraya/Makefile
@@ -56,7 +56,7 @@ post-install:
-or -name upgrade.php ')' | ${SED} -e \
's,^${PREFIX}/\(.*\),@unexec rm -f %D/\1 >/dev/null 2>\&1 || true,' >> ${TMPPLIST}
@${FIND} ${PREFIX}/${XARAYADIR} -type d -and -path "*var*" | \
- ${SED} -e 's,^${PREFIX}/\(.*\),@unexec rmdir %D/\1 >/dev/null 2>\&1 || true,' | \
+ ${SED} -e 's,^${PREFIX}/\(.*\),@dirrmtry \1,' | \
${SORT} -r >> ${TMPPLIST}
@${FIND} ${PREFIX}/${XARAYADIR} -type d -and ! -path "*var*" | \
${SED} -e 's,^${PREFIX}/,@dirrm ,' | \
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index 3400fb5029f3..435757d2e5fc 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -22,7 +22,6 @@ PLIST_FILES= bin/bbdate share/bbtools/README.bbdate \
share/bbtools/bbdate.style share/bbtools/bbtoolsrc.in
post-install:
- @${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
- >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrmtry share/bbtools" >> ${TMPPLIST}
.include <bsd.port.mk>
diff --git a/x11-fm/gentoo/pkg-plist b/x11-fm/gentoo/pkg-plist
index 49b5a44fc1ab..6ac22b78da06 100644
--- a/x11-fm/gentoo/pkg-plist
+++ b/x11-fm/gentoo/pkg-plist
@@ -230,17 +230,17 @@ etc/gentoorc
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/config
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.cp1251/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.cp1251 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.CP1251/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.CP1251 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.KOI8-R/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.KOI8-R 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.koi8r/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.koi8r 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.UTF-8/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.UTF-8 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.utf8/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru_RU.utf8 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja_JP.UTF-8/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja_JP.UTF-8 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/ru_RU.cp1251/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU.cp1251
+%%NLS%%@dirrmtry share/locale/ru_RU.CP1251/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU.CP1251
+%%NLS%%@dirrmtry share/locale/ru_RU.KOI8-R/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU.KOI8-R
+%%NLS%%@dirrmtry share/locale/ru_RU.koi8r/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU.koi8r
+%%NLS%%@dirrmtry share/locale/ru_RU.UTF-8/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU.UTF-8
+%%NLS%%@dirrmtry share/locale/ru_RU.utf8/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU.utf8
+%%NLS%%@dirrmtry share/locale/ja_JP.UTF-8/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja_JP.UTF-8
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile
index 32781a9bd192..3d1271bffea2 100644
--- a/x11-themes/gtk-bluecurve-theme/Makefile
+++ b/x11-themes/gtk-bluecurve-theme/Makefile
@@ -63,7 +63,7 @@ pre-install:
@${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}/${GTK${v}_RCDIR}" >> ${PLIST}
. endfor
.endfor
- @${ECHO_CMD} "@unexec rmdir %D/share/themes/Bluecurve 2>/dev/null || true" >> ${PLIST}
+ @${ECHO_CMD} "@dirrmtry share/themes/Bluecurve" >> ${PLIST}
.for s in ${EXTRA_STYLES}
@${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}" >> ${PLIST}
.endfor
diff --git a/x11-themes/icon-bluecurve-theme/Makefile b/x11-themes/icon-bluecurve-theme/Makefile
index 991557217b5b..1c0504991607 100644
--- a/x11-themes/icon-bluecurve-theme/Makefile
+++ b/x11-themes/icon-bluecurve-theme/Makefile
@@ -44,6 +44,6 @@ do-build:
pre-install:
@${ECHO_CMD} "@dirrm share/icons/Bluecurve" >> ${PLIST}
- @${ECHO_CMD} "@unexec rmdir %D/share/icons 2>/dev/null || true" >> ${PLIST}
+ @${ECHO_CMD} "@dirrmtry share/icons" >> ${PLIST}
.include "${MASTERDIR}/Makefile"
diff --git a/x11-themes/kde-icons-noia/Makefile.icons b/x11-themes/kde-icons-noia/Makefile.icons
index 4f4003c3ed25..1207eb898181 100644
--- a/x11-themes/kde-icons-noia/Makefile.icons
+++ b/x11-themes/kde-icons-noia/Makefile.icons
@@ -86,8 +86,7 @@ generate-tmpplist:
-e 's|^\.|@dirrm share/icons/${PORT_SHAREDIR:S/"//g}|' \
>> ${TMPPLIST}
@${ECHO_CMD} \
- '@unexec rmdir %D/share/icons 2>/dev/null || true' \
- >> ${TMPPLIST}
+ '@dirrmtry share/icons' >> ${TMPPLIST}
# use generated installation scripts
install-run-scripts:
diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile
index d0ed4d5b425c..c187f4c346ca 100644
--- a/x11-themes/linux-gtk-bluecurve-theme/Makefile
+++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile
@@ -34,7 +34,7 @@ pre-install:
.for v in 1 2
@${ECHO_CMD} '${GTK${v}_ENGINEDIR}/libbluecurve.so' >> ${PLIST}
. for d in ${GTK${v}_ENGINEDIRS}
- @${ECHO_CMD} '@unexec rmdir %D/${d} 2>/dev/null || true' >> ${PLIST}
+ @${ECHO_CMD} '@dirrmtry ${d}' >> ${PLIST}
. endfor
. for t in ${THEMES}
@${ECHO_CMD} 'usr/share/themes/${t}/${GTK${v}_RCDIR}/gtkrc' >> ${PLIST}
@@ -44,7 +44,7 @@ pre-install:
.for t in ${THEMES}
@${ECHO_CMD} '@dirrm usr/share/themes/${t}' >> ${PLIST}
.endfor
- @${ECHO_CMD} '@unexec rmdir %D/usr/share/themes 2>/dev/null || true' >> ${PLIST}
+ @${ECHO_CMD} '@dirrmtry usr/share/themes' >> ${PLIST}
do-install:
.for v in 1 2
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 5eb1ac8a7b3b..d228143ed30c 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -220,8 +220,8 @@ share/themes/Default/gtk/gtkrc.yi
share/themes/Default/gtk/gtkrc.zh_CN
share/themes/Default/gtk/gtkrc.zh_TW.Big5
@exec mkdir -p %D/lib/gtk/themes/engines
-%%NLS%%@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sp 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/sp/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sp
@dirrm lib/gtk/themes/engines
@dirrm lib/gtk/themes
@dirrm lib/gtk
diff --git a/x11-toolkits/hs-frantk/pkg-plist b/x11-toolkits/hs-frantk/pkg-plist
index 935892b5878b..7a052639ff4d 100644
--- a/x11-toolkits/hs-frantk/pkg-plist
+++ b/x11-toolkits/hs-frantk/pkg-plist
@@ -167,7 +167,7 @@
%%HUGS%%@dirrm lib/frantk/hugs
%%GHC%%@dirrm lib/frantk/imports
%%GHC%%@dirrm lib/frantk
-%%HUGS%%@unexec rmdir %D/lib/frantk || true
+%%HUGS%%@dirrmtry lib/frantk
%%GHC%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
%%GHC%%@unexec ghc-pkg -r FranTk
%%GHC%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha b/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
index ba9995db51b5..052e7ae60a60 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
@@ -102,81 +102,81 @@ usr/lib/libgtk-1.2.so.0
@dirrm etc/gtk
@dirrm usr/share/doc/gtk+-1.2.9
@dirrm usr/share/themes/Default/gtk
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@dirrmtry usr/share/themes/Default
+@dirrmtry usr/share/themes
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
+@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN.GB2312
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.i386 b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
index 1379ffb1f057..d24b9a54faef 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
@@ -103,82 +103,82 @@ usr/share/themes/Default/gtk/gtkrc
@dirrm etc/gtk
@dirrm usr/share/doc/gtk+-1.2.10
@dirrm usr/share/themes/Default/gtk
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@dirrmtry usr/share/themes/Default
+@dirrmtry usr/share/themes
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/vi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
+@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN.GB2312
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
diff --git a/x11-toolkits/linux-f10-gtk2/pkg-plist b/x11-toolkits/linux-f10-gtk2/pkg-plist
index e742e7465f7a..3e2b28cc2faf 100644
--- a/x11-toolkits/linux-f10-gtk2/pkg-plist
+++ b/x11-toolkits/linux-f10-gtk2/pkg-plist
@@ -249,159 +249,159 @@ usr/share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm usr/share/themes/Raleigh/gtk-2.0
@dirrm usr/share/themes/Raleigh
@dirrm usr/share/themes
-@unexec rmdir %D/usr/share/locale/af/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/af >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ang/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ang >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az_IR/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az_IR >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/be/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/be >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/br/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/br >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ca >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/da >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/de >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/el >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/es >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/et >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ia >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/id/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/id >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/is/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/is >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/it >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ja >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ko >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/no >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nso/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nso >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt_BR >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ro >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ru >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/th/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/th >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_CN/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_CN >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_TW/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_TW >/dev/null 2>&1 || true
+@dirrmtry usr/share/locale/af/LC_MESSAGES
+@dirrmtry usr/share/locale/af
+@dirrmtry usr/share/locale/am/LC_MESSAGES
+@dirrmtry usr/share/locale/am
+@dirrmtry usr/share/locale/ang/LC_MESSAGES
+@dirrmtry usr/share/locale/ang
+@dirrmtry usr/share/locale/ar/LC_MESSAGES
+@dirrmtry usr/share/locale/ar
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
+@dirrmtry usr/share/locale/az_IR/LC_MESSAGES
+@dirrmtry usr/share/locale/az_IR
+@dirrmtry usr/share/locale/be/LC_MESSAGES
+@dirrmtry usr/share/locale/be
+@dirrmtry usr/share/locale/bg/LC_MESSAGES
+@dirrmtry usr/share/locale/bg
+@dirrmtry usr/share/locale/bn/LC_MESSAGES
+@dirrmtry usr/share/locale/bn
+@dirrmtry usr/share/locale/br/LC_MESSAGES
+@dirrmtry usr/share/locale/br
+@dirrmtry usr/share/locale/bs/LC_MESSAGES
+@dirrmtry usr/share/locale/bs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/cy/LC_MESSAGES
+@dirrmtry usr/share/locale/cy
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/en_CA/LC_MESSAGES
+@dirrmtry usr/share/locale/en_CA
+@dirrmtry usr/share/locale/en_GB/LC_MESSAGES
+@dirrmtry usr/share/locale/en_GB
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/fa/LC_MESSAGES
+@dirrmtry usr/share/locale/fa
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/gu/LC_MESSAGES
+@dirrmtry usr/share/locale/gu
+@dirrmtry usr/share/locale/he/LC_MESSAGES
+@dirrmtry usr/share/locale/he
+@dirrmtry usr/share/locale/hi/LC_MESSAGES
+@dirrmtry usr/share/locale/hi
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/ia/LC_MESSAGES
+@dirrmtry usr/share/locale/ia
+@dirrmtry usr/share/locale/id/LC_MESSAGES
+@dirrmtry usr/share/locale/id
+@dirrmtry usr/share/locale/is/LC_MESSAGES
+@dirrmtry usr/share/locale/is
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/li/LC_MESSAGES
+@dirrmtry usr/share/locale/li
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/lv/LC_MESSAGES
+@dirrmtry usr/share/locale/lv
+@dirrmtry usr/share/locale/mi/LC_MESSAGES
+@dirrmtry usr/share/locale/mi
+@dirrmtry usr/share/locale/mk/LC_MESSAGES
+@dirrmtry usr/share/locale/mk
+@dirrmtry usr/share/locale/ml/LC_MESSAGES
+@dirrmtry usr/share/locale/ml
+@dirrmtry usr/share/locale/mn/LC_MESSAGES
+@dirrmtry usr/share/locale/mn
+@dirrmtry usr/share/locale/mr/LC_MESSAGES
+@dirrmtry usr/share/locale/mr
+@dirrmtry usr/share/locale/ms/LC_MESSAGES
+@dirrmtry usr/share/locale/ms
+@dirrmtry usr/share/locale/nb/LC_MESSAGES
+@dirrmtry usr/share/locale/nb
+@dirrmtry usr/share/locale/ne/LC_MESSAGES
+@dirrmtry usr/share/locale/ne
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nso/LC_MESSAGES
+@dirrmtry usr/share/locale/nso
+@dirrmtry usr/share/locale/pa/LC_MESSAGES
+@dirrmtry usr/share/locale/pa
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sq/LC_MESSAGES
+@dirrmtry usr/share/locale/sq
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sr@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@Latn
+@dirrmtry usr/share/locale/sr@ije/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@ije
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/ta/LC_MESSAGES
+@dirrmtry usr/share/locale/ta
+@dirrmtry usr/share/locale/th/LC_MESSAGES
+@dirrmtry usr/share/locale/th
+@dirrmtry usr/share/locale/tk/LC_MESSAGES
+@dirrmtry usr/share/locale/tk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/uz/LC_MESSAGES
+@dirrmtry usr/share/locale/uz
+@dirrmtry usr/share/locale/uz@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/uz@Latn
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/yi/LC_MESSAGES
+@dirrmtry usr/share/locale/yi
+@dirrmtry usr/share/locale/zh_CN/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN
+@dirrmtry usr/share/locale/zh_TW/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
index ba9995db51b5..052e7ae60a60 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
@@ -102,81 +102,81 @@ usr/lib/libgtk-1.2.so.0
@dirrm etc/gtk
@dirrm usr/share/doc/gtk+-1.2.9
@dirrm usr/share/themes/Default/gtk
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@dirrmtry usr/share/themes/Default
+@dirrmtry usr/share/themes
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
+@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN.GB2312
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.i386 b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
index 1379ffb1f057..d24b9a54faef 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
@@ -103,82 +103,82 @@ usr/share/themes/Default/gtk/gtkrc
@dirrm etc/gtk
@dirrm usr/share/doc/gtk+-1.2.10
@dirrm usr/share/themes/Default/gtk
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@dirrmtry usr/share/themes/Default
+@dirrmtry usr/share/themes
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/vi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
+@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN.GB2312
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
diff --git a/x11-toolkits/linux-f8-gtk2/pkg-plist b/x11-toolkits/linux-f8-gtk2/pkg-plist
index e742e7465f7a..3e2b28cc2faf 100644
--- a/x11-toolkits/linux-f8-gtk2/pkg-plist
+++ b/x11-toolkits/linux-f8-gtk2/pkg-plist
@@ -249,159 +249,159 @@ usr/share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm usr/share/themes/Raleigh/gtk-2.0
@dirrm usr/share/themes/Raleigh
@dirrm usr/share/themes
-@unexec rmdir %D/usr/share/locale/af/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/af >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ang/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ang >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az_IR/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az_IR >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/be/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/be >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/br/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/br >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ca >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/da >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/de >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/el >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/es >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/et >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ia >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/id/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/id >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/is/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/is >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/it >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ja >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ko >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/no >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nso/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nso >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt_BR >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ro >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ru >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/th/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/th >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_CN/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_CN >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_TW/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_TW >/dev/null 2>&1 || true
+@dirrmtry usr/share/locale/af/LC_MESSAGES
+@dirrmtry usr/share/locale/af
+@dirrmtry usr/share/locale/am/LC_MESSAGES
+@dirrmtry usr/share/locale/am
+@dirrmtry usr/share/locale/ang/LC_MESSAGES
+@dirrmtry usr/share/locale/ang
+@dirrmtry usr/share/locale/ar/LC_MESSAGES
+@dirrmtry usr/share/locale/ar
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
+@dirrmtry usr/share/locale/az_IR/LC_MESSAGES
+@dirrmtry usr/share/locale/az_IR
+@dirrmtry usr/share/locale/be/LC_MESSAGES
+@dirrmtry usr/share/locale/be
+@dirrmtry usr/share/locale/bg/LC_MESSAGES
+@dirrmtry usr/share/locale/bg
+@dirrmtry usr/share/locale/bn/LC_MESSAGES
+@dirrmtry usr/share/locale/bn
+@dirrmtry usr/share/locale/br/LC_MESSAGES
+@dirrmtry usr/share/locale/br
+@dirrmtry usr/share/locale/bs/LC_MESSAGES
+@dirrmtry usr/share/locale/bs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/cy/LC_MESSAGES
+@dirrmtry usr/share/locale/cy
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/en_CA/LC_MESSAGES
+@dirrmtry usr/share/locale/en_CA
+@dirrmtry usr/share/locale/en_GB/LC_MESSAGES
+@dirrmtry usr/share/locale/en_GB
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/fa/LC_MESSAGES
+@dirrmtry usr/share/locale/fa
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/gu/LC_MESSAGES
+@dirrmtry usr/share/locale/gu
+@dirrmtry usr/share/locale/he/LC_MESSAGES
+@dirrmtry usr/share/locale/he
+@dirrmtry usr/share/locale/hi/LC_MESSAGES
+@dirrmtry usr/share/locale/hi
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/ia/LC_MESSAGES
+@dirrmtry usr/share/locale/ia
+@dirrmtry usr/share/locale/id/LC_MESSAGES
+@dirrmtry usr/share/locale/id
+@dirrmtry usr/share/locale/is/LC_MESSAGES
+@dirrmtry usr/share/locale/is
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/li/LC_MESSAGES
+@dirrmtry usr/share/locale/li
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/lv/LC_MESSAGES
+@dirrmtry usr/share/locale/lv
+@dirrmtry usr/share/locale/mi/LC_MESSAGES
+@dirrmtry usr/share/locale/mi
+@dirrmtry usr/share/locale/mk/LC_MESSAGES
+@dirrmtry usr/share/locale/mk
+@dirrmtry usr/share/locale/ml/LC_MESSAGES
+@dirrmtry usr/share/locale/ml
+@dirrmtry usr/share/locale/mn/LC_MESSAGES
+@dirrmtry usr/share/locale/mn
+@dirrmtry usr/share/locale/mr/LC_MESSAGES
+@dirrmtry usr/share/locale/mr
+@dirrmtry usr/share/locale/ms/LC_MESSAGES
+@dirrmtry usr/share/locale/ms
+@dirrmtry usr/share/locale/nb/LC_MESSAGES
+@dirrmtry usr/share/locale/nb
+@dirrmtry usr/share/locale/ne/LC_MESSAGES
+@dirrmtry usr/share/locale/ne
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nso/LC_MESSAGES
+@dirrmtry usr/share/locale/nso
+@dirrmtry usr/share/locale/pa/LC_MESSAGES
+@dirrmtry usr/share/locale/pa
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sq/LC_MESSAGES
+@dirrmtry usr/share/locale/sq
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sr@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@Latn
+@dirrmtry usr/share/locale/sr@ije/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@ije
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/ta/LC_MESSAGES
+@dirrmtry usr/share/locale/ta
+@dirrmtry usr/share/locale/th/LC_MESSAGES
+@dirrmtry usr/share/locale/th
+@dirrmtry usr/share/locale/tk/LC_MESSAGES
+@dirrmtry usr/share/locale/tk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/uz/LC_MESSAGES
+@dirrmtry usr/share/locale/uz
+@dirrmtry usr/share/locale/uz@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/uz@Latn
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/yi/LC_MESSAGES
+@dirrmtry usr/share/locale/yi
+@dirrmtry usr/share/locale/zh_CN/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN
+@dirrmtry usr/share/locale/zh_TW/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW
diff --git a/x11-toolkits/linux-gtk/pkg-plist.alpha b/x11-toolkits/linux-gtk/pkg-plist.alpha
index ba9995db51b5..052e7ae60a60 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.alpha
+++ b/x11-toolkits/linux-gtk/pkg-plist.alpha
@@ -102,81 +102,81 @@ usr/lib/libgtk-1.2.so.0
@dirrm etc/gtk
@dirrm usr/share/doc/gtk+-1.2.9
@dirrm usr/share/themes/Default/gtk
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@dirrmtry usr/share/themes/Default
+@dirrmtry usr/share/themes
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
+@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN.GB2312
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
diff --git a/x11-toolkits/linux-gtk/pkg-plist.i386 b/x11-toolkits/linux-gtk/pkg-plist.i386
index 1379ffb1f057..d24b9a54faef 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-gtk/pkg-plist.i386
@@ -103,82 +103,82 @@ usr/share/themes/Default/gtk/gtkrc
@dirrm etc/gtk
@dirrm usr/share/doc/gtk+-1.2.10
@dirrm usr/share/themes/Default/gtk
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@dirrmtry usr/share/themes/Default
+@dirrmtry usr/share/themes
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/vi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
+@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN.GB2312
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
diff --git a/x11-toolkits/linux-gtk2/pkg-plist b/x11-toolkits/linux-gtk2/pkg-plist
index e742e7465f7a..3e2b28cc2faf 100644
--- a/x11-toolkits/linux-gtk2/pkg-plist
+++ b/x11-toolkits/linux-gtk2/pkg-plist
@@ -249,159 +249,159 @@ usr/share/themes/Raleigh/gtk-2.0/gtkrc
@dirrm usr/share/themes/Raleigh/gtk-2.0
@dirrm usr/share/themes/Raleigh
@dirrm usr/share/themes
-@unexec rmdir %D/usr/share/locale/af/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/af >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ang/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ang >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az_IR/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az_IR >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/be/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/be >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/br/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/br >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ca >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/da >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/de >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/el >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/es >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/et >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ia/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ia >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/id/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/id >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/is/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/is >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/it >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ja >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ko >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/li >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/no >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nso/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nso >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pt_BR >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ro >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ru >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sl >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/th/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/th >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/tr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/uz@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_CN/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_CN >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_TW/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/zh_TW >/dev/null 2>&1 || true
+@dirrmtry usr/share/locale/af/LC_MESSAGES
+@dirrmtry usr/share/locale/af
+@dirrmtry usr/share/locale/am/LC_MESSAGES
+@dirrmtry usr/share/locale/am
+@dirrmtry usr/share/locale/ang/LC_MESSAGES
+@dirrmtry usr/share/locale/ang
+@dirrmtry usr/share/locale/ar/LC_MESSAGES
+@dirrmtry usr/share/locale/ar
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
+@dirrmtry usr/share/locale/az_IR/LC_MESSAGES
+@dirrmtry usr/share/locale/az_IR
+@dirrmtry usr/share/locale/be/LC_MESSAGES
+@dirrmtry usr/share/locale/be
+@dirrmtry usr/share/locale/bg/LC_MESSAGES
+@dirrmtry usr/share/locale/bg
+@dirrmtry usr/share/locale/bn/LC_MESSAGES
+@dirrmtry usr/share/locale/bn
+@dirrmtry usr/share/locale/br/LC_MESSAGES
+@dirrmtry usr/share/locale/br
+@dirrmtry usr/share/locale/bs/LC_MESSAGES
+@dirrmtry usr/share/locale/bs
+@dirrmtry usr/share/locale/ca/LC_MESSAGES
+@dirrmtry usr/share/locale/ca
+@dirrmtry usr/share/locale/cs/LC_MESSAGES
+@dirrmtry usr/share/locale/cs
+@dirrmtry usr/share/locale/cy/LC_MESSAGES
+@dirrmtry usr/share/locale/cy
+@dirrmtry usr/share/locale/da/LC_MESSAGES
+@dirrmtry usr/share/locale/da
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale/el/LC_MESSAGES
+@dirrmtry usr/share/locale/el
+@dirrmtry usr/share/locale/en_CA/LC_MESSAGES
+@dirrmtry usr/share/locale/en_CA
+@dirrmtry usr/share/locale/en_GB/LC_MESSAGES
+@dirrmtry usr/share/locale/en_GB
+@dirrmtry usr/share/locale/es/LC_MESSAGES
+@dirrmtry usr/share/locale/es
+@dirrmtry usr/share/locale/et/LC_MESSAGES
+@dirrmtry usr/share/locale/et
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/fa/LC_MESSAGES
+@dirrmtry usr/share/locale/fa
+@dirrmtry usr/share/locale/fi/LC_MESSAGES
+@dirrmtry usr/share/locale/fi
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/gl/LC_MESSAGES
+@dirrmtry usr/share/locale/gl
+@dirrmtry usr/share/locale/gu/LC_MESSAGES
+@dirrmtry usr/share/locale/gu
+@dirrmtry usr/share/locale/he/LC_MESSAGES
+@dirrmtry usr/share/locale/he
+@dirrmtry usr/share/locale/hi/LC_MESSAGES
+@dirrmtry usr/share/locale/hi
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/hu/LC_MESSAGES
+@dirrmtry usr/share/locale/hu
+@dirrmtry usr/share/locale/ia/LC_MESSAGES
+@dirrmtry usr/share/locale/ia
+@dirrmtry usr/share/locale/id/LC_MESSAGES
+@dirrmtry usr/share/locale/id
+@dirrmtry usr/share/locale/is/LC_MESSAGES
+@dirrmtry usr/share/locale/is
+@dirrmtry usr/share/locale/it/LC_MESSAGES
+@dirrmtry usr/share/locale/it
+@dirrmtry usr/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/share/locale/ja
+@dirrmtry usr/share/locale/ko/LC_MESSAGES
+@dirrmtry usr/share/locale/ko
+@dirrmtry usr/share/locale/li/LC_MESSAGES
+@dirrmtry usr/share/locale/li
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/lv/LC_MESSAGES
+@dirrmtry usr/share/locale/lv
+@dirrmtry usr/share/locale/mi/LC_MESSAGES
+@dirrmtry usr/share/locale/mi
+@dirrmtry usr/share/locale/mk/LC_MESSAGES
+@dirrmtry usr/share/locale/mk
+@dirrmtry usr/share/locale/ml/LC_MESSAGES
+@dirrmtry usr/share/locale/ml
+@dirrmtry usr/share/locale/mn/LC_MESSAGES
+@dirrmtry usr/share/locale/mn
+@dirrmtry usr/share/locale/mr/LC_MESSAGES
+@dirrmtry usr/share/locale/mr
+@dirrmtry usr/share/locale/ms/LC_MESSAGES
+@dirrmtry usr/share/locale/ms
+@dirrmtry usr/share/locale/nb/LC_MESSAGES
+@dirrmtry usr/share/locale/nb
+@dirrmtry usr/share/locale/ne/LC_MESSAGES
+@dirrmtry usr/share/locale/ne
+@dirrmtry usr/share/locale/nl/LC_MESSAGES
+@dirrmtry usr/share/locale/nl
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/no/LC_MESSAGES
+@dirrmtry usr/share/locale/no
+@dirrmtry usr/share/locale/nso/LC_MESSAGES
+@dirrmtry usr/share/locale/nso
+@dirrmtry usr/share/locale/pa/LC_MESSAGES
+@dirrmtry usr/share/locale/pa
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/pt/LC_MESSAGES
+@dirrmtry usr/share/locale/pt
+@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
+@dirrmtry usr/share/locale/pt_BR
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/ru/LC_MESSAGES
+@dirrmtry usr/share/locale/ru
+@dirrmtry usr/share/locale/sk/LC_MESSAGES
+@dirrmtry usr/share/locale/sk
+@dirrmtry usr/share/locale/sl/LC_MESSAGES
+@dirrmtry usr/share/locale/sl
+@dirrmtry usr/share/locale/sq/LC_MESSAGES
+@dirrmtry usr/share/locale/sq
+@dirrmtry usr/share/locale/sr/LC_MESSAGES
+@dirrmtry usr/share/locale/sr
+@dirrmtry usr/share/locale/sr@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@Latn
+@dirrmtry usr/share/locale/sr@ije/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@ije
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/ta/LC_MESSAGES
+@dirrmtry usr/share/locale/ta
+@dirrmtry usr/share/locale/th/LC_MESSAGES
+@dirrmtry usr/share/locale/th
+@dirrmtry usr/share/locale/tk/LC_MESSAGES
+@dirrmtry usr/share/locale/tk
+@dirrmtry usr/share/locale/tr/LC_MESSAGES
+@dirrmtry usr/share/locale/tr
+@dirrmtry usr/share/locale/uk/LC_MESSAGES
+@dirrmtry usr/share/locale/uk
+@dirrmtry usr/share/locale/uz/LC_MESSAGES
+@dirrmtry usr/share/locale/uz
+@dirrmtry usr/share/locale/uz@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/uz@Latn
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/yi/LC_MESSAGES
+@dirrmtry usr/share/locale/yi
+@dirrmtry usr/share/locale/zh_CN/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_CN
+@dirrmtry usr/share/locale/zh_TW/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index ca80492aca31..57f43ccb0347 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -76,8 +76,7 @@ pre-install:
${ECHO_CMD} lib/libobrender.${ii} >> ${PLIST}
.endfor
.for ii in gnome/wm-properties gnome
- ${ECHO_CMD} "@unexec rmdir %D/share/${ii} 2>/dev/null || true" \
- >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/${ii}" >> ${PLIST}
.endfor
.if !defined(NOPORTDOCS)
.for ii in ${DOCS}
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index 86fccb56b1ea..f1b32f03f7d6 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1,4 +1,4 @@
%%GDM%%etc/dm/Sessions/XFce4.desktop
%%GDM%%etc/gdm/Sessions/XFce4
-%%GDM%%@unexec rmdir %D/etc/gdm/Sessions 2>/dev/null || true
-%%GDM%%@unexec rmdir %D/etc/gdm 2>/dev/null || true
+%%GDM%%@dirrmtry etc/gdm/Sessions
+%%GDM%%@dirrmtry etc/gdm
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 912e3d51434a..d3b31040039d 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -61,15 +61,15 @@ share/gtk-doc/html/exo/up.png
%%PYTHON%%share/pygtk/2.0/defs/exo-0.3/exo.defs
%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
@dirrmtry share/gtk-doc/html
-%%PYTHON%%@unexec rmdir %D/share/pygtk/2.0/defs 2> /dev/null || true
-%%PYTHON%%@unexec rmdir %D/share/pygtk/2.0 2> /dev/null || true
-%%PYTHON%%@unexec rmdir %D/share/pygtk 2> /dev/null || true
+%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
+%%PYTHON%%@dirrmtry share/pygtk/2.0
+%%PYTHON%%@dirrmtry share/pygtk
@dirrm share/gtk-doc/html/exo
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
%%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3/exo
%%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3
-%%PYTHON%%@unexec rmdir %D/lib/python2.4/site-packages 2> /dev/null || true
-%%PYTHON%%@unexec rmdir %D/lib/python2.4 2> /dev/null || true
+%%PYTHON%%@dirrmtry lib/python2.4/site-packages
+%%PYTHON%%@dirrmtry lib/python2.4
@dirrm include/exo-0.3/exo
@dirrm include/exo-0.3
diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386
index 44530c0df6ae..0c58af34a8c2 100644
--- a/x11/linux-gnomelibs/pkg-plist.i386
+++ b/x11/linux-gnomelibs/pkg-plist.i386
@@ -115,15 +115,15 @@ usr/lib/libzvt.so.2
@dirrm etc/sound/events
@dirrm etc/sound
@dirrm etc/gnome
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/lt 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/nn 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/sp 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>&1 >/dev/null || true
-@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>&1 >/dev/null || true
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrmtry usr/share/locale/zh_TW.Big5
diff --git a/x11/xdialog/pkg-plist b/x11/xdialog/pkg-plist
index d9f1dfd0ff58..a4d254192f73 100644
--- a/x11/xdialog/pkg-plist
+++ b/x11/xdialog/pkg-plist
@@ -65,7 +65,7 @@ bin/Xdialog
%%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
%%PORTDOCS%%%%DOCSDIR%%/yesno.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%NLS%%@unexec rmdir %D/share/locale/no_NO/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/no_NO 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv_SE 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/no_NO/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/no_NO
+%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv_SE