33 files changed, 92 insertions, 92 deletions

diff --git a/finance/gnucash-devel/pkg-plist b/finance/gnucash-devel/pkg-plist
index bae85845a1e6..62c44e6dd85b 100644
--- a/finance/gnucash-devel/pkg-plist
+++ b/finance/gnucash-devel/pkg-plist
@@ -677,10 +677,10 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/es_NI/LC_MESSAGES
+@dirrmtry share/locale/es_NI
 @dirrm share/gnome/pixmaps/gnucash
 @dirrm share/gnome/gnucash/scm/qif-import
 @dirrm share/gnome/gnucash/scm/printing
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index bae85845a1e6..62c44e6dd85b 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -677,10 +677,10 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/es_NI/LC_MESSAGES
+@dirrmtry share/locale/es_NI
 @dirrm share/gnome/pixmaps/gnucash
 @dirrm share/gnome/gnucash/scm/qif-import
 @dirrm share/gnome/gnucash/scm/printing
diff --git a/finance/kexchange/pkg-plist b/finance/kexchange/pkg-plist
index af31ef7edcaf..110140f84bfb 100644
--- a/finance/kexchange/pkg-plist
+++ b/finance/kexchange/pkg-plist
@@ -28,30 +28,30 @@ share/icons/locolor/16x16/apps/kexchange.png
 share/icons/locolor/32x32/apps/kexchange.png
 share/locale/de/LC_MESSAGES/kexchange.mo
 share/locale/fi/LC_MESSAGES/kexchange.mo
-@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/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kexchange
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
 @dirrm share/apps/kexchange/icons/hicolor/16x16/actions
 @dirrm share/apps/kexchange/icons/hicolor/16x16
 @dirrm share/apps/kexchange/icons/hicolor
 @dirrm share/apps/kexchange/icons
 @dirrm share/apps/kexchange
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/finance/p5-Business-CreditCard/pkg-plist b/finance/p5-Business-CreditCard/pkg-plist
index 1e4fd4adc9b1..515d950bf57b 100644
--- a/finance/p5-Business-CreditCard/pkg-plist
+++ b/finance/p5-Business-CreditCard/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Business/CreditCard.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/CreditCard
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Business-OCV/pkg-plist b/finance/p5-Business-OCV/pkg-plist
index fe324e38a4ec..f1ca3a6d93f7 100644
--- a/finance/p5-Business-OCV/pkg-plist
+++ b/finance/p5-Business-OCV/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Business/OCV.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OCV/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OCV
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
index 35ed06f86ce4..99a9719c7d91 100644
--- a/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-2CheckOut/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/2CheckOut
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/2CheckOut
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
index 777449e73911..ca381a5ce042 100644
--- a/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-AuthorizeNet/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/AuthorizeNet
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/AuthorizeNet
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
index 137530e67f43..d8112bf58f81 100644
--- a/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-BankOfAmerica/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/BankOfAmerica
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/BankOfAmerica
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
index 0b67429a01cf..3aae8faaf8d1 100644
--- a/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Beanstream/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Beanstream
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Beanstream
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
index 06fdb0b47c38..5294d060cc42 100644
--- a/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Cardstream/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Cardstream
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Cardstream
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
index f96f934eca99..0e84631f0ebd 100644
--- a/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Jettis/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Jettis
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Jettis
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
index 0e48d959feee..4c5dbc2af139 100644
--- a/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-LinkPoint/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/LinkPoint
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/LinkPoint
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
index 56c5eebd26bd..f2e16e1dc38f 100644
--- a/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-MerchantCommerce/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/MerchantCommerce
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/MerchantCommerce
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
index d733e8a6142b..47b67c3bfe76 100644
--- a/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-Network1Financial/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/Network1Financial
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/Network1Financial
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-OCV/pkg-plist b/finance/p5-Business-OnlinePayment-OCV/pkg-plist
index 8cb4121d3e61..9130a61f03d5 100644
--- a/finance/p5-Business-OnlinePayment-OCV/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-OCV/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/OCV/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/OCV
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/OCV
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
index 096b70a83566..4660660d295b 100644
--- a/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PayConnect/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PayConnect
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/PayConnect
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
index 3243f897c03d..1a8b3bd6ae06 100644
--- a/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-PaymentsGateway/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/PaymentsGateway
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/PaymentsGateway
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
index bceac1e33d7a..f4ca3cdbe995 100644
--- a/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-SurePay/pkg-plist
@@ -1,4 +1,4 @@
 %%SITE_PERL%%/Business/OnlinePayment/SurePay.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/SurePay
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
index b810b118954c..7074c55625fd 100644
--- a/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-TCLink/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/TCLink
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/TCLink
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
index 9f732513f9d8..09b75a18284c 100644
--- a/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-VirtualNet/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/VirtualNet
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/VirtualNet
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-eSec/pkg-plist b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
index 38c055d1ba3b..7bbb2ade67d3 100644
--- a/finance/p5-Business-OnlinePayment-eSec/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-eSec/pkg-plist
@@ -3,4 +3,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/eSec
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/eSec
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist b/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
index e634d63ff77f..c359c670ef89 100644
--- a/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
+++ b/finance/p5-Business-OnlinePayment-iAuthorizer/pkg-plist
@@ -4,4 +4,4 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/iAuthorizer/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/iAuthorizer
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment/iAuthorizer
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
diff --git a/finance/p5-Business-OnlinePayment/pkg-plist b/finance/p5-Business-OnlinePayment/pkg-plist
index acce58f6a7cc..3186abf2ab92 100644
--- a/finance/p5-Business-OnlinePayment/pkg-plist
+++ b/finance/p5-Business-OnlinePayment/pkg-plist
@@ -3,7 +3,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/OnlinePayment
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-@unexec rmdir %D/%%SITE_PERL%%/Business/OnlinePayment 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business/OnlinePayment
 @dirrm %%SITE_PERL%%/Business
 @dirrm %%SITE_PERL%%/auto/Business/OnlinePayment
 @dirrm %%SITE_PERL%%/auto/Business
