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

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

16 files changed, 164 insertions, 164 deletions

diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index b9f5dd8116fe..ca908a21e5b8 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -280,7 +280,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
 share/applications/abiword.desktop
 %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
 share/pixmaps/abiword_48.png
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
 @dirrm share/AbiSuite-%%ABIVERSION%%/templates
 @dirrm share/AbiSuite-%%ABIVERSION%%/icons
 @dirrm share/AbiSuite-%%ABIVERSION%%/dictionary
diff --git a/editors/emacs19/pkg-plist b/editors/emacs19/pkg-plist
index 962cd90127b9..c944e4749b69 100644
--- a/editors/emacs19/pkg-plist
+++ b/editors/emacs19/pkg-plist
@@ -12,7 +12,7 @@ bin/emacsclient
 etc/rc.d/emacs.sh
 @comment This can fail if other ports are installed, no need to
 @comment scare user in that case
-@unexec rmdir %D/share/emacs/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true
+@dirrmtry share/emacs/%%EMACS_VERSION%%/site-lisp
 @unexec install-info --delete %D/info/emacs %D/info/dir
 @unexec install-info --delete %D/info/vip %D/info/dir
 @unexec install-info --delete %D/info/viper %D/info/dir
@@ -125,7 +125,7 @@ libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/vcdiff
 libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%/yow
 @dirrm libexec/emacs/%%EMACS_VERSION%%/%%EMACS_ARCH%%
 @dirrm libexec/emacs/%%EMACS_VERSION%%
-@unexec rmdir %D/libexec/emacs 2>/dev/null || true
+@dirrmtry libexec/emacs
 share/emacs/%%EMACS_VERSION%%/etc/3B-MAXMEM
 share/emacs/%%EMACS_VERSION%%/etc/AIX.DUMP
 share/emacs/%%EMACS_VERSION%%/etc/BABYL
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index ee3dd784d391..b1c230f82e0d 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -217,8 +217,8 @@ share/locale/wa/LC_MESSAGES/gedit.mo
 share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
 @dirrm share/gnome/omf/gedit
 @dirrm share/gnome/help/gedit/zh_TW/figures
 @dirrm share/gnome/help/gedit/zh_TW
diff --git a/editors/joe/pkg-plist b/editors/joe/pkg-plist
index 79e774b76355..ab011874ca98 100644
--- a/editors/joe/pkg-plist
+++ b/editors/joe/pkg-plist
@@ -57,7 +57,7 @@ etc/joe/doc/HACKING
 etc/joe/doc/HINTS
 etc/joe/doc/NEWS
 etc/joe/doc/README
-@unexec rmdir %D/etc/joe/doc 2>/dev/null || true
-@unexec rmdir %D/etc/joe/charmaps 2>/dev/null || true
-@unexec rmdir %D/etc/joe/syntax 2>/dev/null || true
-@unexec rmdir %D/etc/joe 2>/dev/null || true
+@dirrmtry etc/joe/doc
+@dirrmtry etc/joe/charmaps
+@dirrmtry etc/joe/syntax
+@dirrmtry etc/joe
diff --git a/editors/joe2/pkg-plist b/editors/joe2/pkg-plist
index 458ab3d0994f..f3fdcfacdf83 100644
--- a/editors/joe2/pkg-plist
+++ b/editors/joe2/pkg-plist
@@ -16,4 +16,4 @@ etc/joe/jpicorc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.cvs
 %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
-@unexec rmdir %D/etc/joe 2>/dev/null || true
+@dirrmtry etc/joe
diff --git a/editors/kile-kde4/pkg-plist b/editors/kile-kde4/pkg-plist
index 09be5eaca031..d904845f00a8 100644
--- a/editors/kile-kde4/pkg-plist
+++ b/editors/kile-kde4/pkg-plist
@@ -693,46 +693,46 @@ share/locale/sr@Latn/LC_MESSAGES/kile.mo
 share/locale/sv/LC_MESSAGES/kile.mo
 share/locale/ta/LC_MESSAGES/kile.mo
 share/mimelnk/text/x-kilepr.desktop
