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

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

12 files changed, 31 insertions, 31 deletions

diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist
index d4a3f148f280..d8f992bcf5c3 100644
--- a/news/inn-current/pkg-plist
+++ b/news/inn-current/pkg-plist
@@ -227,7 +227,7 @@ news/lib/libstorage.a
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/news/tmp 2>/dev/null || true
+@dirrmtry news/tmp
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing
 @dirrm news/spool/innfeed
@@ -241,7 +241,7 @@ news/lib/libstorage.a
 @dirrm news/lib
 @dirrm news/include/inn
 @dirrm news/include
-@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true
+@dirrmtry %%ETCDIR%%
 @dirrm news/doc
 @dirrm news/db
 @dirrm news/bin/rnews.libexec
diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist
index c0e5eeac4caf..441dde381bb5 100644
--- a/news/inn-stable/pkg-plist
+++ b/news/inn-stable/pkg-plist
@@ -249,7 +249,7 @@ news/lib/libstorage.a
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/news/tmp 2>/dev/null || true
+@dirrmtry news/tmp
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing
 @dirrm news/spool/innfeed
@@ -263,9 +263,9 @@ news/lib/libstorage.a
 @dirrm news/lib
 @dirrm news/include/inn
 @dirrm news/include
-@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true
+@dirrmtry %%ETCDIR%%
 @dirrm news/doc
-@unexec rmdir %D/news/db 2>/dev/null || true
+@dirrmtry news/db
 @dirrm news/bin/rnews.libexec
 @dirrm news/bin/filter
 @dirrm news/bin/control
diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist
index 38345dc582f3..7e1f117a9be5 100644
--- a/news/inn/pkg-plist
+++ b/news/inn/pkg-plist
@@ -248,7 +248,7 @@ news/lib/libstorage.a
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/news/tmp 2>/dev/null || true
+@dirrmtry news/tmp
 @dirrm news/spool/overview
 @dirrm news/spool/outgoing
 @dirrm news/spool/innfeed
@@ -262,9 +262,9 @@ news/lib/libstorage.a
 @dirrm news/lib
 @dirrm news/include/inn
 @dirrm news/include
-@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true
+@dirrmtry %%ETCDIR%%
 @dirrm news/doc
-@unexec rmdir %D/news/db 2>/dev/null || true
+@dirrmtry news/db
 @dirrm news/bin/rnews.libexec
 @dirrm news/bin/filter
 @dirrm news/bin/control
diff --git a/news/newsx/pkg-plist b/news/newsx/pkg-plist
index d5bc44736a1c..eb7453bb0833 100644
--- a/news/newsx/pkg-plist
+++ b/news/newsx/pkg-plist
@@ -10,5 +10,5 @@ bin/newsq
 %%PORTDOCS%%share/doc/newsx/TODO
 %%PORTDOCS%%@dirrm share/doc/newsx
 @dirrm news/spool/inhosts
-@unexec rmdir %D/news/spool 2> /dev/null || true
-@unexec rmdir %D/news 2> /dev/null || true
+@dirrmtry news/spool
+@dirrmtry news
diff --git a/news/p5-Gateway/pkg-plist b/news/p5-Gateway/pkg-plist
index 31f45353e237..bb8b15d85c12 100644
--- a/news/p5-Gateway/pkg-plist
+++ b/news/p5-Gateway/pkg-plist
@@ -1,6 +1,6 @@
 %%SITE_PERL%%/News/Gateway.pm
 %%SITE_PERL%%/News/Gateway.pod
-@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/News
 %%SITE_PERL%%/auto/News/Gateway/anykeyword.al
 %%SITE_PERL%%/auto/News/Gateway/bodyheaders.al
 %%SITE_PERL%%/auto/News/Gateway/cleanbody.al
@@ -20,8 +20,8 @@
 %%SITE_PERL%%/auto/News/Gateway/post.al
 %%SITE_PERL%%/auto/News/Gateway/previoushop.al
 %%SITE_PERL%%/auto/News/Gateway/whitelist.al
-@unexec rmdir %D/%%SITE_PERL%%/auto/News/Gateway 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/News 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/News/Gateway
+@dirrmtry %%SITE_PERL%%/auto/News
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway
 share/examples/Gateway/listgate
diff --git a/news/p5-NNTPClient/pkg-plist b/news/p5-NNTPClient/pkg-plist
index 30f5bb0f3c8b..7c51cdb6f8b5 100644
--- a/news/p5-NNTPClient/pkg-plist
+++ b/news/p5-NNTPClient/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/News/NNTPClient.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
+@dirrmtry %%SITE_PERL%%/News
diff --git a/news/p5-News-Article-NoCeM/pkg-plist b/news/p5-News-Article-NoCeM/pkg-plist
index 28a6afd0216b..8932268129fa 100644
--- a/news/p5-News-Article-NoCeM/pkg-plist
+++ b/news/p5-News-Article-NoCeM/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/News/Article/NoCeM.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/NoCeM/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/NoCeM
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/News/Article 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article
+@dirrmtry %%SITE_PERL%%/News/Article
diff --git a/news/p5-News-Article/pkg-plist b/news/p5-News-Article/pkg-plist
index 6825491b9154..e5b4a8b1c6b8 100644
--- a/news/p5-News-Article/pkg-plist
+++ b/news/p5-News-Article/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/News/FormReply.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
+@dirrmtry %%SITE_PERL%%/News
diff --git a/news/p5-News-Newsrc/pkg-plist b/news/p5-News-Newsrc/pkg-plist
index 2366b1d0c678..6e94f91b2c6c 100644
--- a/news/p5-News-Newsrc/pkg-plist
+++ b/news/p5-News-Newsrc/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/News/Newsrc.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News
+@dirrmtry %%SITE_PERL%%/News
diff --git a/news/p5-NewsLib/pkg-plist b/news/p5-NewsLib/pkg-plist
index 837a0eb6dd8e..aa51f1a854c2 100644
--- a/news/p5-NewsLib/pkg-plist
+++ b/news/p5-NewsLib/pkg-plist
@@ -8,6 +8,6 @@
 %%SITE_PERL%%/Net/NNTP/Proxy.pm
 %%SITE_PERL%%/Net/NNTP/Client.pm
 %%SITE_PERL%%/Net/NNTP/Functions.pm
-@unexec rmdir %D/%%SITE_PERL%%/News/Article 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/News/Article
 @dirrm %%SITE_PERL%%/Net/NNTP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NewsLib
diff --git a/news/p5-POE-Component-Client-NNTP/pkg-plist b/news/p5-POE-Component-Client-NNTP/pkg-plist
index 3fe2b976abcb..b43623a49c17 100644
--- a/news/p5-POE-Component-Client-NNTP/pkg-plist
+++ b/news/p5-POE-Component-Client-NNTP/pkg-plist
@@ -1,9 +1,9 @@
 %%SITE_PERL%%/POE/Component/Client/NNTP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/NNTP/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/NNTP
-@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/news/slurp/pkg-plist b/news/slurp/pkg-plist
index 9094f01cd881..b3d771012ab8 100644
--- a/news/slurp/pkg-plist
+++ b/news/slurp/pkg-plist
@@ -1,5 +1,5 @@
 news/bin/slurp
 news/lib/slurp.sys.sample
-@unexec rmdir %D/news/lib 2> /dev/null || true
-@unexec rmdir %D/news/bin 2> /dev/null || true
-@unexec rmdir %D/news 2> /dev/null || true
+@dirrmtry news/lib
+@dirrmtry news/bin
+@dirrmtry news