diff --git a/finance/p5-Business-WorldPay-Junior/pkg-plist b/finance/p5-Business-WorldPay-Junior/pkg-plist
index 8b6a00b63d4e..03bf8e9ddc88 100644
--- a/finance/p5-Business-WorldPay-Junior/pkg-plist
+++ b/finance/p5-Business-WorldPay-Junior/pkg-plist
@@ -13,7 +13,7 @@
 @dirrm %%SITE_PERL%%/auto/Business/WorldPay/Junior
 @dirrm %%SITE_PERL%%/auto/Business/WorldPay
 @dirrm %%SITE_PERL%%/Business/WorldPay
-@unexec rmdir %D/%%SITE_PERL%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Business
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay/Junior
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/WorldPay
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
diff --git a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
index 11a55b2fc6d5..3dd00047ca1b 100644
--- a/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert-WebserviceX/pkg-plist
@@ -1,9 +1,9 @@
 %%SITE_PERL%%/Finance/Currency/Convert/WebserviceX.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/WebserviceX
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
+@dirrmtry %%SITE_PERL%%/Finance/Currency/Convert
+@dirrmtry %%SITE_PERL%%/Finance/Currency
+@dirrmtry %%SITE_PERL%%/Finance
diff --git a/finance/p5-Finance-Currency-Convert-XE/pkg-plist b/finance/p5-Finance-Currency-Convert-XE/pkg-plist
index f76e0de71717..ee1155687580 100644
--- a/finance/p5-Finance-Currency-Convert-XE/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert-XE/pkg-plist
@@ -2,9 +2,9 @@
 %%SITE_PERL%%/Finance/Currency/Convert/XE.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/XE/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/XE
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency
+@dirrmtry %%SITE_PERL%%/Finance/Currency/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
+@dirrmtry %%SITE_PERL%%/Finance/Currency
+@dirrmtry %%SITE_PERL%%/Finance
diff --git a/finance/p5-Finance-Currency-Convert/pkg-plist b/finance/p5-Finance-Currency-Convert/pkg-plist
index 0f529d8b2deb..2b7fd214ca36 100644
--- a/finance/p5-Finance-Currency-Convert/pkg-plist
+++ b/finance/p5-Finance-Currency-Convert/pkg-plist
@@ -1,11 +1,11 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert/.packlist
 %%SITE_PERL%%/Finance/Currency/Convert.pm
 %%SITE_PERL%%/auto/Finance/Currency/Convert/autosplit.ix