-@unexec rmdir %D/share/mimelnk/text 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/text
+@dirrmtry share/mimelnk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/kile
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/kile
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/kile
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/kile
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/et/kile
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/en/kile
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/da/kile
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/kile/test
 @dirrm share/apps/kile/templates
 @dirrm share/apps/kile/pics
@@ -754,7 +754,7 @@ share/mimelnk/text/x-kilepr.desktop
 @dirrm share/apps/kile/complete/abbreviation
 @dirrm share/apps/kile/complete
 @dirrm share/apps/kile
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/editors/kile/pkg-plist b/editors/kile/pkg-plist
index 09be5eaca031..d904845f00a8 100644
--- a/editors/kile/pkg-plist
+++ b/editors/kile/pkg-plist
@@ -693,46 +693,46 @@ share/locale/sr@Latn/LC_MESSAGES/kile.mo
 share/locale/sv/LC_MESSAGES/kile.mo
 share/locale/ta/LC_MESSAGES/kile.mo
 share/mimelnk/text/x-kilepr.desktop
-@unexec rmdir %D/share/mimelnk/text 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/text
+@dirrmtry share/mimelnk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/sv/kile
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
 @dirrm share/doc/HTML/pt/kile
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
 @dirrm share/doc/HTML/nl/kile
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
 @dirrm share/doc/HTML/it/kile
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
 @dirrm share/doc/HTML/et/kile
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
 @dirrm share/doc/HTML/en/kile
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
 @dirrm share/doc/HTML/da/kile
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/kile/test
 @dirrm share/apps/kile/templates
 @dirrm share/apps/kile/pics
@@ -754,7 +754,7 @@ share/mimelnk/text/x-kilepr.desktop
 @dirrm share/apps/kile/complete/abbreviation
 @dirrm share/apps/kile/complete
 @dirrm share/apps/kile
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/editors/kxmleditor/pkg-plist b/editors/kxmleditor/pkg-plist
index b07329f441a2..4b195e888e22 100644
--- a/editors/kxmleditor/pkg-plist
+++ b/editors/kxmleditor/pkg-plist
@@ -102,21 +102,21 @@ share/locale/de/LC_MESSAGES/kxmleditor.mo
 share/locale/fr/LC_MESSAGES/kxmleditor.mo
 share/locale/pl/LC_MESSAGES/kxmleditor.mo
 share/services/kxmleditorpart.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kxmleditor
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/kxmleditor/pics
 @dirrm share/apps/kxmleditor/icons/locolor/16x16/actions
 @dirrm share/apps/kxmleditor/icons/locolor/16x16
@@ -130,6 +130,6 @@ share/services/kxmleditorpart.desktop
 @dirrm share/apps/kxmleditor/icons/hicolor
 @dirrm share/apps/kxmleditor/icons
 @dirrm share/apps/kxmleditor
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/editors/muggy/pkg-plist b/editors/muggy/pkg-plist
index df04fb7dcc08..2af2385b300c 100644
--- a/editors/muggy/pkg-plist
+++ b/editors/muggy/pkg-plist
@@ -36,4 +36,4 @@ bin/Muggy.app
 @dirrm JDE/Muggy/modules/Undo.m
 @dirrm JDE/Muggy/modules
 @dirrm JDE/Muggy
-@unexec rmdir %D/JDE 2>/dev/null || true
+@dirrmtry JDE
diff --git a/editors/mule-common/pkg-plist b/editors/mule-common/pkg-plist
index cda279ccc366..ce480d06758f 100644
--- a/editors/mule-common/pkg-plist
+++ b/editors/mule-common/pkg-plist
@@ -12,8 +12,8 @@ bin/rcs-checkin
 @exec if [ ! -d %d/share/mule/%%EMACS_VERSION%%/site-lisp ]; then mkdir -p %D/share/mule/%%EMACS_VERSION%%/site-lisp; fi
 @comment these two can fail if other ports are installed, no need to
 @comment scare user in that case
