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

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

7 files changed, 10 insertions, 10 deletions

diff --git a/security/courier-authlib/pkg-plist-base b/security/courier-authlib/pkg-plist-base
index 3a3b3f9e7bf2..b6e8a39df5da 100644
--- a/security/courier-authlib/pkg-plist-base
+++ b/security/courier-authlib/pkg-plist-base
@@ -43,6 +43,6 @@ sbin/courierlogger
 %%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rm -rf %%AUTHDAEMONVAR%% 2>/dev/null || true
-@unexec rmdir %D/etc/authlib 2>/dev/null || true
+@dirrmtry etc/authlib
 @dirrm libexec/courier-authlib
 @dirrm lib/courier-authlib
diff --git a/security/courier-authlib/pkg-plist-ldap b/security/courier-authlib/pkg-plist-ldap
index 9cad26f3545f..45a091162a3c 100644
--- a/security/courier-authlib/pkg-plist-ldap
+++ b/security/courier-authlib/pkg-plist-ldap
@@ -7,5 +7,5 @@ etc/openldap/schema/authldap.schema.default
 lib/courier-authlib/libauthldap.so
 lib/courier-authlib/libauthldap.so.0
 %%PORTDOCS%%%%DOCSDIR%%/README.ldap
-@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
+@dirrmtry etc/openldap/schema
+@dirrmtry etc/openldap
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index ccc72efe59ad..a5bd8d19782c 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -14,9 +14,9 @@ lib/libpreludedb.so
 lib/libpreludedb.a
 lib/libpreludedb/plugins/formats/classic.so
 %%WITH_MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
-%%WITH_MYSQL%%@unexec rmdir %D/lib/libpreludedb/plugins/sql 2> /dev/null || true
+%%WITH_MYSQL%%@dirrmtry lib/libpreludedb/plugins/sql
 %%WITH_PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
-%%WITH_PGSQL%%@unexec rmdir %D/lib/libpreludedb/plugins/sql 2> /dev/null || true
+%%WITH_PGSQL%%@dirrmtry lib/libpreludedb/plugins/sql
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeDB.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.bs
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 7835f9b3a5f0..fae910f8be1e 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -44,8 +44,8 @@ pre-install:
 	${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
 .for i in cs de el es_AR pl
 	${ECHO_CMD} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
-	${ECHO_CMD} @unexec rmdir %D/share/locale/${i}/LC_MESSAGES '2>/dev/null | true' >> ${PLIST}
-	${ECHO_CMD} @unexec rmdir %D/share/locale/${i} '2>/dev/null | true' >> ${PLIST}
+	${ECHO_CMD} @dirrmtry share/locale/${i}/LC_MESSAGES >> ${PLIST}
+	${ECHO_CMD} @dirrmtry share/locale/${i} >> ${PLIST}
 .endfor
 .if !defined(NOPORTDOCS)
 	${ECHO_CMD} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
diff --git a/security/nmap/pkg-plist.fe b/security/nmap/pkg-plist.fe
index 5f9a0cc1b98c..9f6f1f4aea16 100644
--- a/security/nmap/pkg-plist.fe
+++ b/security/nmap/pkg-plist.fe
@@ -2,5 +2,5 @@ bin/nmapfe
 bin/xnmap
 @cwd %%X11BASE%%
 share/applications/nmapfe.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
 @cwd %%REALPREFIX%%
diff --git a/security/poly1305aes/pkg-plist b/security/poly1305aes/pkg-plist
index a7a0dd799678..9fda8377ffa3 100644
--- a/security/poly1305aes/pkg-plist
+++ b/security/poly1305aes/pkg-plist
@@ -30,4 +30,4 @@ include/poly1305/poly1305aes_ppro.h
 include/poly1305/poly1305aes_sparc.h
 lib/cpucycles.a
 lib/poly1305aes.a
-@unexec rmdir %D/include/poly1305 || true
+@dirrmtry include/poly1305
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index 963638407a46..f72fbb211388 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -36,5 +36,5 @@ share/xca/xca-8.html
 share/xca/xca-9.html
 share/xca/xca.html
 @dirrm share/xca
-@unexec rmdir %D/share/pixmaps || true
+@dirrmtry share/pixmaps
 @dirrmtry share/applications