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

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

6 files changed, 13 insertions, 13 deletions

diff --git a/ports-mgmt/jailaudit/pkg-plist b/ports-mgmt/jailaudit/pkg-plist
index 447a2b0a3746..43a7a083dd0d 100644
--- a/ports-mgmt/jailaudit/pkg-plist
+++ b/ports-mgmt/jailaudit/pkg-plist
@@ -1,11 +1,11 @@
 bin/jailaudit
 etc/jailaudit.conf.sample
 %%PERIODICDIR%%/security/410.jailaudit
-@unexec rmdir %D/%%PERIODICDIR%%/security 2>/dev/null || true
-@unexec rmdir %D/%%PERIODICDIR%% 2>/dev/null || true
+@dirrmtry %%PERIODICDIR%%/security
+@dirrmtry %%PERIODICDIR%%
 @exec mkdir -p %D/%%REPORTDIR%%
-@unexec rmdir %D/%%REPORTDIR%% 2>/dev/null || true
+@dirrmtry %%REPORTDIR%%
 @exec mkdir -p %D/%%TMPDIR%%
-@unexec rmdir %D/%%TMPDIR%% 2>/dev/null || true
+@dirrmtry %%TMPDIR%%
 @unexec rmdir %DPDIR%% 2>/dev/null || true
-@unexec rmdir %D/jailaudit 2>/dev/null || true
+@dirrmtry jailaudit
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
index 3e2d25069968..49c2158a11ab 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
@@ -11,5 +11,5 @@ etc/portindex.cfg.sample
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex/.packlist
 @dirrm %%SITE_PERL%%/FreeBSD/Portindex
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex
-@unexec rmdir %D/%%SITE_PERL%%/FreeBSD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/FreeBSD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/ports-mgmt/portaudit/pkg-plist b/ports-mgmt/portaudit/pkg-plist
index 84b4ccaaf52e..8edf7bb6dbc8 100644
--- a/ports-mgmt/portaudit/pkg-plist
+++ b/ports-mgmt/portaudit/pkg-plist
@@ -1,7 +1,7 @@
 sbin/portaudit
 etc/portaudit.conf.sample
 %%PERIODICDIR%%/security/410.portaudit
-@unexec rmdir %D/%%PERIODICDIR%%/security 2>/dev/null || true
-@unexec rmdir %D/%%PERIODICDIR%% 2>/dev/null || true
+@dirrmtry %%PERIODICDIR%%/security
+@dirrmtry %%PERIODICDIR%%
 @exec mkdir -p %%DATABASEDIR%%
 @unexec rmdir %%DATABASEDIR%% 2>/dev/null || true
diff --git a/ports-mgmt/portmanager/pkg-plist b/ports-mgmt/portmanager/pkg-plist
index a59e63569925..dac7ae1fd888 100644
--- a/ports-mgmt/portmanager/pkg-plist
+++ b/ports-mgmt/portmanager/pkg-plist
@@ -24,5 +24,5 @@ lib/libMG.so
 lib/libMG.so.2
 lib/libMGPM.so
 lib/libMGPM.so.1
-@unexec rmdir %D/etc/portmanager 2>/dev/null || true
-@unexec rmdir %D/share/portmanager 2>/dev/null || true
+@dirrmtry etc/portmanager
+@dirrmtry share/portmanager
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 03dffce2b2fa..3892dddc2c3d 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -30,7 +30,7 @@ etc/pkgtools.conf.sample
 etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
 @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
-@unexec rmdir %D/share/zsh 2>/dev/null || true
+@dirrmtry share/zsh
 %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
 %%PORTDOCS%%@dirrm share/examples/pkgtools/bash
 %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 03dffce2b2fa..3892dddc2c3d 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -30,7 +30,7 @@ etc/pkgtools.conf.sample
 etc/pkgtools.status-pkg.sh
 share/zsh/site-functions/_pkgtools
 @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
-@unexec rmdir %D/share/zsh 2>/dev/null || true
+@dirrmtry share/zsh
 %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
 %%PORTDOCS%%@dirrm share/examples/pkgtools/bash
 %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample