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

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

7 files changed, 27 insertions, 27 deletions

diff --git a/russian/cyrproxy/pkg-plist b/russian/cyrproxy/pkg-plist
index 7f147b20d9e1..d81ceaef9225 100644
--- a/russian/cyrproxy/pkg-plist
+++ b/russian/cyrproxy/pkg-plist
@@ -23,4 +23,4 @@ libexec/tcpspy
 www/cgi-bin/cyrwww
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/russian/fortuneru/pkg-plist b/russian/fortuneru/pkg-plist
index dc988e50c80f..f7ea5ba843bc 100644
--- a/russian/fortuneru/pkg-plist
+++ b/russian/fortuneru/pkg-plist
@@ -32,5 +32,5 @@ share/games/fortune/rus/windows_errors.dat
 share/games/fortune/rus/pavlenka
 share/games/fortune/rus/pavlenka.dat
 @dirrm share/games/fortune/rus
-@unexec rmdir %D/share/games/fortune 2>/dev/null || true
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games/fortune
+@dirrmtry share/games
diff --git a/russian/ksocrat/pkg-plist b/russian/ksocrat/pkg-plist
index d83d402c6383..b1f163787424 100644
--- a/russian/ksocrat/pkg-plist
+++ b/russian/ksocrat/pkg-plist
@@ -10,18 +10,18 @@ share/apps/ksocrat/Arsenal_Commware_License_ENG.txt
 share/apps/ksocrat/Arsenal_Commware_License_RUS.txt
 share/apps/ksocrat/enru.dic
 share/apps/ksocrat/ruen.dic
-@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/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/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
 @dirrm share/apps/ksocrat
-@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/russian/messarge/pkg-plist b/russian/messarge/pkg-plist
index f1bc09dfe9e3..6274ae03e123 100644
--- a/russian/messarge/pkg-plist
+++ b/russian/messarge/pkg-plist
@@ -15,5 +15,5 @@ share/examples/messarge/s.shtml
 share/examples/messarge/t.shtml
 share/examples/messarge/write.shtml
 @dirrm share/examples/messarge
-@unexec rmdir %D/man/ru_RU.KOI8-R/man1 2> /dev/null || true
-@unexec rmdir %D/man/ru_RU.KOI8-R 2> /dev/null || true
+@dirrmtry man/ru_RU.KOI8-R/man1
+@dirrmtry man/ru_RU.KOI8-R
diff --git a/russian/p5-Lingua-RU-Charset/pkg-plist b/russian/p5-Lingua-RU-Charset/pkg-plist
index f91b2535e624..2c8d16043d2c 100644
--- a/russian/p5-Lingua-RU-Charset/pkg-plist
+++ b/russian/p5-Lingua-RU-Charset/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Lingua/RU/Charset.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/RU 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua/RU
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/russian/p5-XML-Parser-encodings/pkg-plist b/russian/p5-XML-Parser-encodings/pkg-plist
index 53fa70993e8e..2b5d3bfc40b7 100644
--- a/russian/p5-XML-Parser-encodings/pkg-plist
+++ b/russian/p5-XML-Parser-encodings/pkg-plist
@@ -3,6 +3,6 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc
 %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/russian/tac+ia/pkg-plist b/russian/tac+ia/pkg-plist
index fe0ce2c0f99b..e4252bbdf7bd 100644
--- a/russian/tac+ia/pkg-plist
+++ b/russian/tac+ia/pkg-plist
@@ -24,4 +24,4 @@ share/doc/tac_plus/users_guide
 @dirrm tac_plus/parrot
 @dirrm tac_plus
 @cwd /var/log
-@unexec rmdir %D/tac_plus 2>/dev/null || true
+@dirrmtry tac_plus