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

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

2 files changed, 154 insertions, 154 deletions

diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
index ba9995db51b..052e7ae60a6 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 1379ffb1f05..d24b9a54fae 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