-@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Finance 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Finance/Currency/Convert
+@dirrmtry %%SITE_PERL%%/auto/Finance/Currency
+@dirrmtry %%SITE_PERL%%/auto/Finance
+@dirrmtry %%SITE_PERL%%/Finance/Currency
+@dirrmtry %%SITE_PERL%%/Finance
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Currency
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
diff --git a/finance/p5-Finance-Quote/pkg-plist b/finance/p5-Finance-Quote/pkg-plist
index df4b973785c5..0469970947ba 100644
--- a/finance/p5-Finance-Quote/pkg-plist
+++ b/finance/p5-Finance-Quote/pkg-plist
@@ -37,5 +37,5 @@
 @dirrm %%SITE_PERL%%/Finance/Quote/Yahoo
 @dirrm %%SITE_PERL%%/Finance/Quote
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance/Quote
-@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Finance
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance
diff --git a/finance/p5-Finance-QuoteHist/pkg-plist b/finance/p5-Finance-QuoteHist/pkg-plist
index b30641726311..7e4e6b67ea09 100644
--- a/finance/p5-Finance-QuoteHist/pkg-plist
+++ b/finance/p5-Finance-QuoteHist/pkg-plist
@@ -3,6 +3,6 @@
 %%SITE_PERL%%/Finance/QuoteHist/Generic.pm
 %%SITE_PERL%%/Finance/QuoteHist/QuoteMedia.pm
 %%SITE_PERL%%/Finance/QuoteHist/Yahoo.pm
-@unexec rmdir %D/%%SITE_PERL%%/Finance/QuoteHist 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Finance 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Finance/QuoteHist
+@dirrmtry %%SITE_PERL%%/Finance
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Finance-QuoteHist
diff --git a/finance/p5-Locale-Currency-Format/pkg-plist b/finance/p5-Locale-Currency-Format/pkg-plist
index 10d466e8b9eb..924239648864 100644
--- a/finance/p5-Locale-Currency-Format/pkg-plist
+++ b/finance/p5-Locale-Currency-Format/pkg-plist
@@ -1,7 +1,7 @@
 %%SITE_PERL%%/Locale/Currency/Format.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Currency/Format/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Currency/Format
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale/Currency 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Currency
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
+@dirrmtry %%SITE_PERL%%/Locale/Currency
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/finance/p5-Math-Financial/pkg-plist b/finance/p5-Math-Financial/pkg-plist
index c355eb260985..a4d21c56ce09 100644
--- a/finance/p5-Math-Financial/pkg-plist
+++ b/finance/p5-Math-Financial/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Math/Financial.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Financial
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index 9c5597f62f4d..30229182bbbb 100644
--- a/finance/qhacc/pkg-plist
+++ b/finance/qhacc/pkg-plist
@@ -191,8 +191,8 @@ lib/plugins/report/libtrans.so
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/lib/plugins/report 2>/dev/null || true
-@unexec rmdir %D/lib/plugins/import 2>/dev/null || true
-@unexec rmdir %D/lib/plugins/graph 2>/dev/null || true
-@unexec rmdir %D/lib/plugins/export 2>/dev/null || true
-@unexec rmdir %D/lib/plugins/db 2>/dev/null || true
+@dirrmtry lib/plugins/report
+@dirrmtry lib/plugins/import
+@dirrmtry lib/plugins/graph
+@dirrmtry lib/plugins/export
+@dirrmtry lib/plugins/db
diff --git a/finance/sql-ledger/pkg-plist b/finance/sql-ledger/pkg-plist
index dc24c2b7addf..fa5cc864bb2b 100644
--- a/finance/sql-ledger/pkg-plist
+++ b/finance/sql-ledger/pkg-plist
@@ -2119,8 +2119,8 @@ sql-ledger/templates/Spanish_Letter-work_order.tex
 sql-ledger/users/sql-ledger.eps
 sql-ledger/users/sql-ledger.png
 etc/sql-ledger-httpd.conf
-@unexec rmdir %D/sql-ledger/users 2>/dev/null || true
-@unexec rmdir %D/sql-ledger/templates 2>/dev/null || true
+@dirrmtry sql-ledger/users
+@dirrmtry sql-ledger/templates
 @dirrm sql-ledger/sql
 @dirrm sql-ledger/spool
 @dirrm sql-ledger/locale/ve
@@ -2175,4 +2175,4 @@ etc/sql-ledger-httpd.conf
 @dirrm sql-ledger/bin/lynx
 @dirrm sql-ledger/bin
 @dirrm sql-ledger/SL
-@unexec rmdir %D/sql-ledger 2>/dev/null || true
+@dirrmtry sql-ledger