-@unexec rmdir %D/share/mule/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/mule/%%EMACS_VERSION%%/site-lisp 2>/dev/null || true
+@dirrmtry share/mule/site-lisp
+@dirrmtry share/mule/%%EMACS_VERSION%%/site-lisp
 @unexec install-info --delete %D/info/emacs %D/info/dir
 @unexec install-info --delete %D/info/vip %D/info/dir
 @unexec install-info --delete %D/info/viper %D/info/dir
@@ -152,7 +152,7 @@ info/terminology
 @exec install-info --section="The Emacs editor and associated tools" --entry="* Canna-jp: (canna-jp).			Another Japanese Inputting Method. (Japanese)" %D/info/canna-jp %D/info/dir
 @comment
 @exec [ -f %D/share/mule/%%EMACS_VERSION%%/info/dir ] || mkdir -p %D/share/mule/%%EMACS_VERSION%%/info
-@unexec rmdir %D/share/mule/%%EMACS_VERSION%%/info 2>/dev/null || true
+@dirrmtry share/mule/%%EMACS_VERSION%%/info
 libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/cvtmail
 libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/digest-doc
 libexec/mule/%%EMACS_VERSION%%/%%EMACS_ARCH%%/emacsserver
diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist
index a62b174570de..dc95d06168d1 100644
--- a/editors/poedit/pkg-plist
+++ b/editors/poedit/pkg-plist
@@ -62,23 +62,23 @@ share/locale/zh_TW/LC_MESSAGES/poedit.mo
 %%DATADIR%%/help.zip
 %%DATADIR%%/resources.zip
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/tt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tt 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv_SE 2> /dev/null || true
-@unexec rmdir %D/share/locale/sq_AL/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sq_AL 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
-@unexec rmdir %D/share/locale/fur/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fur 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_PR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_PR 2> /dev/null || true
-@unexec rmdir %D/share/locale/ast/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ast 2> /dev/null || true
-@unexec rmdir %D/share/locale/am_ET/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/am_ET 2> /dev/null || true
-@unexec rmdir %D/share/locale/af_ZA/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/af_ZA 2> /dev/null || true
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/sv_SE/LC_MESSAGES
+@dirrmtry share/locale/sv_SE
+@dirrmtry share/locale/sq_AL/LC_MESSAGES
+@dirrmtry share/locale/sq_AL
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/es_PR/LC_MESSAGES
+@dirrmtry share/locale/es_PR
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/am_ET/LC_MESSAGES
+@dirrmtry share/locale/am_ET
+@dirrmtry share/locale/af_ZA/LC_MESSAGES
+@dirrmtry share/locale/af_ZA
diff --git a/editors/rox-edit/pkg-plist b/editors/rox-edit/pkg-plist
index 0d026d10071c..244c2e961c12 100644
--- a/editors/rox-edit/pkg-plist
+++ b/editors/rox-edit/pkg-plist
@@ -55,4 +55,4 @@ apps/Edit/tests/testreplace.pyo
 @dirrm apps/Edit/Messages
 @dirrm apps/Edit/Help
 @dirrm apps/Edit
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index c1bba09bb5bc..366c0cf737f6 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -1,30 +1,30 @@
 @exec mkdir -p %D/lib/xemacs/site-packages/etc
-@unexec rmdir %D/lib/xemacs/site-packages/etc 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/etc
 @exec mkdir -p %D/lib/xemacs/site-packages/info
-@unexec rmdir %D/lib/xemacs/site-packages/info 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/info
 @exec mkdir -p %D/lib/xemacs/site-packages/man
-@unexec rmdir %D/lib/xemacs/site-packages/man 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/man
 @exec mkdir -p %D/lib/xemacs/site-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/site-packages/pkginfo 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/site-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/pkginfo
+@dirrmtry lib/xemacs/site-packages
 @exec mkdir -p %D/lib/xemacs/mule-packages/etc
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/etc
 @exec mkdir -p %D/lib/xemacs/mule-packages/info
-@unexec rmdir %D/lib/xemacs/mule-packages/info 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/info
 @exec mkdir -p %D/lib/xemacs/mule-packages/man
