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

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

14 files changed, 49 insertions, 49 deletions

diff --git a/comms/cutecom/pkg-plist b/comms/cutecom/pkg-plist
index 9136a93faa07..407465d61313 100644
--- a/comms/cutecom/pkg-plist
+++ b/comms/cutecom/pkg-plist
@@ -1,4 +1,4 @@
 bin/cutecom
 share/applnk/Utilities/cutecom.desktop
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/comms/efax-gtk/pkg-plist b/comms/efax-gtk/pkg-plist
index c39c8ad735fe..d8cfc3c63f41 100644
--- a/comms/efax-gtk/pkg-plist
+++ b/comms/efax-gtk/pkg-plist
@@ -3,4 +3,4 @@ bin/efax-0.9a
 bin/efix-0.9a
 etc/efax-gtkrc
 share/applications/efax-gtk.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index 1759f68572fa..17b56f3a5ab1 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -38,4 +38,4 @@ share/gscmxx/i18n/italian
 @dirrm share/gscmxx
 @dirrm share/pixmaps/gscmxx/groups
 @dirrm share/pixmaps/gscmxx
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
diff --git a/comms/kallers/pkg-plist b/comms/kallers/pkg-plist
index 3ddeaee74416..d94741570fea 100644
--- a/comms/kallers/pkg-plist
+++ b/comms/kallers/pkg-plist
@@ -8,16 +8,16 @@ share/autostart/kallers.desktop
 share/icons/hicolor/16x16/apps/kallers.png
 share/icons/hicolor/32x32/apps/kallers.png
 share/icons/hicolor/48x48/apps/kallers.png
-@unexec rmdir %D/share/applnk/Toys 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Toys
+@dirrmtry share/applnk
 @dirrm share/apps/kallers/sound
 @dirrm share/apps/kallers/pics
 @dirrm share/apps/kallers
-@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/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 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/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
diff --git a/comms/klog/pkg-plist b/comms/klog/pkg-plist
index 1e3107c8c789..dca169860a94 100644
--- a/comms/klog/pkg-plist
+++ b/comms/klog/pkg-plist
@@ -6,9 +6,9 @@ share/doc/HTML/en/klog/index.docbook
 share/icons/locolor/16x16/apps/klog.png
 share/icons/locolor/32x32/apps/klog.png
 @dirrm share/doc/HTML/en/klog
-@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/applnk/Applications 2>/dev/null || true
+@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/applnk/Applications
diff --git a/comms/libticables/pkg-plist b/comms/libticables/pkg-plist
index 14b9fd88f771..3e44992262a5 100644
--- a/comms/libticables/pkg-plist
+++ b/comms/libticables/pkg-plist
@@ -10,4 +10,4 @@ lib/libticables.so
 lib/libticables.so.12
 libdata/pkgconfig/ticables.pc
 share/locale/fr/LC_MESSAGES/libticables.mo
-@unexec rmdir %D/include/tilp 2>/dev/null || true
+@dirrmtry include/tilp
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 126d1ebf9ddc..8a0642bf5157 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -93,7 +93,7 @@ sbin/faxrunqd
 sbin/mgetty
 sbin/sendfax
 sbin/vgetty
-@unexec rmdir %D/etc/mgetty+sendfax 2>/dev/null || true
+@dirrmtry etc/mgetty+sendfax
 @dirrm lib/mgetty+sendfax/samples/new_fax.all
 @dirrm lib/mgetty+sendfax/samples
 @dirrm lib/mgetty+sendfax
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index 112f079e1866..066b4c81d9e6 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -13,7 +13,7 @@ etc/minicom/minicom.users
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/minicom.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/minicom.mo
 @exec /usr/sbin/chown uucp %D/etc/minicom
-@unexec rmdir %D/etc/minicom 2>/dev/null || true
+@dirrmtry etc/minicom
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/comms/p5-Device-Modem/pkg-plist b/comms/p5-Device-Modem/pkg-plist
index a2aa75ce1887..0c09f6e5866a 100644
--- a/comms/p5-Device-Modem/pkg-plist
+++ b/comms/p5-Device-Modem/pkg-plist
@@ -8,8 +8,8 @@
 @dirrm %%SITE_PERL%%/Device/Modem/Protocol
 @dirrm %%SITE_PERL%%/Device/Modem
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Device 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
+@dirrmtry %%SITE_PERL%%/Device
 %%PORTDOCS%%%%EXAMPLESDIR%%/xmodem.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/shell.pl
 %%PORTDOCS%%%%EXAMPLESDIR%%/dial.pl
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 5d10e873f573..b1980725db19 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -3,6 +3,6 @@ bin/modemtest
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Device 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device
diff --git a/comms/p5-Fax-Hylafax-Client/pkg-plist b/comms/p5-Fax-Hylafax-Client/pkg-plist
index 2d68dc813754..1caa6f69129d 100644
--- a/comms/p5-Fax-Hylafax-Client/pkg-plist
+++ b/comms/p5-Fax-Hylafax-Client/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Fax/Hylafax/Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Fax/Hylafax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Fax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Fax/Hylafax
+@dirrmtry %%SITE_PERL%%/Fax
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax
diff --git a/comms/scmxx/pkg-plist b/comms/scmxx/pkg-plist
index 65ff96465e53..d72e0391ebab 100644
--- a/comms/scmxx/pkg-plist
+++ b/comms/scmxx/pkg-plist
@@ -14,11 +14,11 @@ share/locale/ru/LC_MESSAGES/scmxx.mo
 %%EXAMPLESDIR%%/vCalendar.vcs
 %%EXAMPLESDIR%%/vCard.vcf
 @dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de/ 2>/dev/null || true
-@unexec rmdir %D/man/ru/man1 2>/dev/null || true
-@unexec rmdir %D/man/ru/ 2>/dev/null || true
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry man/de/man1
+@dirrmtry man/de/
+@dirrmtry man/ru/man1
+@dirrmtry man/ru/
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index f97805bc18a0..c30405b2b688 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -61,10 +61,10 @@ share/pixmaps/xlog/xlog.xpm
 @dirrm share/pixmaps/xlog
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec rmdir %D/share/applications 2> /dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2> /dev/null || true
-@unexec rmdir %D/share/applnk 2> /dev/null || true
-@unexec rmdir %D/share/application-registry 2> /dev/null || true
-@unexec rmdir %D/share/mimelnk/text 2> /dev/null || true
-@unexec rmdir %D/share/mimelnk 2> /dev/null || true
-@unexec rmdir %D/share/mime-info 2> /dev/null || true
+@dirrmtry share/applications
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
+@dirrmtry share/application-registry
+@dirrmtry share/mimelnk/text
+@dirrmtry share/mimelnk
+@dirrmtry share/mime-info
diff --git a/comms/yaps/pkg-plist b/comms/yaps/pkg-plist
index 6001c95c32ae..a40dc38be2c4 100644
--- a/comms/yaps/pkg-plist
+++ b/comms/yaps/pkg-plist
@@ -4,4 +4,4 @@ etc/yaps.rc.sample
 %%PORTDOCS%%%%DOCSDIR%%/yaps.doc
 %%PORTDOCS%%%%DOCSDIR%%/yaps.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/yaps 2>/dev/null || true
+@dirrmtry share/yaps