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

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

15 files changed, 146 insertions, 146 deletions

diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index 7c255576d595..a90ac979e63a 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
-@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true
-@unexec rmdir %D/var/amanda 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/amanda/gnutar-lists
+@dirrmtry var/amanda
+@dirrmtry var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client
index 7c255576d595..a90ac979e63a 100644
--- a/misc/amanda25-server/pkg-plist.client
+++ b/misc/amanda25-server/pkg-plist.client
@@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
-@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true
-@unexec rmdir %D/var/amanda 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/amanda/gnutar-lists
+@dirrmtry var/amanda
+@dirrmtry var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client
index 7c255576d595..a90ac979e63a 100644
--- a/misc/amanda26-server/pkg-plist.client
+++ b/misc/amanda26-server/pkg-plist.client
@@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
-@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true
-@unexec rmdir %D/var/amanda 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/amanda/gnutar-lists
+@dirrmtry var/amanda
+@dirrmtry var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client
index 7c255576d595..a90ac979e63a 100644
--- a/misc/amanda32-server/pkg-plist.client
+++ b/misc/amanda32-server/pkg-plist.client
@@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
-@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true
-@unexec rmdir %D/var/amanda 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var/amanda/gnutar-lists
+@dirrmtry var/amanda
+@dirrmtry var
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
diff --git a/misc/compat4x/pkg-plist.freebsd4 b/misc/compat4x/pkg-plist.freebsd4
index da57584f7898..35824c35b003 100644
--- a/misc/compat4x/pkg-plist.freebsd4
+++ b/misc/compat4x/pkg-plist.freebsd4
@@ -3,4 +3,4 @@
 lib/compat/libfetch.so.2
 %%FORBIDDEN:%%lib/compat/libssl.so.1
 %%FORBIDDEN:%%lib/compat/libssl.so.2
-@unexec rmdir %D/lib/compat 2>/dev/null || true
+@dirrmtry lib/compat
diff --git a/misc/compat4x/pkg-plist.freebsd5 b/misc/compat4x/pkg-plist.freebsd5
index 5861550cb91c..2856b16c113e 100644
--- a/misc/compat4x/pkg-plist.freebsd5
+++ b/misc/compat4x/pkg-plist.freebsd5
@@ -40,6 +40,6 @@
 %%USE_LDCONFIG%%libdata/ldconfig/compat4x
 %%USE_LDCONFIG%%%%AMD64_ONLY%%libdata/ldconfig32/compat4x
 %%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat
-@unexec rmdir %D/%%LIBDIR%%/compat 2>/dev/null || true
+@dirrmtry %%LIBDIR%%/compat
 @comment Hardcode lib32 since we should not remove lib.
-@unexec rmdir %D/lib32 2>/dev/null || true
+@dirrmtry lib32
diff --git a/misc/compat5x/pkg-plist b/misc/compat5x/pkg-plist
index 3328a8c1b48a..c1456bac8d57 100644
--- a/misc/compat5x/pkg-plist
+++ b/misc/compat5x/pkg-plist
@@ -204,6 +204,6 @@ lib/compat/snmp_netgraph.so.2
 %%AMD64%%lib32/compat/snmp_mibII.so.2
 %%AMD64%%lib32/compat/snmp_netgraph.so.2
 %%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
-%%AMD64%%@unexec rmdir %D/lib32/compat 2>/dev/null || true
-%%AMD64%%@unexec rmdir %D/lib32 2>/dev/null || true
+%%AMD64%%@dirrmtry lib32/compat
+%%AMD64%%@dirrmtry lib32
 @dirrmtry lib/compat
diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist
index 1a9d8a7598d6..e98ab54e8222 100644
--- a/misc/findutils/pkg-plist
+++ b/misc/findutils/pkg-plist
@@ -38,5 +38,5 @@ libexec/gbigram
 %%NLS%%share/locale/tr/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/findutils.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/findutils.mo
-%%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lg
diff --git a/misc/fortune-mod-culmea-culmilor/Makefile.fortune b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
index 1aab580ede3b..bf87d329c18d 100644
--- a/misc/fortune-mod-culmea-culmilor/Makefile.fortune
+++ b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
@@ -40,6 +40,6 @@ post-install:
 		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O} >> ${TMPPLIST}; \
 		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O}.dat >> ${TMPPLIST}; \
 	fi
-	@${ECHO_CMD} "@unexec rmdir %D/${_FORTUNE_DIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/share/games 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${_FORTUNE_DIR}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry share/games" >> ${TMPPLIST}
 	@${CAT} ${PKGMESSAGE}
diff --git a/misc/globus2/pkg-plist b/misc/globus2/pkg-plist
index 6dc8e0aaec6c..a82b97dcc317 100644
--- a/misc/globus2/pkg-plist
+++ b/misc/globus2/pkg-plist
@@ -1692,4 +1692,4 @@
 @dirrm %%GLOBUS_BASE%%bin/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%bin/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%bin
-@unexec rmdir %D/%%GLOBUS_BASE%% || /usr/bin/true
+@dirrmtry %%GLOBUS_BASE%%
diff --git a/misc/hello/pkg-plist b/misc/hello/pkg-plist
index d0dfbd192c7e..c4a214a16f06 100644
--- a/misc/hello/pkg-plist
+++ b/misc/hello/pkg-plist
@@ -33,5 +33,5 @@ info/hello.info
 %%NLS%%share/locale/sv/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/hello.mo
