aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 03:01:03 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 03:01:03 +0000
commit508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
treef7810d4887e5297c7b7788225e906b99c81d709b /security
parent4008c7e23fe847e2c8ade0ecb5d86f943d84c917 (diff)
downloadports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.tar.gz
ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/amap/pkg-plist2
-rw-r--r--security/antivir-milter/pkg-plist2
-rw-r--r--security/audit/pkg-plist2
-rw-r--r--security/base/pkg-plist2
-rw-r--r--security/dazuko/pkg-plist2
-rw-r--r--security/doorman/pkg-plist2
-rw-r--r--security/f-prot-sig/pkg-plist2
-rw-r--r--security/f-prot/pkg-plist2
-rw-r--r--security/fakeroot/pkg-plist12
-rw-r--r--security/gnupg/pkg-plist44
-rw-r--r--security/gnupg1/pkg-plist44
-rw-r--r--security/gringotts/pkg-plist4
-rw-r--r--security/ipsec-tools/pkg-plist4
-rw-r--r--security/jailaudit/pkg-plist10
-rw-r--r--security/klamav/pkg-plist58
-rw-r--r--security/nessus-devel/pkg-plist14
-rw-r--r--security/nessus-libnasl/pkg-plist4
-rw-r--r--security/nessus/pkg-plist14
-rw-r--r--security/nmap/pkg-plist8
-rw-r--r--security/ocaml-cryptokit/pkg-plist4
-rw-r--r--security/opensc/pkg-plist2
-rw-r--r--security/openscep/pkg-plist2
-rw-r--r--security/p5-Authen-Captcha/pkg-plist4
-rw-r--r--security/p5-Authen-CyrusSASL/pkg-plist6
-rw-r--r--security/p5-Authen-Htpasswd/pkg-plist8
-rw-r--r--security/p5-Authen-PAM/pkg-plist4
-rw-r--r--security/p5-Authen-Radius/pkg-plist4
-rw-r--r--security/p5-Authen-SASL-Cyrus/pkg-plist10
-rw-r--r--security/p5-Authen-SASL/pkg-plist4
-rw-r--r--security/p5-Authen-Smb/pkg-plist4
-rw-r--r--security/p5-Authen-TacacsPlus/pkg-plist4
-rw-r--r--security/p5-Authen-Ticket/pkg-plist4
-rw-r--r--security/p5-Business-PayPal-EWP/pkg-plist8
-rw-r--r--security/p5-Crypt-Anubis/pkg-plist4
-rw-r--r--security/p5-Crypt-AppleTwoFish/pkg-plist4
-rw-r--r--security/p5-Crypt-Blowfish/pkg-plist4
-rw-r--r--security/p5-Crypt-Blowfish_PP/pkg-plist6
-rw-r--r--security/p5-Crypt-CAST5_PP/pkg-plist6
-rw-r--r--security/p5-Crypt-CBC/pkg-plist4
-rw-r--r--security/p5-Crypt-CBCeasy/pkg-plist4
-rw-r--r--security/p5-Crypt-CFB/pkg-plist4
-rw-r--r--security/p5-Crypt-Caesar/pkg-plist4
-rw-r--r--security/p5-Crypt-Chimera/pkg-plist4
-rw-r--r--security/p5-Crypt-CipherSaber/pkg-plist4
-rw-r--r--security/p5-Crypt-Cracklib/pkg-plist4
-rw-r--r--security/p5-Crypt-Ctr/pkg-plist4
-rw-r--r--security/p5-Crypt-DES/pkg-plist4
-rw-r--r--security/p5-Crypt-DES_EDE3/pkg-plist2
-rw-r--r--security/p5-Crypt-DES_PP/pkg-plist2
-rw-r--r--security/p5-Crypt-ECB/pkg-plist4
-rw-r--r--security/p5-Crypt-Enigma/pkg-plist4
-rw-r--r--security/p5-Crypt-GOST/pkg-plist4
-rw-r--r--security/p5-Crypt-GOST_PP/pkg-plist4
-rw-r--r--security/p5-Crypt-GPG/pkg-plist4
-rw-r--r--security/p5-Crypt-GeneratePassword/pkg-plist4
-rw-r--r--security/p5-Crypt-HCE_MD5/pkg-plist6
-rw-r--r--security/p5-Crypt-HCE_SHA/pkg-plist8
-rw-r--r--security/p5-Crypt-IDEA/pkg-plist4
-rw-r--r--security/p5-Crypt-Imail/pkg-plist4
-rw-r--r--security/p5-Crypt-Khazad/pkg-plist4
-rw-r--r--security/p5-Crypt-License/pkg-plist4
-rw-r--r--security/p5-Crypt-Lite/pkg-plist4
-rw-r--r--security/p5-Crypt-Loki97/pkg-plist4
-rw-r--r--security/p5-Crypt-MySQL/pkg-plist4
-rw-r--r--security/p5-Crypt-NULL/pkg-plist4
-rw-r--r--security/p5-Crypt-OFB/pkg-plist4
-rw-r--r--security/p5-Crypt-OTP/pkg-plist4
-rw-r--r--security/p5-Crypt-OpenPGP/pkg-plist2
-rw-r--r--security/p5-Crypt-OpenSSL-Bignum/pkg-plist8
-rw-r--r--security/p5-Crypt-OpenSSL-DSA/pkg-plist8
-rw-r--r--security/p5-Crypt-OpenSSL-RSA/pkg-plist10
-rw-r--r--security/p5-Crypt-OpenSSL-Random/pkg-plist10
-rw-r--r--security/p5-Crypt-PGPSimple/pkg-plist4
-rw-r--r--security/p5-Crypt-PassGen/pkg-plist4
-rw-r--r--security/p5-Crypt-PasswdMD5/pkg-plist4
-rw-r--r--security/p5-Crypt-RC4/pkg-plist4
-rw-r--r--security/p5-Crypt-RC5/pkg-plist4
-rw-r--r--security/p5-Crypt-RC6/pkg-plist4
-rw-r--r--security/p5-Crypt-RIPEMD160/pkg-plist4
-rw-r--r--security/p5-Crypt-RSA/pkg-plist4
-rw-r--r--security/p5-Crypt-Rabbit/pkg-plist4
-rw-r--r--security/p5-Crypt-Random/pkg-plist4
-rw-r--r--security/p5-Crypt-Rijndael/pkg-plist4
-rw-r--r--security/p5-Crypt-SKey/pkg-plist4
-rw-r--r--security/p5-Crypt-SSLeay/pkg-plist6
-rw-r--r--security/p5-Crypt-Salt/pkg-plist4
-rw-r--r--security/p5-Crypt-SaltedHash/pkg-plist4
-rw-r--r--security/p5-Crypt-Serpent/pkg-plist4
-rw-r--r--security/p5-Crypt-Shark/pkg-plist4
-rw-r--r--security/p5-Crypt-SmbHash/pkg-plist4
-rw-r--r--security/p5-Crypt-Solitaire/pkg-plist6
-rw-r--r--security/p5-Crypt-TEA/pkg-plist4
-rw-r--r--security/p5-Crypt-TripleDES/pkg-plist4
-rw-r--r--security/p5-Crypt-Twofish/pkg-plist4
-rw-r--r--security/p5-Crypt-Twofish2/pkg-plist4
-rw-r--r--security/p5-Crypt-UnixCrypt/pkg-plist4
-rw-r--r--security/p5-Crypt-X509/pkg-plist4
-rw-r--r--security/p5-Crypt-xDBM_File/pkg-plist4
-rw-r--r--security/p5-Data-Password/pkg-plist4
-rw-r--r--security/p5-Digest-Adler32/pkg-plist4
-rw-r--r--security/p5-Digest-BubbleBabble/pkg-plist4
-rw-r--r--security/p5-Digest-CRC/pkg-plist4
-rw-r--r--security/p5-Digest-Crc32/pkg-plist4
-rw-r--r--security/p5-Digest-DJB/pkg-plist4
-rw-r--r--security/p5-Digest-DMAC/pkg-plist4
-rw-r--r--security/p5-Digest-EMAC/pkg-plist4
-rw-r--r--security/p5-Digest-Elf/pkg-plist4
-rw-r--r--security/p5-Digest-FNV/pkg-plist4
-rw-r--r--security/p5-Digest-HMAC/pkg-plist6
-rw-r--r--security/p5-Digest-Hashcash/pkg-plist6
-rw-r--r--security/p5-Digest-Haval256/pkg-plist4
-rw-r--r--security/p5-Digest-JHash/pkg-plist4
-rw-r--r--security/p5-Digest-MD2/pkg-plist4
-rw-r--r--security/p5-Digest-MD4/pkg-plist4
-rw-r--r--security/p5-Digest-MD5-File/pkg-plist8
-rw-r--r--security/p5-Digest-MD5-M4p/pkg-plist8
-rw-r--r--security/p5-Digest-MD5-Reverse/pkg-plist8
-rw-r--r--security/p5-Digest-MD5/pkg-plist4
-rw-r--r--security/p5-Digest-ManberHash/pkg-plist4
-rw-r--r--security/p5-Digest-Nilsimsa/pkg-plist4
-rw-r--r--security/p5-Digest-Pearson-PurePerl/pkg-plist6
-rw-r--r--security/p5-Digest-Pearson/pkg-plist4
-rw-r--r--security/p5-Digest-Perl-MD4/pkg-plist6
-rw-r--r--security/p5-Digest-Perl-MD5/pkg-plist6
-rw-r--r--security/p5-Digest-SHA-PurePerl/pkg-plist6
-rw-r--r--security/p5-Digest-SHA/pkg-plist6
-rw-r--r--security/p5-Digest-SHA1/pkg-plist4
-rw-r--r--security/p5-Digest-SHA2/pkg-plist4
-rw-r--r--security/p5-Digest-SHA256/pkg-plist4
-rw-r--r--security/p5-Digest-SV1/pkg-plist2
-rw-r--r--security/p5-Digest-Tiger/pkg-plist4
-rw-r--r--security/p5-Digest-Whirlpool/pkg-plist4
-rw-r--r--security/p5-Digest/pkg-plist4
-rw-r--r--security/p5-Email-Obfuscate/pkg-plist4
-rw-r--r--security/p5-File-Scan/pkg-plist4
-rw-r--r--security/p5-Filter-CBC/pkg-plist4
-rw-r--r--security/p5-Filter-Crypto/pkg-plist6
-rw-r--r--security/p5-GD-SecurityImage/pkg-plist4
-rw-r--r--security/p5-IO-Socket-SSL/pkg-plist6
-rw-r--r--security/p5-Module-Signature/pkg-plist4
-rw-r--r--security/p5-Net-OpenID-Server/pkg-plist8
-rw-r--r--security/p5-Net-SSLeay/pkg-plist4
-rw-r--r--security/p5-Nmap-Scanner/pkg-plist4
-rw-r--r--security/p5-OpenCA-CRL/pkg-plist4
-rw-r--r--security/p5-OpenCA-CRR/pkg-plist4
-rw-r--r--security/p5-OpenCA-PKCS7/pkg-plist4
-rw-r--r--security/p5-OpenCA-REQ/pkg-plist4
-rw-r--r--security/p5-PGP-Sign/pkg-plist4
-rw-r--r--security/p5-POE-Component-SSLify/pkg-plist8
-rw-r--r--security/p5-Safe-Hole/pkg-plist2
-rw-r--r--security/p5-Tie-EncryptedHash/pkg-plist4
-rw-r--r--security/portaudit/pkg-plist4
-rw-r--r--security/prelude-lml/pkg-plist2
-rw-r--r--security/revelation/pkg-plist4
-rw-r--r--security/samba-vscan/pkg-plist4
-rw-r--r--security/shishi/pkg-plist2
-rw-r--r--security/snort/pkg-plist2
-rw-r--r--security/snortsms/pkg-plist4
-rw-r--r--security/ssh2/pkg-plist6
-rw-r--r--security/tor/pkg-plist2
-rw-r--r--security/unicornscan/pkg-plist8
-rw-r--r--security/xca/pkg-plist2
162 files changed, 437 insertions, 437 deletions
diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist
index 4aac38bdf575..99d2fcb82803 100644
--- a/security/amap/pkg-plist
+++ b/security/amap/pkg-plist
@@ -11,4 +11,4 @@ etc/amap/appdefs.trig.default
%%AMAPINCDIR%%/amap-lib.h
@dirrm %%AMAPLIBDIR%%
@dirrm %%AMAPINCDIR%%
-@unexec rmdir %D/etc/amap 2>/dev/null || true
+@dirrmtry etc/amap
diff --git a/security/antivir-milter/pkg-plist b/security/antivir-milter/pkg-plist
index e373ba7b628b..aa03e827f27e 100644
--- a/security/antivir-milter/pkg-plist
+++ b/security/antivir-milter/pkg-plist
@@ -13,7 +13,7 @@ AntiVir/antivir2.vdf-dist_avmilter
@unexec if cmp -s %D/AntiVir/antivir3.vdf-dist_avmilter %D/AntiVir/antivir3.vdf; then rm -f %D/AntiVir/antivir3.vdf; fi
AntiVir/antivir3.vdf-dist_avmilter
@exec [ -f %B/antivir3.vdf ] || cp -p %B/%f %B/antivir3.vdf
-@unexec rmdir %D/AntiVir/updcomp 2> /dev/null || true
+@dirrmtry AntiVir/updcomp
@unexec rmdir %D/AntiVir 2> /dev/null || echo "If permanently deleting this package, %D/AntiVir and its contents must be removed manually."
bin/avq
bin/avqrm
diff --git a/security/audit/pkg-plist b/security/audit/pkg-plist
index 29c6a08aeb1f..0b74e0fa0be4 100644
--- a/security/audit/pkg-plist
+++ b/security/audit/pkg-plist
@@ -10,4 +10,4 @@ lib/alat/libauth_raw.so.1
lib/alat/libia_syslog.so.1
lib/alat/libres_local.so.1
sbin/auditd
-@unexec rmdir %D/lib/alat 2>/dev/null || true
+@dirrmtry lib/alat
diff --git a/security/base/pkg-plist b/security/base/pkg-plist
index 60c32b328bc4..05247dadd53a 100644
--- a/security/base/pkg-plist
+++ b/security/base/pkg-plist
@@ -123,4 +123,4 @@ www/base/styles/acid_style.css
@dirrm www/base/images
@dirrm www/base/help
@dirrm www/base/admin
-@unexec rmdir %D/www/base 2>/dev/null || true
+@dirrmtry www/base
diff --git a/security/dazuko/pkg-plist b/security/dazuko/pkg-plist
index bf2e1df9fb2b..65115540657c 100644
--- a/security/dazuko/pkg-plist
+++ b/security/dazuko/pkg-plist
@@ -1,2 +1,2 @@
modules/dazuko.ko
-@unexec rmdir %D/modules 2>/dev/null || true
+@dirrmtry modules
diff --git a/security/doorman/pkg-plist b/security/doorman/pkg-plist
index b786195a8f02..65bc32edc5f3 100644
--- a/security/doorman/pkg-plist
+++ b/security/doorman/pkg-plist
@@ -13,4 +13,4 @@ etc/doormand/iptables_delete
etc/doormand/pfctl_add
etc/doormand/pfctl_delete
sbin/doormand
-@unexec rmdir %D/etc/doormand 2>/dev/null || true
+@dirrmtry etc/doormand
diff --git a/security/f-prot-sig/pkg-plist b/security/f-prot-sig/pkg-plist
index 10ba24cdb2d2..201228d524c7 100644
--- a/security/f-prot-sig/pkg-plist
+++ b/security/f-prot-sig/pkg-plist
@@ -4,4 +4,4 @@ f-prot/SIGN2.ASC
f-prot/SIGN2.DEF
f-prot/MACRO.DEF
f-prot/MACRO.ASC
-@unexec rmdir %D/f-prot 2>/dev/null || true
+@dirrmtry f-prot
diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist
index dabef511edcf..684cac875fc8 100644
--- a/security/f-prot/pkg-plist
+++ b/security/f-prot/pkg-plist
@@ -34,4 +34,4 @@ f-prot/tools/check-updates.pl
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm f-prot/tools
@dirrm f-prot/etc
-@unexec rmdir %D/f-prot 2>/dev/null || true
+@dirrmtry f-prot
diff --git a/security/fakeroot/pkg-plist b/security/fakeroot/pkg-plist
index 66e0e9153a7d..6c22406f13aa 100644
--- a/security/fakeroot/pkg-plist
+++ b/security/fakeroot/pkg-plist
@@ -4,9 +4,9 @@ lib/libfakeroot.a
lib/libfakeroot.so
lib/libfakeroot.so.0
man/fr/man1/fakeroot.1.gz
-@unexec rmdir %D/man/sv/man1 2>/dev/null || true
-@unexec rmdir %D/man/sv 2>/dev/null || true
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/es/man1 2>/dev/null || true
-@unexec rmdir %D/man/es 2>/dev/null || true
+@dirrmtry man/sv/man1
+@dirrmtry man/sv
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/es/man1
+@dirrmtry man/es
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index c3d185c8136b..8f80c4a594cf 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -53,26 +53,26 @@ libexec/gnupg/gpgkeys_http
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/be 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 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/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrm %%DOCSDIR%%
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index c3d185c8136b..8f80c4a594cf 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -53,26 +53,26 @@ libexec/gnupg/gpgkeys_http
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/be 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 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/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
@dirrm %%DOCSDIR%%
diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist
index 21187fcc3df2..4cfe3580d89f 100644
--- a/security/gringotts/pkg-plist
+++ b/security/gringotts/pkg-plist
@@ -5,8 +5,8 @@ share/locale/fr/LC_MESSAGES/gringotts.mo
share/locale/it/LC_MESSAGES/gringotts.mo
%%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
%%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
+@dirrmtry share/gnome
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/security/ipsec-tools/pkg-plist b/security/ipsec-tools/pkg-plist
index 27f2cfbc6542..1d4617e6083c 100644
--- a/security/ipsec-tools/pkg-plist
+++ b/security/ipsec-tools/pkg-plist
@@ -38,11 +38,11 @@ sbin/racoonctl
%%EXAMPLESDIR%%/roadwarrior/client/racoon.conf
%%EXAMPLESDIR%%/roadwarrior/server/racoon.conf
%%EXAMPLESDIR%%/roadwarrior/server/racoon.conf-radius
-@unexec rmdir %D/etc/racoon 2>/dev/null || true
+@dirrmtry etc/racoon
@dirrm include/racoon
@dirrm include/libipsec
@dirrm %%EXAMPLESDIR%%/roadwarrior/server
@dirrm %%EXAMPLESDIR%%/roadwarrior/client
@dirrm %%EXAMPLESDIR%%/roadwarrior
@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/var/racoon 2>/dev/null || true
+@dirrmtry var/racoon
diff --git a/security/jailaudit/pkg-plist b/security/jailaudit/pkg-plist
index 447a2b0a3746..43a7a083dd0d 100644
--- a/security/jailaudit/pkg-plist
+++ b/security/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/security/klamav/pkg-plist b/security/klamav/pkg-plist
index 2927ca6b49c4..000107f7f07c 100644
--- a/security/klamav/pkg-plist
+++ b/security/klamav/pkg-plist
@@ -47,32 +47,32 @@ share/apps/klamav/about/wait.html
share/apps/klamav/about/aboutklamav.html
share/apps/klamav/about/klam.png
share/apps/klamav/about/tshirt.png
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/en/klamav02 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/icons 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav/about 2>/dev/null || true
-@unexec rmdir %D/share/apps/klamav 2>/dev/null || true
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/doc/HTML/en/klamav02
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32/actions
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/locolor/16x16/actions
+@dirrmtry share/apps/klamav/icons/locolor/32x32/apps
+@dirrmtry share/apps/klamav/icons/hicolor/32x32/actions
+@dirrmtry share/apps/klamav/icons/hicolor/32x32/apps
+@dirrmtry share/apps/klamav/icons/hicolor/22x22/actions
+@dirrmtry share/apps/klamav/icons/locolor/32x32/actions
+@dirrmtry share/apps/klamav/icons/locolor/16x16/apps
+@dirrmtry share/apps/klamav/icons/hicolor/48x48/apps
+@dirrmtry share/apps/klamav/icons/locolor/16x16/actions
+@dirrmtry share/apps/klamav/icons/locolor/32x32
+@dirrmtry share/apps/klamav/icons/locolor/16x16
+@dirrmtry share/apps/klamav/icons/locolor
+@dirrmtry share/apps/klamav/icons/hicolor/32x32
+@dirrmtry share/apps/klamav/icons/hicolor/22x22
+@dirrmtry share/apps/klamav/icons/hicolor/48x48
+@dirrmtry share/apps/klamav/icons/hicolor
+@dirrmtry share/apps/klamav/icons
+@dirrmtry share/apps/klamav/about
+@dirrmtry share/apps/klamav
diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist
index 888c58c17474..f1263b9acaa5 100644
--- a/security/nessus-devel/pkg-plist
+++ b/security/nessus-devel/pkg-plist
@@ -27,12 +27,12 @@ sbin/nessusd
@exec mkdir -p %D/var/nessus/logs
@exec mkdir -p %D/var/nessus/users
@unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/nessus/logs/nessusd.messages 2> /dev/null; fi || true
-@unexec rmdir %D/var/nessus/jobs 2>/dev/null || true
-@unexec rmdir %D/var/nessus/logs 2>/dev/null || true
-@unexec rmdir %D/var/nessus/users 2>/dev/null || true
-@unexec rmdir %D/var/nessus 2>/dev/null || true
-@unexec rmdir %D/etc/nessus 2>/dev/null || true
+@dirrmtry var/nessus/jobs
+@dirrmtry var/nessus/logs
+@dirrmtry var/nessus/users
+@dirrmtry var/nessus
+@dirrmtry etc/nessus
@exec mkdir -p %D/lib/nessus/plugins
-@unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/nessus 2>/dev/null || true
+@dirrmtry lib/nessus/plugins
+@dirrmtry lib/nessus
@exec if [ ! -f %D/var/CA/serverkey.pem ]; then %D/sbin/nessus-mkcert; fi
diff --git a/security/nessus-libnasl/pkg-plist b/security/nessus-libnasl/pkg-plist
index 72a6abb1878f..10ccab19c3c0 100644
--- a/security/nessus-libnasl/pkg-plist
+++ b/security/nessus-libnasl/pkg-plist
@@ -6,5 +6,5 @@ lib/libnasl.la
lib/libnasl.so
lib/libnasl.so.4
var/nessus/nessus_org.pem
-@unexec rmdir %D/var/nessus 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/nessus
+@dirrmtry var
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index 888c58c17474..f1263b9acaa5 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -27,12 +27,12 @@ sbin/nessusd
@exec mkdir -p %D/var/nessus/logs
@exec mkdir -p %D/var/nessus/users
@unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/nessus/logs/nessusd.messages 2> /dev/null; fi || true
-@unexec rmdir %D/var/nessus/jobs 2>/dev/null || true
-@unexec rmdir %D/var/nessus/logs 2>/dev/null || true
-@unexec rmdir %D/var/nessus/users 2>/dev/null || true
-@unexec rmdir %D/var/nessus 2>/dev/null || true
-@unexec rmdir %D/etc/nessus 2>/dev/null || true
+@dirrmtry var/nessus/jobs
+@dirrmtry var/nessus/logs
+@dirrmtry var/nessus/users
+@dirrmtry var/nessus
+@dirrmtry etc/nessus
@exec mkdir -p %D/lib/nessus/plugins
-@unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/nessus 2>/dev/null || true
+@dirrmtry lib/nessus/plugins
+@dirrmtry lib/nessus
@exec if [ ! -f %D/var/CA/serverkey.pem ]; then %D/sbin/nessus-mkcert; fi
diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist
index 1fa09e07e2a2..1da8797a351f 100644
--- a/security/nmap/pkg-plist
+++ b/security/nmap/pkg-plist
@@ -12,7 +12,7 @@ bin/nmap
%%PORTDOCS%%%%DOCSDIR%%/HACKING
%%PORTDOCS%%%%DOCSDIR%%/nmap.dtd
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/man/pt.ISO8859-1/man1 2>/dev/null || true
-@unexec rmdir %D/man/pt_BR.ISO8859-1/man1 2>/dev/null || true
-@unexec rmdir %D/man/pt.ISO8859-1 2>/dev/null || true
-@unexec rmdir %D/man/pt_BR.ISO8859-1 2>/dev/null || true
+@dirrmtry man/pt.ISO8859-1/man1
+@dirrmtry man/pt_BR.ISO8859-1/man1
+@dirrmtry man/pt.ISO8859-1
+@dirrmtry man/pt_BR.ISO8859-1
diff --git a/security/ocaml-cryptokit/pkg-plist b/security/ocaml-cryptokit/pkg-plist
index 3b2ae4f7cbaa..340e5b406d84 100644
--- a/security/ocaml-cryptokit/pkg-plist
+++ b/security/ocaml-cryptokit/pkg-plist
@@ -6,5 +6,5 @@ lib/ocaml/cryptokit.cmxa
lib/ocaml/cryptokit.mli
lib/ocaml/libcryptokit.a
lib/ocaml/stublibs/dllcryptokit.so
-@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true
-@unexec rmdir %D/lib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml/stublibs
+@dirrmtry lib/ocaml
diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist
index 0792d7f01581..49e68ed122b7 100644
--- a/security/opensc/pkg-plist
+++ b/security/opensc/pkg-plist
@@ -14,7 +14,7 @@ libdata/pkgconfig/libscam.pc
libdata/pkgconfig/libscconf.pc
libdata/pkgconfig/libscldap.pc
lib/security/pam_opensc.so
-@unexec rmdir %D/lib/security 2>/dev/null || true
+@dirrmtry lib/security
lib/pkcs11/pkcs11-spy.so
lib/pkcs11/opensc-pkcs11.so
lib/pkcs11/libpkcs11.so.1
diff --git a/security/openscep/pkg-plist b/security/openscep/pkg-plist
index 900f117f0874..cced5b4c6984 100644
--- a/security/openscep/pkg-plist
+++ b/security/openscep/pkg-plist
@@ -70,4 +70,4 @@ www/openscep/updatecrl.8.html
www/openscep/welcome.html
@dirrm www/cgi-bin/openscep
@dirrm www/openscep
-@unexec rmdir %D/etc/openscep 2>/dev/null || true
+@dirrmtry etc/openscep
diff --git a/security/p5-Authen-Captcha/pkg-plist b/security/p5-Authen-Captcha/pkg-plist
index 32588496fbad..d1bec9ddf23e 100644
--- a/security/p5-Authen-Captcha/pkg-plist
+++ b/security/p5-Authen-Captcha/pkg-plist
@@ -43,5 +43,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Captcha
@dirrm %%SITE_PERL%%/Authen/Captcha/images
@dirrm %%SITE_PERL%%/Authen/Captcha
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-CyrusSASL/pkg-plist b/security/p5-Authen-CyrusSASL/pkg-plist
index a6cdc1e368b7..ffed084228af 100644
--- a/security/p5-Authen-CyrusSASL/pkg-plist
+++ b/security/p5-Authen-CyrusSASL/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/CyrusSASL/.packlist
%%SITE_PERL%%/auto/Authen/CyrusSASL/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/CyrusSASL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
@dirrm %%SITE_PERL%%/auto/Authen/CyrusSASL
-@unexec rmdir %D/%%SITE_PERL%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Htpasswd/pkg-plist b/security/p5-Authen-Htpasswd/pkg-plist
index 776c1f77a4e1..b5f95b7322d9 100644
--- a/security/p5-Authen-Htpasswd/pkg-plist
+++ b/security/p5-Authen-Htpasswd/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Authen/Htpasswd/User.pm
%%SITE_PERL%%/Authen/Htpasswd/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Authen/Htpasswd 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/Authen/Htpasswd
+@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-PAM/pkg-plist b/security/p5-Authen-PAM/pkg-plist
index 1d6535116b2f..6e7300c9a1cd 100644
--- a/security/p5-Authen-PAM/pkg-plist
+++ b/security/p5-Authen-PAM/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
diff --git a/security/p5-Authen-Radius/pkg-plist b/security/p5-Authen-Radius/pkg-plist
index 8054a8530fd0..3b1b22f1a734 100644
--- a/security/p5-Authen-Radius/pkg-plist
+++ b/security/p5-Authen-Radius/pkg-plist
@@ -13,5 +13,5 @@
%%DATADIR%%/dictionary.xtradius
@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Radius
-@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Authen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
diff --git a/security/p5-Authen-SASL-Cyrus/pkg-plist b/security/p5-Authen-SASL-Cyrus/pkg-plist
index 7f10f5ad82ae..d033708bfe0c 100644
--- a/security/p5-Authen-SASL-Cyrus/pkg-plist
+++ b/security/p5-Authen-SASL-Cyrus/pkg-plist
@@ -6,8 +6,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus/Cyrus.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL/Cyrus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
diff --git a/security/p5-Authen-SASL/pkg-plist b/security/p5-Authen-SASL/pkg-plist
index cd1710058c39..145e25f726c2 100644
--- a/security/p5-Authen-SASL/pkg-plist
+++ b/security/p5-Authen-SASL/pkg-plist
@@ -12,7 +12,7 @@
%%SITE_PERL%%/Authen/SASL/Perl/PLAIN.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
@dirrm %%SITE_PERL%%/Authen/SASL/Perl
@dirrm %%SITE_PERL%%/Authen/SASL
-@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Authen-Smb/pkg-plist b/security/p5-Authen-Smb/pkg-plist
index 67b447cd7a27..9c6e93101b83 100644
--- a/security/p5-Authen-Smb/pkg-plist
+++ b/security/p5-Authen-Smb/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
diff --git a/security/p5-Authen-TacacsPlus/pkg-plist b/security/p5-Authen-TacacsPlus/pkg-plist
index 0140da6a61cf..be658388fe83 100644
--- a/security/p5-Authen-TacacsPlus/pkg-plist
+++ b/security/p5-Authen-TacacsPlus/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen
diff --git a/security/p5-Authen-Ticket/pkg-plist b/security/p5-Authen-Ticket/pkg-plist
index 87b02d1b9624..116e93cfb387 100644
--- a/security/p5-Authen-Ticket/pkg-plist
+++ b/security/p5-Authen-Ticket/pkg-plist
@@ -9,5 +9,5 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Authen::Ticket::Signature.3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket
@dirrm %%SITE_PERL%%/Authen/Ticket
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen
+@dirrmtry %%SITE_PERL%%/Authen
diff --git a/security/p5-Business-PayPal-EWP/pkg-plist b/security/p5-Business-PayPal-EWP/pkg-plist
index b7067e3261b9..29127c5904bf 100644
--- a/security/p5-Business-PayPal-EWP/pkg-plist
+++ b/security/p5-Business-PayPal-EWP/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal/EWP.pm.orig
%%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal/EWP.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/EWP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Business
diff --git a/security/p5-Crypt-Anubis/pkg-plist b/security/p5-Crypt-Anubis/pkg-plist
index 41b426620bab..c32cf52fa481 100644
--- a/security/p5-Crypt-Anubis/pkg-plist
+++ b/security/p5-Crypt-Anubis/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis/Anubis.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Anubis.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-AppleTwoFish/pkg-plist b/security/p5-Crypt-AppleTwoFish/pkg-plist
index 9a1ac9209620..fa2365816a97 100644
--- a/security/p5-Crypt-AppleTwoFish/pkg-plist
+++ b/security/p5-Crypt-AppleTwoFish/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/AppleTwoFish.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/AppleTwoFish/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/AppleTwoFish/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Blowfish/pkg-plist b/security/p5-Crypt-Blowfish/pkg-plist
index e7a7883aa25d..e3d712ed9b8d 100644
--- a/security/p5-Crypt-Blowfish/pkg-plist
+++ b/security/p5-Crypt-Blowfish/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Blowfish_PP/pkg-plist b/security/p5-Crypt-Blowfish_PP/pkg-plist
index 59bb9f1990f9..fef394b9eb82 100644
--- a/security/p5-Crypt-Blowfish_PP/pkg-plist
+++ b/security/p5-Crypt-Blowfish_PP/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Crypt/Blowfish_PP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CAST5_PP/pkg-plist b/security/p5-Crypt-CAST5_PP/pkg-plist
index 104880503e66..00aef0893362 100644
--- a/security/p5-Crypt-CAST5_PP/pkg-plist
+++ b/security/p5-Crypt-CAST5_PP/pkg-plist
@@ -6,8 +6,8 @@
%%SITE_PERL%%/auto/Crypt/CAST5_PP/init.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP/.packlist
@dirrm %%SITE_PERL%%/Crypt/CAST5_PP
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
@dirrm %%SITE_PERL%%/auto/Crypt/CAST5_PP
-@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Crypt
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-CBC/pkg-plist b/security/p5-Crypt-CBC/pkg-plist
index fefc24052297..fafe8b3a8e32 100644
--- a/security/p5-Crypt-CBC/pkg-plist
+++ b/security/p5-Crypt-CBC/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/CBC.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CBCeasy/pkg-plist b/security/p5-Crypt-CBCeasy/pkg-plist
index 70f50f6fd34e..f56a73f9dc44 100644
--- a/security/p5-Crypt-CBCeasy/pkg-plist
+++ b/security/p5-Crypt-CBCeasy/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/CBCeasy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBCeasy/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBCeasy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CFB/pkg-plist b/security/p5-Crypt-CFB/pkg-plist
index 055080039c53..7393bb8dde69 100644
--- a/security/p5-Crypt-CFB/pkg-plist
+++ b/security/p5-Crypt-CFB/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/CFB.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CFB/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CFB/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Caesar/pkg-plist b/security/p5-Crypt-Caesar/pkg-plist
index 47c3a559bd07..e8e6faabb213 100644
--- a/security/p5-Crypt-Caesar/pkg-plist
+++ b/security/p5-Crypt-Caesar/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/Caesar.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Caesar/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Caesar/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Chimera/pkg-plist b/security/p5-Crypt-Chimera/pkg-plist
index 05dd2e73b4a3..ccaa706f2ee5 100644
--- a/security/p5-Crypt-Chimera/pkg-plist
+++ b/security/p5-Crypt-Chimera/pkg-plist
@@ -6,6 +6,6 @@
%%SITE_PERL%%/Crypt/Chimera/World.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Chimera/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Chimera/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrm %%SITE_PERL%%/Crypt/Chimera/
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-CipherSaber/pkg-plist b/security/p5-Crypt-CipherSaber/pkg-plist
index 45c0dc1c90ec..86b9145e063f 100644
--- a/security/p5-Crypt-CipherSaber/pkg-plist
+++ b/security/p5-Crypt-CipherSaber/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/CipherSaber.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Cracklib/pkg-plist b/security/p5-Crypt-Cracklib/pkg-plist
index 9f9abbdb3788..5065f7248931 100644
--- a/security/p5-Crypt-Cracklib/pkg-plist
+++ b/security/p5-Crypt-Cracklib/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Ctr/pkg-plist b/security/p5-Crypt-Ctr/pkg-plist
index 8695dbd029e2..5b91f7aaff1b 100644
--- a/security/p5-Crypt-Ctr/pkg-plist
+++ b/security/p5-Crypt-Ctr/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/Ctr.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Ctr/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Ctr/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-DES/pkg-plist b/security/p5-Crypt-DES/pkg-plist
index bf40e2183b1c..6f1d3d477d41 100644
--- a/security/p5-Crypt-DES/pkg-plist
+++ b/security/p5-Crypt-DES/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-DES_EDE3/pkg-plist b/security/p5-Crypt-DES_EDE3/pkg-plist
index f8b2f54428e5..d18a3a303e82 100644
--- a/security/p5-Crypt-DES_EDE3/pkg-plist
+++ b/security/p5-Crypt-DES_EDE3/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Crypt/DES_EDE3.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES_EDE3/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES_EDE3
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-DES_PP/pkg-plist b/security/p5-Crypt-DES_PP/pkg-plist
index b490ea7d7e32..775d6ea1d635 100644
--- a/security/p5-Crypt-DES_PP/pkg-plist
+++ b/security/p5-Crypt-DES_PP/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Crypt/.cvsignore
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-DES_PP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-DES_PP/
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-ECB/pkg-plist b/security/p5-Crypt-ECB/pkg-plist
index 9de44d23c92e..f62db0771196 100644
--- a/security/p5-Crypt-ECB/pkg-plist
+++ b/security/p5-Crypt-ECB/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/ECB.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Enigma/pkg-plist b/security/p5-Crypt-Enigma/pkg-plist
index 94d914953dfa..1bf9fdf36a45 100644
--- a/security/p5-Crypt-Enigma/pkg-plist
+++ b/security/p5-Crypt-Enigma/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/Enigma.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Enigma/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Enigma/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-GOST/pkg-plist b/security/p5-Crypt-GOST/pkg-plist
index 122d6e83bf4d..bc36cac4b460 100644
--- a/security/p5-Crypt-GOST/pkg-plist
+++ b/security/p5-Crypt-GOST/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/GOST.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/GOST.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-GOST_PP/pkg-plist b/security/p5-Crypt-GOST_PP/pkg-plist
index 25361b58dad8..c138817a0dc6 100644
--- a/security/p5-Crypt-GOST_PP/pkg-plist
+++ b/security/p5-Crypt-GOST_PP/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/GOST_PP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST_PP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST_PP/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-GPG/pkg-plist b/security/p5-Crypt-GPG/pkg-plist
index ea482071b39c..e6654833f51e 100644
--- a/security/p5-Crypt-GPG/pkg-plist
+++ b/security/p5-Crypt-GPG/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/GPG.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GPG/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GPG/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-GeneratePassword/pkg-plist b/security/p5-Crypt-GeneratePassword/pkg-plist
index fcab373a647e..f60ff96e213e 100644
--- a/security/p5-Crypt-GeneratePassword/pkg-plist
+++ b/security/p5-Crypt-GeneratePassword/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Crypt/GeneratePassword/de.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GeneratePassword/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GeneratePassword
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrm %%SITE_PERL%%/Crypt/GeneratePassword
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-HCE_MD5/pkg-plist b/security/p5-Crypt-HCE_MD5/pkg-plist
index 5b28579e3573..8d14cda74803 100644
--- a/security/p5-Crypt-HCE_MD5/pkg-plist
+++ b/security/p5-Crypt-HCE_MD5/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/auto/Crypt/HCE_MD5/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_MD5/
@dirrm %%SITE_PERL%%/auto/Crypt/HCE_MD5/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-HCE_SHA/pkg-plist b/security/p5-Crypt-HCE_SHA/pkg-plist
index 6bff173d3f9c..1ba45019ee2f 100644
--- a/security/p5-Crypt-HCE_SHA/pkg-plist
+++ b/security/p5-Crypt-HCE_SHA/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/auto/Crypt/HCE_SHA/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA
@dirrm %%SITE_PERL%%/auto/Crypt/HCE_SHA
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+@dirrmtry %%SITE_PERL%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-IDEA/pkg-plist b/security/p5-Crypt-IDEA/pkg-plist
index 88167ababefe..c6daaa21b2cb 100644
--- a/security/p5-Crypt-IDEA/pkg-plist
+++ b/security/p5-Crypt-IDEA/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Imail/pkg-plist b/security/p5-Crypt-Imail/pkg-plist
index 65416fb3b748..2fa6fafff715 100644
--- a/security/p5-Crypt-Imail/pkg-plist
+++ b/security/p5-Crypt-Imail/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/Imail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Imail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Imail/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Khazad/pkg-plist b/security/p5-Crypt-Khazad/pkg-plist
index bb55ea021139..597548d79be3 100644
--- a/security/p5-Crypt-Khazad/pkg-plist
+++ b/security/p5-Crypt-Khazad/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/Khazad.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/Khazad.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-License/pkg-plist b/security/p5-Crypt-License/pkg-plist
index c3d578e81d7d..57a3d145fcdf 100644
--- a/security/p5-Crypt-License/pkg-plist
+++ b/security/p5-Crypt-License/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/License/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/License/
@dirrm %%SITE_PERL%%/Crypt/License/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Lite/pkg-plist b/security/p5-Crypt-Lite/pkg-plist
index 6a9d69d2d300..81be2bb0843b 100644
--- a/security/p5-Crypt-Lite/pkg-plist
+++ b/security/p5-Crypt-Lite/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/Lite.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/Lite.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Loki97/pkg-plist b/security/p5-Crypt-Loki97/pkg-plist
index 088f57911af8..31134f6319b8 100644
--- a/security/p5-Crypt-Loki97/pkg-plist
+++ b/security/p5-Crypt-Loki97/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/Loki97.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/Loki97.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-MySQL/pkg-plist b/security/p5-Crypt-MySQL/pkg-plist
index 50cbc65e6a38..a0f2e73afcaf 100644
--- a/security/p5-Crypt-MySQL/pkg-plist
+++ b/security/p5-Crypt-MySQL/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL/MySQL.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL/MySQL.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-NULL/pkg-plist b/security/p5-Crypt-NULL/pkg-plist
index 3c4d937c0adb..c9efbab5416b 100644
--- a/security/p5-Crypt-NULL/pkg-plist
+++ b/security/p5-Crypt-NULL/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Crypt/NULL.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/NULL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/NULL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OFB/pkg-plist b/security/p5-Crypt-OFB/pkg-plist
index 6b4f77918070..7ff7041f2153 100644
--- a/security/p5-Crypt-OFB/pkg-plist
+++ b/security/p5-Crypt-OFB/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/OFB.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OFB/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OFB
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OTP/pkg-plist b/security/p5-Crypt-OTP/pkg-plist
index 639fd6c5ce84..ea3fd561dc08 100644
--- a/security/p5-Crypt-OTP/pkg-plist
+++ b/security/p5-Crypt-OTP/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/OTP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OpenPGP/pkg-plist b/security/p5-Crypt-OpenPGP/pkg-plist
index 58794e59172f..535cf543f4ff 100644
--- a/security/p5-Crypt-OpenPGP/pkg-plist
+++ b/security/p5-Crypt-OpenPGP/pkg-plist
@@ -44,4 +44,4 @@
@dirrm %%SITE_PERL%%/Crypt/OpenPGP/Key
@dirrm %%SITE_PERL%%/Crypt/OpenPGP/Signature
@dirrm %%SITE_PERL%%/Crypt/OpenPGP
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-Bignum/pkg-plist b/security/p5-Crypt-OpenSSL-Bignum/pkg-plist
index 300f2a888853..feef75e2b682 100644
--- a/security/p5-Crypt-OpenSSL-Bignum/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-Bignum/pkg-plist
@@ -4,8 +4,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum/CTX.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Bignum
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-DSA/pkg-plist b/security/p5-Crypt-OpenSSL-DSA/pkg-plist
index 8832928f600e..b743390b07ed 100644
--- a/security/p5-Crypt-OpenSSL-DSA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-DSA/pkg-plist
@@ -5,8 +5,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-RSA/pkg-plist b/security/p5-Crypt-OpenSSL-RSA/pkg-plist
index be80bc51a652..c49e360a476b 100644
--- a/security/p5-Crypt-OpenSSL-RSA/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-RSA/pkg-plist
@@ -17,8 +17,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_public_key.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/set_padding_mode.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/use_sslv23_padding.al
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-OpenSSL-Random/pkg-plist b/security/p5-Crypt-OpenSSL-Random/pkg-plist
index 61d813d6a70d..a9f5564cec9a 100644
--- a/security/p5-Crypt-OpenSSL-Random/pkg-plist
+++ b/security/p5-Crypt-OpenSSL-Random/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/autosplit.ix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-PGPSimple/pkg-plist b/security/p5-Crypt-PGPSimple/pkg-plist
index 94256c17c920..ad03aeb496f8 100644
--- a/security/p5-Crypt-PGPSimple/pkg-plist
+++ b/security/p5-Crypt-PGPSimple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple/.packlist
%%SITE_PERL%%/Crypt/PGPSimple.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-PassGen/pkg-plist b/security/p5-Crypt-PassGen/pkg-plist
index 032d181adc56..1b6338f4d738 100644
--- a/security/p5-Crypt-PassGen/pkg-plist
+++ b/security/p5-Crypt-PassGen/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Crypt/PassGenWordFreq.dat
%%SITE_PERL%%/Crypt/PassGen.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PassGen
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-PasswdMD5/pkg-plist b/security/p5-Crypt-PasswdMD5/pkg-plist
index 2cd4efbede1f..c932cf5c3c4e 100644
--- a/security/p5-Crypt-PasswdMD5/pkg-plist
+++ b/security/p5-Crypt-PasswdMD5/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/PasswdMD5.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
diff --git a/security/p5-Crypt-RC4/pkg-plist b/security/p5-Crypt-RC4/pkg-plist
index a70c3b1acec9..bc99edce44bd 100644
--- a/security/p5-Crypt-RC4/pkg-plist
+++ b/security/p5-Crypt-RC4/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/RC4.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-RC5/pkg-plist b/security/p5-Crypt-RC5/pkg-plist
index 5b5822b99979..cdce55091b8d 100644
--- a/security/p5-Crypt-RC5/pkg-plist
+++ b/security/p5-Crypt-RC5/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/RC5.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-RC6/pkg-plist b/security/p5-Crypt-RC6/pkg-plist
index c3441f96c83e..b1c0f904bb3f 100644
--- a/security/p5-Crypt-RC6/pkg-plist
+++ b/security/p5-Crypt-RC6/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-RIPEMD160/pkg-plist b/security/p5-Crypt-RIPEMD160/pkg-plist
index 0560b276a2e4..fda973bf8aa8 100644
--- a/security/p5-Crypt-RIPEMD160/pkg-plist
+++ b/security/p5-Crypt-RIPEMD160/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160/MAC.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-RSA/pkg-plist b/security/p5-Crypt-RSA/pkg-plist
index 9b949c687f52..d550f81e9f4f 100644
--- a/security/p5-Crypt-RSA/pkg-plist
+++ b/security/p5-Crypt-RSA/pkg-plist
@@ -14,11 +14,11 @@
%%SITE_PERL%%/Crypt/RSA/SS/PSS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrm %%SITE_PERL%%/Crypt/RSA/SS
@dirrm %%SITE_PERL%%/Crypt/RSA/Key/Public
@dirrm %%SITE_PERL%%/Crypt/RSA/Key/Private
@dirrm %%SITE_PERL%%/Crypt/RSA/Key
@dirrm %%SITE_PERL%%/Crypt/RSA/ES
@dirrm %%SITE_PERL%%/Crypt/RSA
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Rabbit/pkg-plist b/security/p5-Crypt-Rabbit/pkg-plist
index 5c42cded897f..697a0be59e2a 100644
--- a/security/p5-Crypt-Rabbit/pkg-plist
+++ b/security/p5-Crypt-Rabbit/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/Rabbit.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/Rabbit.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Random/pkg-plist b/security/p5-Crypt-Random/pkg-plist
index acf0ccebad69..6c36c24a9e03 100644
--- a/security/p5-Crypt-Random/pkg-plist
+++ b/security/p5-Crypt-Random/pkg-plist
@@ -10,5 +10,5 @@ bin/makerandom
@dirrm %%SITE_PERL%%/Crypt/Random/Provider
@dirrm %%SITE_PERL%%/Crypt/Random
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Rijndael/pkg-plist b/security/p5-Crypt-Rijndael/pkg-plist
index cc0dc16563d7..80edc6b86148 100644
--- a/security/p5-Crypt-Rijndael/pkg-plist
+++ b/security/p5-Crypt-Rijndael/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-SKey/pkg-plist b/security/p5-Crypt-SKey/pkg-plist
index 41cc5d7a985b..5ebb5bf73927 100644
--- a/security/p5-Crypt-SKey/pkg-plist
+++ b/security/p5-Crypt-SKey/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/SKey.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SKey/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SKey/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-SSLeay/pkg-plist b/security/p5-Crypt-SSLeay/pkg-plist
index 04e1619975df..9581cc4cb84d 100644
--- a/security/p5-Crypt-SSLeay/pkg-plist
+++ b/security/p5-Crypt-SSLeay/pkg-plist
@@ -10,6 +10,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Salt/pkg-plist b/security/p5-Crypt-Salt/pkg-plist
index 8ab5a43bf5cd..8d99606fb21f 100644
--- a/security/p5-Crypt-Salt/pkg-plist
+++ b/security/p5-Crypt-Salt/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/Salt.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Salt/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Salt/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-SaltedHash/pkg-plist b/security/p5-Crypt-SaltedHash/pkg-plist
index 5ad7b629c294..b5e777cb9710 100644
--- a/security/p5-Crypt-SaltedHash/pkg-plist
+++ b/security/p5-Crypt-SaltedHash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/SaltedHash.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SaltedHash/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SaltedHash/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Serpent/pkg-plist b/security/p5-Crypt-Serpent/pkg-plist
index 03e7e9c7379d..59b45f67568d 100644
--- a/security/p5-Crypt-Serpent/pkg-plist
+++ b/security/p5-Crypt-Serpent/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Shark/pkg-plist b/security/p5-Crypt-Shark/pkg-plist
index 67c5e23faff8..ff06c58df41a 100644
--- a/security/p5-Crypt-Shark/pkg-plist
+++ b/security/p5-Crypt-Shark/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/Shark.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/Shark.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-SmbHash/pkg-plist b/security/p5-Crypt-SmbHash/pkg-plist
index 653b7f60b943..d58d97f2c361 100644
--- a/security/p5-Crypt-SmbHash/pkg-plist
+++ b/security/p5-Crypt-SmbHash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/SmbHash.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SmbHash/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SmbHash
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Solitaire/pkg-plist b/security/p5-Crypt-Solitaire/pkg-plist
index 6cd45923cd41..f2c4370de768 100644
--- a/security/p5-Crypt-Solitaire/pkg-plist
+++ b/security/p5-Crypt-Solitaire/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/auto/Crypt/Solitaire/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
@dirrm %%SITE_PERL%%/auto/Crypt/Solitaire
-@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-TEA/pkg-plist b/security/p5-Crypt-TEA/pkg-plist
index b6219d076d92..82cc42fd8f42 100644
--- a/security/p5-Crypt-TEA/pkg-plist
+++ b/security/p5-Crypt-TEA/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/TEA.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/TEA.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-TripleDES/pkg-plist b/security/p5-Crypt-TripleDES/pkg-plist
index 79a3db025a97..79bf235a81e5 100644
--- a/security/p5-Crypt-TripleDES/pkg-plist
+++ b/security/p5-Crypt-TripleDES/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Crypt/TripleDES.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-Twofish/pkg-plist b/security/p5-Crypt-Twofish/pkg-plist
index 347fe0fd504c..d70c93e6c841 100644
--- a/security/p5-Crypt-Twofish/pkg-plist
+++ b/security/p5-Crypt-Twofish/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-Twofish2/pkg-plist b/security/p5-Crypt-Twofish2/pkg-plist
index 0091565543d6..86c9b7cc24e6 100644
--- a/security/p5-Crypt-Twofish2/pkg-plist
+++ b/security/p5-Crypt-Twofish2/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
diff --git a/security/p5-Crypt-UnixCrypt/pkg-plist b/security/p5-Crypt-UnixCrypt/pkg-plist
index 302e0f58561d..465eaa9b521d 100644
--- a/security/p5-Crypt-UnixCrypt/pkg-plist
+++ b/security/p5-Crypt-UnixCrypt/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/UnixCrypt.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-X509/pkg-plist b/security/p5-Crypt-X509/pkg-plist
index bfc0e607931d..192d8e2a3930 100644
--- a/security/p5-Crypt-X509/pkg-plist
+++ b/security/p5-Crypt-X509/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/X509.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/X509/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/X509/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Crypt-xDBM_File/pkg-plist b/security/p5-Crypt-xDBM_File/pkg-plist
index 441165e81111..9cd0ab1aac02 100644
--- a/security/p5-Crypt-xDBM_File/pkg-plist
+++ b/security/p5-Crypt-xDBM_File/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Crypt/xDBM_File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/xDBM_File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/xDBM_File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/Crypt
diff --git a/security/p5-Data-Password/pkg-plist b/security/p5-Data-Password/pkg-plist
index dac7875ae2d1..4342ed05e70e 100644
--- a/security/p5-Data-Password/pkg-plist
+++ b/security/p5-Data-Password/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Data/Password.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Password/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Password
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/security/p5-Digest-Adler32/pkg-plist b/security/p5-Digest-Adler32/pkg-plist
index 49359cc4645d..e0093be90b27 100644
--- a/security/p5-Digest-Adler32/pkg-plist
+++ b/security/p5-Digest-Adler32/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Digest/Adler32.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Adler32/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Adler32
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-BubbleBabble/pkg-plist b/security/p5-Digest-BubbleBabble/pkg-plist
index 12d902db7f74..9f28a654de48 100644
--- a/security/p5-Digest-BubbleBabble/pkg-plist
+++ b/security/p5-Digest-BubbleBabble/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Digest/BubbleBabble.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/BubbleBabble/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/BubbleBabble
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/Digest
diff --git a/security/p5-Digest-CRC/pkg-plist b/security/p5-Digest-CRC/pkg-plist
index 8d3a1a1d8ad3..de7929194fbd 100644
--- a/security/p5-Digest-CRC/pkg-plist
+++ b/security/p5-Digest-CRC/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC/CRC.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC/CRC.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
diff --git a/security/p5-Digest-Crc32/pkg-plist b/security/p5-Digest-Crc32/pkg-plist
index 1dd898786717..6ddc37113db5 100644
--- a/security/p5-Digest-Crc32/pkg-plist
+++ b/security/p5-Digest-Crc32/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Digest/Crc32.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Crc32/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Crc32/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-DJB/pkg-plist b/security/p5-Digest-DJB/pkg-plist
index e68f5dba2b09..1a5b57e9b0b8 100644
--- a/security/p5-Digest-DJB/pkg-plist
+++ b/security/p5-Digest-DJB/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/DJB.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/DJB.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-DMAC/pkg-plist b/security/p5-Digest-DMAC/pkg-plist
index 565537d144a2..ddf3a696ecb1 100644
--- a/security/p5-Digest-DMAC/pkg-plist
+++ b/security/p5-Digest-DMAC/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Digest/DMAC.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DMAC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DMAC/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-EMAC/pkg-plist b/security/p5-Digest-EMAC/pkg-plist
index 0822434bdb9f..e520c6764845 100644
--- a/security/p5-Digest-EMAC/pkg-plist
+++ b/security/p5-Digest-EMAC/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Digest/EMAC.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/EMAC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/EMAC/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Elf/pkg-plist b/security/p5-Digest-Elf/pkg-plist
index ffc327260dba..730f04750298 100644
--- a/security/p5-Digest-Elf/pkg-plist
+++ b/security/p5-Digest-Elf/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/Elf.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/Elf.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-FNV/pkg-plist b/security/p5-Digest-FNV/pkg-plist
index 0baab84c4da6..c8833e73ce49 100644
--- a/security/p5-Digest-FNV/pkg-plist
+++ b/security/p5-Digest-FNV/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/FNV.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/FNV.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-HMAC/pkg-plist b/security/p5-Digest-HMAC/pkg-plist
index 350bd43d71ce..76c6d448a06f 100644
--- a/security/p5-Digest-HMAC/pkg-plist
+++ b/security/p5-Digest-HMAC/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Digest/HMAC_MD5.pm
%%SITE_PERL%%/Digest/HMAC_SHA1.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/Digest
diff --git a/security/p5-Digest-Hashcash/pkg-plist b/security/p5-Digest-Hashcash/pkg-plist
index 1e3d1e97a3ec..a2a8dbe1d963 100644
--- a/security/p5-Digest-Hashcash/pkg-plist
+++ b/security/p5-Digest-Hashcash/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/Hashcash.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/Hashcash.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
diff --git a/security/p5-Digest-Haval256/pkg-plist b/security/p5-Digest-Haval256/pkg-plist
index d56296269cec..517a6ed9156b 100644
--- a/security/p5-Digest-Haval256/pkg-plist
+++ b/security/p5-Digest-Haval256/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256/Haval256.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256/Haval256.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-JHash/pkg-plist b/security/p5-Digest-JHash/pkg-plist
index 64d0505070c7..c3548f8c3811 100644
--- a/security/p5-Digest-JHash/pkg-plist
+++ b/security/p5-Digest-JHash/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/JHash.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/JHash.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-MD2/pkg-plist b/security/p5-Digest-MD2/pkg-plist
index 2f42d58fd055..7e340e22dc89 100644
--- a/security/p5-Digest-MD2/pkg-plist
+++ b/security/p5-Digest-MD2/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.bs
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-MD4/pkg-plist b/security/p5-Digest-MD4/pkg-plist
index 4712c7dabee7..8c072000bcaa 100644
--- a/security/p5-Digest-MD4/pkg-plist
+++ b/security/p5-Digest-MD4/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4/MD4.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4/MD4.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-MD5-File/pkg-plist b/security/p5-Digest-MD5-File/pkg-plist
index 9ed2e3fcfd74..e994828cd062 100644
--- a/security/p5-Digest-MD5-File/pkg-plist
+++ b/security/p5-Digest-MD5-File/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Digest/MD5/File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/File/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/Digest/MD5
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-MD5-M4p/pkg-plist b/security/p5-Digest-MD5-M4p/pkg-plist
index 47b991696b4f..8d7002ceef5b 100644
--- a/security/p5-Digest-MD5-M4p/pkg-plist
+++ b/security/p5-Digest-MD5-M4p/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p/M4p.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p/M4p.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-MD5-Reverse/pkg-plist b/security/p5-Digest-MD5-Reverse/pkg-plist
index 09db6ffa52f4..cb26129d65d3 100644
--- a/security/p5-Digest-MD5-Reverse/pkg-plist
+++ b/security/p5-Digest-MD5-Reverse/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Digest/MD5/Reverse.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/Reverse/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/Reverse/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/Digest/MD5
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-MD5/pkg-plist b/security/p5-Digest-MD5/pkg-plist
index cd8b45f104b2..6121c381507d 100644
--- a/security/p5-Digest-MD5/pkg-plist
+++ b/security/p5-Digest-MD5/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/MD5.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/MD5.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-ManberHash/pkg-plist b/security/p5-Digest-ManberHash/pkg-plist
index e85f4b56da81..2fb1a571cdaf 100644
--- a/security/p5-Digest-ManberHash/pkg-plist
+++ b/security/p5-Digest-ManberHash/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash/ManberHash.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash/ManberHash.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-Nilsimsa/pkg-plist b/security/p5-Digest-Nilsimsa/pkg-plist
index 7e86c12d5910..dab4f5d233aa 100644
--- a/security/p5-Digest-Nilsimsa/pkg-plist
+++ b/security/p5-Digest-Nilsimsa/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa/Nilsimsa.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa/Nilsimsa.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-Pearson-PurePerl/pkg-plist b/security/p5-Digest-Pearson-PurePerl/pkg-plist
index 9e482faf0dcb..d5e2148d4a73 100644
--- a/security/p5-Digest-Pearson-PurePerl/pkg-plist
+++ b/security/p5-Digest-Pearson-PurePerl/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Digest/Pearson/PurePerl.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/PurePerl/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/PurePerl/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
@dirrm %%SITE_PERL%%/Digest/Pearson/
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Pearson/pkg-plist b/security/p5-Digest-Pearson/pkg-plist
index 21df5b8ac42b..e23e76a0dad0 100644
--- a/security/p5-Digest-Pearson/pkg-plist
+++ b/security/p5-Digest-Pearson/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/Pearson.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/Pearson.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-Perl-MD4/pkg-plist b/security/p5-Digest-Perl-MD4/pkg-plist
index 6d18aae464b5..93dea3436bec 100644
--- a/security/p5-Digest-Perl-MD4/pkg-plist
+++ b/security/p5-Digest-Perl-MD4/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Digest/Perl/Digest-MD4.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD4/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD4/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
@dirrm %%SITE_PERL%%/Digest/Perl/
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Perl-MD5/pkg-plist b/security/p5-Digest-Perl-MD5/pkg-plist
index 80bde8594b2b..4c1d5dd178d4 100644
--- a/security/p5-Digest-Perl-MD5/pkg-plist
+++ b/security/p5-Digest-Perl-MD5/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Digest/Perl/MD5.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD5/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD5/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
@dirrm %%SITE_PERL%%/Digest/Perl/
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-SHA-PurePerl/pkg-plist b/security/p5-Digest-SHA-PurePerl/pkg-plist
index 90be7d582275..81f8012613eb 100644
--- a/security/p5-Digest-SHA-PurePerl/pkg-plist
+++ b/security/p5-Digest-SHA-PurePerl/pkg-plist
@@ -2,7 +2,7 @@ bin/shasum
%%SITE_PERL%%/Digest/SHA/PurePerl.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/PurePerl/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/PurePerl/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/
@dirrm %%SITE_PERL%%/Digest/SHA/
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-SHA/pkg-plist b/security/p5-Digest-SHA/pkg-plist
index 2da93527a67b..9f82141b210c 100644
--- a/security/p5-Digest-SHA/pkg-plist
+++ b/security/p5-Digest-SHA/pkg-plist
@@ -3,6 +3,6 @@ bin/shasum
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/SHA.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/SHA.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-SHA1/pkg-plist b/security/p5-Digest-SHA1/pkg-plist
index a552aec3c7b9..02760efd8321 100644
--- a/security/p5-Digest-SHA1/pkg-plist
+++ b/security/p5-Digest-SHA1/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1/SHA1.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1/SHA1.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-SHA2/pkg-plist b/security/p5-Digest-SHA2/pkg-plist
index d239641a8c83..82442b8ceb79 100644
--- a/security/p5-Digest-SHA2/pkg-plist
+++ b/security/p5-Digest-SHA2/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2/SHA2.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2/SHA2.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
diff --git a/security/p5-Digest-SHA256/pkg-plist b/security/p5-Digest-SHA256/pkg-plist
index 6ad961e1cbc7..93bd95fb6eca 100644
--- a/security/p5-Digest-SHA256/pkg-plist
+++ b/security/p5-Digest-SHA256/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA256/SHA256.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA256/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA256
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest
diff --git a/security/p5-Digest-SV1/pkg-plist b/security/p5-Digest-SV1/pkg-plist
index 5028d857d9bc..726386ad8c88 100644
--- a/security/p5-Digest-SV1/pkg-plist
+++ b/security/p5-Digest-SV1/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Digest/SV1.pm
-@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Digest/
diff --git a/security/p5-Digest-Tiger/pkg-plist b/security/p5-Digest-Tiger/pkg-plist
index c11e6a33c704..46506fa3f2ae 100644
--- a/security/p5-Digest-Tiger/pkg-plist
+++ b/security/p5-Digest-Tiger/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/Tiger.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/Tiger.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest-Whirlpool/pkg-plist b/security/p5-Digest-Whirlpool/pkg-plist
index 3a0f7715e4d8..a2e002399a9b 100644
--- a/security/p5-Digest-Whirlpool/pkg-plist
+++ b/security/p5-Digest-Whirlpool/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool/Whirlpool.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool/Whirlpool.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/
diff --git a/security/p5-Digest/pkg-plist b/security/p5-Digest/pkg-plist
index 20d61770d45e..b592854aa7ba 100644
--- a/security/p5-Digest/pkg-plist
+++ b/security/p5-Digest/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Digest.pm
%%SITE_PERL%%/Digest/base.pm
%%SITE_PERL%%/Digest/file.pm
-@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Digest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest
diff --git a/security/p5-Email-Obfuscate/pkg-plist b/security/p5-Email-Obfuscate/pkg-plist
index 6abcf3f736f6..e0f640ec95d2 100644
--- a/security/p5-Email-Obfuscate/pkg-plist
+++ b/security/p5-Email-Obfuscate/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Email/Obfuscate.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Obfuscate/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Obfuscate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/security/p5-File-Scan/pkg-plist b/security/p5-File-Scan/pkg-plist
index d04feba0f8f3..11f4c15e6f85 100644
--- a/security/p5-File-Scan/pkg-plist
+++ b/security/p5-File-Scan/pkg-plist
@@ -16,5 +16,5 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/security/p5-Filter-CBC/pkg-plist b/security/p5-Filter-CBC/pkg-plist
index 94989c6b4e2b..267f476adc30 100644
--- a/security/p5-Filter-CBC/pkg-plist
+++ b/security/p5-Filter-CBC/pkg-plist
@@ -15,5 +15,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/twofish.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC
-@unexec rmdir %D/%%SITE_PERL%%/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter
diff --git a/security/p5-Filter-Crypto/pkg-plist b/security/p5-Filter-Crypto/pkg-plist
index 546c07ea04cf..4e4458ceaa07 100644
--- a/security/p5-Filter-Crypto/pkg-plist
+++ b/security/p5-Filter-Crypto/pkg-plist
@@ -9,10 +9,10 @@ bin/crypt_file
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt/Decrypt.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt/Decrypt.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Filter/Crypto
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filter
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/PAR/Filter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/PAR 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PAR
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/CryptFile
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter
diff --git a/security/p5-GD-SecurityImage/pkg-plist b/security/p5-GD-SecurityImage/pkg-plist
index b82d70fead35..560fd4dfa2ed 100644
--- a/security/p5-GD-SecurityImage/pkg-plist
+++ b/security/p5-GD-SecurityImage/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/GD/SecurityImage/Styles.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SecurityImage
@dirrm %%SITE_PERL%%/GD/SecurityImage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
+@dirrmtry %%SITE_PERL%%/GD
diff --git a/security/p5-IO-Socket-SSL/pkg-plist b/security/p5-IO-Socket-SSL/pkg-plist
index 96908b518b82..8344d611f70f 100644
--- a/security/p5-IO-Socket-SSL/pkg-plist
+++ b/security/p5-IO-Socket-SSL/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/IO/Socket/SSL.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket
@dirrm %%SITE_PERL%%/IO/Socket
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/security/p5-Module-Signature/pkg-plist b/security/p5-Module-Signature/pkg-plist
index a756698dcf7c..6e09cc2ffb1d 100644
--- a/security/p5-Module-Signature/pkg-plist
+++ b/security/p5-Module-Signature/pkg-plist
@@ -2,5 +2,5 @@ bin/cpansign
%%SITE_PERL%%/Module/Signature.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Signature/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Signature
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
diff --git a/security/p5-Net-OpenID-Server/pkg-plist b/security/p5-Net-OpenID-Server/pkg-plist
index 56bcd9a6b804..5bba5d86432d 100644
--- a/security/p5-Net-OpenID-Server/pkg-plist
+++ b/security/p5-Net-OpenID-Server/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Net/OpenID/Server.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Server/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Server
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/OpenID 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/OpenID
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/security/p5-Net-SSLeay/pkg-plist b/security/p5-Net-SSLeay/pkg-plist
index a7b5dcdee3f4..2ad0c961784c 100644
--- a/security/p5-Net-SSLeay/pkg-plist
+++ b/security/p5-Net-SSLeay/pkg-plist
@@ -102,6 +102,6 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/tcpecho.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/security/p5-Nmap-Scanner/pkg-plist b/security/p5-Nmap-Scanner/pkg-plist
index e15e94f97fa4..28a62bd10d67 100644
--- a/security/p5-Nmap-Scanner/pkg-plist
+++ b/security/p5-Nmap-Scanner/pkg-plist
@@ -34,5 +34,5 @@
@dirrm %%SITE_PERL%%/Nmap/Scanner/Util
@dirrm %%SITE_PERL%%/Nmap/Scanner
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap/Scanner
-@unexec rmdir %D/%%SITE_PERL%%/Nmap 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Nmap
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap
diff --git a/security/p5-OpenCA-CRL/pkg-plist b/security/p5-OpenCA-CRL/pkg-plist
index a767760715a7..cf68e8ec34fd 100644
--- a/security/p5-OpenCA-CRL/pkg-plist
+++ b/security/p5-OpenCA-CRL/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRL/.packlist
%%SITE_PERL%%/OpenCA/CRL.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRL
-@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/OpenCA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
diff --git a/security/p5-OpenCA-CRR/pkg-plist b/security/p5-OpenCA-CRR/pkg-plist
index 633588f6b19c..c1d7dc7a3571 100644
--- a/security/p5-OpenCA-CRR/pkg-plist
+++ b/security/p5-OpenCA-CRR/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRR/.packlist
%%SITE_PERL%%/OpenCA/CRR.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRR
-@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/OpenCA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
diff --git a/security/p5-OpenCA-PKCS7/pkg-plist b/security/p5-OpenCA-PKCS7/pkg-plist
index 9917283de371..df96bbafbfbe 100644
--- a/security/p5-OpenCA-PKCS7/pkg-plist
+++ b/security/p5-OpenCA-PKCS7/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/PKCS7/.packlist
%%SITE_PERL%%/OpenCA/PKCS7.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/PKCS7
-@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/OpenCA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
diff --git a/security/p5-OpenCA-REQ/pkg-plist b/security/p5-OpenCA-REQ/pkg-plist
index 002de9fc3097..1a869dab6bb3 100644
--- a/security/p5-OpenCA-REQ/pkg-plist
+++ b/security/p5-OpenCA-REQ/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/REQ/.packlist
%%SITE_PERL%%/OpenCA/REQ.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/REQ
-@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/OpenCA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA
diff --git a/security/p5-PGP-Sign/pkg-plist b/security/p5-PGP-Sign/pkg-plist
index a5f790989576..fa88ee96559b 100644
--- a/security/p5-PGP-Sign/pkg-plist
+++ b/security/p5-PGP-Sign/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/PGP/Sign.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PGP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP
+@dirrmtry %%SITE_PERL%%/PGP
diff --git a/security/p5-POE-Component-SSLify/pkg-plist b/security/p5-POE-Component-SSLify/pkg-plist
index fd0fb1561d57..d18f03ddbb9c 100644
--- a/security/p5-POE-Component-SSLify/pkg-plist
+++ b/security/p5-POE-Component-SSLify/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/POE/Component/SSLify/ClientHandle.pm
%%SITE_PERL%%/POE/Component/SSLify/ServerHandle.pm
@dirrm %%SITE_PERL%%/POE/Component/SSLify
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SSLify
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/security/p5-Safe-Hole/pkg-plist b/security/p5-Safe-Hole/pkg-plist
index 40a37e51d91f..6993041f51be 100644
--- a/security/p5-Safe-Hole/pkg-plist
+++ b/security/p5-Safe-Hole/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Safe/Hole.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Safe
diff --git a/security/p5-Tie-EncryptedHash/pkg-plist b/security/p5-Tie-EncryptedHash/pkg-plist
index f77b5ed0cda2..b57215caaa56 100644
--- a/security/p5-Tie-EncryptedHash/pkg-plist
+++ b/security/p5-Tie-EncryptedHash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Tie/EncryptedHash.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/EncryptedHash/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/EncryptedHash
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/security/portaudit/pkg-plist b/security/portaudit/pkg-plist
index 84b4ccaaf52e..8edf7bb6dbc8 100644
--- a/security/portaudit/pkg-plist
+++ b/security/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/security/prelude-lml/pkg-plist b/security/prelude-lml/pkg-plist
index da1772a00347..70dd6b4712a0 100644
--- a/security/prelude-lml/pkg-plist
+++ b/security/prelude-lml/pkg-plist
@@ -51,7 +51,7 @@ etc/prelude-lml/plugins.rules-dist
include/prelude-lml/prelude-lml.h
lib/prelude-lml/debug.so
lib/prelude-lml/pcre.so
-@unexec rmdir %D/etc/prelude-lml/ruleset 2>/dev/null || true
+@dirrmtry etc/prelude-lml/ruleset
@unexec rmdir %D/etc/prelude-lml 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/prelude-lml`` to remove any configuration files left." | fmt
@dirrm include/prelude-lml
@dirrm lib/prelude-lml
diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist
index 26c50169ae10..2036325bb2f0 100644
--- a/security/revelation/pkg-plist
+++ b/security/revelation/pkg-plist
@@ -54,8 +54,8 @@ bin/revelation
%%PYTHON_SITELIBDIR%%/revelation/crack.so
%%PYTHON_SITELIBDIR%%/revelation/gnomemisc.so
@dirrm %%PYTHON_SITELIBDIR%%/revelation
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
libdata/bonobo/servers/GNOME_RevelationApplet.server
libexec/revelation-applet
share/gnome/applications/revelation.desktop
diff --git a/security/samba-vscan/pkg-plist b/security/samba-vscan/pkg-plist
index 4d4a10ae1693..cf6aba67437c 100644
--- a/security/samba-vscan/pkg-plist
+++ b/security/samba-vscan/pkg-plist
@@ -17,6 +17,6 @@ etc/samba-vscan/vscan-trend.conf
%%VFSDIR%%/vscan-sophos.so
%%VFSDIR%%/vscan-trend.so
%%VFSDIR%%/vscan-antivir.so
-@unexec rmdir %D/%%VFSDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/samba 2>/dev/null || true
+@dirrmtry %%VFSDIR%%
+@dirrmtry lib/samba
@dirrm etc/samba-vscan
diff --git a/security/shishi/pkg-plist b/security/shishi/pkg-plist
index 8384352bdd17..1949e678c80c 100644
--- a/security/shishi/pkg-plist
+++ b/security/shishi/pkg-plist
@@ -18,4 +18,4 @@ sbin/shishid
%%NLS%%share/locale/en@quot/LC_MESSAGES/shishi.mo
%%NLS%%share/locale/pl/LC_MESSAGES/shishi.mo
%%NLS%%share/locale/sv/LC_MESSAGES/shishi.mo
-@unexec rmdir %D/etc/shishi 2>/dev/null || true
+@dirrmtry etc/shishi
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index c4568c4fb393..a9d2258c5f01 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -9,7 +9,7 @@ etc/snort/sid-msg.map-sample
etc/snort/snort.conf-sample
etc/snort/threshold.conf-sample
etc/snort/unicode.map-sample
-@unexec rmdir %D/etc/snort 2>/dev/null || true
+@dirrmtry etc/snort
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
diff --git a/security/snortsms/pkg-plist b/security/snortsms/pkg-plist
index 4d9639db542f..6e2297a8ae96 100644
--- a/security/snortsms/pkg-plist
+++ b/security/snortsms/pkg-plist
@@ -322,8 +322,8 @@ www/snortsms/variables/qry_variables.php
@dirrm www/snortsms/css
@dirrm www/snortsms/contrib
@dirrm www/snortsms/configs
-@unexec rmdir %D/www/snortsms/conf 2>/dev/null || true
+@dirrmtry www/snortsms/conf
@dirrm www/snortsms/classifications
@dirrm www/snortsms/barnyard
@dirrm www/snortsms/barnctrl
-@unexec rmdir %D/www/snortsms 2>/dev/null || true
+@dirrmtry www/snortsms
diff --git a/security/ssh2/pkg-plist b/security/ssh2/pkg-plist
index 4bb3ecf2d02f..523c27579984 100644
--- a/security/ssh2/pkg-plist
+++ b/security/ssh2/pkg-plist
@@ -53,7 +53,7 @@ sbin/sshd2
%%EXAMPLESDIR%%/ext_authorization_example.sh
%%EXAMPLESDIR%%/kbdint_plugin_example.sh
@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/etc/ssh2/hostkeys 2> /dev/null || true
-@unexec rmdir %D/etc/ssh2/knownhosts 2> /dev/null || true
-@unexec rmdir %D/etc/ssh2/subconfig 2> /dev/null || true
+@dirrmtry etc/ssh2/hostkeys
+@dirrmtry etc/ssh2/knownhosts
+@dirrmtry etc/ssh2/subconfig
@unexec rmdir %D/etc/ssh2 2> /dev/null || echo "If permanently deleting this package, %D/etc/ssh2 and its contents must be removed manually."
diff --git a/security/tor/pkg-plist b/security/tor/pkg-plist
index c3e22fbf8a72..abae4f580d85 100644
--- a/security/tor/pkg-plist
+++ b/security/tor/pkg-plist
@@ -5,4 +5,4 @@ bin/torify
etc/rc.d/tor.sh.sample
etc/tor/torrc.sample
etc/tor/tor-tsocks.conf.sample
-@unexec rmdir %D/etc/tor 2>/dev/null || true
+@dirrmtry etc/tor
diff --git a/security/unicornscan/pkg-plist b/security/unicornscan/pkg-plist
index 08e471780c13..ea2ae3a9b5a8 100644
--- a/security/unicornscan/pkg-plist
+++ b/security/unicornscan/pkg-plist
@@ -21,9 +21,9 @@ share/unicornscan/p0fa.fp
share/unicornscan/p0fr.fp
share/unicornscan/port-numbers
@exec %D/var/unicornscan/
-@unexec rmdir %D/var/unicornscan 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
-@unexec rmdir %D/share/unicornscan 2>/dev/null || true
+@dirrmtry var/unicornscan
+@dirrmtry var
+@dirrmtry share/unicornscan
@dirrm libexec/unicornscan/modules
@dirrm libexec/unicornscan
-@unexec rmdir %D/etc/unicornscan 2>/dev/null || true
+@dirrmtry etc/unicornscan
diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist
index 9571fc598ce9..963638407a46 100644
--- a/security/xca/pkg-plist
+++ b/security/xca/pkg-plist
@@ -37,4 +37,4 @@ share/xca/xca-9.html
share/xca/xca.html
@dirrm share/xca
@unexec rmdir %D/share/pixmaps || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications