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

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

11 files changed, 79 insertions, 79 deletions

diff --git a/ftp/gollem/pkg-plist b/ftp/gollem/pkg-plist
index 33866e40f888..bcd72a9c673e 100644
--- a/ftp/gollem/pkg-plist
+++ b/ftp/gollem/pkg-plist
@@ -160,5 +160,5 @@
 @dirrm %%GOLLEMDIR%%/lib/Auth
 @dirrm %%GOLLEMDIR%%/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/%%GOLLEMDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%GOLLEMDIR%% 2>/dev/null || true
+@dirrmtry %%GOLLEMDIR%%/config
+@dirrmtry %%GOLLEMDIR%%
diff --git a/ftp/horde-gollem/pkg-plist b/ftp/horde-gollem/pkg-plist
index 33866e40f888..bcd72a9c673e 100644
--- a/ftp/horde-gollem/pkg-plist
+++ b/ftp/horde-gollem/pkg-plist
@@ -160,5 +160,5 @@
 @dirrm %%GOLLEMDIR%%/lib/Auth
 @dirrm %%GOLLEMDIR%%/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/%%GOLLEMDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%GOLLEMDIR%% 2>/dev/null || true
+@dirrmtry %%GOLLEMDIR%%/config
+@dirrmtry %%GOLLEMDIR%%
diff --git a/ftp/kasablanca/pkg-plist b/ftp/kasablanca/pkg-plist
index 085768712569..ef283cb4cf28 100644
--- a/ftp/kasablanca/pkg-plist
+++ b/ftp/kasablanca/pkg-plist
@@ -14,25 +14,25 @@ share/icons/hicolor/48x48/apps/kasablanca.png
 share/icons/hicolor/64x64/apps/kasablanca.png
 share/locale/de/LC_MESSAGES/kasablanca.mo
 share/locale/pl/LC_MESSAGES/kasablanca.mo
-@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/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/en/kasablanca
-@unexec rmdir %D/share/doc/HTML/en 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/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
 @dirrm share/apps/kasablanca
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/ftp/kbear/pkg-plist b/ftp/kbear/pkg-plist
index 5da90173986d..9500dd5b2704 100644
--- a/ftp/kbear/pkg-plist
+++ b/ftp/kbear/pkg-plist
@@ -210,13 +210,13 @@ share/servicetypes/kbearsiteimportfilterplugin.desktop
 @dirrm share/apps/kbear/icons
 @dirrm share/apps/kbear
 @dirrm include/kbear
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
+@dirrmtry share/doc/HTML/fr
+@dirrmtry share/doc/HTML/es
+@dirrmtry share/doc/HTML/cs
+@dirrmtry share/locale/ro
+@dirrmtry share/applnk/Internet
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/48x48
diff --git a/ftp/kftpgrabber/pkg-plist b/ftp/kftpgrabber/pkg-plist
index 2264cbd8aa71..4a8166f0f9be 100644
--- a/ftp/kftpgrabber/pkg-plist
+++ b/ftp/kftpgrabber/pkg-plist
@@ -29,28 +29,28 @@ share/locale/zh_CN/LC_MESSAGES/kftpgrabber.mo
 share/services/kftpimportplugin_gftp.desktop
 share/services/kftpimportplugin_ncftp.desktop
 share/servicetypes/kftpbookmarkimportplugin.desktop
-@unexec rmdir %D/share/servicetypes 2>/dev/null || true
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/servicetypes
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@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
+@dirrmtry share/icons
 @dirrm share/apps/kftpgrabber
-@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
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
 @dirrm include/kftpgrabber
diff --git a/ftp/kwebget/pkg-plist b/ftp/kwebget/pkg-plist
index cf024c23f466..fd6e34c539e4 100644
--- a/ftp/kwebget/pkg-plist
+++ b/ftp/kwebget/pkg-plist
@@ -5,13 +5,13 @@ share/doc/HTML/en/kwebget/index.cache.bz2
 share/doc/HTML/en/kwebget/index.docbook
 share/icons/locolor/16x16/apps/kwebget.png
 share/icons/locolor/32x32/apps/kwebget.png
-@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/32x32 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/icons/hicolor/32x32
 @dirrm share/doc/HTML/en/kwebget
-@unexec rmdir %D/share/doc/HTML/en 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/doc/HTML/en
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/ftp/p5-Net-FTP-Recursive/pkg-plist b/ftp/p5-Net-FTP-Recursive/pkg-plist
index 17e87ba7729f..702abdfddc1d 100644
--- a/ftp/p5-Net-FTP-Recursive/pkg-plist
+++ b/ftp/p5-Net-FTP-Recursive/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Net/FTP/Recursive.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Recursive/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP/Recursive
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTP
diff --git a/ftp/p5-Net-FTPServer/pkg-plist b/ftp/p5-Net-FTPServer/pkg-plist
index a47ef76144a5..fad675c84e69 100644
--- a/ftp/p5-Net-FTPServer/pkg-plist
+++ b/ftp/p5-Net-FTPServer/pkg-plist
@@ -40,11 +40,11 @@ sbin/ro-ftpd.pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/FTPServer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
 @dirrm %%SITE_PERL%%/Net/FTPServer/RO
 @dirrm %%SITE_PERL%%/Net/FTPServer/Proxy
 @dirrm %%SITE_PERL%%/Net/FTPServer/InMem
 @dirrm %%SITE_PERL%%/Net/FTPServer/Full
 @dirrm %%SITE_PERL%%/Net/FTPServer/DBeg1
 @dirrm %%SITE_PERL%%/Net/FTPServer
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-plist b/ftp/p5-POE-Component-Client-FTP/pkg-plist
index 8e75c937e0bb..599c0a5190d0 100644
--- a/ftp/p5-POE-Component-Client-FTP/pkg-plist
+++ b/ftp/p5-POE-Component-Client-FTP/pkg-plist
@@ -5,9 +5,9 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/sync.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/FTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/ftp/paraget/pkg-plist b/ftp/paraget/pkg-plist
index 8e5d5f1e5357..b09d0e5c78fa 100644
--- a/ftp/paraget/pkg-plist
+++ b/ftp/paraget/pkg-plist
@@ -18,5 +18,5 @@ bin/paraget-child
 %%SITE_PERL%%/Net/Paraget/ServerQueue.pm
 @dirrm %%SITE_PERL%%/Net/Paraget
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/paraget
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/ftp/pureadmin/pkg-plist b/ftp/pureadmin/pkg-plist
index 00a5cdf2b6f1..6ec54249712d 100644
--- a/ftp/pureadmin/pkg-plist
+++ b/ftp/pureadmin/pkg-plist
@@ -30,5 +30,5 @@ share/locale/it/LC_MESSAGES/pureadmin.mo
 share/locale/sv/LC_MESSAGES/pureadmin.mo
 @dirrm share/gnome/pureadmin/docs
 @dirrm share/gnome/pureadmin
-@unexec rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/24x24 2>/dev/null || true
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24