/textproc/agrep/

FreeBSD Ports (https://github.com/freebsd/freebsd-ports)
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 13:52:28 +0800
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 13:52:28 +0800
commitd568611c3eb334453c4a0352b61f081a623d72f1 (patch)
treec3c2e5147c98015eb1ada868e403a08ef31d9123
parentf35229590b6b5b323c1b01abd2946e20fc1a0476 (diff)
downloadfreebsd-ports-d568611c3eb334453c4a0352b61f081a623d72f1.tar.gz
freebsd-ports-d568611c3eb334453c4a0352b61f081a623d72f1.tar.zst
freebsd-ports-d568611c3eb334453c4a0352b61f081a623d72f1.zip
eplace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Notes
Notes: svn path=/head/; revision=154134
Diffstat
-rw-r--r--astro/gpsdrive/pkg-plist4
-rw-r--r--audio/cantus/pkg-plist8
-rw-r--r--audio/hydrogen/Makefile6
-rw-r--r--audio/orpheus/pkg-plist2
-rw-r--r--audio/polypaudio/pkg-plist2
-rw-r--r--audio/xmms-kj/pkg-plist2
-rw-r--r--cad/alliance/pkg-plist4
-rw-r--r--chinese/gcin-devel/pkg-plist2
-rw-r--r--chinese/gcin/pkg-plist2
-rw-r--r--chinese/iiimf-le-newpy/pkg-plist2
-rw-r--r--chinese/iiimf-le-ude/pkg-plist2
-rw-r--r--chinese/p5-Encode-HanConvert/pkg-plist4
-rw-r--r--chinese/xemacs21/pkg-plist6
-rw-r--r--chinese/zhcon/pkg-plist8
-rw-r--r--databases/dbXML/pkg-plist8
-rw-r--r--databases/firebird-server/pkg-plist.client2
-rw-r--r--databases/firebird2-server/pkg-plist.client2
-rw-r--r--databases/firebird20-server/pkg-plist.client2
-rw-r--r--databases/mysql41-server/pkg-plist2
-rw-r--r--databases/p5-DBD-Excel/pkg-plist2
-rw-r--r--databases/p5-DBIx-SQLEngine/pkg-plist4
-rw-r--r--databases/pgaccess/pkg-plist2
-rw-r--r--databases/php-sqlrelay/Makefile4
-rw-r--r--databases/phpmyadmin/Makefile2
-rw-r--r--databases/phpmyadmin211/Makefile2
-rw-r--r--databases/postgis/pkg-plist2
-rw-r--r--databases/postgresql-docs/Makefile2
-rw-r--r--databases/postgresql-jdbc/pkg-plist6
-rw-r--r--databases/postgresql73-server/pkg-plist-client16
-rw-r--r--databases/postgresql73-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql73-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql73-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql73-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql73-server/pkg-plist-server24
-rw-r--r--databases/postgresql74-server/pkg-plist-client20
-rw-r--r--databases/postgresql74-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql74-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql74-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql74-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql74-server/pkg-plist-server24
-rw-r--r--databases/postgresql74-server/pkg-plist-tcltk6
-rw-r--r--databases/postgresql80-server/pkg-plist-client36
-rw-r--r--databases/postgresql80-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql80-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql80-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql80-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql80-server/pkg-plist-server40
-rw-r--r--databases/postgresql81-server/pkg-plist-client36
-rw-r--r--databases/postgresql81-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql81-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql81-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql81-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql81-server/pkg-plist-server40
-rw-r--r--databases/postgresql82-server/pkg-plist-client36
-rw-r--r--databases/postgresql82-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql82-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql82-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql82-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql82-server/pkg-plist-server40
-rw-r--r--databases/postgresql83-server/pkg-plist-client36
-rw-r--r--databases/postgresql83-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql83-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql83-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql83-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql83-server/pkg-plist-server40
-rw-r--r--databases/postgresql84-server/pkg-plist-client36
-rw-r--r--databases/postgresql84-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql84-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql84-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql84-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql84-server/pkg-plist-server40
-rw-r--r--databases/postgresql90-server/pkg-plist-client36
-rw-r--r--databases/postgresql90-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql90-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql90-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql90-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql90-server/pkg-plist-server40
-rw-r--r--databases/postgresql91-server/pkg-plist-client36
-rw-r--r--databases/postgresql91-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql91-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql91-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql91-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql91-server/pkg-plist-server40
-rw-r--r--databases/postgresql92-server/pkg-plist-client36
-rw-r--r--databases/postgresql92-server/pkg-plist-contrib10
-rw-r--r--databases/postgresql92-server/pkg-plist-plperl4
-rw-r--r--databases/postgresql92-server/pkg-plist-plpython4
-rw-r--r--databases/postgresql92-server/pkg-plist-pltcl6
-rw-r--r--databases/postgresql92-server/pkg-plist-server40
-rw-r--r--deskutils/gnochm/pkg-plist4
-rw-r--r--deskutils/narval/pkg-plist2
-rw-r--r--devel/bison2/pkg-plist4
-rw-r--r--devel/cscout-devel/pkg-plist2
-rw-r--r--devel/cscout/pkg-plist2
-rw-r--r--devel/cvsweb/Makefile3
-rw-r--r--devel/cvsweb3/Makefile4
-rw-r--r--devel/dialyzer/pkg-plist4
-rw-r--r--devel/esvn/pkg-plist10
-rw-r--r--devel/gettext/pkg-plist80
-rw-r--r--devel/libds/pkg-plist2
-rw-r--r--devel/linux-f10-sdl12/pkg-plist.i3862
-rw-r--r--devel/linux-f8-sdl12/pkg-plist.i3862
-rw-r--r--devel/linux-glib2/pkg-plist140
-rw-r--r--devel/linux-sdl12/pkg-plist.i3862
-rw-r--r--devel/linux_devtools/pkg-plist4
-rw-r--r--devel/p5-Data-Swap/pkg-plist4
-rw-r--r--devel/p5-Log-Accounting-SVK/pkg-plist4
-rw-r--r--devel/p5-Module-Info-File/pkg-plist8
-rw-r--r--devel/p5-Object-MultiType/pkg-plist2
-rw-r--r--devel/p5-Test-Pod-Coverage/pkg-plist8
-rw-r--r--devel/pear/bsd.pear.mk16
-rw-r--r--devel/popt/pkg-plist52
-rw-r--r--devel/porttools/files/patch-cmd_test.in2
-rw-r--r--devel/py-kid/pkg-plist6
-rw-r--r--devel/py-reverse/Makefile2
-rw-r--r--devel/ruby-byaccr/pkg-plist4
-rw-r--r--dns/libidn/pkg-plist4
-rw-r--r--dns/p5-Net-LibIDN/pkg-plist4
-rw-r--r--dns/p5-Tie-DNS/pkg-plist2
-rw-r--r--editors/joe2/pkg-plist2
-rw-r--r--editors/mp/pkg-plist8
-rw-r--r--editors/xemacs-devel-mule/pkg-plist.arch-dep6
-rw-r--r--editors/xemacs21-mule/pkg-plist.arch-dep8
-rw-r--r--emulators/vmware-guestd4/pkg-plist4
-rw-r--r--emulators/vmware-guestd5/pkg-plist4
-rw-r--r--emulators/vmware-guestd6/pkg-plist4
-rw-r--r--finance/grisbi/pkg-plist22
-rw-r--r--ftp/gwget/pkg-plist4
-rw-r--r--ftp/wgetpro/pkg-plist22
-rw-r--r--games/quake3-data/pkg-plist2
-rw-r--r--german/BBBike/pkg-plist.in2
-rw-r--r--graphics/GraphicsMagick/pkg-plist2
-rw-r--r--graphics/GraphicsMagick12/pkg-plist2
-rw-r--r--graphics/GraphicsMagick13/pkg-plist2
-rw-r--r--graphics/ImageMagick/pkg-plist2
-rw-r--r--graphics/fyre/pkg-plist2
-rw-r--r--graphics/gtksee/pkg-plist8
-rw-r--r--graphics/mapserver/pkg-plist2
-rw-r--r--graphics/p5-Chart-PNGgraph/pkg-plist4
-rw-r--r--graphics/p5-Imager-Graph/pkg-plist2
-rw-r--r--graphics/p5-ming/pkg-plist2
-rw-r--r--irc/cgiirc/pkg-plist2
-rw-r--r--irc/infobot/pkg-plist6
-rw-r--r--irc/xchat/pkg-plist6
-rw-r--r--irc/xchat1/pkg-plist6
-rw-r--r--japanese/iiimf-le-canna/pkg-plist2
-rw-r--r--japanese/iiimf-le-freewnn/pkg-plist2
-rw-r--r--japanese/mell/pkg-plist2
-rw-r--r--japanese/migemo/pkg-plist2
-rw-r--r--japanese/navi2ch-emacs20/pkg-plist2
-rw-r--r--japanese/perl5/pkg-plist6
-rw-r--r--japanese/prime-el/pkg-plist10
-rw-r--r--japanese/prime/pkg-plist8
-rw-r--r--japanese/skk-jisyo/pkg-plist2
-rw-r--r--japanese/suikyo/pkg-plist6
-rw-r--r--java/classpath/Makefile2
-rw-r--r--korean/iiimf-le-hangul/pkg-plist2
-rw-r--r--lang/fpc-devel/pkg-plist2
-rw-r--r--lang/gcc30/Makefile2
-rw-r--r--lang/gcc32/Makefile2
-rw-r--r--lang/icc/pkg-plist2
-rw-r--r--lang/icc7/pkg-plist2
-rw-r--r--lang/ifc/pkg-plist2
-rw-r--r--lang/ifc7/pkg-plist2
-rw-r--r--lang/kroc/pkg-plist12
-rw-r--r--lang/python-doc-html/Makefile2
-rw-r--r--lang/python-doc-html/pkg-plist_html2
-rw-r--r--lang/python-doc-html/pkg-plist_pdf-a42
-rw-r--r--lang/python-doc-html/pkg-plist_pdf-letter2
-rw-r--r--lang/python-doc-html/pkg-plist_postscript-a42
-rw-r--r--lang/python-doc-html/pkg-plist_postscript-letter2
-rw-r--r--mail/balsa/pkg-plist2
-rw-r--r--mail/bbmail/Makefile2
-rw-r--r--mail/claws-mail/pkg-plist4
-rw-r--r--mail/dspam-devel/pkg-plist2
-rw-r--r--mail/dspam/pkg-plist2
-rw-r--r--mail/exim/pkg-plist6
-rw-r--r--mail/mailman/pkg-plist2
-rw-r--r--mail/p5-Email-Date/pkg-plist2
-rw-r--r--mail/p5-Qmail-Envelope/pkg-plist4
-rw-r--r--mail/roundcube/pkg-plist8
-rw-r--r--mail/spruce/pkg-plist4
-rw-r--r--mail/sylpheed-claws/pkg-plist4
-rw-r--r--mail/sympa5/pkg-plist40
-rw-r--r--math/vtk-java/pkg-plist4
-rw-r--r--misc/amanda-server/pkg-plist.client6
-rw-r--r--misc/amanda25-server/pkg-plist.client6
-rw-r--r--misc/amanda26-server/pkg-plist.client6
-rw-r--r--misc/amanda32-server/pkg-plist.client6
-rw-r--r--misc/compat4x/pkg-plist.freebsd42
-rw-r--r--misc/compat4x/pkg-plist.freebsd54
-rw-r--r--misc/compat5x/pkg-plist4
-rw-r--r--misc/findutils/pkg-plist4
-rw-r--r--misc/fortune-mod-culmea-culmilor/Makefile.fortune4
-rw-r--r--misc/globus2/pkg-plist2
-rw-r--r--misc/hello/pkg-plist4
-rw-r--r--misc/help2man/pkg-plist12
-rw-r--r--misc/iso-codes/pkg-plist228
-rw-r--r--misc/ldconfig_compat/Makefile2
-rw-r--r--misc/p5-Business-UPS/pkg-plist2
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common2
-rw-r--r--multimedia/kplayer-kde4/pkg-plist4
-rw-r--r--multimedia/kplayer/pkg-plist4
-rw-r--r--multimedia/linux-realplayer/pkg-plist22
-rw-r--r--ports-mgmt/porttools/files/patch-cmd_test.in2
206 files changed, 1028 insertions, 1025 deletions
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index 046333d465ac..f91e77f9cd78 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -59,7 +59,7 @@ share/pixmaps/gpsicon.png
%%NLS%%share/locale/sk/LC_MESSAGES/gpsdrive.mo
%%NLS%%share/locale/sv/LC_MESSAGES/gpsdrive.mo
%%NLS%%share/locale/tr/LC_MESSAGES/gpsdrive.mo
-%%NLS%%@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/gr 2> /dev/null || true
+%%NLS%%@dirrmtry share/locale/gr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gr
@dirrmtry share/applications
@dirrm %%DATADIR%%
diff --git a/audio/cantus/pkg-plist b/audio/cantus/pkg-plist
index 98aea4760c26..6d416d64b759 100644
--- a/audio/cantus/pkg-plist
+++ b/audio/cantus/pkg-plist
@@ -22,9 +22,9 @@ share/pixmaps/cantus/warning.xpm
share/pixmaps/cantus/addrecursive.xpm
share/gnome/apps/Applications/cantus.desktop
@dirrm share/pixmaps/cantus
-@unexec rmdir %D/share/pixmaps
-@unexec rmdir %D/share/gnome/apps/Applications
-@unexec rmdir %D/share/gnome/apps
-@unexec rmdir %D/share/gnome
+@dirrmtry share/pixmaps
+@dirrmtry share/gnome/apps/Applications
+@dirrmtry share/gnome/apps
+@dirrmtry share/gnome
@dirrm doc/Cantus
@dirrm doc
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 6cb865e769cd..be2d0cdd581d 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -103,9 +103,9 @@ pre-install:
${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
${FIND} data -type d ! -empty | ${SORT} -r | \
${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
- @${ECHO_CMD} '@unexec rmdir %D/share/applications 2>/dev/null || true' >> ${PLIST}
- @${ECHO_CMD} '@unexec rmdir %D/man/ru.KOI8-R/man1 2>/dev/null || true' >> ${PLIST}
- @${ECHO_CMD} '@unexec rmdir %D/man/ru.KOI8-R 2>/dev/null || true' >> ${PLIST}
+ @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+ @${ECHO_CMD} '@dirrmtry man/ru.KOI8-R/man1' >> ${PLIST}
+ @${ECHO_CMD} '@dirrmtry man/ru.KOI8-R' >> ${PLIST}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hydrogen ${WRKSRC}/hydrogenPlayer ${PREFIX}/bin
diff --git a/audio/orpheus/pkg-plist b/audio/orpheus/pkg-plist
index 2f810213c465..f012b035f7c9 100644
--- a/audio/orpheus/pkg-plist
+++ b/audio/orpheus/pkg-plist
@@ -1,3 +1,3 @@
bin/orpheus
%%NLS%%share/locale/ru/LC_MESSAGES/orpheus.mo
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
diff --git a/audio/polypaudio/pkg-plist b/audio/polypaudio/pkg-plist
index 2e9925435fc8..d71469eafb7f 100644
--- a/audio/polypaudio/pkg-plist
+++ b/audio/polypaudio/pkg-plist
@@ -211,4 +211,4 @@ libdata/pkgconfig/polyplib-simple.pc
libdata/pkgconfig/polyplib.pc
@dirrm lib/polypaudio-%%VERSION%%
@dirrm include/polyp
-@unexec rmdir %D/etc/polypaudio 2> /dev/null || /usr/bin/true
+@dirrmtry etc/polypaudio
diff --git a/audio/xmms-kj/pkg-plist b/audio/xmms-kj/pkg-plist
index d302c39deeba..22c87dc716f3 100644
--- a/audio/xmms-kj/pkg-plist
+++ b/audio/xmms-kj/pkg-plist
@@ -1,4 +1,4 @@
lib/xmms/Visualization/libkjofol.so
share/xmms/kjofol/default.zip
-@unexec rmdir %D/lib/xmms/Visualization 2>&1 >/dev/null || true
+@dirrmtry lib/xmms/Visualization
@dirrm share/xmms/kjofol
diff --git a/cad/alliance/pkg-plist b/cad/alliance/pkg-plist
index 258591b16f7a..68cbf5c2ceba 100644
--- a/cad/alliance/pkg-plist
+++ b/cad/alliance/pkg-plist
@@ -1768,5 +1768,5 @@ alliance/examples/alliance-examples/tuner/tuner_io.c
@dirrm alliance/examples/alliance-examples/tuner
@dirrm alliance/examples/alliance-examples
@dirrm alliance/examples
-@unexec rmdir %D/alliance/etc > /dev/null 2>&1 || true
-@unexec rmdir %D/alliance > /dev/null 2>&1 || true
+@dirrmtry alliance/etc
+@dirrmtry alliance
diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist
index 11fa8ca87ee2..c297dd25cc21 100644
--- a/chinese/gcin-devel/pkg-plist
+++ b/chinese/gcin-devel/pkg-plist
@@ -49,7 +49,7 @@ share/gnome/control-center-2.0/capplets/gcin-setup.desktop
share/icons/gcin.png
share/icons/gcin/pin-fixed24.png
share/icons/gcin/pin-float16.png
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
@dirrmtry share/icons/gcin
@dirrmtry share/icons
@dirrmtry share/gnome/control-center-2.0/capplets
diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist
index 11fa8ca87ee2..c297dd25cc21 100644
--- a/chinese/gcin/pkg-plist
+++ b/chinese/gcin/pkg-plist
@@ -49,7 +49,7 @@ share/gnome/control-center-2.0/capplets/gcin-setup.desktop
share/icons/gcin.png
share/icons/gcin/pin-fixed24.png
share/icons/gcin/pin-float16.png
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
@dirrmtry share/icons/gcin
@dirrmtry share/icons
@dirrmtry share/gnome/control-center-2.0/capplets
diff --git a/chinese/iiimf-le-newpy/pkg-plist b/chinese/iiimf-le-newpy/pkg-plist
index d02b7a045aa0..b2858ed6fbf4 100644
--- a/chinese/iiimf-le-newpy/pkg-plist
+++ b/chinese/iiimf-le-newpy/pkg-plist
@@ -14,4 +14,4 @@ lib/iiim/le/newpy/data/UdCiku.dat
%%WANT_XAUX%%lib/iiim/le/newpy/help.gif
@dirrm lib/iiim/le/newpy/data
@dirrm lib/iiim/le/newpy
-@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
+@dirrmtry lib/iiim/le
diff --git a/chinese/iiimf-le-ude/pkg-plist b/chinese/iiimf-le-ude/pkg-plist
index 353765143b79..d73e2f75ffd7 100644
--- a/chinese/iiimf-le-ude/pkg-plist
+++ b/chinese/iiimf-le-ude/pkg-plist
@@ -2,4 +2,4 @@ lib/iiim/le/ude/ude.so
lib/iiim/le/ude/data/pinyin.mb
@dirrm lib/iiim/le/ude/data
@dirrm lib/iiim/le/ude
-@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true
+@dirrmtry lib/iiim/le
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index f1c7d3f2e99a..fbfaef3ac6b2 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -12,6 +12,6 @@ bin/g2b.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
%%OLD%%@dirrm %%SITE_PERL%%/Encode/HanConvert
-%%OLD%%@unexec rmdir %D/%%SITE_PERL%%/Encode 2>/dev/null || true
+%%OLD%%@dirrmtry %%SITE_PERL%%/Encode
%%NEW%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert
-%%NEW%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
+%%NEW%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
diff --git a/chinese/xemacs21/pkg-plist b/chinese/xemacs21/pkg-plist
index d7937a036e21..bbceebc1a6ba 100644
--- a/chinese/xemacs21/pkg-plist
+++ b/chinese/xemacs21/pkg-plist
@@ -17,8 +17,8 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/config.values
@exec ln -sf ja %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
@unexec rm -f %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC
-@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true
-@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages 2>/dev/null || true
+@dirrmtry lib/xemacs/mule-packages/etc/app-defaults
+@dirrmtry lib/xemacs/mule-packages/etc
+@dirrmtry lib/xemacs/mule-packages
@dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%
@dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/zh_TW.Big5
diff --git a/chinese/zhcon/pkg-plist b/chinese/zhcon/pkg-plist
index 5a58ae69dd8b..e66d7816ec8e 100644
--- a/chinese/zhcon/pkg-plist
+++ b/chinese/zhcon/pkg-plist
@@ -40,10 +40,10 @@ lib/zhcon/input/winzm.mb
%%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
%%NLS%%share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/zh_CN.GBK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN.GBK
+%%NLS%%@dirrmtry share/locale/zh_CN.EUC/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN.EUC
@dirrm lib/zhcon/input
@dirrm lib/zhcon/font
@dirrm lib/zhcon
diff --git a/databases/dbXML/pkg-plist b/databases/dbXML/pkg-plist
index 7b44ae809d64..3af75ae1cc04 100644
--- a/databases/dbXML/pkg-plist
+++ b/databases/dbXML/pkg-plist
@@ -1386,10 +1386,10 @@ bin/dbxmlctl
@dirrm %%T%%/docs/src
@dirrm %%T%%/docs/licenses
@dirrm %%T%%/docs/notes
-@unexec rmdir %D/%%T%%/docs > /dev/null 2>&1 || true
+@dirrmtry %%T%%/docs
@dirrm %%T%%/icons
-@unexec rmdir %D/%%T%%/config > /dev/null 2>&1 || true
+@dirrmtry %%T%%/config
@dirrm %%T%%/idl
-@unexec rmdir %D/%%T%%/logs > /dev/null 2>&1 || true
+@dirrmtry %%T%%/logs
@dirrm %%T%%/xml
-@unexec rmdir %D/%%T%% > /dev/null 2>&1 || true
+@dirrmtry %%T%%
diff --git a/databases/firebird-server/pkg-plist.client b/databases/firebird-server/pkg-plist.client
index 1e600c2e67dd..8b61d85d22d4 100644
--- a/databases/firebird-server/pkg-plist.client
+++ b/databases/firebird-server/pkg-plist.client
@@ -20,7 +20,7 @@ lib/libib_util.so
@unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi
%%CONFDIR%%/firebird.conf.sample
@exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
%%DATADIR%%/de_DE.msg
%%DATADIR%%/firebird.msg
%%DATADIR%%/fr_FR.msg
diff --git a/databases/firebird2-server/pkg-plist.client b/databases/firebird2-server/pkg-plist.client
index 1e600c2e67dd..8b61d85d22d4 100644
--- a/databases/firebird2-server/pkg-plist.client
+++ b/databases/firebird2-server/pkg-plist.client
@@ -20,7 +20,7 @@ lib/libib_util.so
@unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi
%%CONFDIR%%/firebird.conf.sample
@exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
%%DATADIR%%/de_DE.msg
%%DATADIR%%/firebird.msg
%%DATADIR%%/fr_FR.msg
diff --git a/databases/firebird20-server/pkg-plist.client b/databases/firebird20-server/pkg-plist.client
index 1e600c2e67dd..8b61d85d22d4 100644
--- a/databases/firebird20-server/pkg-plist.client
+++ b/databases/firebird20-server/pkg-plist.client
@@ -20,7 +20,7 @@ lib/libib_util.so
@unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi
%%CONFDIR%%/firebird.conf.sample
@exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
%%DATADIR%%/de_DE.msg
%%DATADIR%%/firebird.msg
%%DATADIR%%/fr_FR.msg
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 955fc5fec43b..324514595b0c 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -162,7 +162,7 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-%%NDB%%@unexec rmdir %D/include/mysql 2> /dev/null || true
+%%NDB%%@dirrmtry include/mysql
@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist
index 93473bffb585..6c08d0af261a 100644
--- a/databases/p5-DBD-Excel/pkg-plist
+++ b/databases/p5-DBD-Excel/pkg-plist
@@ -16,4 +16,4 @@
@dirrmtry %%SITE_PERL%%/DBD
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
-%%PORTDOCS%%@unexec rmdir %D/share/examples/DBD-Excel 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry share/examples/DBD-Excel
diff --git a/databases/p5-DBIx-SQLEngine/pkg-plist b/databases/p5-DBIx-SQLEngine/pkg-plist
index 10ae9d0a2ec9..0048bb77755c 100644
--- a/databases/p5-DBIx-SQLEngine/pkg-plist
+++ b/databases/p5-DBIx-SQLEngine/pkg-plist
@@ -61,7 +61,7 @@
@dirrm %%SITE_PERL%%/DBIx/SQLEngine/Schema
@dirrm %%SITE_PERL%%/DBIx/SQLEngine/Utility
@dirrm %%SITE_PERL%%/DBIx/SQLEngine
-@unexec rmdir %D%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBIx
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SQLEngine/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SQLEngine
-@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
diff --git a/databases/pgaccess/pkg-plist b/databases/pgaccess/pkg-plist
index 26844e6e3a85..49f27e2ce48c 100644
--- a/databases/pgaccess/pkg-plist
+++ b/databases/pgaccess/pkg-plist
@@ -394,4 +394,4 @@ share/postgresql/pgaccess/utils/mkkit.tcl
@dirrmtry share/postgresql
%%PORTDOCS%%@dirrm share/doc/postgresql/pgaccess/tutorial
%%PORTDOCS%%@dirrm share/doc/postgresql/pgaccess
-%%PORTDOCS%%@unexec rmdir %D/share/doc/postgresql 2> /dev/null || true
+%%PORTDOCS%%@dirrmtry share/doc/postgresql
diff --git a/databases/php-sqlrelay/Makefile b/databases/php-sqlrelay/Makefile
index ef541abaa9d9..d16cd78cbfbd 100644
--- a/databases/php-sqlrelay/Makefile
+++ b/databases/php-sqlrelay/Makefile
@@ -50,7 +50,7 @@ pre-install:
post-install:
dir=`php-config --extension-dir | ${SED} 's,^${LOCALBASE}/,,'`; \
${ECHO_CMD} "$$dir/sql_relay.so" >> ${TMPPLIST}; \
- ${ECHO_CMD} "@unexec rmdir %D/$$dir 2>/dev/null || true" >> ${TMPPLIST}
+ ${ECHO_CMD} "@dirrmtry $$dir" >> ${TMPPLIST}
@${MKDIR} ${PREFIX}/etc/php
@${ECHO_CMD} extension=sql_relay.so \
>> ${PREFIX}/etc/php/extensions.ini
@@ -64,7 +64,7 @@ post-install:
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
>> ${TMPPLIST}
- @${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
+ @${ECHO_CMD} "@dirrmtry etc/php" \
>> ${TMPPLIST}
.include <bsd.port.post.mk>
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index ae9652fd4dd3..87e5db041dd4 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -109,7 +109,7 @@ post-patch:
${SED} -e "s,^\.,%%MYADMDIR%%," >${PLIST} ; \
${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \
${FIND} . -type d | ${SORT} -r | ${SED} \
- -e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \
+ -e "s,^\.$$,@dirrmtry %%MYADMDIR%%," \
-e "s,^\.,@dirrm %%MYADMDIR%%," >>${PLIST}
pre-install:
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index ae9652fd4dd3..87e5db041dd4 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -109,7 +109,7 @@ post-patch:
${SED} -e "s,^\.,%%MYADMDIR%%," >${PLIST} ; \
${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \
${FIND} . -type d | ${SORT} -r | ${SED} \
- -e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \
+ -e "s,^\.$$,@dirrmtry %%MYADMDIR%%," \
-e "s,^\.,@dirrm %%MYADMDIR%%," >>${PLIST}
pre-install:
diff --git a/databases/postgis/pkg-plist b/databases/postgis/pkg-plist
index 233eb7b4eb90..cc089bc2e0ea 100644
--- a/databases/postgis/pkg-plist
+++ b/databases/postgis/pkg-plist
@@ -12,7 +12,7 @@ lib/postgresql/liblwgeom.so.1
%%DATADIR%%/utils/test_joinestimation.pl
%%DATADIR%%/utils/create_undef.pl
%%DATADIR%%/utils/README
-%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
@dirrmtry lib/postgresql
@dirrmtry %%DATADIR%%/utils
@dirrmtry %%DATADIR%%
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index a2ee5df8f225..3e5356a2358b 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -44,6 +44,6 @@ post-install:
${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \
${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\
${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\
- ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST}
+ ${ECHO} "@dirrmtry ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql-jdbc/pkg-plist b/databases/postgresql-jdbc/pkg-plist
index e7695f1cf5a5..03d29388aa49 100644
--- a/databases/postgresql-jdbc/pkg-plist
+++ b/databases/postgresql-jdbc/pkg-plist
@@ -18,7 +18,7 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/threadsafe.java
%%JAVAJARDIR%%/postgresql.jar
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/jdbc/corba
-%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/jdbc 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-%%PORTDOCS%%@unexec rmdir %D/share/postgresql 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/jdbc
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry share/postgresql
@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql73-server/pkg-plist-client b/databases/postgresql73-server/pkg-plist-client
index a9bec3181497..282e1cda6451 100644
--- a/databases/postgresql73-server/pkg-plist-client
+++ b/databases/postgresql73-server/pkg-plist-client
@@ -381,8 +381,8 @@ lib/libpq.a
lib/libpq.so
lib/libpq.so.3
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
@@ -421,10 +421,10 @@ lib/libpq.so.3
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
@dirrm include/postgresql
diff --git a/databases/postgresql73-server/pkg-plist-contrib b/databases/postgresql73-server/pkg-plist-contrib
index a8e5c6b5f764..93320a24c62d 100644
--- a/databases/postgresql73-server/pkg-plist-contrib
+++ b/databases/postgresql73-server/pkg-plist-contrib
@@ -133,8 +133,8 @@ share/postgresql/contrib/tablefunc.sql
share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql73-server/pkg-plist-plperl b/databases/postgresql73-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql73-server/pkg-plist-plperl
+++ b/databases/postgresql73-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql73-server/pkg-plist-plpython b/databases/postgresql73-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql73-server/pkg-plist-plpython
+++ b/databases/postgresql73-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql73-server/pkg-plist-pltcl b/databases/postgresql73-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql73-server/pkg-plist-pltcl
+++ b/databases/postgresql73-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql73-server/pkg-plist-server b/databases/postgresql73-server/pkg-plist-server
index 59e3de96ed86..795f41b84f87 100644
--- a/databases/postgresql73-server/pkg-plist-server
+++ b/databases/postgresql73-server/pkg-plist-server
@@ -30,7 +30,7 @@ lib/postgresql/utf8_and_win1256.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/postgres.bki
share/postgresql/postgres.description
share/postgresql/pg_hba.conf.sample
@@ -47,12 +47,12 @@ share/postgresql/conversion_create.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
@@ -64,8 +64,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql74-server/pkg-plist-client b/databases/postgresql74-server/pkg-plist-client
index bdce037056e9..041d674b33a8 100644
--- a/databases/postgresql74-server/pkg-plist-client
+++ b/databases/postgresql74-server/pkg-plist-client
@@ -410,9 +410,9 @@ lib/libpgtypes.a
lib/libpgtypes.so
lib/libpgtypes.so.1
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
@@ -490,12 +490,12 @@ share/postgresql/pg_service.conf.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
@dirrm include/postgresql
diff --git a/databases/postgresql74-server/pkg-plist-contrib b/databases/postgresql74-server/pkg-plist-contrib
index 99006e7e61fa..203006014135 100644
--- a/databases/postgresql74-server/pkg-plist-contrib
+++ b/databases/postgresql74-server/pkg-plist-contrib
@@ -138,8 +138,8 @@ share/postgresql/contrib/tsearch.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql74-server/pkg-plist-plperl b/databases/postgresql74-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql74-server/pkg-plist-plperl
+++ b/databases/postgresql74-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql74-server/pkg-plist-plpython b/databases/postgresql74-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql74-server/pkg-plist-plpython
+++ b/databases/postgresql74-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql74-server/pkg-plist-pltcl b/databases/postgresql74-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql74-server/pkg-plist-pltcl
+++ b/databases/postgresql74-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql74-server/pkg-plist-server b/databases/postgresql74-server/pkg-plist-server
index 9da9fdf0c62c..32b27790c8b1 100644
--- a/databases/postgresql74-server/pkg-plist-server
+++ b/databases/postgresql74-server/pkg-plist-server
@@ -30,7 +30,7 @@ lib/postgresql/utf8_and_win1256.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -53,12 +53,12 @@ share/postgresql/sql_features.txt
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
@@ -70,8 +70,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql74-server/pkg-plist-tcltk b/databases/postgresql74-server/pkg-plist-tcltk
index f4b49ae59eeb..ad1c0ca9184c 100644
--- a/databases/postgresql74-server/pkg-plist-tcltk
+++ b/databases/postgresql74-server/pkg-plist-tcltk
@@ -2,11 +2,11 @@ bin/pgtclsh
include/libpgtcl.h
lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl
@dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3
-@unexec rmdir %D/lib/tcl%%TCLVERSION%% 2>/dev/null || true
+@dirrmtry lib/tcl%%TCLVERSION%%
lib/libpgtcl.a
lib/libpgtcl.so
lib/libpgtcl.so.2
%%TK%%bin/pgtksh
%%DOCSDIR%%/README-tcltk
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql80-server/pkg-plist-client b/databases/postgresql80-server/pkg-plist-client
index 3d4497fcdbd7..50d2103784a3 100644
--- a/databases/postgresql80-server/pkg-plist-client
+++ b/databases/postgresql80-server/pkg-plist-client
@@ -433,10 +433,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -584,19 +584,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql80-server/pkg-plist-contrib b/databases/postgresql80-server/pkg-plist-contrib
index fd3f553e5b25..6aa759533233 100644
--- a/databases/postgresql80-server/pkg-plist-contrib
+++ b/databases/postgresql80-server/pkg-plist-contrib
@@ -130,8 +130,8 @@ share/postgresql/contrib/tsearch.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql80-server/pkg-plist-plperl b/databases/postgresql80-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql80-server/pkg-plist-plperl
+++ b/databases/postgresql80-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql80-server/pkg-plist-plpython b/databases/postgresql80-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql80-server/pkg-plist-plpython
+++ b/databases/postgresql80-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql80-server/pkg-plist-pltcl b/databases/postgresql80-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql80-server/pkg-plist-pltcl
+++ b/databases/postgresql80-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index 9b9478022a74..654010402baa 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -31,7 +31,7 @@ lib/postgresql/utf8_and_win1256.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -61,20 +61,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -663,8 +663,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql81-server/pkg-plist-client b/databases/postgresql81-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql81-server/pkg-plist-client
+++ b/databases/postgresql81-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql81-server/pkg-plist-contrib b/databases/postgresql81-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql81-server/pkg-plist-contrib
+++ b/databases/postgresql81-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql81-server/pkg-plist-plperl b/databases/postgresql81-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql81-server/pkg-plist-plperl
+++ b/databases/postgresql81-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql81-server/pkg-plist-plpython b/databases/postgresql81-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql81-server/pkg-plist-plpython
+++ b/databases/postgresql81-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql81-server/pkg-plist-pltcl b/databases/postgresql81-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql81-server/pkg-plist-pltcl
+++ b/databases/postgresql81-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql82-server/pkg-plist-client b/databases/postgresql82-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql82-server/pkg-plist-client
+++ b/databases/postgresql82-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql82-server/pkg-plist-contrib b/databases/postgresql82-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql82-server/pkg-plist-contrib
+++ b/databases/postgresql82-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql82-server/pkg-plist-plperl b/databases/postgresql82-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql82-server/pkg-plist-plperl
+++ b/databases/postgresql82-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql82-server/pkg-plist-plpython b/databases/postgresql82-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql82-server/pkg-plist-plpython
+++ b/databases/postgresql82-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql82-server/pkg-plist-pltcl b/databases/postgresql82-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql82-server/pkg-plist-pltcl
+++ b/databases/postgresql82-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql83-server/pkg-plist-client b/databases/postgresql83-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql83-server/pkg-plist-client
+++ b/databases/postgresql83-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql83-server/pkg-plist-contrib b/databases/postgresql83-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql83-server/pkg-plist-contrib
+++ b/databases/postgresql83-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql83-server/pkg-plist-plperl b/databases/postgresql83-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql83-server/pkg-plist-plperl
+++ b/databases/postgresql83-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql83-server/pkg-plist-plpython b/databases/postgresql83-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql83-server/pkg-plist-plpython
+++ b/databases/postgresql83-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql83-server/pkg-plist-pltcl b/databases/postgresql83-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql83-server/pkg-plist-pltcl
+++ b/databases/postgresql83-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql84-server/pkg-plist-contrib b/databases/postgresql84-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql84-server/pkg-plist-contrib
+++ b/databases/postgresql84-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql84-server/pkg-plist-plperl b/databases/postgresql84-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql84-server/pkg-plist-plperl
+++ b/databases/postgresql84-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql84-server/pkg-plist-plpython b/databases/postgresql84-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql84-server/pkg-plist-plpython
+++ b/databases/postgresql84-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql84-server/pkg-plist-pltcl b/databases/postgresql84-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql84-server/pkg-plist-pltcl
+++ b/databases/postgresql84-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql90-server/pkg-plist-contrib
+++ b/databases/postgresql90-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql90-server/pkg-plist-plperl b/databases/postgresql90-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql90-server/pkg-plist-plperl
+++ b/databases/postgresql90-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql90-server/pkg-plist-plpython b/databases/postgresql90-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql90-server/pkg-plist-plpython
+++ b/databases/postgresql90-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql90-server/pkg-plist-pltcl b/databases/postgresql90-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql90-server/pkg-plist-pltcl
+++ b/databases/postgresql90-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql91-server/pkg-plist-contrib
+++ b/databases/postgresql91-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql91-server/pkg-plist-plperl b/databases/postgresql91-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql91-server/pkg-plist-plperl
+++ b/databases/postgresql91-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql91-server/pkg-plist-plpython b/databases/postgresql91-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql91-server/pkg-plist-plpython
+++ b/databases/postgresql91-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql91-server/pkg-plist-pltcl b/databases/postgresql91-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql91-server/pkg-plist-pltcl
+++ b/databases/postgresql91-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
@dirrm lib/postgresql/pgxs
@dirrm lib/postgresql
%%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/pg_service.conf.sample
share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
%%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
share/postgresql/contrib/tsearch2.sql
share/postgresql/contrib/untsearch2.sql
share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql92-server/pkg-plist-plperl b/databases/postgresql92-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql92-server/pkg-plist-plperl
+++ b/databases/postgresql92-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plperl
lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql92-server/pkg-plist-plpython b/databases/postgresql92-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql92-server/pkg-plist-plpython
+++ b/databases/postgresql92-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
%%DOCSDIR%%/README-plpython
lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql92-server/pkg-plist-pltcl b/databases/postgresql92-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql92-server/pkg-plist-pltcl
+++ b/databases/postgresql92-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
%%DOCSDIR%%/README-pltcl
lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
bin/pltcl_loadmod
bin/pltcl_delmod
bin/pltcl_listmod
share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
lib/postgresql/utf8_and_win874.so
lib/postgresql/plpgsql.so
%%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
share/postgresql/conversion_create.sql
share/postgresql/information_schema.sql
share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
share/postgresql/timezone/Africa/Algiers
share/postgresql/timezone/Africa/Luanda
share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
@exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
@exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql
diff --git a/deskutils/gnochm/pkg-plist b/deskutils/gnochm/pkg-plist
index 17b0337229d7..881398249b5f 100644
--- a/deskutils/gnochm/pkg-plist
+++ b/deskutils/gnochm/pkg-plist
@@ -25,7 +25,7 @@ share/mime/packages/gnochm.xml
@dirrm share/gnome/help/gnochm
@dirrm share/gnome/gnochm/glade
@dirrm share/gnome/gnochm
-@unexec rmdir %D/man/it/man1 2>/dev/null||true
-@unexec rmdir %D/man/it 2>/dev/null||true
+@dirrmtry man/it/man1
+@dirrmtry man/it
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/deskutils/narval/pkg-plist b/deskutils/narval/pkg-plist
index 9118b8c359d9..f8a49083b440 100644
--- a/deskutils/narval/pkg-plist
+++ b/deskutils/narval/pkg-plist
@@ -535,4 +535,4 @@ etc/narval/narval.conf.bak
@dirrm %%PYTHON_SITELIBDIR%%/narval/communication
@dirrm %%PYTHON_SITELIBDIR%%/narval/actions
@dirrm %%PYTHON_SITELIBDIR%%/narval
-@unexec rmdir %D/etc/narval >/dev/null 2>&1 || true
+@dirrmtry etc/narval
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index 8a7c7ddba574..1daefba49783 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -53,8 +53,8 @@ share/aclocal/bison-i18n.m4
%%NLS%%share/locale/tr/LC_MESSAGES/bison-runtime.mo
%%NLS%%share/locale/vi/LC_MESSAGES/bison.mo
%%NLS%%share/locale/vi/LC_MESSAGES/bison-runtime.mo
-%%NLS%%@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/rw 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw
@dirrm %%DATADIR%%/m4sugar
@dirrm %%DATADIR%%
@dirrmtry share/aclocal
diff --git a/devel/cscout-devel/pkg-plist b/devel/cscout-devel/pkg-plist
index a36e49606c10..abe84b597ad2 100644
--- a/devel/cscout-devel/pkg-plist
+++ b/devel/cscout-devel/pkg-plist
@@ -13,7 +13,7 @@ etc/cscout/cscout_incs.GENERIC
etc/cscout/cscout_incs.LINUX_GCC
etc/cscout/cscout_incs.WIN32_MINGW
etc/cscout/cscout_incs.WIN32_MSC
-@unexec rmdir %D/etc/cscout || true
+@dirrmtry etc/cscout
%%PORTDOCS%%%%DOCSDIR%%/access.html
%%PORTDOCS%%%%DOCSDIR%%/bib.html
diff --git a/devel/cscout/pkg-plist b/devel/cscout/pkg-plist
index b9fcf7761a0e..feb00a1649ca 100644
--- a/devel/cscout/pkg-plist
+++ b/devel/cscout/pkg-plist
@@ -13,7 +13,7 @@ etc/cscout/cscout_incs.GENERIC
etc/cscout/cscout_incs.LINUX_GCC
etc/cscout/cscout_incs.WIN32_MINGW
etc/cscout/cscout_incs.WIN32_MSC
-@unexec rmdir %D/etc/cscout || true
+@dirrmtry etc/cscout
%%PORTDOCS%%%%DOCSDIR%%/access.html
%%PORTDOCS%%%%DOCSDIR%%/contents.html
%%PORTDOCS%%%%DOCSDIR%%/cvs.html
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index dcbdcf136495..ae355ef65933 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -81,7 +81,8 @@ do-install:
post-install:
.if defined(PACKAGE_BUILDING)
- ${ECHO_CMD} "@unexec rmdir %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+ ${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST}
+ ${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST}
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 045388802df3..a09b0a32f144 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -120,7 +120,9 @@ do-install:
post-install:
.if defined(PACKAGE_BUILDING)
- ${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} %D/${CSSDIR} 2>/dev/null || true" >> ${TMPPLIST}
+ ${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST}
+ ${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST}
+ ${ECHO_CMD} "@dirrmtry ${CSSDIR}" >> ${TMPPLIST}
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/devel/dialyzer/pkg-plist b/devel/dialyzer/pkg-plist
index bad7fb97617d..76cdb11feda2 100644
--- a/devel/dialyzer/pkg-plist
+++ b/devel/dialyzer/pkg-plist
@@ -28,8 +28,8 @@ lib/erlang/lib/dialyzer-%%VERSION%%/src/hipe_icode_type.hrl
@dirrm lib/erlang/lib/dialyzer-%%VERSION%%/src
@dirrm lib/erlang/lib/dialyzer-%%VERSION%%/ebin
@dirrm lib/erlang/lib/dialyzer-%%VERSION%%/doc
-@unexec rmdir %D/lib/erlang/lib/dialyzer-%%VERSION%%/plt >/dev/null 2>&1 || true
-@unexec rmdir %D/lib/erlang/lib/dialyzer-%%VERSION%% >/dev/null 2>&1 || true
+@dirrmtry lib/erlang/lib/dialyzer-%%VERSION%%/plt
+@dirrmtry lib/erlang/lib/dialyzer-%%VERSION%%
@exec ln -sf dialyzer-%%VERSION%% %D/lib/erlang/lib/dialyzer
@unexec rm -f %D/lib/erlang/lib/dialyzer >/dev/null 2>&1 || true
@exec ln -sf %D/lib/erlang/lib/dialyzer-%%VERSION%%/dialyzer %D/bin/dialyzer
diff --git a/devel/esvn/pkg-plist b/devel/esvn/pkg-plist
index e8690c1fd832..94de86732841 100644
--- a/devel/esvn/pkg-plist
+++ b/devel/esvn/pkg-plist
@@ -107,8 +107,8 @@ bin/esvn-diff-wrapper
%%KDE%%@cwd %%LOCALBASE%%
%%KDE%%share/applnk/eSvn.desktop
%%KDE%%share/icons/hicolor/48x48/apps/esvn.png
-%%KDE%%@unexec rmdir %D/share/applnk 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-%%KDE%%@unexec rmdir %D/share/icons 2>/dev/null || true
+%%KDE%%@dirrmtry share/applnk
+%%KDE%%@dirrmtry share/icons/hicolor/48x48/apps
+%%KDE%%@dirrmtry share/icons/hicolor/48x48
+%%KDE%%@dirrmtry share/icons/hicolor
+%%KDE%%@dirrmtry share/icons
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 97ee55a18524..42008cfe0ee9 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -304,43 +304,43 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
@dirrm %%DOCSDIR%%
@dirrm libdata/gettext-tools
@dirrm lib/gettext
-@unexec rmdir %%LOCALBASE%%/share/locale/be/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/en@boldquot/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/en@quot/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/be 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/ca 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/cs 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/el 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/en@boldquot 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/en@quot 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/fi 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/gl 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/ko 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/nn 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/no 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/pl 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/pt 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/ro 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/sk 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/sl 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/sr 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/uk 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/zh_TW 2>/dev/null || true
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/be
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/el
+@dirrmtry share/locale/en@boldquot
+@dirrmtry share/locale/en@quot
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/zh_TW
diff --git a/devel/libds/pkg-plist b/devel/libds/pkg-plist
index c475c32c0b81..83c1294d43d1 100644
--- a/devel/libds/pkg-plist
+++ b/devel/libds/pkg-plist
@@ -10,4 +10,4 @@ lib/libds.so
%%PORTDOCS%%share/doc/libds/queue.html
%%PORTDOCS%%share/doc/libds/set.html
%%PORTDOCS%%share/doc/libds/stack.html
-%%PORTDOCS%%@unexec rmdir %D/share/doc/libds 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry share/doc/libds
diff --git a/devel/linux-f10-sdl12/pkg-plist.i386 b/devel/linux-f10-sdl12/pkg-plist.i386
index 76916fafd2f9..f822d036c62a 100644
--- a/devel/linux-f10-sdl12/pkg-plist.i386
+++ b/devel/linux-f10-sdl12/pkg-plist.i386
@@ -6,4 +6,4 @@ usr/lib/libSDL-1.1.so.0
usr/lib/libSDL-1.2.so.0
usr/lib/libSDL-1.2.so.0.0.5
@dirrm usr/doc/SDL-1.2.5
-@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true
+@dirrmtry usr/doc
diff --git a/devel/linux-f8-sdl12/pkg-plist.i386 b/devel/linux-f8-sdl12/pkg-plist.i386
index 76916fafd2f9..f822d036c62a 100644
--- a/devel/linux-f8-sdl12/pkg-plist.i386
+++ b/devel/linux-f8-sdl12/pkg-plist.i386
@@ -6,4 +6,4 @@ usr/lib/libSDL-1.1.so.0
usr/lib/libSDL-1.2.so.0
usr/lib/libSDL-1.2.so.0.0.5
@dirrm usr/doc/SDL-1.2.5
-@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true
+@dirrmtry usr/doc
diff --git a/devel/linux-glib2/pkg-plist b/devel/linux-glib2/pkg-plist
index 574c0dbd7e01..cea8ba446817 100644
--- a/devel/linux-glib2/pkg-plist
+++ b/devel/linux-glib2/pkg-plist
@@ -79,73 +79,73 @@ usr/share/locale/yi/LC_MESSAGES/glib20.mo
usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
@dirrm usr/share/doc/glib2-%%PORTVERSION%%
-@unexec rmdir %D/usr/share/locale/am/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/am >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ar >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/az >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bg >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/bs >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/cy >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_CA >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/en_GB >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/eu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/fa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ga >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/gu >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/he >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/hr >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lt >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/lv >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mk >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ml >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/mn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ms >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nb >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ne >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/nn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/or/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/or >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/pa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sq >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@Latn >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/sr@ije >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/ta >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/vi >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/wa >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi/LC_MESSAGES >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/share/locale/yi >/dev/null 2>&1 || true
+@dirrmtry usr/share/locale/am/LC_MESSAGES
+@dirrmtry usr/share/locale/am
+@dirrmtry usr/share/locale/ar/LC_MESSAGES
+@dirrmtry usr/share/locale/ar
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
+@dirrmtry usr/share/locale/bg/LC_MESSAGES
+@dirrmtry usr/share/locale/bg
+@dirrmtry usr/share/locale/bn/LC_MESSAGES
+@dirrmtry usr/share/locale/bn
+@dirrmtry usr/share/locale/bs/LC_MESSAGES
+@dirrmtry usr/share/locale/bs
+@dirrmtry usr/share/locale/cy/LC_MESSAGES
+@dirrmtry usr/share/locale/cy
+@dirrmtry usr/share/locale/en/LC_MESSAGES
+@dirrmtry usr/share/locale/en
+@dirrmtry usr/share/locale/en_CA/LC_MESSAGES
+@dirrmtry usr/share/locale/en_CA
+@dirrmtry usr/share/locale/en_GB/LC_MESSAGES
+@dirrmtry usr/share/locale/en_GB
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/fa/LC_MESSAGES
+@dirrmtry usr/share/locale/fa
+@dirrmtry usr/share/locale/ga/LC_MESSAGES
+@dirrmtry usr/share/locale/ga
+@dirrmtry usr/share/locale/gu/LC_MESSAGES
+@dirrmtry usr/share/locale/gu
+@dirrmtry usr/share/locale/he/LC_MESSAGES
+@dirrmtry usr/share/locale/he
+@dirrmtry usr/share/locale/hi/LC_MESSAGES
+@dirrmtry usr/share/locale/hi
+@dirrmtry usr/share/locale/hr/LC_MESSAGES
+@dirrmtry usr/share/locale/hr
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/lv/LC_MESSAGES
+@dirrmtry usr/share/locale/lv
+@dirrmtry usr/share/locale/mk/LC_MESSAGES
+@dirrmtry usr/share/locale/mk
+@dirrmtry usr/share/locale/ml/LC_MESSAGES
+@dirrmtry usr/share/locale/ml
+@dirrmtry usr/share/locale/mn/LC_MESSAGES
+@dirrmtry usr/share/locale/mn
+@dirrmtry usr/share/locale/ms/LC_MESSAGES
+@dirrmtry usr/share/locale/ms
+@dirrmtry usr/share/locale/nb/LC_MESSAGES
+@dirrmtry usr/share/locale/nb
+@dirrmtry usr/share/locale/ne/LC_MESSAGES
+@dirrmtry usr/share/locale/ne
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/or/LC_MESSAGES
+@dirrmtry usr/share/locale/or
+@dirrmtry usr/share/locale/pa/LC_MESSAGES
+@dirrmtry usr/share/locale/pa
+@dirrmtry usr/share/locale/sq/LC_MESSAGES
+@dirrmtry usr/share/locale/sq
+@dirrmtry usr/share/locale/sr@Latn/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@Latn
+@dirrmtry usr/share/locale/sr@ije/LC_MESSAGES
+@dirrmtry usr/share/locale/sr@ije
+@dirrmtry usr/share/locale/ta/LC_MESSAGES
+@dirrmtry usr/share/locale/ta
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/wa/LC_MESSAGES
+@dirrmtry usr/share/locale/wa
+@dirrmtry usr/share/locale/yi/LC_MESSAGES
+@dirrmtry usr/share/locale/yi
diff --git a/devel/linux-sdl12/pkg-plist.i386 b/devel/linux-sdl12/pkg-plist.i386
index 76916fafd2f9..f822d036c62a 100644
--- a/devel/linux-sdl12/pkg-plist.i386
+++ b/devel/linux-sdl12/pkg-plist.i386
@@ -6,4 +6,4 @@ usr/lib/libSDL-1.1.so.0
usr/lib/libSDL-1.2.so.0
usr/lib/libSDL-1.2.so.0.0.5
@dirrm usr/doc/SDL-1.2.5
-@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true
+@dirrmtry usr/doc
diff --git a/devel/linux_devtools/pkg-plist b/devel/linux_devtools/pkg-plist
index dc1b844575a5..5c52f89ca3fe 100644
--- a/devel/linux_devtools/pkg-plist
+++ b/devel/linux_devtools/pkg-plist
@@ -5006,5 +5006,5 @@ usr/X11R6/man/man3/gluUnProject.3x.gz
@dirrm usr/X11R6/include/X11
@dirrm usr/X11R6/lib/X11/config
@dirrm usr/X11R6/lib/X11
-@unexec rmdir %D/usr/X11R6/man/man1 >/dev/null 2>&1 || true
-@unexec rmdir %D/usr/X11R6/man/man3 >/dev/null 2>&1 || true
+@dirrmtry usr/X11R6/man/man1
+@dirrmtry usr/X11R6/man/man3
diff --git a/devel/p5-Data-Swap/pkg-plist b/devel/p5-Data-Swap/pkg-plist
index deacf058c5b3..5b2694f597fb 100644
--- a/devel/p5-Data-Swap/pkg-plist
+++ b/devel/p5-Data-Swap/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap/Swap.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap/Swap.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Data || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Data
diff --git a/devel/p5-Log-Accounting-SVK/pkg-plist b/devel/p5-Log-Accounting-SVK/pkg-plist
index ec751489c244..b9496741f8fa 100644
--- a/devel/p5-Log-Accounting-SVK/pkg-plist
+++ b/devel/p5-Log-Accounting-SVK/pkg-plist
@@ -4,5 +4,5 @@ bin/svk-accounting.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting/SVK
@dirrmtry %%SITE_PERL%%/Log/Accounting
@dirrmtry %%SITE_PERL%%/Log
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting 2>/dev/null ||true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null ||true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
diff --git a/devel/p5-Module-Info-File/pkg-plist b/devel/p5-Module-Info-File/pkg-plist
index d0d3251d175c..77a4b0b4edbc 100644
--- a/devel/p5-Module-Info-File/pkg-plist
+++ b/devel/p5-Module-Info-File/pkg-plist
@@ -2,7 +2,7 @@ bin/version.pl
%%SITE_PERL%%/Module/Info/File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info/File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info 2>/dev/null | true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null | true
-@unexec rmdir %D/%%SITE_PERL%%/Module/Info 2>/dev/null | true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null | true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module/Info
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Object-MultiType/pkg-plist b/devel/p5-Object-MultiType/pkg-plist
index 58b2f80845b6..21620a8e5165 100644
--- a/devel/p5-Object-MultiType/pkg-plist
+++ b/devel/p5-Object-MultiType/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/MultiType/.packlist
%%SITE_PERL%%/Object/MultiType.pm
@dirrm %%SITE_PERL%%/mach/auto/Object/MultiType
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Object 2>/dev/null
+@dirrmtry %%SITE_PERL%%/mach/auto/Object
@dirrmtry %SITE_PERL%%/%%PERL_ARCH%%/Object
@dirrmtry %%SITE_PERL%%/Object
diff --git a/devel/p5-Test-Pod-Coverage/pkg-plist b/devel/p5-Test-Pod-Coverage/pkg-plist
index 424f724873e2..c935cdc2e492 100644
--- a/devel/p5-Test-Pod-Coverage/pkg-plist
+++ b/devel/p5-Test-Pod-Coverage/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Test/Pod/Coverage.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/Coverage/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/Coverage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod 2>/dev/null | true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null | true
-@unexec rmdir %D/%%SITE_PERL%%/Test/Pod 2>/dev/null | true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null | true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/Pod
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk
index 2991fb31b80c..4a864ef67e1d 100644
--- a/devel/pear/bsd.pear.mk
+++ b/devel/pear/bsd.pear.mk
@@ -129,14 +129,14 @@ do-generate-plist:
if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
echo "@dirrm ${LPKGREGDIR}"; \
- if [ -n "${CATEGORY}" ]; then echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; fi; \
- if [ -n "${CATEGORY:M*/*}" ]; then echo "@unexec rmdir %D/${LINSTDIR:H} 2> /dev/null || true"; fi; \
- echo "@unexec rmdir %D/${LPKGREGDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
+ if [ -n "${CATEGORY}" ]; then echo "@dirrmtry ${LINSTDIR}"; fi; \
+ if [ -n "${CATEGORY:M*/*}" ]; then echo "@dirrmtry ${LINSTDIR:H}"; fi; \
+ echo "@dirrmtry ${LPKGREGDIR:H}"; \
+ echo "@dirrmtry ${LDOCSDIR:H}"; \
+ echo "@dirrmtry ${LEXAMPLESDIR:H}"; \
+ echo "@dirrmtry ${LTESTSDIR:H}"; \
+ echo "@dirrmtry ${LDATADIR:H}"; \
+ echo "@dirrmtry ${LSQLSDIR:H}") > ${PLIST}
. endif
. for t in files docs tests sqls scriptfiles examples data
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index d94139fbb789..cc53c0b8554e 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -31,29 +31,29 @@ lib/libpopt.so.0
%%NLS%%share/locale/wa/LC_MESSAGES/popt.mo
%%NLS%%share/locale/zh/LC_MESSAGES/popt.mo
%%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
-%%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/eu_ES/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/eu_ES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr
+%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sl
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/no
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/eu_ES/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eu_ES
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
diff --git a/devel/porttools/files/patch-cmd_test.in b/devel/porttools/files/patch-cmd_test.in
index c73b616f58bc..f5c918f27544 100644
--- a/devel/porttools/files/patch-cmd_test.in
+++ b/devel/porttools/files/patch-cmd_test.in
@@ -15,7 +15,7 @@
sed -e "s,^${PREFIX}/,,"
+ sudo find ${LOCALBASE}/ -type d | sed "s,^${LOCALBASE}/,," | sort > ${PREFIX}.PLIST_DIRS.before
+ sudo find ${PREFIX}/ -type d | sed "s,^${PREFIX}/,," | sort > ${PREFIX}.PLIST_DIRS.after
-+ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@unexec rmdir %D/"$1" 2>/dev/null || true"}'
++ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@dirrmtry "$1}'
fi
# Finish with a clean workspace
diff --git a/devel/py-kid/pkg-plist b/devel/py-kid/pkg-plist
index f121e4ce4a0a..c2721d8bc45b 100644
--- a/devel/py-kid/pkg-plist
+++ b/devel/py-kid/pkg-plist