-%%NLS%%@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
diff --git a/misc/help2man/pkg-plist b/misc/help2man/pkg-plist
index a3192f2cf651..f31ab622e4ac 100644
--- a/misc/help2man/pkg-plist
+++ b/misc/help2man/pkg-plist
@@ -3,9 +3,9 @@ bin/help2man
 %%NLS%%share/locale/fi/LC_MESSAGES/help2man.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/help2man.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/help2man.mo
-%%NLS%%@unexec rmdir %D/man/fi/man1 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/man/fi 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/man/fr 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/man/pl/man1 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/man/pl 2>/dev/null || true
+%%NLS%%@dirrmtry man/fi/man1
+%%NLS%%@dirrmtry man/fi
+%%NLS%%@dirrmtry man/fr/man1
+%%NLS%%@dirrmtry man/fr
+%%NLS%%@dirrmtry man/pl/man1
+%%NLS%%@dirrmtry man/pl
diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist
index 72e006f2b896..2bccc8ca2458 100644
--- a/misc/iso-codes/pkg-plist
+++ b/misc/iso-codes/pkg-plist
@@ -307,118 +307,118 @@ share/xml/iso-codes/iso_3166_2.xml
 share/xml/iso-codes/iso_4217.xml
 share/xml/iso-codes/iso_639.xml
 @dirrm share/xml/iso-codes
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/locale/zu 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/xh 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/wo/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/wo 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/wal/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/wal 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ve/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ve 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/uz/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/uz 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ur/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ur 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/uk 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tt/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tt 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tl 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tk/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tk 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tig/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/tig 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ti/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ti 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/te 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/syr/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/syr 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sw 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sr 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/so/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/so 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sl 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sk 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sid/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sid 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sa/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/sa 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/rw 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ro 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/pt 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ps/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ps 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/pl 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/om/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/om 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/oc/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/oc/ 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/nso 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/no 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/nn 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/mr 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/mi 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ky 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kw 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kok/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kok 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ko 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kl 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kk/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/kk 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/iu/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/iu 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/hy 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/haw/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/haw 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/gv 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/gl 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/gez/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/gez 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/fo 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/fi 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/el 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/dv/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/dv 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/cs 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/ca 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/byn/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/byn 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/be 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/aa/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/aa 2>/dev/null ||/usr/bin/true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/wo/LC_MESSAGES
+@dirrmtry share/locale/wo
+@dirrmtry share/locale/wal/LC_MESSAGES
+@dirrmtry share/locale/wal
+@dirrmtry share/locale/ve/LC_MESSAGES
+@dirrmtry share/locale/ve
+@dirrmtry share/locale/uz/LC_MESSAGES
+@dirrmtry share/locale/uz
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/tig/LC_MESSAGES
+@dirrmtry share/locale/tig
+@dirrmtry share/locale/ti/LC_MESSAGES
+@dirrmtry share/locale/ti
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/syr/LC_MESSAGES
+@dirrmtry share/locale/syr
+@dirrmtry share/locale/sw/LC_MESSAGES
+@dirrmtry share/locale/sw
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/so/LC_MESSAGES
+@dirrmtry share/locale/so
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/sid/LC_MESSAGES
+@dirrmtry share/locale/sid
+@dirrmtry share/locale/sa/LC_MESSAGES
+@dirrmtry share/locale/sa
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/om/LC_MESSAGES
+@dirrmtry share/locale/om
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc/
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/kw/LC_MESSAGES
+@dirrmtry share/locale/kw
+@dirrmtry share/locale/kok/LC_MESSAGES
+@dirrmtry share/locale/kok
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/kl/LC_MESSAGES
+@dirrmtry share/locale/kl
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/iu/LC_MESSAGES
+@dirrmtry share/locale/iu
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/haw/LC_MESSAGES
+@dirrmtry share/locale/haw
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/gez/LC_MESSAGES
+@dirrmtry share/locale/gez
+@dirrmtry share/locale/fo/LC_MESSAGES
+@dirrmtry share/locale/fo
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dv/LC_MESSAGES
+@dirrmtry share/locale/dv
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/byn/LC_MESSAGES
+@dirrmtry share/locale/byn
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/aa/LC_MESSAGES
+@dirrmtry share/locale/aa
 @dirrm share/iso-codes
diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile
index a3e016490be9..112f76190a0c 100644
--- a/misc/ldconfig_compat/Makefile
+++ b/misc/ldconfig_compat/Makefile
@@ -60,7 +60,7 @@ do-install:
 .for dir in ${LOCAL_DIRS}
 	@${MKDIR} -p ${prefix}/${dir}
 	@${ECHO_CMD} "@exec mkdir -p %D/${dir}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/${dir} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${dir}" >> ${TMPPLIST}
 .endfor
 .endfor
 
diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist
index 0ef2fcc238da..6bcdce6dd541 100644
--- a/misc/p5-Business-UPS/pkg-plist
+++ b/misc/p5-Business-UPS/pkg-plist
@@ -7,4 +7,4 @@
 @dirrmtry %%SITE_PERL%%/Business
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
-%%PORTDOCS%%@unexec rmdir %D/share/examples/Business-UPS 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry share/examples/Business-UPS