-@unexec rmdir %D/lib/xemacs/mule-packages/man 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/man
 @exec mkdir -p %D/lib/xemacs/mule-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/mule-packages/pkginfo 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/pkginfo
+@dirrmtry lib/xemacs/mule-packages
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/etc
-@unexec rmdir %D/lib/xemacs/xemacs-packages/etc 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/etc
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/info
-@unexec rmdir %D/lib/xemacs/xemacs-packages/info 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/info
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/man
-@unexec rmdir %D/lib/xemacs/xemacs-packages/man 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/man
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/xemacs-packages/pkginfo 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/pkginfo
+@dirrmtry lib/xemacs/xemacs-packages
 @exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
 bin/b2m
 bin/ctags
@@ -1497,4 +1497,4 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
-@unexec rmdir %D/lib/xemacs-%%XEMACS_VER%% 2>/dev/null || true
+@dirrmtry lib/xemacs-%%XEMACS_VER%%
diff --git a/editors/xemacs-devel/pkg-plist b/editors/xemacs-devel/pkg-plist
index 48ddff0b19fc..fcee3dfbeea5 100644
--- a/editors/xemacs-devel/pkg-plist
+++ b/editors/xemacs-devel/pkg-plist
@@ -1414,6 +1414,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
 @dirrm lib/xemacs-%%XEMACS_VER%%
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/site-modules 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs/site-modules
+@dirrmtry lib/xemacs
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 8994c791ff93..5e9c8c1fad86 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -1262,5 +1262,5 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
 @dirrm lib/xemacs-%%XEMACS_VER%%
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs
diff --git a/editors/xemacs21-mule/pkg-plist b/editors/xemacs21-mule/pkg-plist
index e8a8c722db01..1460fc627d30 100644
--- a/editors/xemacs21-mule/pkg-plist
+++ b/editors/xemacs21-mule/pkg-plist
@@ -1,30 +1,30 @@
 @exec mkdir -p %D/lib/xemacs/site-packages/etc
-@unexec rmdir %D/lib/xemacs/site-packages/etc 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/etc
 @exec mkdir -p %D/lib/xemacs/site-packages/info
-@unexec rmdir %D/lib/xemacs/site-packages/info 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/info
 @exec mkdir -p %D/lib/xemacs/site-packages/man
-@unexec rmdir %D/lib/xemacs/site-packages/man 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/man
 @exec mkdir -p %D/lib/xemacs/site-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/site-packages/pkginfo 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/site-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/site-packages/pkginfo
+@dirrmtry lib/xemacs/site-packages
 @exec mkdir -p %D/lib/xemacs/mule-packages/etc
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/etc
 @exec mkdir -p %D/lib/xemacs/mule-packages/info
-@unexec rmdir %D/lib/xemacs/mule-packages/info 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/info
 @exec mkdir -p %D/lib/xemacs/mule-packages/man
-@unexec rmdir %D/lib/xemacs/mule-packages/man 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/man
 @exec mkdir -p %D/lib/xemacs/mule-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/mule-packages/pkginfo 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/pkginfo
+@dirrmtry lib/xemacs/mule-packages
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/etc
-@unexec rmdir %D/lib/xemacs/xemacs-packages/etc 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/etc
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/info
-@unexec rmdir %D/lib/xemacs/xemacs-packages/info 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/info
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/man
-@unexec rmdir %D/lib/xemacs/xemacs-packages/man 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/man
 @exec mkdir -p %D/lib/xemacs/xemacs-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/xemacs-packages/pkginfo 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/xemacs-packages/pkginfo
+@dirrmtry lib/xemacs/xemacs-packages
 @exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock
 bin/b2m
 bin/ctags
@@ -1301,7 +1301,7 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include
-@unexec rmdir %D/lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules 2>/dev/null || true
+@dirrmtry lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/toolbar
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/tests/external-widget
@@ -1313,4 +1313,4 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom/example-themes
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc/custom
 @dirrm lib/xemacs-%%XEMACS_VER%%/etc
-@unexec rmdir %D/lib/xemacs-%%XEMACS_VER%% 2>/dev/null || true
+@dirrmtry lib/xemacs-%%XEMACS_VER%%