aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/convertall/pkg-plist2
-rw-r--r--math/coq/pkg-plist8
-rw-r--r--math/drgeo/pkg-plist10
-rw-r--r--math/fung-calc/pkg-plist28
-rw-r--r--math/galculator/pkg-plist2
-rw-r--r--math/gcalctool/pkg-plist8
-rw-r--r--math/gdcalc/pkg-plist14
-rw-r--r--math/koctave/pkg-plist28
-rw-r--r--math/octave-devel/pkg-plist58
-rw-r--r--math/octave/pkg-plist58
-rw-r--r--math/p5-AI-DecisionTree/pkg-plist4
-rw-r--r--math/p5-AI-NeuralNet-BackProp/pkg-plist4
-rw-r--r--math/p5-AI-NeuralNet-Mesh/pkg-plist8
-rw-r--r--math/p5-AI-Perceptron/pkg-plist2
-rw-r--r--math/p5-Algorithm-Combinatorics/pkg-plist4
-rw-r--r--math/p5-Bit-ShiftReg/pkg-plist4
-rw-r--r--math/p5-Bit-Vector-Minimal/pkg-plist8
-rw-r--r--math/p5-Bit-Vector/pkg-plist6
-rw-r--r--math/p5-Chart-Math-Axis/pkg-plist8
-rw-r--r--math/p5-Date-Handler/pkg-plist4
-rw-r--r--math/p5-Geo-Distance/pkg-plist4
-rw-r--r--math/p5-Graph/pkg-plist4
-rw-r--r--math/p5-Math-BaseCalc/pkg-plist6
-rw-r--r--math/p5-Math-Bezier-Convert/pkg-plist8
-rw-r--r--math/p5-Math-Bezier/pkg-plist4
-rw-r--r--math/p5-Math-BigInt/pkg-plist2
-rw-r--r--math/p5-Math-BigRat/pkg-plist2
-rw-r--r--math/p5-Math-Calc-Units/pkg-plist14
-rw-r--r--math/p5-Math-Combinatorics/pkg-plist4
-rw-r--r--math/p5-Math-ConvexHull/pkg-plist6
-rw-r--r--math/p5-Math-Currency/pkg-plist2
-rw-r--r--math/p5-Math-Derivative/pkg-plist2
-rw-r--r--math/p5-Math-FixedPrecision/pkg-plist4
-rw-r--r--math/p5-Math-GMP/pkg-plist4
-rw-r--r--math/p5-Math-GSL/pkg-plist4
-rw-r--r--math/p5-Math-LinearCombination/pkg-plist4
-rw-r--r--math/p5-Math-Matrix/pkg-plist6
-rw-r--r--math/p5-Math-Pari/pkg-plist4
-rw-r--r--math/p5-Math-Random-MT/pkg-plist8
-rw-r--r--math/p5-Math-Random/pkg-plist4
-rw-r--r--math/p5-Math-Round/pkg-plist8
-rw-r--r--math/p5-Math-SimpleVariable/pkg-plist4
-rw-r--r--math/p5-Math-Spline/pkg-plist4
-rw-r--r--math/p5-Math-TrulyRandom/pkg-plist4
-rw-r--r--math/p5-Math-Vec/pkg-plist4
-rw-r--r--math/p5-Math-VecStat/pkg-plist4
-rw-r--r--math/p5-MatrixReal/pkg-plist4
-rw-r--r--math/p5-NetCDF/pkg-plist2
-rw-r--r--math/p5-Number-Compare/pkg-plist4
-rw-r--r--math/p5-Set-IntSpan/pkg-plist4
-rw-r--r--math/p5-Set-Window/pkg-plist4
-rw-r--r--math/p5-Statistics-ChiSquare/pkg-plist4
-rw-r--r--math/p5-Statistics-Contingency/pkg-plist4
-rw-r--r--math/p5-Statistics-Descriptive/pkg-plist4
-rw-r--r--math/p5-Statistics-Distributions/pkg-plist6
-rw-r--r--math/p5-Statistics-LTU/pkg-plist4
-rw-r--r--math/p5-Statistics-Lite/pkg-plist4
-rw-r--r--math/p5-Statistics-OLS/pkg-plist4
-rw-r--r--math/pgcalc/pkg-plist18
-rw-r--r--math/proofgeneral/pkg-plist2
-rw-r--r--math/pspp/pkg-plist2
-rw-r--r--math/ruby-numru_misc/pkg-plist2
-rw-r--r--math/ruby-numru_units/pkg-plist2
-rw-r--r--math/vtk-data/pkg-plist2
-rw-r--r--math/vtk-examples/pkg-plist6
-rw-r--r--math/vtk-headers/pkg-plist6
-rw-r--r--math/vtk-java/pkg-plist2
-rw-r--r--math/vtk-python/pkg-plist4
-rw-r--r--math/vtk-tcl/pkg-plist4
-rw-r--r--math/vtk/pkg-plist2
-rw-r--r--math/vtk43-headers/pkg-plist6
-rw-r--r--math/vtk43/pkg-plist2
-rw-r--r--math/vtk5/pkg-plist2
-rw-r--r--misc/bibletime-devel/pkg-plist44
-rw-r--r--misc/bibletime-kde3/pkg-plist44
-rw-r--r--misc/bibletime-kde4/pkg-plist44
-rw-r--r--misc/bibletime/pkg-plist44
-rw-r--r--misc/compat3x/pkg-plist2
-rw-r--r--misc/compat5x/pkg-plist2
-rw-r--r--misc/cuecat/pkg-plist2
-rw-r--r--misc/flyway/pkg-plist2
-rw-r--r--misc/fortune-mod-bible/pkg-plist4
-rw-r--r--misc/fortune-mod-bofh/pkg-plist4
-rw-r--r--misc/freeguide/pkg-plist4
-rw-r--r--misc/gman/pkg-plist2
-rw-r--r--misc/gnome-icon-theme/pkg-plist8
-rw-r--r--misc/gnome-mime-data/pkg-plist8
-rw-r--r--misc/gnome-osd/pkg-plist4
-rw-r--r--misc/gnomemimedata/pkg-plist8
-rw-r--r--misc/gnomesword/pkg-plist4
-rw-r--r--misc/k3b-i18n/pkg-plist44
-rw-r--r--misc/katalog/pkg-plist38
-rw-r--r--misc/kcd-devel/pkg-plist8
-rw-r--r--misc/kcd/pkg-plist8
-rw-r--r--misc/kwatch/pkg-plist26
-rw-r--r--misc/lifelines/pkg-plist36
-rw-r--r--misc/man.el/pkg-plist8
-rw-r--r--misc/nagios-base-logos/pkg-plist6
-rw-r--r--misc/p5-Array-Compare/pkg-plist2
-rw-r--r--misc/p5-Array-IntSpan/pkg-plist4
-rw-r--r--misc/p5-Array-PrintCols/pkg-plist4
-rw-r--r--misc/p5-Array-RefElem/pkg-plist4
-rw-r--r--misc/p5-Business-ISBN-Data/pkg-plist6
-rw-r--r--misc/p5-Business-ISIN/pkg-plist6
-rw-r--r--misc/p5-Business-ISSN/pkg-plist4
-rw-r--r--misc/p5-Business-UPS/pkg-plist10
-rw-r--r--misc/p5-File-CounterFile/pkg-plist4
-rw-r--r--misc/p5-File-Sort/pkg-plist4
-rw-r--r--misc/p5-Geo-Weather/pkg-plist4
-rw-r--r--misc/p5-Geography-Countries/pkg-plist6
-rw-r--r--misc/p5-I18N-Charset/pkg-plist4
-rw-r--r--misc/p5-I18N-LangTags/pkg-plist4
-rw-r--r--misc/p5-List-Compare/pkg-plist4
-rw-r--r--misc/p5-Locale-SubCountry/pkg-plist4
-rw-r--r--misc/p5-Net-vCard/pkg-plist4
-rw-r--r--misc/p5-Norge/pkg-plist4
-rw-r--r--misc/p5-Text-FIGlet/pkg-plist4
-rw-r--r--misc/p5-Tie-DxHash/pkg-plist6
-rw-r--r--misc/proxyper/pkg-plist2
-rw-r--r--misc/quick-lounge-applet/pkg-plist4
-rw-r--r--misc/seizedesktop/pkg-plist2
-rw-r--r--misc/shared-mime-info/pkg-plist22
-rw-r--r--misc/smssend/pkg-plist4
-rw-r--r--misc/tellico-kde4/pkg-plist30
-rw-r--r--misc/tellico/pkg-plist30
-rw-r--r--misc/utf8locale/pkg-plist2
-rw-r--r--misc/xfce4-appfinder/pkg-plist18
-rw-r--r--misc/xfce4-iconbox/pkg-plist16
-rw-r--r--misc/xfce4-weather-plugin/pkg-plist12
-rw-r--r--misc/xfce4-wm-themes/pkg-plist160
-rw-r--r--misc/xiphos/pkg-plist4
-rw-r--r--multimedia/audacious-plugins/pkg-plist2
-rw-r--r--multimedia/audacious/pkg-plist2
-rw-r--r--multimedia/avifile/pkg-plist2
-rw-r--r--multimedia/beep-media-player/pkg-plist2
-rw-r--r--multimedia/bmpx/pkg-plist2
-rw-r--r--multimedia/dvdrip/pkg-plist30
-rw-r--r--multimedia/dvdstyler/pkg-plist2
-rw-r--r--multimedia/gstreamer-editor/pkg-plist8
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist4
-rw-r--r--multimedia/gstreamer-plugins80/pkg-plist4
-rw-r--r--multimedia/gstreamer/pkg-plist2
-rw-r--r--multimedia/gstreamer80/pkg-plist2
-rw-r--r--multimedia/gtksubtitler/pkg-plist4
-rw-r--r--multimedia/hayes/pkg-plist24
-rw-r--r--multimedia/istanbul/pkg-plist6
-rw-r--r--multimedia/kino/pkg-plist4
-rw-r--r--multimedia/kmplayer-kde4/pkg-plist114
-rw-r--r--multimedia/kmplayer/pkg-plist114
-rw-r--r--multimedia/konverter/pkg-plist22
-rw-r--r--multimedia/ksubeditor/pkg-plist18
-rw-r--r--multimedia/libdivxdecore-devel/pkg-plist2
-rw-r--r--multimedia/libdivxencore/pkg-plist2
-rw-r--r--multimedia/libmovtar/pkg-plist2
-rw-r--r--multimedia/libxine/pkg-plist4
-rw-r--r--multimedia/linux-realplayer/pkg-plist4
-rw-r--r--multimedia/mplayer-skins/pkg-plist2
-rw-r--r--multimedia/mplayer/pkg-plist2
-rw-r--r--multimedia/ogle-gui/pkg-plist26
-rw-r--r--multimedia/okle/pkg-plist22
-rw-r--r--multimedia/p5-MP4-Info/pkg-plist4
-rw-r--r--multimedia/p5-RIFF-Info/pkg-plist4
-rw-r--r--multimedia/p5-Video-Info/pkg-plist4
-rw-r--r--multimedia/p5-Video-OpenQuicktime/pkg-plist4
-rw-r--r--multimedia/quodlibet/pkg-plist2
-rw-r--r--multimedia/rox-videothumbnail/pkg-plist2
-rw-r--r--multimedia/tovid/pkg-plist4
-rw-r--r--multimedia/xfce4-media/pkg-plist4
-rw-r--r--multimedia/xfce4-xmms-controller-plugin/pkg-plist6
-rw-r--r--multimedia/xfce4-xmms-plugin/pkg-plist4
-rw-r--r--multimedia/xine/pkg-plist54
171 files changed, 915 insertions, 915 deletions
diff --git a/math/convertall/pkg-plist b/math/convertall/pkg-plist
index b5c7829e9347..c6d31039a0bf 100644
--- a/math/convertall/pkg-plist
+++ b/math/convertall/pkg-plist
@@ -34,4 +34,4 @@ share/icons/convertall_lg.png
share/icons/convertall_sm.png
@dirrm %%DATADIR%%
@dirrm lib/convertall
-@unexec rmdir %D/share/icons 2> /dev/null || true
+@dirrmtry share/icons
diff --git a/math/coq/pkg-plist b/math/coq/pkg-plist
index e1ab20fc7242..1d50d11cdbd1 100644
--- a/math/coq/pkg-plist
+++ b/math/coq/pkg-plist
@@ -517,7 +517,7 @@ lib/coq/theories7/ZArith/zarith_aux.vo
share/emacs/site-lisp/coq-inferior.el
share/emacs/site-lisp/coq.el
share/texmf/tex/latex/misc/coqdoc.sty
-@unexec rmdir %D/share/texmf/tex/latex/misc 2>/dev/null || true
-@unexec rmdir %D/share/texmf/tex/latex 2>/dev/null || true
-@unexec rmdir %D/share/texmf/tex 2>/dev/null || true
-@unexec rmdir %D/share/texmf 2>/dev/null || true
+@dirrmtry share/texmf/tex/latex/misc
+@dirrmtry share/texmf/tex/latex
+@dirrmtry share/texmf/tex
+@dirrmtry share/texmf
diff --git a/math/drgeo/pkg-plist b/math/drgeo/pkg-plist
index 55a5141119ed..f4e93044df4f 100644
--- a/math/drgeo/pkg-plist
+++ b/math/drgeo/pkg-plist
@@ -211,11 +211,11 @@ share/locale/sv/LC_MESSAGES/drgeo.mo
share/locale/uk/LC_MESSAGES/drgeo.mo
share/locale/zh_CN/LC_MESSAGES/drgeo.mo
share/locale/zh_TW/LC_MESSAGES/drgeo.mo
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo/progs 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs 2>/dev/null || true
-@unexec rmdir %D/share/gnome/texmacs 2>/dev/null || true
+@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo/progs
+@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo
+@dirrmtry share/gnome/texmacs/TeXmacs/plugins
+@dirrmtry share/gnome/texmacs/TeXmacs
+@dirrmtry share/gnome/texmacs
@dirrm share/gnome/drgeo/scm
@dirrm share/gnome/drgeo/glade
@dirrm share/gnome/drgeo/examples/scheme
diff --git a/math/fung-calc/pkg-plist b/math/fung-calc/pkg-plist
index 06014546871e..48cfc1972ea1 100644
--- a/math/fung-calc/pkg-plist
+++ b/math/fung-calc/pkg-plist
@@ -70,20 +70,20 @@ share/icons/hicolor/32x32/apps/fung_calc.png
share/icons/hicolor/48x48/apps/fung_calc.png
share/icons/hicolor/64x64/apps/fung_calc.png
share/mimelnk/application/x-fgc.desktop
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
@dirrm include/fung-calc
@dirrm share/doc/HTML/en/fung-calc
@dirrm share/fung-calc/translations
diff --git a/math/galculator/pkg-plist b/math/galculator/pkg-plist
index 2533985c300f..4a9577c47e11 100644
--- a/math/galculator/pkg-plist
+++ b/math/galculator/pkg-plist
@@ -19,4 +19,4 @@ share/locale/pt_BR/LC_MESSAGES/galculator.mo
share/locale/ro/LC_MESSAGES/galculator.mo
@dirrm share/galculator/glade
@dirrm share/galculator
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist
index 3deaa2477bf6..cac1d272bc56 100644
--- a/math/gcalctool/pkg-plist
+++ b/math/gcalctool/pkg-plist
@@ -144,10 +144,10 @@ share/locale/xh/LC_MESSAGES/gcalctool.mo
share/locale/zh_CN/LC_MESSAGES/gcalctool.mo
share/locale/zh_HK/LC_MESSAGES/gcalctool.mo
share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
@dirrm share/gnome/omf/gcalctool
@dirrm share/gnome/help/gcalctool/zh_TW/figures
@dirrm share/gnome/help/gcalctool/zh_TW
diff --git a/math/gdcalc/pkg-plist b/math/gdcalc/pkg-plist
index 215d3350631f..55382829322e 100644
--- a/math/gdcalc/pkg-plist
+++ b/math/gdcalc/pkg-plist
@@ -5,10 +5,10 @@ share/icons/HP-16C-48.xpm
share/icons/mini-HP-16C-48.xpm
share/pixmaps/HP-16C-48.xpm
share/pixmaps/mini-HP-16C-48.xpm
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome/ 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/icons
+@dirrmtry share/gnome/apps/Utilities
+@dirrmtry share/gnome/apps
+@dirrmtry share/gnome/
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/math/koctave/pkg-plist b/math/koctave/pkg-plist
index 26823a11fc58..4236de51955d 100644
--- a/math/koctave/pkg-plist
+++ b/math/koctave/pkg-plist
@@ -13,17 +13,17 @@ share/icons/locolor/32x32/apps/koctave3.png
@dirrm share/doc/HTML/en/koctave3
@dirrm share/apps/koctave3
@dirrm share/applnk/share/apps/koctave3
-@unexec rmdir %D/share/applnk/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/share 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@dirrmtry share/applnk/share/apps
+@dirrmtry share/applnk/share
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor
diff --git a/math/octave-devel/pkg-plist b/math/octave-devel/pkg-plist
index 38e412091fdd..76b1a506c616 100644
--- a/math/octave-devel/pkg-plist
+++ b/math/octave-devel/pkg-plist
@@ -1266,15 +1266,15 @@ share/octave/ls-R
@exec mkdir -p %D/share/octave/site/m 2>/dev/null || true
@exec mkdir -p %D/share/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
@exec mkdir -p %D/share/octave/%%OCTAVE_VERSION%%/site 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/api-v13/m 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/api-v13 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/exec 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/oct 2>/dev/null || true
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/m 2>/dev/null || true
+@dirrmtry share/octave/site/api-v13/m
+@dirrmtry share/octave/site/api-v13
+@dirrmtry share/octave/site/exec/%%GNU_HOST%%
+@dirrmtry share/octave/site/exec
+@dirrmtry share/octave/site/oct/%%GNU_HOST%%
+@dirrmtry share/octave/site/oct
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m
@dirrm share/octave/%%OCTAVE_VERSION%%/site
@dirrm share/octave/%%OCTAVE_VERSION%%/m/audio
@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/base
@@ -1318,26 +1318,26 @@ share/octave/ls-R
@exec mkdir -p %D/libexec/octave/site/m 2>/dev/null || true
@exec mkdir -p %D/libexec/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
@exec mkdir -p %D/libexec/octave/site/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/api-v13/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/api-v13/m 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/api-v13 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/exec 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/m 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/api-v13 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/m 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site 2>/dev/null || true
+@dirrmtry libexec/octave/site/api-v13/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/api-v13/m
+@dirrmtry libexec/octave/site/api-v13
+@dirrmtry libexec/octave/site/exec/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/exec
+@dirrmtry libexec/octave/site/oct/api-v13/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/oct/api-v13/m
+@dirrmtry libexec/octave/site/oct/api-v13
+@dirrmtry libexec/octave/site/m
+@dirrmtry libexec/octave/site/oct/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/oct
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/octave/%%OCTAVE_VERSION%%
@dirrm libexec/octave/site
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 38e412091fdd..76b1a506c616 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -1266,15 +1266,15 @@ share/octave/ls-R
@exec mkdir -p %D/share/octave/site/m 2>/dev/null || true
@exec mkdir -p %D/share/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
@exec mkdir -p %D/share/octave/%%OCTAVE_VERSION%%/site 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/api-v13/m 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/api-v13 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/exec 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/share/octave/site/oct 2>/dev/null || true
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/m 2>/dev/null || true
+@dirrmtry share/octave/site/api-v13/m
+@dirrmtry share/octave/site/api-v13
+@dirrmtry share/octave/site/exec/%%GNU_HOST%%
+@dirrmtry share/octave/site/exec
+@dirrmtry share/octave/site/oct/%%GNU_HOST%%
+@dirrmtry share/octave/site/oct
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/m
@dirrm share/octave/%%OCTAVE_VERSION%%/site
@dirrm share/octave/%%OCTAVE_VERSION%%/m/audio
@dirrm share/octave/%%OCTAVE_VERSION%%/m/control/base
@@ -1318,26 +1318,26 @@ share/octave/ls-R
@exec mkdir -p %D/libexec/octave/site/m 2>/dev/null || true
@exec mkdir -p %D/libexec/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
@exec mkdir -p %D/libexec/octave/site/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/api-v13/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/api-v13/m 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/api-v13 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/exec 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/m 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/api-v13 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/m 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/site/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct 2>/dev/null || true
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site 2>/dev/null || true
+@dirrmtry libexec/octave/site/api-v13/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/api-v13/m
+@dirrmtry libexec/octave/site/api-v13
+@dirrmtry libexec/octave/site/exec/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/exec
+@dirrmtry libexec/octave/site/oct/api-v13/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/oct/api-v13/m
+@dirrmtry libexec/octave/site/oct/api-v13
+@dirrmtry libexec/octave/site/m
+@dirrmtry libexec/octave/site/oct/%%GNU_HOST%%
+@dirrmtry libexec/octave/site/oct
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/octave/%%OCTAVE_VERSION%%
@dirrm libexec/octave/site
diff --git a/math/p5-AI-DecisionTree/pkg-plist b/math/p5-AI-DecisionTree/pkg-plist
index c27c4062cf4b..a4a1411b1e4c 100644
--- a/math/p5-AI-DecisionTree/pkg-plist
+++ b/math/p5-AI-DecisionTree/pkg-plist
@@ -6,5 +6,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/AI/DecisionTree
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/DecisionTree/Instance
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/DecisionTree
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/AI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/AI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
diff --git a/math/p5-AI-NeuralNet-BackProp/pkg-plist b/math/p5-AI-NeuralNet-BackProp/pkg-plist
index 4ad9c8e1fa2f..f38aecc25a64 100644
--- a/math/p5-AI-NeuralNet-BackProp/pkg-plist
+++ b/math/p5-AI-NeuralNet-BackProp/pkg-plist
@@ -3,5 +3,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/BackProp
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet
@dirrm %%SITE_PERL%%/AI/NeuralNet
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
+@dirrmtry %%SITE_PERL%%/AI
diff --git a/math/p5-AI-NeuralNet-Mesh/pkg-plist b/math/p5-AI-NeuralNet-Mesh/pkg-plist
index 5d0db789c5b5..bb86fd263193 100644
--- a/math/p5-AI-NeuralNet-Mesh/pkg-plist
+++ b/math/p5-AI-NeuralNet-Mesh/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/AI/NeuralNet/Mesh.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet/Mesh
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AI/NeuralNet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
+@dirrmtry %%SITE_PERL%%/AI/NeuralNet
+@dirrmtry %%SITE_PERL%%/AI
diff --git a/math/p5-AI-Perceptron/pkg-plist b/math/p5-AI-Perceptron/pkg-plist
index f4334391ee82..d1434541dde8 100644
--- a/math/p5-AI-Perceptron/pkg-plist
+++ b/math/p5-AI-Perceptron/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/AI/Perceptron.pm
-@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/AI
diff --git a/math/p5-Algorithm-Combinatorics/pkg-plist b/math/p5-Algorithm-Combinatorics/pkg-plist
index 5ae7062cca08..4f65bee155a4 100644
--- a/math/p5-Algorithm-Combinatorics/pkg-plist
+++ b/math/p5-Algorithm-Combinatorics/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Combinatorics/Combinatorics.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Combinatorics/Combinatorics.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Combinatorics
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
diff --git a/math/p5-Bit-ShiftReg/pkg-plist b/math/p5-Bit-ShiftReg/pkg-plist
index 36225f19994d..74b5b8b98b63 100644
--- a/math/p5-Bit-ShiftReg/pkg-plist
+++ b/math/p5-Bit-ShiftReg/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg/ShiftReg.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/ShiftReg
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bit
diff --git a/math/p5-Bit-Vector-Minimal/pkg-plist b/math/p5-Bit-Vector-Minimal/pkg-plist
index e4ad9ff326ed..f003de6f2d19 100644
--- a/math/p5-Bit-Vector-Minimal/pkg-plist
+++ b/math/p5-Bit-Vector-Minimal/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Minimal/.packlist
%%SITE_PERL%%/Bit/Vector/Minimal.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Minimal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bit/Vector 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
+@dirrmtry %%SITE_PERL%%/Bit/Vector
+@dirrmtry %%SITE_PERL%%/Bit
diff --git a/math/p5-Bit-Vector/pkg-plist b/math/p5-Bit-Vector/pkg-plist
index 731faabe99e7..a65ebc972e1a 100644
--- a/math/p5-Bit-Vector/pkg-plist
+++ b/math/p5-Bit-Vector/pkg-plist
@@ -9,6 +9,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector/Vector.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bit/Vector
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Carp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Carp
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bit
diff --git a/math/p5-Chart-Math-Axis/pkg-plist b/math/p5-Chart-Math-Axis/pkg-plist
index 4f0111ce866f..091da486d30e 100644
--- a/math/p5-Chart-Math-Axis/pkg-plist
+++ b/math/p5-Chart-Math-Axis/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math/Axis/.packlist
%%SITE_PERL%%/Chart/Math/Axis.pm
-@unexec rmdir %D/%%SITE_PERL%%/Chart/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Chart/Math
+@dirrmtry %%SITE_PERL%%/Chart
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math/Axis
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart
diff --git a/math/p5-Date-Handler/pkg-plist b/math/p5-Date-Handler/pkg-plist
index 4ac734c245d3..896e60ddca8b 100644
--- a/math/p5-Date-Handler/pkg-plist
+++ b/math/p5-Date-Handler/pkg-plist
@@ -7,5 +7,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Handler/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Handler
@dirrm %%SITE_PERL%%/Date/Handler
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/math/p5-Geo-Distance/pkg-plist b/math/p5-Geo-Distance/pkg-plist
index facc791ff356..dd3d535e0cb6 100644
--- a/math/p5-Geo-Distance/pkg-plist
+++ b/math/p5-Geo-Distance/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance/.packlist
%%SITE_PERL%%/Geo/Distance.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Distance
-@unexec rmdir %D/%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/%%%SITE_PERL%%/Geo 2>/dev/null || true
+@dirrmtry %%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%%SITE_PERL%%/Geo
diff --git a/math/p5-Graph/pkg-plist b/math/p5-Graph/pkg-plist
index ff7e4ea2040a..b1b830373e12 100644
--- a/math/p5-Graph/pkg-plist
+++ b/math/p5-Graph/pkg-plist
@@ -22,5 +22,5 @@
@dirrm %%SITE_PERL%%/Graph/AdjacencyMap
@dirrm %%SITE_PERL%%/Graph/TransitiveClosure
@dirrm %%SITE_PERL%%/Graph/Traversal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph
+@dirrmtry %%SITE_PERL%%/Graph
diff --git a/math/p5-Math-BaseCalc/pkg-plist b/math/p5-Math-BaseCalc/pkg-plist
index 6ce08f343148..cc101abea447 100644
--- a/math/p5-Math-BaseCalc/pkg-plist
+++ b/math/p5-Math-BaseCalc/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc/.packlist
%%SITE_PERL%%/Math/BaseCalc.pm
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Bezier-Convert/pkg-plist b/math/p5-Math-Bezier-Convert/pkg-plist
index f15ff1adb99d..ec6a9a5b2225 100644
--- a/math/p5-Math-Bezier-Convert/pkg-plist
+++ b/math/p5-Math-Bezier-Convert/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Math/Bezier/Convert.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/Convert/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Math/Bezier 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math/Bezier
+@dirrmtry %%SITE_PERL%%/Math
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/Convert
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Bezier/pkg-plist b/math/p5-Math-Bezier/pkg-plist
index d9d725054d7b..949ff721d60c 100644
--- a/math/p5-Math-Bezier/pkg-plist
+++ b/math/p5-Math-Bezier/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Math/Bezier.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-BigInt/pkg-plist b/math/p5-Math-BigInt/pkg-plist
index e258ba622483..103d15f183f1 100644
--- a/math/p5-Math-BigInt/pkg-plist
+++ b/math/p5-Math-BigInt/pkg-plist
@@ -5,4 +5,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math-BigInt/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math-BigInt
@dirrm %%SITE_PERL%%/Math/BigInt
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-BigRat/pkg-plist b/math/p5-Math-BigRat/pkg-plist
index 0c75ee2cb3ab..d6acf80f21a9 100644
--- a/math/p5-Math-BigRat/pkg-plist
+++ b/math/p5-Math-BigRat/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math-BigRat/.packlist
%%SITE_PERL%%/Math/BigRat.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math-BigRat
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Calc-Units/pkg-plist b/math/p5-Math-Calc-Units/pkg-plist
index 721dc506009a..b956b86273ce 100644
--- a/math/p5-Math-Calc-Units/pkg-plist
+++ b/math/p5-Math-Calc-Units/pkg-plist
@@ -15,10 +15,10 @@ bin/ucalc
%%SITE_PERL%%/Math/Calc/Units/Grammar.pm
%%SITE_PERL%%/Math/Calc/Units/Grammar.y
%%SITE_PERL%%/Math/Calc/Units/Rank.pm
-@unexec rmdir %D/%%SITE_PERL%%/Math/Calc/Units/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math/Calc/Units 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math/Calc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math/Calc/Units/Convert
+@dirrmtry %%SITE_PERL%%/Math/Calc/Units
+@dirrmtry %%SITE_PERL%%/Math/Calc
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Combinatorics/pkg-plist b/math/p5-Math-Combinatorics/pkg-plist
index 0fa60ad08a34..bc3698dc574b 100644
--- a/math/p5-Math-Combinatorics/pkg-plist
+++ b/math/p5-Math-Combinatorics/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Math/Combinatorics.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Combinatorics/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Combinatorics
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-ConvexHull/pkg-plist b/math/p5-Math-ConvexHull/pkg-plist
index ff11bfdaa509..85ee09bc97ef 100644
--- a/math/p5-Math-ConvexHull/pkg-plist
+++ b/math/p5-Math-ConvexHull/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Math/ConvexHull.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/ConvexHull/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/ConvexHull 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/ConvexHull
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Currency/pkg-plist b/math/p5-Math-Currency/pkg-plist
index 2c790c1b780c..8153224bf5c4 100644
--- a/math/p5-Math-Currency/pkg-plist
+++ b/math/p5-Math-Currency/pkg-plist
@@ -3,4 +3,4 @@
%%SITE_PERL%%/Math/Currency/GBP.pm
%%SITE_PERL%%/Math/Currency/JPY.pm
@dirrm %%SITE_PERL%%/Math/Currency
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Derivative/pkg-plist b/math/p5-Math-Derivative/pkg-plist
index 51810fba49cd..0d16f002ef58 100644
--- a/math/p5-Math-Derivative/pkg-plist
+++ b/math/p5-Math-Derivative/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Math/Derivative.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Derivative
@dirrm %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-FixedPrecision/pkg-plist b/math/p5-Math-FixedPrecision/pkg-plist
index 7139f56d385a..dc79993866ee 100644
--- a/math/p5-Math-FixedPrecision/pkg-plist
+++ b/math/p5-Math-FixedPrecision/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Math/FixedPrecision.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FixedPrecision/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/FixedPrecision
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-GMP/pkg-plist b/math/p5-Math-GMP/pkg-plist
index 29885bd66e07..e0c898e6a194 100644
--- a/math/p5-Math-GMP/pkg-plist
+++ b/math/p5-Math-GMP/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP/GMP.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/GMP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-GSL/pkg-plist b/math/p5-Math-GSL/pkg-plist
index f0ff92cd188b..1a757a05cce9 100644
--- a/math/p5-Math-GSL/pkg-plist
+++ b/math/p5-Math-GSL/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/mach/auto/Math/GSL/.packlist
%%SITE_PERL%%/mach/Math/GSL.pm
@dirrm %%SITE_PERL%%/mach/auto/Math/GSL
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Math
+@dirrmtry %%SITE_PERL%%/mach/Math
diff --git a/math/p5-Math-LinearCombination/pkg-plist b/math/p5-Math-LinearCombination/pkg-plist
index b5de37002641..046ffb76c20d 100644
--- a/math/p5-Math-LinearCombination/pkg-plist
+++ b/math/p5-Math-LinearCombination/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/LinearCombination/.packlist
%%SITE_PERL%%/Math/LinearCombination.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/LinearCombination
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Matrix/pkg-plist b/math/p5-Math-Matrix/pkg-plist
index 2b23e24906db..ab9bde5acf55 100644
--- a/math/p5-Math-Matrix/pkg-plist
+++ b/math/p5-Math-Matrix/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Math/Matrix.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Matrix/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Matrix 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Matrix
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-Math-Pari/pkg-plist b/math/p5-Math-Pari/pkg-plist
index c9c59034f330..a906d62edc59 100644
--- a/math/p5-Math-Pari/pkg-plist
+++ b/math/p5-Math-Pari/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Pari/Pari.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Pari/Pari.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Pari
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-Random-MT/pkg-plist b/math/p5-Math-Random-MT/pkg-plist
index d43d866b05b2..92ce5d3e0c25 100644
--- a/math/p5-Math-Random-MT/pkg-plist
+++ b/math/p5-Math-Random-MT/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random/MT.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT/MT.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math/Random 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/MT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Random/pkg-plist b/math/p5-Math-Random/pkg-plist
index d9a4cff9d95a..92c9fb15973d 100644
--- a/math/p5-Math-Random/pkg-plist
+++ b/math/p5-Math-Random/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/Random.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-Round/pkg-plist b/math/p5-Math-Round/pkg-plist
index d99e0feddafc..a3d437cd74fa 100644
--- a/math/p5-Math-Round/pkg-plist
+++ b/math/p5-Math-Round/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/Math/Round.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Round
@dirrm %%SITE_PERL%%/auto/Math/Round
-@unexec rmdir %D/%%SITE_PERL%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-SimpleVariable/pkg-plist b/math/p5-Math-SimpleVariable/pkg-plist
index cc3eecf45c6d..8da0f70f4fdc 100644
--- a/math/p5-Math-SimpleVariable/pkg-plist
+++ b/math/p5-Math-SimpleVariable/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SimpleVariable/.packlist
%%SITE_PERL%%/Math/SimpleVariable.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/SimpleVariable
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-Spline/pkg-plist b/math/p5-Math-Spline/pkg-plist
index 4933e93b8f13..f112ccf8f93c 100644
--- a/math/p5-Math-Spline/pkg-plist
+++ b/math/p5-Math-Spline/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Spline/.packlist
%%SITE_PERL%%/Math/Spline.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Spline
-@unexec rmdir %D/%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %SITE_PERL%%/Math
diff --git a/math/p5-Math-TrulyRandom/pkg-plist b/math/p5-Math-TrulyRandom/pkg-plist
index 43863c012cce..e0ddae05cacf 100644
--- a/math/p5-Math-TrulyRandom/pkg-plist
+++ b/math/p5-Math-TrulyRandom/pkg-plist
@@ -8,5 +8,5 @@
%%PORTDOCS%%%%DOCSDIR%%/truerand.h
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/TrulyRandom
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math
diff --git a/math/p5-Math-Vec/pkg-plist b/math/p5-Math-Vec/pkg-plist
index 3fa0ccce7cf0..669e7e7cdea3 100644
--- a/math/p5-Math-Vec/pkg-plist
+++ b/math/p5-Math-Vec/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Math/Vec.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Vec/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Vec
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
diff --git a/math/p5-Math-VecStat/pkg-plist b/math/p5-Math-VecStat/pkg-plist
index a8c630f8b2c3..c56ca746cfbd 100644
--- a/math/p5-Math-VecStat/pkg-plist
+++ b/math/p5-Math-VecStat/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/VecStat/.packlist
%%SITE_PERL%%/Math/VecStat.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/VecStat
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-MatrixReal/pkg-plist b/math/p5-MatrixReal/pkg-plist
index cfe73b4d5a34..de529d689b3f 100644
--- a/math/p5-MatrixReal/pkg-plist
+++ b/math/p5-MatrixReal/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Math/funcs.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MatrixReal/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/MatrixReal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
+@dirrmtry %%SITE_PERL%%/Math
diff --git a/math/p5-NetCDF/pkg-plist b/math/p5-NetCDF/pkg-plist
index 74d7a8d3a783..22d3cbde0b7b 100644
--- a/math/p5-NetCDF/pkg-plist
+++ b/math/p5-NetCDF/pkg-plist
@@ -3,4 +3,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF/NetCDF.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetCDF
diff --git a/math/p5-Number-Compare/pkg-plist b/math/p5-Number-Compare/pkg-plist
index fb82f1d203a6..3f666f3c97a7 100644
--- a/math/p5-Number-Compare/pkg-plist
+++ b/math/p5-Number-Compare/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Compare/.packlist
%%SITE_PERL%%/Number/Compare.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Compare
-@unexec rmdir %D/%%SITE_PERL%%/Number 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Number
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
diff --git a/math/p5-Set-IntSpan/pkg-plist b/math/p5-Set-IntSpan/pkg-plist
index 044c5e9b4784..baab8d908567 100644
--- a/math/p5-Set-IntSpan/pkg-plist
+++ b/math/p5-Set-IntSpan/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Set/IntSpan.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/IntSpan
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/math/p5-Set-Window/pkg-plist b/math/p5-Set-Window/pkg-plist
index 2714bb6fffde..a0d9705cb40d 100644
--- a/math/p5-Set-Window/pkg-plist
+++ b/math/p5-Set-Window/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Window/.packlist
%%SITE_PERL%%/Set/Window.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Window
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/math/p5-Statistics-ChiSquare/pkg-plist b/math/p5-Statistics-ChiSquare/pkg-plist
index 4d855a2d36af..020b538a266d 100644
--- a/math/p5-Statistics-ChiSquare/pkg-plist
+++ b/math/p5-Statistics-ChiSquare/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare/.packlist
%%SITE_PERL%%/Statistics/ChiSquare.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/ChiSquare
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Contingency/pkg-plist b/math/p5-Statistics-Contingency/pkg-plist
index 0cfd0b46b3ae..6aa07b5c7c86 100644
--- a/math/p5-Statistics-Contingency/pkg-plist
+++ b/math/p5-Statistics-Contingency/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Contingency/.packlist
%%SITE_PERL%%/Statistics/Contingency.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Contingency
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Descriptive/pkg-plist b/math/p5-Statistics-Descriptive/pkg-plist
index 6269b7f2676c..82642f5b39ee 100644
--- a/math/p5-Statistics-Descriptive/pkg-plist
+++ b/math/p5-Statistics-Descriptive/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive/.packlist
%%SITE_PERL%%/Statistics/Descriptive.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Descriptive
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Distributions/pkg-plist b/math/p5-Statistics-Distributions/pkg-plist
index b9f1794519df..9bf93fc55759 100644
--- a/math/p5-Statistics-Distributions/pkg-plist
+++ b/math/p5-Statistics-Distributions/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Distributions/.packlist
@dirrm %%SITE_PERL%%/auto/Statistics/Distributions
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Distributions
-@unexec rmdir %D/%%SITE_PERL%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-LTU/pkg-plist b/math/p5-Statistics-LTU/pkg-plist
index 25f4d0432ee2..5a04463d81c8 100644
--- a/math/p5-Statistics-LTU/pkg-plist
+++ b/math/p5-Statistics-LTU/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Statistics/weather.pl
%%SITE_PERL%%/Statistics/LTU.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/LTU
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-Lite/pkg-plist b/math/p5-Statistics-Lite/pkg-plist
index a1c5121da06d..3ec5a2d2888e 100644
--- a/math/p5-Statistics-Lite/pkg-plist
+++ b/math/p5-Statistics-Lite/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Lite/.packlist
%%SITE_PERL%%/Statistics/Lite.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/p5-Statistics-OLS/pkg-plist b/math/p5-Statistics-OLS/pkg-plist
index 79f2a9b6f5d9..c4cade2174a7 100644
--- a/math/p5-Statistics-OLS/pkg-plist
+++ b/math/p5-Statistics-OLS/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/OLS/.packlist
%%SITE_PERL%%/Statistics/OLS.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics/OLS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
+@dirrmtry %%SITE_PERL%%/Statistics
diff --git a/math/pgcalc/pkg-plist b/math/pgcalc/pkg-plist
index dc462894fde8..f14b20f2d95d 100644
--- a/math/pgcalc/pkg-plist
+++ b/math/pgcalc/pkg-plist
@@ -3,8 +3,8 @@ share/doc/HTML/en/pgcalc2/common
share/doc/HTML/en/pgcalc2/index.docbook
share/doc/HTML/en/pgcalc2/index.cache.bz2
@dirrm share/doc/HTML/en/pgcalc2
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
%%DOCSDIR%%/alg_mode1.png
%%DOCSDIR%%/alg_mode2.png
%%DOCSDIR%%/apps_menu.png
@@ -126,10 +126,10 @@ share/doc/HTML/en/pgcalc2/index.cache.bz2
%%DOCSDIR%%/var_dlg1.png
@dirrm %%DOCSDIR%%
share/icons/hicolor/32x32/apps/pgcalc2.png
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
share/applnk/Office/PGCalculator/pgcalc2.desktop
share/applnk/Office/PGCalculator/pgcalc2-BHP49G.desktop
share/applnk/Office/PGCalculator/pgcalc2-Metallic.desktop
@@ -138,8 +138,8 @@ share/applnk/Office/PGCalculator/pgcalc2-FX20.desktop
share/applnk/Office/PGCalculator/pgcalc2-HP48GX.desktop
share/applnk/Office/PGCalculator/pgcalc2-HP49G+.desktop
@dirrm share/applnk/Office/PGCalculator
-@unexec rmdir %D/share/applnk/Office 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Office
+@dirrmtry share/applnk
share/apps/pgcalc2/pgcalc2ui.rc
share/apps/pgcalc2/skins/BHP49G/Backgrnd.bmp
share/apps/pgcalc2/skins/BHP49G/HP49GFon.bmp
@@ -178,4 +178,4 @@ share/apps/pgcalc2/skins/HP49G+/skin.csk
@dirrm share/apps/pgcalc2/skins/HP49G+
@dirrm share/apps/pgcalc2/skins
@dirrm share/apps/pgcalc2
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps
diff --git a/math/proofgeneral/pkg-plist b/math/proofgeneral/pkg-plist
index 06d0b1aad2e8..421e1ecf4b58 100644
--- a/math/proofgeneral/pkg-plist
+++ b/math/proofgeneral/pkg-plist
@@ -369,7 +369,7 @@ bin/proofgeneral
@dirrm %%EMACS_SITE_LISPDIR%%/proofgeneral/coq
@dirrm %%EMACS_SITE_LISPDIR%%/proofgeneral/acl2
@dirrm %%EMACS_SITE_LISPDIR%%/proofgeneral
-@unexec rmdir %D/%%EMACS_SITE_LISPDIR%%/site-start.d 2>/dev/null || true
+@dirrmtry %%EMACS_SITE_LISPDIR%%/site-start.d
share/application-registry/proofgeneral.applications
share/applications/proofgeneral.desktop
share/icons/hicolor/16x16/proofgeneral.png
diff --git a/math/pspp/pkg-plist b/math/pspp/pkg-plist
index 1daaf6c85411..7d7536572c23 100644
--- a/math/pspp/pkg-plist
+++ b/math/pspp/pkg-plist
@@ -4,4 +4,4 @@ etc/pspp/devices
etc/pspp/html-prologue
etc/pspp/papersize
etc/pspp/ps-prologue
-@unexec rmdir %D/etc/pspp 2>/dev/null || true
+@dirrmtry etc/pspp
diff --git a/math/ruby-numru_misc/pkg-plist b/math/ruby-numru_misc/pkg-plist
index 6742128ed0fa..608b173aeca0 100644
--- a/math/ruby-numru_misc/pkg-plist
+++ b/math/ruby-numru_misc/pkg-plist
@@ -4,7 +4,7 @@
%%RUBY_SITELIBDIR%%/numru/misc/md_iterators.rb
%%RUBY_SITELIBDIR%%/numru/misc/misc.rb
@dirrm %%RUBY_SITELIBDIR%%/numru/misc
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/numru 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/numru
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/emath.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
diff --git a/math/ruby-numru_units/pkg-plist b/math/ruby-numru_units/pkg-plist
index 0c56bca0ab85..240c89e11644 100644
--- a/math/ruby-numru_units/pkg-plist
+++ b/math/ruby-numru_units/pkg-plist
@@ -1,5 +1,5 @@
%%RUBY_SITELIBDIR%%/numru/units.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/numru 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/numru
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/units.html
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/units.rd
diff --git a/math/vtk-data/pkg-plist b/math/vtk-data/pkg-plist
index 9e0df9b861e0..8a2f736c77d9 100644
--- a/math/vtk-data/pkg-plist
+++ b/math/vtk-data/pkg-plist
@@ -770,4 +770,4 @@
@dirrm %%EXAMPLESDIR%%/VTKData/Baseline/Filtering
@dirrm %%EXAMPLESDIR%%/VTKData/Baseline
@dirrm %%EXAMPLESDIR%%/VTKData
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+@dirrmtry %%EXAMPLESDIR%%
diff --git a/math/vtk-examples/pkg-plist b/math/vtk-examples/pkg-plist
index 6206f8a88669..f85134f1c52d 100644
--- a/math/vtk-examples/pkg-plist
+++ b/math/vtk-examples/pkg-plist
@@ -881,7 +881,7 @@
@dirrm %%EXAMPLESDIR%%/Testing/Common/Install
@dirrm %%EXAMPLESDIR%%/Testing/Common/Cxx
@dirrm %%EXAMPLESDIR%%/Testing/Common
-@unexec rmdir %D/%%EXAMPLESDIR%%/Testing 2>/dev/null || true
+@dirrmtry %%EXAMPLESDIR%%/Testing
@dirrm %%EXAMPLESDIR%%/Examples/VolumeRendering/Tcl
@dirrm %%EXAMPLESDIR%%/Examples/VolumeRendering/Python
@dirrm %%EXAMPLESDIR%%/Examples/VolumeRendering
@@ -993,5 +993,5 @@
@dirrm %%EXAMPLESDIR%%/Examples/AMR/Cxx
@dirrm %%EXAMPLESDIR%%/Examples/AMR
@dirrm %%EXAMPLESDIR%%/Examples
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%EXAMPLESDIR%%
+@dirrmtry %%DOCSDIR%%
diff --git a/math/vtk-headers/pkg-plist b/math/vtk-headers/pkg-plist
index 1afb5f167153..dd7bce9f0188 100644
--- a/math/vtk-headers/pkg-plist
+++ b/math/vtk-headers/pkg-plist
@@ -978,11 +978,11 @@ share/vtk/doxygen/paper-clip.gif
share/vtk/doxygen/pic.gif
share/vtk/doxygen/vtk-logo.gif
@dirrm share/vtk/doxygen
-@unexec rmdir %D/share/vtk 2>/dev/null || true
+@dirrmtry share/vtk
@dirrm %%DOCSDIR%%
@dirrm lib/vtk/CMake
-@unexec rmdir %D/lib/vtk 2>/dev/null || true
+@dirrmtry lib/vtk
@dirrm include/vtk/vtkstd
@dirrm include/vtk/DICOMParser
@dirrm include/vtk
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/math/vtk-java/pkg-plist b/math/vtk-java/pkg-plist
index 082bb330c1b1..a2cbea6c9ec5 100644
--- a/math/vtk-java/pkg-plist
+++ b/math/vtk-java/pkg-plist
@@ -45,7 +45,7 @@ share/java/classes/vtk.jar
%%TESTING_ONLY%%share/examples/vtk/Testing/Java/TestVTKCanvas.class
%%TESTING_ONLY%%share/examples/vtk/Testing/Java/TestVTKCanvas.java
%%TESTING_ONLY%%share/examples/vtk/Testing/Java/README
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
%%TESTING_ONLY%%@dirrm share/examples/vtk/Testing/Java
%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk/Testing 2>/dev/null || true
%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk 2>/dev/null || true
diff --git a/math/vtk-python/pkg-plist b/math/vtk-python/pkg-plist
index 113efb6d526e..c4ba88a0bf45 100644
--- a/math/vtk-python/pkg-plist
+++ b/math/vtk-python/pkg-plist
@@ -172,7 +172,7 @@ lib/vtk/python/wxVTKRenderWindow.pyo
%%DOCSDIR%%/README.html
%%DOCSDIR%%/README.patented-classes
%%DOCSDIR%%/vtkLogo.jpg
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
@dirrm lib/vtk/python/vtk/wx
@dirrm lib/vtk/python/vtk/util
@dirrm lib/vtk/python/vtk/tk
@@ -181,5 +181,5 @@ lib/vtk/python/wxVTKRenderWindow.pyo
@dirrm lib/vtk/python/vtk/gtk
@dirrm lib/vtk/python/vtk
@dirrm lib/vtk/python
-@unexec rmdir %D/lib/vtk 2>/dev/null || true
+@dirrmtry lib/vtk
@unexec rm %%VTK_PTH_LOCATION_DIR%%/vtk.pth 2>/dev/null || true
diff --git a/math/vtk-tcl/pkg-plist b/math/vtk-tcl/pkg-plist
index 7e0605b98c9c..755caa981d90 100644
--- a/math/vtk-tcl/pkg-plist
+++ b/math/vtk-tcl/pkg-plist
@@ -46,7 +46,7 @@ lib/vtk/tcl/vtktesting/vtktesting.tcl
%%DOCSDIR%%/README.html
%%DOCSDIR%%/README.patented-classes
%%DOCSDIR%%/vtkLogo.jpg
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
@dirrm lib/vtk/tcl/vtktesting
@dirrm lib/vtk/tcl/vtkrendering
@dirrm lib/vtk/tcl/vtkpatented
@@ -61,4 +61,4 @@ lib/vtk/tcl/vtktesting/vtktesting.tcl
@dirrm lib/vtk/tcl/vtkbase
@dirrm lib/vtk/tcl/vtk
@dirrm lib/vtk/tcl
-@unexec rmdir %D/lib/vtk 2>/dev/null || true
+@dirrmtry lib/vtk
diff --git a/math/vtk/pkg-plist b/math/vtk/pkg-plist
index f2d76b7fe19d..0966f8547f5c 100644
--- a/math/vtk/pkg-plist
+++ b/math/vtk/pkg-plist
@@ -42,4 +42,4 @@ lib/libvtkftgl.so.%%LIBVER%%
%%DOCSDIR%%/README.html
%%DOCSDIR%%/README.patented-classes
%%DOCSDIR%%/vtkLogo.jpg
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/math/vtk43-headers/pkg-plist b/math/vtk43-headers/pkg-plist
index 1afb5f167153..dd7bce9f0188 100644
--- a/math/vtk43-headers/pkg-plist
+++ b/math/vtk43-headers/pkg-plist
@@ -978,11 +978,11 @@ share/vtk/doxygen/paper-clip.gif
share/vtk/doxygen/pic.gif
share/vtk/doxygen/vtk-logo.gif
@dirrm share/vtk/doxygen
-@unexec rmdir %D/share/vtk 2>/dev/null || true
+@dirrmtry share/vtk
@dirrm %%DOCSDIR%%
@dirrm lib/vtk/CMake
-@unexec rmdir %D/lib/vtk 2>/dev/null || true
+@dirrmtry lib/vtk
@dirrm include/vtk/vtkstd
@dirrm include/vtk/DICOMParser
@dirrm include/vtk
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/math/vtk43/pkg-plist b/math/vtk43/pkg-plist
index f2d76b7fe19d..0966f8547f5c 100644
--- a/math/vtk43/pkg-plist
+++ b/math/vtk43/pkg-plist
@@ -42,4 +42,4 @@ lib/libvtkftgl.so.%%LIBVER%%
%%DOCSDIR%%/README.html
%%DOCSDIR%%/README.patented-classes
%%DOCSDIR%%/vtkLogo.jpg
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist
index f2d76b7fe19d..0966f8547f5c 100644
--- a/math/vtk5/pkg-plist
+++ b/math/vtk5/pkg-plist
@@ -42,4 +42,4 @@ lib/libvtkftgl.so.%%LIBVER%%
%%DOCSDIR%%/README.html
%%DOCSDIR%%/README.patented-classes
%%DOCSDIR%%/vtkLogo.jpg
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/bibletime-kde3/pkg-plist b/misc/bibletime-kde3/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime-kde3/pkg-plist
+++ b/misc/bibletime-kde3/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime-kde4/pkg-plist
+++ b/misc/bibletime-kde4/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index 4cfab28cea85..add36c508a16 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -162,29 +162,29 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
share/icons/hicolor/48x48/apps/bibletime.png
share/icons/hicolor/64x64/apps/bibletime.png
share/doc/HTML/en/common/common
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48/actions
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/en/bibletime/howto
@dirrm share/doc/HTML/en/bibletime/handbook
@dirrm share/doc/HTML/en/bibletime
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/bibletime
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/misc/compat3x/pkg-plist b/misc/compat3x/pkg-plist
index ff4c811bb652..c930698f2840 100644
--- a/misc/compat3x/pkg-plist
+++ b/misc/compat3x/pkg-plist
@@ -26,4 +26,4 @@ lib/compat/libutil.so.2
lib/compat/libvgl.so.1
lib/compat/libwrap.so.2
lib/compat/libxpg4.so.2
-@unexec rmdir %D/lib/compat 2>/dev/null || true
+@dirrmtry lib/compat
diff --git a/misc/compat5x/pkg-plist b/misc/compat5x/pkg-plist
index 6fbca14168d8..3328a8c1b48a 100644
--- a/misc/compat5x/pkg-plist
+++ b/misc/compat5x/pkg-plist
@@ -206,4 +206,4 @@ lib/compat/snmp_netgraph.so.2
%%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
%%AMD64%%@unexec rmdir %D/lib32/compat 2>/dev/null || true
%%AMD64%%@unexec rmdir %D/lib32 2>/dev/null || true
-@unexec rmdir %D/lib/compat 2>/dev/null || true
+@dirrmtry lib/compat
diff --git a/misc/cuecat/pkg-plist b/misc/cuecat/pkg-plist
index 4faa0df92b00..d36288bb23a1 100644
--- a/misc/cuecat/pkg-plist
+++ b/misc/cuecat/pkg-plist
@@ -4,4 +4,4 @@ lib/%%PYTHON_VERSION%%/site-packages/barcode.py
lib/%%PYTHON_VERSION%%/site-packages/barcode.pyo
lib/%%PYTHON_VERSION%%/site-packages/cuecat.py
lib/%%PYTHON_VERSION%%/site-packages/cuecat.pyo
-@unexec rmdir %D/lib/%%PYTHON_VERSION%%/site-packages 2>/dev/null || true
+@dirrmtry lib/%%PYTHON_VERSION%%/site-packages
diff --git a/misc/flyway/pkg-plist b/misc/flyway/pkg-plist
index 35733e1e0c10..e4cb57c10c3f 100644
--- a/misc/flyway/pkg-plist
+++ b/misc/flyway/pkg-plist
@@ -58,4 +58,4 @@ share/icons/flyway_lg.png
share/icons/flyway_sm.png
@dirrm share/flyway
@dirrm lib/flyway
-@unexec rmdir %D/share/icons 2> /dev/null || true
+@dirrmtry share/icons
diff --git a/misc/fortune-mod-bible/pkg-plist b/misc/fortune-mod-bible/pkg-plist
index c77d709e5c46..bc456c180de9 100644
--- a/misc/fortune-mod-bible/pkg-plist
+++ b/misc/fortune-mod-bible/pkg-plist
@@ -1,4 +1,4 @@
share/games/fortune/bible
share/games/fortune/bible.dat
-@unexec rmdir %D/share/games/fortune 2>/dev/null || true
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games/fortune
+@dirrmtry share/games
diff --git a/misc/fortune-mod-bofh/pkg-plist b/misc/fortune-mod-bofh/pkg-plist
index 51f21261e84a..80ee1a9bde21 100644
--- a/misc/fortune-mod-bofh/pkg-plist
+++ b/misc/fortune-mod-bofh/pkg-plist
@@ -1,4 +1,4 @@
share/games/fortune/bofh
share/games/fortune/bofh.dat
-@unexec rmdir %D/share/games/fortune 2>/dev/null || true
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games/fortune
+@dirrmtry share/games
diff --git a/misc/freeguide/pkg-plist b/misc/freeguide/pkg-plist
index 630dd0287878..c9a2cba80164 100644
--- a/misc/freeguide/pkg-plist
+++ b/misc/freeguide/pkg-plist
@@ -26,6 +26,6 @@ share/applications/freeguide.desktop
%%JAVASHAREDIR%%/pixmaps/freeguide/logo-72x72.png
%%JAVASHAREDIR%%/pixmaps/freeguide/logo-96x96.png
@dirrm %%JAVASHAREDIR%%/pixmaps/freeguide
-@unexec rmdir %D/%%JAVASHAREDIR%%/pixmaps 2>/dev/null || true
+@dirrmtry %%JAVASHAREDIR%%/pixmaps
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/misc/gman/pkg-plist b/misc/gman/pkg-plist
index 98fc1f23c910..6dabe70a5c14 100644
--- a/misc/gman/pkg-plist
+++ b/misc/gman/pkg-plist
@@ -1,4 +1,4 @@
bin/gman
bin/gman.cgi
www/cgi-bin/gman.pl
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index e38a60a99716..033bb0a6770c 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -2707,10 +2707,10 @@ share/icons/hicolor/96x96/apps/gnome-globe.png
share/icons/hicolor/96x96/apps/gnome-starthere.png
share/icons/hicolor/scalable/apps/evolution.svg
share/icons/hicolor/scalable/apps/volume-knob.svg
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@unexec /bin/rmdir %D/share/icons/hicolor/96x96 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/icons/hicolor/72x72 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || /usr/bin/true
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index c789c2f1bf90..a7b6babf339e 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -73,7 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi 2>/dev/null || true
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index f5ff07d2eadb..00c2427ddb89 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -35,7 +35,7 @@ share/locale/ja/LC_MESSAGES/gnome-osd.mo
share/locale/pt/LC_MESSAGES/gnome-osd.mo
@dirrm share/gnome/gnome-osd
@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
@comment only remove the dbus directories if dbus is not installed
@unexec if ! [ -e %%LOCALBASE%%/bin/dbus-daemon ]; then rmdir %D/share/dbus-1/services 2>/dev/null; rmdir %D/share/dbus-1 2>/dev/null; fi
diff --git a/misc/gnomemimedata/pkg-plist b/misc/gnomemimedata/pkg-plist
index c789c2f1bf90..a7b6babf339e 100644
--- a/misc/gnomemimedata/pkg-plist
+++ b/misc/gnomemimedata/pkg-plist
@@ -73,7 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
-@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/yi 2>/dev/null || true
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index b08c8a0b7ee8..b58325062c34 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -63,6 +63,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/k3b-i18n/pkg-plist b/misc/k3b-i18n/pkg-plist
index 3d011994483b..7054c354a094 100644
--- a/misc/k3b-i18n/pkg-plist
+++ b/misc/k3b-i18n/pkg-plist
@@ -270,28 +270,28 @@ share/locale/zh_CN/LC_MESSAGES/k3b.mo
share/locale/zh_CN/LC_MESSAGES/k3bsetup.mo
share/locale/zh_CN/LC_MESSAGES/libk3b.mo
share/locale/zh_CN/LC_MESSAGES/libk3bdevice.mo
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/doc/HTML/sv/k3b
@dirrm share/doc/HTML/ru/k3b
@dirrm share/doc/HTML/pt_BR/k3b
diff --git a/misc/katalog/pkg-plist b/misc/katalog/pkg-plist
index e1e3f9f015fc..4b39f99a6ac9 100644
--- a/misc/katalog/pkg-plist
+++ b/misc/katalog/pkg-plist
@@ -30,22 +30,22 @@ share/mimelnk/inode/katalog-directory.desktop
share/services/katalogdcop.desktop
share/services/katalogslave.protocol
share/services/kfile_katalog.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/mimetypes 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/mimelnk/inode
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/crystalsvg/64x64/mimetypes
+@dirrmtry share/icons/crystalsvg/64x64
+@dirrmtry share/icons/crystalsvg/48x48/mimetypes
+@dirrmtry share/icons/crystalsvg/48x48
+@dirrmtry share/icons/crystalsvg/32x32/mimetypes
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/mimetypes
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/mimetypes
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
+@dirrmtry share/apps
diff --git a/misc/kcd-devel/pkg-plist b/misc/kcd-devel/pkg-plist
index db5dfc1dae4e..ab84fab3b7e4 100644
--- a/misc/kcd-devel/pkg-plist
+++ b/misc/kcd-devel/pkg-plist
@@ -9,7 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_GB.UTF-8
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
diff --git a/misc/kcd/pkg-plist b/misc/kcd/pkg-plist
index db5dfc1dae4e..ab84fab3b7e4 100644
--- a/misc/kcd/pkg-plist
+++ b/misc/kcd/pkg-plist
@@ -9,7 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_GB.UTF-8
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
diff --git a/misc/kwatch/pkg-plist b/misc/kwatch/pkg-plist
index e128890e3e5d..f3fd4af66ea4 100644
--- a/misc/kwatch/pkg-plist
+++ b/misc/kwatch/pkg-plist
@@ -10,18 +10,18 @@ share/icons/locolor/16x16/apps/kwatch.png
share/icons/locolor/32x32/apps/kwatch.png
share/locale/de/LC_MESSAGES/kwatch.mo
@comment directories
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
@dirrm share/doc/HTML/default/kwatch
-@unexec rmdir %D/share/doc/HTML/default 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/default
+@dirrmtry share/doc/HTML
@dirrm share/apps/kwatch
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@dirrmtry share/applnk/Utilities
diff --git a/misc/lifelines/pkg-plist b/misc/lifelines/pkg-plist
index dfe21ba02f42..4db7f4f884b8 100644
--- a/misc/lifelines/pkg-plist
+++ b/misc/lifelines/pkg-plist
@@ -22,24 +22,24 @@ bin/llines
%%NLS%%share/locale/pl/LC_MESSAGES/lifelines.mo
%%NLS%%share/locale/nl/LC_MESSAGES/lifelines.mo
%%NLS%%share/locale/rw/LC_MESSAGES/lifelines.mo
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/da 2> /dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de 2> /dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/el 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr 2> /dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/it 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sv 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
%%DATADIR%%/2ppage.ll
%%DATADIR%%/4gen1.ll
%%DATADIR%%/6gen1.ll
diff --git a/misc/man.el/pkg-plist b/misc/man.el/pkg-plist
index f8801570ccc6..d730fde576fa 100644
--- a/misc/man.el/pkg-plist
+++ b/misc/man.el/pkg-plist
@@ -15,8 +15,8 @@ share/doc/i18n-man/byte-compile
@dirrm lib/xemacs/site-packages/lisp/i18n-man-de
@dirrm lib/xemacs/site-packages/lisp/i18n-man-en
@dirrm lib/xemacs/site-packages/lisp/i18n-man-ja
-@unexec rmdir %D/lib/xemacs/site-packages/lisp 2> /dev/null || true
-@unexec rmdir %D/lib/xemacs/site-packages/pkginfo 2> /dev/null || true
-@unexec rmdir %D/lib/xemacs/site-packages 2> /dev/null || true
-@unexec rmdir %D/lib/xemacs 2> /dev/null || true
+@dirrmtry lib/xemacs/site-packages/lisp
+@dirrmtry lib/xemacs/site-packages/pkginfo
+@dirrmtry lib/xemacs/site-packages
+@dirrmtry lib/xemacs
@dirrm share/doc/i18n-man
diff --git a/misc/nagios-base-logos/pkg-plist b/misc/nagios-base-logos/pkg-plist
index 4342c468b446..99eec2b0f4fa 100644
--- a/misc/nagios-base-logos/pkg-plist
+++ b/misc/nagios-base-logos/pkg-plist
@@ -124,6 +124,6 @@
%%NAGIOSWWWDIR%%/images/logos/yellowdog.gif
%%NAGIOSWWWDIR%%/images/logos/yellowdog.jpg
%%NAGIOSWWWDIR%%/images/logos/yellowdog.png
-@unexec rmdir %D/%%NAGIOSWWWDIR%%/images/logos 2>/dev/null || true
-@unexec rmdir %D/%%NAGIOSWWWDIR%%/images 2>/dev/null || true
-@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOSWWWDIR%%/images/logos
+@dirrmtry %%NAGIOSWWWDIR%%/images
+@dirrmtry %%NAGIOSWWWDIR%%
diff --git a/misc/p5-Array-Compare/pkg-plist b/misc/p5-Array-Compare/pkg-plist
index f3eea451285a..1553ed97757c 100644
--- a/misc/p5-Array-Compare/pkg-plist
+++ b/misc/p5-Array-Compare/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Array/Compare.pm
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-IntSpan/pkg-plist b/misc/p5-Array-IntSpan/pkg-plist
index 18bd53ddcdab..c6bdf94c886a 100644
--- a/misc/p5-Array-IntSpan/pkg-plist
+++ b/misc/p5-Array-IntSpan/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Array/IntSpan/Fields.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/IntSpan
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
@dirrm %%SITE_PERL%%/Array/IntSpan
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-PrintCols/pkg-plist b/misc/p5-Array-PrintCols/pkg-plist
index b0e1ed2ee54e..cff1411ae715 100644
--- a/misc/p5-Array-PrintCols/pkg-plist
+++ b/misc/p5-Array-PrintCols/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Array/PrintCols.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/PrintCols
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/misc/p5-Array-RefElem/pkg-plist b/misc/p5-Array-RefElem/pkg-plist
index f62a7a4a6b1b..3d062ee1fc15 100644
--- a/misc/p5-Array-RefElem/pkg-plist
+++ b/misc/p5-Array-RefElem/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem/RefElem.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/RefElem
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Array
diff --git a/misc/p5-Business-ISBN-Data/pkg-plist b/misc/p5-Business-ISBN-Data/pkg-plist
index fb066ea6071d..b63f7a16fcc9 100644
--- a/misc/p5-Business-ISBN-Data/pkg-plist
+++ b/misc/p5-Business-ISBN-Data/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Business/ISBN/Data.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/Data/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN/Data
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
@dirrm %%SITE_PERL%%/Business/ISBN
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-ISIN/pkg-plist b/misc/p5-Business-ISIN/pkg-plist
index 36e91d9130af..31f6772b07ac 100644
--- a/misc/p5-Business-ISIN/pkg-plist
+++ b/misc/p5-Business-ISIN/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN/.packlist
%%SITE_PERL%%/Business/ISIN.pm
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Business
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISIN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
diff --git a/misc/p5-Business-ISSN/pkg-plist b/misc/p5-Business-ISSN/pkg-plist
index f1b8dd227624..0ca0dd0884af 100644
--- a/misc/p5-Business-ISSN/pkg-plist
+++ b/misc/p5-Business-ISSN/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Business/ISSN.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/ISSN
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business
diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist
index 2b24cebe717c..0ef2fcc238da 100644
--- a/misc/p5-Business-UPS/pkg-plist
+++ b/misc/p5-Business-UPS/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Business/UPS.pm
%%SITE_PERL%%/auto/Business/UPS/autosplit.ix
%%PORTDOCS%%share/examples/Business-UPS/test.pl
-@unexec rmdir %D/%%SITE_PERL%%/auto/Business/UPS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Business 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Business/UPS
+@dirrmtry %%SITE_PERL%%/auto/Business
+@dirrmtry %%SITE_PERL%%/Business
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business
%%PORTDOCS%%@unexec rmdir %D/share/examples/Business-UPS 2>/dev/null || true
diff --git a/misc/p5-File-CounterFile/pkg-plist b/misc/p5-File-CounterFile/pkg-plist
index f9212e5ad3e3..d43c7f63fd94 100644
--- a/misc/p5-File-CounterFile/pkg-plist
+++ b/misc/p5-File-CounterFile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/CounterFile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CounterFile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/CounterFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/misc/p5-File-Sort/pkg-plist b/misc/p5-File-Sort/pkg-plist
index b164ce1a8eae..309daedb4849 100644
--- a/misc/p5-File-Sort/pkg-plist
+++ b/misc/p5-File-Sort/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Sort.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sort
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/misc/p5-Geo-Weather/pkg-plist b/misc/p5-Geo-Weather/pkg-plist
index a6af6ea5fac6..672b27122a93 100644
--- a/misc/p5-Geo-Weather/pkg-plist
+++ b/misc/p5-Geo-Weather/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Geo/Weather.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Weather
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/Geo
diff --git a/misc/p5-Geography-Countries/pkg-plist b/misc/p5-Geography-Countries/pkg-plist
index 9d96ec041572..e0b646028685 100644
--- a/misc/p5-Geography-Countries/pkg-plist
+++ b/misc/p5-Geography-Countries/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Geography/Countries.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geography 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography/Countries
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geography
+@dirrmtry %%SITE_PERL%%/Geography
diff --git a/misc/p5-I18N-Charset/pkg-plist b/misc/p5-I18N-Charset/pkg-plist
index 575343d35b80..0109723b0ab4 100644
--- a/misc/p5-I18N-Charset/pkg-plist
+++ b/misc/p5-I18N-Charset/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/I18N/Charset.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/Charset/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/Charset
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/I18N 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry %%SITE_PERL%%/I18N
diff --git a/misc/p5-I18N-LangTags/pkg-plist b/misc/p5-I18N-LangTags/pkg-plist
index 52bd2921bb10..011e80da7802 100644
--- a/misc/p5-I18N-LangTags/pkg-plist
+++ b/misc/p5-I18N-LangTags/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/I18N/LangTags/Detect.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/LangTags/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N/LangTags
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/I18N
@dirrm %%SITE_PERL%%/I18N/LangTags
-@unexec rmdir %D/%%SITE_PERL%%/I18N 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/I18N
diff --git a/misc/p5-List-Compare/pkg-plist b/misc/p5-List-Compare/pkg-plist
index cc9811657296..6f7d441ef736 100644
--- a/misc/p5-List-Compare/pkg-plist
+++ b/misc/p5-List-Compare/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/List/Compare/Functional.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Compare/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Compare
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
@dirrm %%SITE_PERL%%/List/Compare/Base
@dirrm %%SITE_PERL%%/List/Compare
-@unexec rmdir %D/%%SITE_PERL%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/List
diff --git a/misc/p5-Locale-SubCountry/pkg-plist b/misc/p5-Locale-SubCountry/pkg-plist
index 89e4168afa57..2a63e51557fc 100644
--- a/misc/p5-Locale-SubCountry/pkg-plist
+++ b/misc/p5-Locale-SubCountry/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Locale/SubCountry.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/SubCountry/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/SubCountry
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/misc/p5-Net-vCard/pkg-plist b/misc/p5-Net-vCard/pkg-plist
index a8c50603ea83..28e5c560c493 100644
--- a/misc/p5-Net-vCard/pkg-plist
+++ b/misc/p5-Net-vCard/pkg-plist
@@ -5,5 +5,5 @@ bin/vCard2label
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vCard/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vCard
@dirrm %%SITE_PERL%%/Net/vCard
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/misc/p5-Norge/pkg-plist b/misc/p5-Norge/pkg-plist
index 98e05ef8bd05..f942d6ce0234 100644
--- a/misc/p5-Norge/pkg-plist
+++ b/misc/p5-Norge/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/No/PersonNr.pm
%%SITE_PERL%%/No/Sort.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/No/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/No 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/No 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/No
+@dirrmtry %%SITE_PERL%%/No
diff --git a/misc/p5-Text-FIGlet/pkg-plist b/misc/p5-Text-FIGlet/pkg-plist
index 04c2e323d0fd..a1fe82fe9a16 100644
--- a/misc/p5-Text-FIGlet/pkg-plist
+++ b/misc/p5-Text-FIGlet/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/Text/showfigfonts.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FIGlet
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/misc/p5-Tie-DxHash/pkg-plist b/misc/p5-Tie-DxHash/pkg-plist
index e270f94f6e5d..124ca199dbbd 100644
--- a/misc/p5-Tie-DxHash/pkg-plist
+++ b/misc/p5-Tie-DxHash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash/.packlist
%%SITE_PERL%%/Tie/DxHash.pm
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tie
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DxHash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
diff --git a/misc/proxyper/pkg-plist b/misc/proxyper/pkg-plist
index 0d42044ac326..de53c256b953 100644
--- a/misc/proxyper/pkg-plist
+++ b/misc/proxyper/pkg-plist
@@ -6,4 +6,4 @@ distributed.net/proxy/proxyper.ini.sample
@exec [ -f %B/proxyper.ini ] || cp %B/%f %B/proxyper.ini
etc/rc.d/proxyper.sh
@dirrm distributed.net/proxy
-@unexec rmdir %D/distributed.net 2>/dev/null || true
+@dirrmtry distributed.net
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index d02687becd48..5d527b5c491d 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -136,8 +136,8 @@ share/locale/sr@Latn/LC_MESSAGES/quick-lounge-applet.mo
share/locale/sv/LC_MESSAGES/quick-lounge-applet.mo
share/locale/uk/LC_MESSAGES/quick-lounge-applet.mo
share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/quick-lounge/glade
@dirrm share/gnome/quick-lounge
@dirrm share/gnome/omf/quick-lounge-applet
diff --git a/misc/seizedesktop/pkg-plist b/misc/seizedesktop/pkg-plist
index fecde8ac7165..37a6f4214386 100644
--- a/misc/seizedesktop/pkg-plist
+++ b/misc/seizedesktop/pkg-plist
@@ -138,4 +138,4 @@ bin/SeizeDesktop.app
@dirrm JDE/SeizeDesktop/WindowMaker/screenshot
@dirrm JDE/SeizeDesktop/WindowMaker
@dirrm JDE/SeizeDesktop
-@unexec rmdir %D/JDE 2>/dev/null || true
+@dirrmtry JDE
diff --git a/misc/shared-mime-info/pkg-plist b/misc/shared-mime-info/pkg-plist
index 3c570d5fc430..03d6bd767eb3 100644
--- a/misc/shared-mime-info/pkg-plist
+++ b/misc/shared-mime-info/pkg-plist
@@ -418,17 +418,17 @@ share/mime/video/x-msvideo.xml
share/mime/video/x-nsv.xml
share/mime/video/x-real-video.xml
share/mime/video/x-sgi-movie.xml
-@unexec rmdir %D/share/mime/video 2>/dev/null || true
-@unexec rmdir %D/share/mime/text 2>/dev/null || true
-@unexec rmdir %D/share/mime/packages 2>/dev/null || true
-@unexec rmdir %D/share/mime/multipart 2>/dev/null || true
-@unexec rmdir %D/share/mime/model 2>/dev/null || true
-@unexec rmdir %D/share/mime/message 2>/dev/null || true
-@unexec rmdir %D/share/mime/inode 2>/dev/null || true
-@unexec rmdir %D/share/mime/image 2>/dev/null || true
-@unexec rmdir %D/share/mime/audio 2>/dev/null || true
-@unexec rmdir %D/share/mime/application 2>/dev/null || true
-@unexec rmdir %D/share/mime 2>/dev/null || true
+@dirrmtry share/mime/video
+@dirrmtry share/mime/text
+@dirrmtry share/mime/packages
+@dirrmtry share/mime/multipart
+@dirrmtry share/mime/model
+@dirrmtry share/mime/message
+@dirrmtry share/mime/inode
+@dirrmtry share/mime/image
+@dirrmtry share/mime/audio
+@dirrmtry share/mime/application
+@dirrmtry share/mime
@unexec [ -f %%X11BASE%%/share/mime/XMLnamespaces ] && rm -f %%X11BASE%%/share/mime/XMLnamespaces || true
@unexec [ -f %%X11BASE%%/share/mime/globs ] && rm -f %%X11BASE%%/share/mime/globs || true
@unexec [ -f %%X11BASE%%/share/mime/magic ] && rm -f %%X11BASE%%/share/mime/magic || true
diff --git a/misc/smssend/pkg-plist b/misc/smssend/pkg-plist
index 0a282769544e..f7921c945280 100644
--- a/misc/smssend/pkg-plist
+++ b/misc/smssend/pkg-plist
@@ -132,6 +132,6 @@ bin/smssend
%%DATADIR%%/vizzaviuk.sms
%%DATADIR%%/vodacom.sms
%%DATADIR%%/yab.sms
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
@dirrm %%DATADIR%%
diff --git a/misc/tellico-kde4/pkg-plist b/misc/tellico-kde4/pkg-plist
index 4c2064842125..e6fc09e17074 100644
--- a/misc/tellico-kde4/pkg-plist
+++ b/misc/tellico-kde4/pkg-plist
@@ -133,23 +133,23 @@ share/locale/pt/LC_MESSAGES/tellico.mo
share/locale/ro/LC_MESSAGES/tellico.mo
share/locale/sv/LC_MESSAGES/tellico.mo
share/mimelnk/application/x-tellico.desktop
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/doc/HTML/en/tellico
@dirrm share/apps/tellico/report-templates
@dirrm share/apps/tellico/pics
@dirrm share/apps/tellico/entry-templates
@dirrm share/apps/tellico
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
diff --git a/misc/tellico/pkg-plist b/misc/tellico/pkg-plist
index 4c2064842125..e6fc09e17074 100644
--- a/misc/tellico/pkg-plist
+++ b/misc/tellico/pkg-plist
@@ -133,23 +133,23 @@ share/locale/pt/LC_MESSAGES/tellico.mo
share/locale/ro/LC_MESSAGES/tellico.mo
share/locale/sv/LC_MESSAGES/tellico.mo
share/mimelnk/application/x-tellico.desktop
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/doc/HTML/en/tellico
@dirrm share/apps/tellico/report-templates
@dirrm share/apps/tellico/pics
@dirrm share/apps/tellico/entry-templates
@dirrm share/apps/tellico
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
diff --git a/misc/utf8locale/pkg-plist b/misc/utf8locale/pkg-plist
index 870e3cc70185..8f12aca3ab94 100644
--- a/misc/utf8locale/pkg-plist
+++ b/misc/utf8locale/pkg-plist
@@ -1,6 +1,6 @@
share/locale/la_LN.UTF-8/LC_COLLATE
share/locale/la_LN.UTF-8/LC_CTYPE
@dirrm share/locale/la_LN.UTF-8
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale
@exec for lang in %%LANGS%%; do ln -sf %D/share/locale/$lang.UTF-8 %%BASELOCALEDIR%%/; done
@unexec for lang in %%LANGS%%; do rm -f %%BASELOCALEDIR%%/$lang.UTF-8; done
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 2650d9d41ec0..5d632837b961 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -13,13 +13,13 @@ share/xfce4/doc/he/images/appfinder-handle-popup.png
share/xfce4/doc/he/images/appfinder-item-popup.png
share/xfce4/doc/he/images/default_appfinder.png
share/xfce4/doc/he/xfce4-appfinder.html
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
index f27ea0bc1f01..ec35fc321013 100644
--- a/misc/xfce4-iconbox/pkg-plist
+++ b/misc/xfce4-iconbox/pkg-plist
@@ -48,11 +48,11 @@ share/locale/uk/LC_MESSAGES/xfce4-iconbox.mo
share/locale/vi/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
diff --git a/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist
index 9366e9f1e0ea..7d432f36c90c 100644
--- a/misc/xfce4-weather-plugin/pkg-plist
+++ b/misc/xfce4-weather-plugin/pkg-plist
@@ -47,9 +47,9 @@ share/xfce4/weather/icons/liquid/6.png
share/xfce4/weather/icons/liquid/7.png
share/xfce4/weather/icons/liquid/8.png
share/xfce4/weather/icons/liquid/9.png
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/weather/icons/liquid 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/weather/icons 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/weather 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4/weather/icons/liquid
+@dirrmtry share/xfce4/weather/icons
+@dirrmtry share/xfce4/weather
+@dirrmtry share/xfce4
diff --git a/misc/xfce4-wm-themes/pkg-plist b/misc/xfce4-wm-themes/pkg-plist
index b51b31f85844..e96a35dace48 100644
--- a/misc/xfce4-wm-themes/pkg-plist
+++ b/misc/xfce4-wm-themes/pkg-plist
@@ -3632,161 +3632,161 @@ share/themes/Xfce/xfwm4/top-left-inactive.xpm
share/themes/Xfce/xfwm4/top-right-active.xpm
share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrm share/themes/Adept/xfwm4
-@unexec rmdir %D/share/themes/Adept 2>/dev/null || true
+@dirrmtry share/themes/Adept
@dirrm share/themes/Agua/xfwm4
-@unexec rmdir %D/share/themes/Agua 2>/dev/null || true
+@dirrmtry share/themes/Agua
@dirrm share/themes/Agualemon/xfwm4
-@unexec rmdir %D/share/themes/Agualemon 2>/dev/null || true
+@dirrmtry share/themes/Agualemon
@dirrm share/themes/Alternate/xfwm4
-@unexec rmdir %D/share/themes/Alternate 2>/dev/null || true
+@dirrmtry share/themes/Alternate
@dirrm share/themes/Atlanta/xfwm4
-@unexec rmdir %D/share/themes/Atlanta 2>/dev/null || true
+@dirrmtry share/themes/Atlanta
@dirrm share/themes/Atlanta2/xfwm4
-@unexec rmdir %D/share/themes/Atlanta2 2>/dev/null || true
+@dirrmtry share/themes/Atlanta2
@dirrm share/themes/B5/xfwm4
-@unexec rmdir %D/share/themes/B5 2>/dev/null || true
+@dirrmtry share/themes/B5
@dirrm share/themes/B6/xfwm4
-@unexec rmdir %D/share/themes/B6 2>/dev/null || true
+@dirrmtry share/themes/B6
@dirrm share/themes/BBS/xfwm4
-@unexec rmdir %D/share/themes/BBS 2>/dev/null || true
+@dirrmtry share/themes/BBS
@dirrm share/themes/Basix/xfwm4
-@unexec rmdir %D/share/themes/Basix 2>/dev/null || true
+@dirrmtry share/themes/Basix
@dirrm share/themes/Beastie/xfwm4
-@unexec rmdir %D/share/themes/Beastie 2>/dev/null || true
+@dirrmtry share/themes/Beastie
@dirrm share/themes/Biz/xfwm4
-@unexec rmdir %D/share/themes/Biz 2>/dev/null || true
+@dirrmtry share/themes/Biz
@dirrm share/themes/Blackwall/xfwm4
-@unexec rmdir %D/share/themes/Blackwall 2>/dev/null || true
+@dirrmtry share/themes/Blackwall
@dirrm share/themes/Buzz/xfwm4
-@unexec rmdir %D/share/themes/Buzz 2>/dev/null || true
+@dirrmtry share/themes/Buzz
@dirrm share/themes/Coldsteel/xfwm4
-@unexec rmdir %D/share/themes/Coldsteel 2>/dev/null || true
+@dirrmtry share/themes/Coldsteel
@dirrm share/themes/Coolclean/xfwm4
-@unexec rmdir %D/share/themes/Coolclean 2>/dev/null || true
+@dirrmtry share/themes/Coolclean
@dirrm share/themes/Crux/xfwm4
-@unexec rmdir %D/share/themes/Crux 2>/dev/null || true
+@dirrmtry share/themes/Crux
@dirrm share/themes/Cruxish/xfwm4
-@unexec rmdir %D/share/themes/Cruxish 2>/dev/null || true
+@dirrmtry share/themes/Cruxish
@dirrm share/themes/Curve/xfwm4
-@unexec rmdir %D/share/themes/Curve 2>/dev/null || true
+@dirrmtry share/themes/Curve
@dirrm share/themes/Defcon-IV/xfwm4
-@unexec rmdir %D/share/themes/Defcon-IV 2>/dev/null || true
+@dirrmtry share/themes/Defcon-IV
@dirrm share/themes/Eazel-blue/xfwm4
-@unexec rmdir %D/share/themes/Eazel-blue 2>/dev/null || true
+@dirrmtry share/themes/Eazel-blue
@dirrm share/themes/Elberg/xfwm4
-@unexec rmdir %D/share/themes/Elberg 2>/dev/null || true
+@dirrmtry share/themes/Elberg
@dirrm share/themes/Exocet/xfwm4
-@unexec rmdir %D/share/themes/Exocet 2>/dev/null || true
+@dirrmtry share/themes/Exocet
@dirrm share/themes/Fbx/xfwm4
-@unexec rmdir %D/share/themes/Fbx 2>/dev/null || true
+@dirrmtry share/themes/Fbx
@dirrm share/themes/G2/xfwm4
-@unexec rmdir %D/share/themes/G2 2>/dev/null || true
+@dirrmtry share/themes/G2
@dirrm share/themes/Galaxy/xfwm4
-@unexec rmdir %D/share/themes/Galaxy 2>/dev/null || true
+@dirrmtry share/themes/Galaxy
@dirrm share/themes/Gaudy/xfwm4
-@unexec rmdir %D/share/themes/Gaudy 2>/dev/null || true
+@dirrmtry share/themes/Gaudy
@dirrm share/themes/Gelly/xfwm4
-@unexec rmdir %D/share/themes/Gelly 2>/dev/null || true
+@dirrmtry share/themes/Gelly
@dirrm share/themes/Gnububble/xfwm4
-@unexec rmdir %D/share/themes/Gnububble 2>/dev/null || true
+@dirrmtry share/themes/Gnububble
@dirrm share/themes/Gorilla/xfwm4
-@unexec rmdir %D/share/themes/Gorilla 2>/dev/null || true
+@dirrmtry share/themes/Gorilla
@dirrm share/themes/Gtk/xfwm4
-@unexec rmdir %D/share/themes/Gtk 2>/dev/null || true
+@dirrmtry share/themes/Gtk
@dirrm share/themes/Iceg/xfwm4
-@unexec rmdir %D/share/themes/Iceg 2>/dev/null || true
+@dirrmtry share/themes/Iceg
@dirrm share/themes/Kde/xfwm4
-@unexec rmdir %D/share/themes/Kde 2>/dev/null || true
+@dirrmtry share/themes/Kde
@dirrm share/themes/Kde1/xfwm4
-@unexec rmdir %D/share/themes/Kde1 2>/dev/null || true
+@dirrmtry share/themes/Kde1
@dirrm share/themes/Keramik/xfwm4
-@unexec rmdir %D/share/themes/Keramik 2>/dev/null || true
+@dirrmtry share/themes/Keramik
@dirrm share/themes/Kindaker/xfwm4
-@unexec rmdir %D/share/themes/Kindaker 2>/dev/null || true
+@dirrmtry share/themes/Kindaker
@dirrm share/themes/Kleanux/xfwm4
-@unexec rmdir %D/share/themes/Kleanux 2>/dev/null || true
+@dirrmtry share/themes/Kleanux
@dirrm share/themes/Koynacity/xfwm4
-@unexec rmdir %D/share/themes/Koynacity 2>/dev/null || true
+@dirrmtry share/themes/Koynacity
@dirrm share/themes/LineArt/xfwm4
-@unexec rmdir %D/share/themes/LineArt 2>/dev/null || true
+@dirrmtry share/themes/LineArt
@dirrm share/themes/Linea/xfwm4
-@unexec rmdir %D/share/themes/Linea 2>/dev/null || true
+@dirrmtry share/themes/Linea
@dirrm share/themes/Meenee/xfwm4
-@unexec rmdir %D/share/themes/Meenee 2>/dev/null || true
+@dirrmtry share/themes/Meenee
@dirrm share/themes/Metabox/xfwm4
-@unexec rmdir %D/share/themes/Metabox 2>/dev/null || true
+@dirrmtry share/themes/Metabox
@dirrm share/themes/Microcurve/xfwm4
-@unexec rmdir %D/share/themes/Microcurve 2>/dev/null || true
+@dirrmtry share/themes/Microcurve
@dirrm share/themes/Microdeck/xfwm4
-@unexec rmdir %D/share/themes/Microdeck 2>/dev/null || true
+@dirrmtry share/themes/Microdeck
@dirrm share/themes/Microdeck2/xfwm4
-@unexec rmdir %D/share/themes/Microdeck2 2>/dev/null || true
+@dirrmtry share/themes/Microdeck2
@dirrm share/themes/Microdeck3/xfwm4
-@unexec rmdir %D/share/themes/Microdeck3 2>/dev/null || true
+@dirrmtry share/themes/Microdeck3
@dirrm share/themes/Microgui/xfwm4
-@unexec rmdir %D/share/themes/Microgui 2>/dev/null || true
+@dirrmtry share/themes/Microgui
@dirrm share/themes/Mofit/xfwm4
-@unexec rmdir %D/share/themes/Mofit 2>/dev/null || true
+@dirrmtry share/themes/Mofit
@dirrm share/themes/Next/xfwm4
-@unexec rmdir %D/share/themes/Next 2>/dev/null || true
+@dirrmtry share/themes/Next
@dirrm share/themes/Ops/xfwm4
-@unexec rmdir %D/share/themes/Ops 2>/dev/null || true
+@dirrmtry share/themes/Ops
@dirrm share/themes/Oroborus/xfwm4
-@unexec rmdir %D/share/themes/Oroborus 2>/dev/null || true
+@dirrmtry share/themes/Oroborus
@dirrm share/themes/Perl/xfwm4
-@unexec rmdir %D/share/themes/Perl 2>/dev/null || true
+@dirrmtry share/themes/Perl
@dirrm share/themes/Pills/xfwm4
-@unexec rmdir %D/share/themes/Pills 2>/dev/null || true
+@dirrmtry share/themes/Pills
@dirrm share/themes/Piranha/xfwm4
-@unexec rmdir %D/share/themes/Piranha 2>/dev/null || true
+@dirrmtry share/themes/Piranha
@dirrm share/themes/Platinum/xfwm4
-@unexec rmdir %D/share/themes/Platinum 2>/dev/null || true
+@dirrmtry share/themes/Platinum
@dirrm share/themes/Prune/xfwm4
-@unexec rmdir %D/share/themes/Prune 2>/dev/null || true
+@dirrmtry share/themes/Prune
@dirrm share/themes/Quiet-purple/xfwm4
-@unexec rmdir %D/share/themes/Quiet-purple 2>/dev/null || true
+@dirrmtry share/themes/Quiet-purple
@dirrm share/themes/Quinx/xfwm4
-@unexec rmdir %D/share/themes/Quinx 2>/dev/null || true
+@dirrmtry share/themes/Quinx
@dirrm share/themes/R9X/xfwm4
-@unexec rmdir %D/share/themes/R9X 2>/dev/null || true
+@dirrmtry share/themes/R9X
@dirrm share/themes/Redmond/xfwm4
-@unexec rmdir %D/share/themes/Redmond 2>/dev/null || true
+@dirrmtry share/themes/Redmond
@dirrm share/themes/RedmondXP/xfwm4
-@unexec rmdir %D/share/themes/RedmondXP 2>/dev/null || true
+@dirrmtry share/themes/RedmondXP
@dirrm share/themes/Retro/xfwm4
-@unexec rmdir %D/share/themes/Retro 2>/dev/null || true
+@dirrmtry share/themes/Retro
@dirrm share/themes/Silverado/xfwm4
-@unexec rmdir %D/share/themes/Silverado 2>/dev/null || true
+@dirrmtry share/themes/Silverado
@dirrm share/themes/Slick/xfwm4
-@unexec rmdir %D/share/themes/Slick 2>/dev/null || true
+@dirrmtry share/themes/Slick
@dirrm share/themes/Slimline/xfwm4
-@unexec rmdir %D/share/themes/Slimline 2>/dev/null || true
+@dirrmtry share/themes/Slimline
@dirrm share/themes/Smallscreen/xfwm4
-@unexec rmdir %D/share/themes/Smallscreen 2>/dev/null || true
+@dirrmtry share/themes/Smallscreen
@dirrm share/themes/Smoothwall/xfwm4
-@unexec rmdir %D/share/themes/Smoothwall 2>/dev/null || true
+@dirrmtry share/themes/Smoothwall
@dirrm share/themes/Synthetic/xfwm4
-@unexec rmdir %D/share/themes/Synthetic 2>/dev/null || true
+@dirrmtry share/themes/Synthetic
@dirrm share/themes/TUX/xfwm4
-@unexec rmdir %D/share/themes/TUX 2>/dev/null || true
+@dirrmtry share/themes/TUX
@dirrm share/themes/Tabs/xfwm4
-@unexec rmdir %D/share/themes/Tabs 2>/dev/null || true
+@dirrmtry share/themes/Tabs
@dirrm share/themes/Tgc-large/xfwm4
-@unexec rmdir %D/share/themes/Tgc-large 2>/dev/null || true
+@dirrmtry share/themes/Tgc-large
@dirrm share/themes/Tgc/xfwm4
-@unexec rmdir %D/share/themes/Tgc 2>/dev/null || true
+@dirrmtry share/themes/Tgc
@dirrm share/themes/Today/xfwm4
-@unexec rmdir %D/share/themes/Today 2>/dev/null || true
+@dirrmtry share/themes/Today
@dirrm share/themes/Totem/xfwm4
-@unexec rmdir %D/share/themes/Totem 2>/dev/null || true
+@dirrmtry share/themes/Totem
@dirrm share/themes/Trench/xfwm4
-@unexec rmdir %D/share/themes/Trench 2>/dev/null || true
+@dirrmtry share/themes/Trench
@dirrm share/themes/Triviality/xfwm4
-@unexec rmdir %D/share/themes/Triviality 2>/dev/null || true
+@dirrmtry share/themes/Triviality
@dirrm share/themes/Tubular/xfwm4
-@unexec rmdir %D/share/themes/Tubular 2>/dev/null || true
+@dirrmtry share/themes/Tubular
@dirrm share/themes/Variation/xfwm4
-@unexec rmdir %D/share/themes/Variation 2>/dev/null || true
+@dirrmtry share/themes/Variation
@dirrm share/themes/Xfce/xfwm4
-@unexec rmdir %D/share/themes/Xfce 2>/dev/null || true
-@unexec rmdir %D/share/themes 2>/dev/null || true
+@dirrmtry share/themes/Xfce
+@dirrmtry share/themes
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index b08c8a0b7ee8..b58325062c34 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -63,6 +63,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
@dirrm share/gnome/help/gnomesword/C/figures
@dirrm share/gnome/help/gnomesword/C
@dirrm share/gnome/help/gnomesword
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 609f0b6366ab..4a77453661f4 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -95,4 +95,4 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
@dirrm lib/audacious/Effect
@dirrm lib/audacious
@dirrm include/audacious
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 609f0b6366ab..4a77453661f4 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -95,4 +95,4 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
@dirrm lib/audacious/Effect
@dirrm lib/audacious
@dirrm include/audacious
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 239bfa7835a2..68f9b96cfd58 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -112,6 +112,6 @@ share/avifile/pixmaps/up.ppm
@dirrm share/doc/avifile
@dirrm share/avifile/pixmaps
@dirrm share/avifile
-@unexec rmdir %D/lib/avifile/vidix 2>/dev/null || true
+@dirrmtry lib/avifile/vidix
@dirrm lib/avifile
@dirrm include/avifile
diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist
index af8ef0027d11..8793d118f6ab 100644
--- a/multimedia/beep-media-player/pkg-plist
+++ b/multimedia/beep-media-player/pkg-plist
@@ -71,7 +71,7 @@ share/locale/ru/LC_MESSAGES/bmp.mo
share/locale/sk/LC_MESSAGES/bmp.mo
share/locale/sv/LC_MESSAGES/bmp.mo
share/locale/zh_CN/LC_MESSAGES/bmp.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@exec mkdir -p %D/share/beep/Skins
@dirrm share/beep/Skins
@dirrm share/beep
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index a9a99f770950..e1aad616c0cb 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -221,6 +221,6 @@ share/locale/ru/LC_MESSAGES/bmpx.mo
@dirrm include/bmpx
%%PYTHON%%@dirrm share/bmpx-clients/pygtk
%%PYTHON%%@dirrm share/bmpx-clients
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/multimedia/dvdrip/pkg-plist b/multimedia/dvdrip/pkg-plist
index 3ef440842b22..5c4fd96ffbac 100644
--- a/multimedia/dvdrip/pkg-plist
+++ b/multimedia/dvdrip/pkg-plist
@@ -102,7 +102,7 @@ bin/dvdrip-master
%%SITE_PERL%%/LocaleData/sr/LC_MESSAGES/video.dvdrip.mo
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/DVDRip
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
@dirrm %%SITE_PERL%%/Video/DVDRip/RPC
@dirrm %%SITE_PERL%%/Video/DVDRip/Job
@dirrm %%SITE_PERL%%/Video/DVDRip/GUI/Setting
@@ -113,17 +113,17 @@ bin/dvdrip-master
@dirrm %%SITE_PERL%%/Video/DVDRip/Cluster
@dirrm %%SITE_PERL%%/Video/DVDRip/CPAN
@dirrm %%SITE_PERL%%/Video/DVDRip
-@unexec rmdir %D/%%SITE_PERL%%/Video 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/cs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/de 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/es 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/fr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/it 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData/sr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LocaleData 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Video
+@dirrmtry %%SITE_PERL%%/LocaleData/cs/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/de/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/es/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/fr/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/it/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/sr/LC_MESSAGES
+@dirrmtry %%SITE_PERL%%/LocaleData/cs
+@dirrmtry %%SITE_PERL%%/LocaleData/de
+@dirrmtry %%SITE_PERL%%/LocaleData/es
+@dirrmtry %%SITE_PERL%%/LocaleData/fr
+@dirrmtry %%SITE_PERL%%/LocaleData/it
+@dirrmtry %%SITE_PERL%%/LocaleData/sr
+@dirrmtry %%SITE_PERL%%/LocaleData
diff --git a/multimedia/dvdstyler/pkg-plist b/multimedia/dvdstyler/pkg-plist
index ddc541906a72..34aa164812f5 100644
--- a/multimedia/dvdstyler/pkg-plist
+++ b/multimedia/dvdstyler/pkg-plist
@@ -70,4 +70,4 @@ share/locale/sr/LC_MESSAGES/dvdstyler.mo
@dirrm %%DATADIR%%/backgrounds
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/multimedia/gstreamer-editor/pkg-plist b/multimedia/gstreamer-editor/pkg-plist
index f17f5f92a5cd..a6ffc5d56ff5 100644
--- a/multimedia/gstreamer-editor/pkg-plist
+++ b/multimedia/gstreamer-editor/pkg-plist
@@ -39,16 +39,16 @@ share/gnome/omf/gst-editor/gst-editor-manual-C.omf
share/gnome/pixmaps/gst-editor.png
share/gnome/pixmaps/gst-inspect.png
share/gnome/pixmaps/gst-launch.png
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
@dirrm share/gnome/omf/gst-editor
-@unexec rmdir %D/share/gnome/omf 2>/dev/null || true
+@dirrmtry share/gnome/omf
@dirrm share/gnome/gst-editor/gnome/help/gst-editor/C
@dirrm share/gnome/gst-editor/gnome/help/gst-editor
@dirrm share/gnome/gst-editor/gnome/help
@dirrm share/gnome/gst-editor/gnome
@dirrm share/gnome/gst-editor
-@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome/applications
+@dirrmtry share/gnome
@dirrm include/gst-editor-%%VERSION%%/gst/element-ui
@dirrm include/gst-editor-%%VERSION%%/gst/element-browser
@dirrm include/gst-editor-%%VERSION%%/gst/editor
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index ce0f0adbf656..1162aed54b9c 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -182,7 +182,7 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
@dirrm include/gstreamer-%%VERSION%%/gst/audio
-@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
-@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrmtry include/gstreamer-%%VERSION%%/gst
+@dirrmtry include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index ce0f0adbf656..1162aed54b9c 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -182,7 +182,7 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
@dirrm include/gstreamer-%%VERSION%%/gst/colorbalance
@dirrm include/gstreamer-%%VERSION%%/gst/audio
-@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
-@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrmtry include/gstreamer-%%VERSION%%/gst
+@dirrmtry include/gstreamer-%%VERSION%%
@exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 164854e15bff..2a5ed190aace 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -122,7 +122,7 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@dirrm share/gnome/cache/gstreamer-%%VERSION%%
-@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
+@dirrmtry share/gnome/cache
@dirrm lib/gstreamer-%%VERSION%%
@dirrm include/gstreamer-%%VERSION%%/gst/getbits
@dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index 164854e15bff..2a5ed190aace 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -122,7 +122,7 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
@dirrm share/gnome/cache/gstreamer-%%VERSION%%
-@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
+@dirrmtry share/gnome/cache
@dirrm lib/gstreamer-%%VERSION%%
@dirrm include/gstreamer-%%VERSION%%/gst/getbits
@dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol
diff --git a/multimedia/gtksubtitler/pkg-plist b/multimedia/gtksubtitler/pkg-plist
index 3b0b9706aabb..09db786d5809 100644
--- a/multimedia/gtksubtitler/pkg-plist
+++ b/multimedia/gtksubtitler/pkg-plist
@@ -5,6 +5,6 @@ share/gnome/GTKsubtitler/lang.hu
share/gnome/GTKsubtitler/lang.pl
share/gnome/pixmaps/GTKsubtitler/GTKsubtitler.xpm
@dirrm share/gnome/pixmaps/GTKsubtitler
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/pixmaps
@dirrm share/gnome/GTKsubtitler
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome
diff --git a/multimedia/hayes/pkg-plist b/multimedia/hayes/pkg-plist
index c19f6431c255..487cacf9b020 100644
--- a/multimedia/hayes/pkg-plist
+++ b/multimedia/hayes/pkg-plist
@@ -7,15 +7,15 @@ share/apps/noatun/icons/hicolor/22x22/actions/noatunshuffle.png
share/apps/noatun/icons/hicolor/32x32/actions/nextsection.png
share/apps/noatun/icons/hicolor/32x32/actions/prevsection.png
share/services/noatunhayessetcurrent.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun/icons 2>/dev/null || true
-@unexec rmdir %D/share/apps/noatun 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/apps/noatun/icons/hicolor/32x32/actions
+@dirrmtry share/apps/noatun/icons/hicolor/32x32
+@dirrmtry share/apps/noatun/icons/hicolor/22x22/actions
+@dirrmtry share/apps/noatun/icons/hicolor/22x22
+@dirrmtry share/apps/noatun/icons/hicolor
+@dirrmtry share/apps/noatun/icons
+@dirrmtry share/apps/noatun
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
+@dirrmtry share/apps
+@dirrmtry lib/kde3
diff --git a/multimedia/istanbul/pkg-plist b/multimedia/istanbul/pkg-plist
index 160dc8e26fa5..55dfc8b682e4 100644
--- a/multimedia/istanbul/pkg-plist
+++ b/multimedia/istanbul/pkg-plist
@@ -18,6 +18,6 @@ share/pixmaps/istanbul.png
@dirrm %%PYTHON_SITELIBDIR%%/istanbul/extern
@dirrm %%PYTHON_SITELIBDIR%%/istanbul/configure
@dirrm %%PYTHON_SITELIBDIR%%/istanbul
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
+@dirrmtry share/applications
diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist
index be2c26bda647..d5747d97b9e6 100644
--- a/multimedia/kino/pkg-plist
+++ b/multimedia/kino/pkg-plist
@@ -144,5 +144,5 @@ share/mime/packages/kino.xml
@dirrm share/gnome/kino/scripts/publish
@dirrm share/gnome/kino/scripts
@dirrm share/gnome/kino
-@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@dirrmtry share/gnome/applications
+@dirrmtry share/gnome/pixmaps
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index e27c9ba1bb8d..c8b47a0789b6 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -93,71 +93,71 @@ share/locale/tr/LC_MESSAGES/kmplayer.mo
share/locale/xx/LC_MESSAGES/kmplayer.mo
share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
share/services/kmplayer_part.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xx/LC_MESSAGES
+@dirrmtry share/locale/xx
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/kmplayer
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/kmplayer
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt/kmplayer
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/it/kmplayer
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/kmplayer
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/kmplayer
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/es/kmplayer
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
@dirrm share/doc/HTML/en/kmplayer
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kmplayer
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/kmplayer
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@dirrm share/apps/kmplayer
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
+@dirrmtry lib/kde3
diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist
index e27c9ba1bb8d..c8b47a0789b6 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -93,71 +93,71 @@ share/locale/tr/LC_MESSAGES/kmplayer.mo
share/locale/xx/LC_MESSAGES/kmplayer.mo
share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
share/services/kmplayer_part.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xx/LC_MESSAGES
+@dirrmtry share/locale/xx
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/kmplayer
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/kmplayer
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt/kmplayer
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/it/kmplayer
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/kmplayer
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/kmplayer
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/es/kmplayer
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
@dirrm share/doc/HTML/en/kmplayer
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kmplayer
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/kmplayer
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
@dirrm share/apps/kmplayer
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
+@dirrmtry lib/kde3
diff --git a/multimedia/konverter/pkg-plist b/multimedia/konverter/pkg-plist
index 87df46264c40..3aefb5205334 100644
--- a/multimedia/konverter/pkg-plist
+++ b/multimedia/konverter/pkg-plist
@@ -6,16 +6,16 @@ share/doc/HTML/en/konverter/index.cache.bz2
share/doc/HTML/en/konverter/index.docbook
share/icons/hicolor/16x16/apps/konverter.png
share/icons/hicolor/32x32/apps/konverter.png
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/konverter
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/konverter
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/multimedia/ksubeditor/pkg-plist b/multimedia/ksubeditor/pkg-plist
index bf76ba58bbed..2d27756e591a 100644
--- a/multimedia/ksubeditor/pkg-plist
+++ b/multimedia/ksubeditor/pkg-plist
@@ -3,13 +3,13 @@ share/applnk/Applications/ksubeditor.desktop
share/apps/ksubeditor/ksubeditorui.rc
share/icons/locolor/16x16/apps/ksubeditor.png
share/icons/locolor/32x32/apps/ksubeditor.png
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
@dirrm share/apps/ksubeditor
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/multimedia/libdivxdecore-devel/pkg-plist b/multimedia/libdivxdecore-devel/pkg-plist
index 605990654dcd..ef72d66788d7 100644
--- a/multimedia/libdivxdecore-devel/pkg-plist
+++ b/multimedia/libdivxdecore-devel/pkg-plist
@@ -3,4 +3,4 @@ lib/libdivxdecore.a
lib/libdivxdecore.so
lib/libdivxdecore.so.%%LIB_VERSION%%
%%NOPROFILE%%lib/libdivxdecore_p.a
-@unexec rmdir %D/include/divx 2>/dev/null || true
+@dirrmtry include/divx
diff --git a/multimedia/libdivxencore/pkg-plist b/multimedia/libdivxencore/pkg-plist
index af46d29caa35..937d6fdcde18 100644
--- a/multimedia/libdivxencore/pkg-plist
+++ b/multimedia/libdivxencore/pkg-plist
@@ -3,4 +3,4 @@ lib/libdivxencore.a
lib/libdivxencore.so
lib/libdivxencore.so.%%LIB_VERSION%%
%%NOPROFILE%%lib/libdivxencore_p.a
-@unexec rmdir %D/include/divx 2>/dev/null || true
+@dirrmtry include/divx
diff --git a/multimedia/libmovtar/pkg-plist b/multimedia/libmovtar/pkg-plist
index 3f5456d231c3..60fc111a1860 100644
--- a/multimedia/libmovtar/pkg-plist
+++ b/multimedia/libmovtar/pkg-plist
@@ -10,4 +10,4 @@ bin/rtjshow
include/movtar.h
lib/libmovtar.a
share/aclocal/movtar.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@dirrmtry share/aclocal
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 024e38b2fff3..c1b8a7bc73ad 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -212,8 +212,8 @@ share/xine/libxine1/fonts/serif-64.xinefont.gz
@dirrm %%DOCSDIR%%/hackersguide
@dirrm %%DOCSDIR%%/faq
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
@dirrm share/xine/libxine1/fonts
@dirrm share/xine/libxine1
@dirrm share/xine
diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist
index 3b0a7919ee6c..04d8ad37bc11 100644
--- a/multimedia/linux-realplayer/pkg-plist
+++ b/multimedia/linux-realplayer/pkg-plist
@@ -177,8 +177,8 @@ lib/linux-mozilla/plugins/nphelix.xpt
@dirrm lib/RealPlayer/share/realplay
@dirrm lib/RealPlayer/share
@dirrm lib/RealPlayer
-@unexec rmdir %D/lib/linux-mozilla/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/linux-mozilla 2>/dev/null || true
+@dirrmtry lib/linux-mozilla/plugins
+@dirrmtry lib/linux-mozilla
%%X11%%@cwd %%X11BASE%%
%%GNOME%%share/gnome/application-registry/realplay.applications
%%GNOME%%share/gnome/applications/realplay.desktop
diff --git a/multimedia/mplayer-skins/pkg-plist b/multimedia/mplayer-skins/pkg-plist
index 63ba33198b79..23a3ee1eb839 100644
--- a/multimedia/mplayer-skins/pkg-plist
+++ b/multimedia/mplayer-skins/pkg-plist
@@ -1730,4 +1730,4 @@ share/mplayer/Skin/%%PKGNAME%%
%%ABYSS%%@dirrm share/mplayer/Skin/Abyss
%%WINDOWSMEDIAPLAYER6%%@dirrm share/mplayer/Skin/WMP6
@dirrm share/mplayer/Skin
-@unexec rmdir %D/share/mplayer/ 2>/dev/null || true
+@dirrmtry share/mplayer/
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 6f4ada61318c..bae7c36327a0 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -96,7 +96,7 @@ bin/mplayer
%%DATADIR%%/input.conf
%%DATADIR%%/menu.conf
@dirrm %%DATADIR%%/tools
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%VIDIX%%@dirrm lib/mplayer/vidix
%%VIDIX%%@dirrm lib/mplayer
diff --git a/multimedia/ogle-gui/pkg-plist b/multimedia/ogle-gui/pkg-plist
index 24b3ec5b4592..54127ed0efb0 100644
--- a/multimedia/ogle-gui/pkg-plist
+++ b/multimedia/ogle-gui/pkg-plist
@@ -28,18 +28,18 @@ share/locale/fr/LC_MESSAGES/ogle_gui.mo
share/locale/nl/LC_MESSAGES/ogle_gui.mo
share/locale/pt/LC_MESSAGES/ogle_gui.mo
share/locale/sv/LC_MESSAGES/ogle_gui.mo
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale
@dirrm share/gnome/ogle_gui
@dirrm lib/ogle
diff --git a/multimedia/okle/pkg-plist b/multimedia/okle/pkg-plist
index 5a35741e98e6..4e64cde264cf 100644
--- a/multimedia/okle/pkg-plist
+++ b/multimedia/okle/pkg-plist
@@ -36,17 +36,17 @@ share/locale/es/LC_MESSAGES/okle.mo
share/locale/hu/LC_MESSAGES/okle.mo
share/locale/it/LC_MESSAGES/okle.mo
share/locale/sv/LC_MESSAGES/okle.mo
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/okle
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/okle/pics
@dirrm share/apps/okle
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Multimedia
+@dirrmtry share/applnk
diff --git a/multimedia/p5-MP4-Info/pkg-plist b/multimedia/p5-MP4-Info/pkg-plist
index e7739b6522a8..b675e9333eb4 100644
--- a/multimedia/p5-MP4-Info/pkg-plist
+++ b/multimedia/p5-MP4-Info/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/MP4/Info.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4/Info/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4/Info
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MP4 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP4
+@dirrmtry %%SITE_PERL%%/MP4
diff --git a/multimedia/p5-RIFF-Info/pkg-plist b/multimedia/p5-RIFF-Info/pkg-plist
index 896919ba951b..d2bf7698fc3c 100644
--- a/multimedia/p5-RIFF-Info/pkg-plist
+++ b/multimedia/p5-RIFF-Info/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/RIFF/Info/DivX.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF/Info/.packlist
@dirrm %%SITE_PERL%%/RIFF/Info
-@unexec rmdir %D/%%SITE_PERL%%/RIFF 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/RIFF
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF/Info
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RIFF
diff --git a/multimedia/p5-Video-Info/pkg-plist b/multimedia/p5-Video-Info/pkg-plist
index 6f54bec53c5a..b43c3fed1bc9 100644
--- a/multimedia/p5-Video-Info/pkg-plist
+++ b/multimedia/p5-Video-Info/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/Info/.packlist
%%SITE_PERL%%/Video/Info.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/Info
-@unexec rmdir %D/%%SITE_PERL%%/Video 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Video
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
diff --git a/multimedia/p5-Video-OpenQuicktime/pkg-plist b/multimedia/p5-Video-OpenQuicktime/pkg-plist
index c6090cc7f2e2..838a751fab93 100644
--- a/multimedia/p5-Video-OpenQuicktime/pkg-plist
+++ b/multimedia/p5-Video-OpenQuicktime/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime/OpenQuicktime.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime/OpenQuicktime.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video/OpenQuicktime
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Video 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Video 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Video
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Video
diff --git a/multimedia/quodlibet/pkg-plist b/multimedia/quodlibet/pkg-plist
index 93cd2b3baf7a..aaec700d0c13 100644
--- a/multimedia/quodlibet/pkg-plist
+++ b/multimedia/quodlibet/pkg-plist
@@ -116,7 +116,7 @@ share/quodlibet/rhythmbox-volume-zero.png
share/quodlibet/stock.py
share/quodlibet/util.py
share/quodlibet/widgets.py
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@exec mkdir -p %D/share/quodlibet/plugins
@dirrm share/quodlibet/plugins
@exec mkdir -p %D/lib/quodlibet
diff --git a/multimedia/rox-videothumbnail/pkg-plist b/multimedia/rox-videothumbnail/pkg-plist
index 19cbf9356ac2..4ca00f961a8b 100644
--- a/multimedia/rox-videothumbnail/pkg-plist
+++ b/multimedia/rox-videothumbnail/pkg-plist
@@ -15,4 +15,4 @@ apps/VideoThumbnail/vidthumb.py
apps/VideoThumbnail/vidthumb.pyc
@dirrm apps/VideoThumbnail/Help
@dirrm apps/VideoThumbnail
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/multimedia/tovid/pkg-plist b/multimedia/tovid/pkg-plist
index 079e71673830..216e10583bc9 100644
--- a/multimedia/tovid/pkg-plist
+++ b/multimedia/tovid/pkg-plist
@@ -35,5 +35,5 @@ bin/tovidgui
%%PYTHON_SITELIBDIR%%/libtovid/tools.pyc
%%PYTHON_SITELIBDIR%%/libtovid/tools.pyo
@dirrm %%PYTHON_SITELIBDIR%%/libtovid
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/multimedia/xfce4-media/pkg-plist b/multimedia/xfce4-media/pkg-plist
index da2fe3c4cf56..c61564a2a1bc 100644
--- a/multimedia/xfce4-media/pkg-plist
+++ b/multimedia/xfce4-media/pkg-plist
@@ -13,5 +13,5 @@ share/icons/hicolor/22x22/actions/xfmedia-shuffle.png
@dirrm include/xfmedia
@dirrm lib/xfmedia/plugins
@dirrm lib/xfmedia
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry etc/xdg
+@dirrmtry share/applications
diff --git a/multimedia/xfce4-xmms-controller-plugin/pkg-plist b/multimedia/xfce4-xmms-controller-plugin/pkg-plist
index 2756f78fbfdc..36924468a7c9 100644
--- a/multimedia/xfce4-xmms-controller-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-controller-plugin/pkg-plist
@@ -6,6 +6,6 @@ share/xfce4-xmms-controller-plugin/pause.png
share/xfce4-xmms-controller-plugin/play.png
share/xfce4-xmms-controller-plugin/prev.png
share/xfce4-xmms-controller-plugin/icon.png
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4-xmms-controller-plugin 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4-xmms-controller-plugin
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index 038799e69564..6a1b86463878 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -5,5 +5,5 @@ share/xfce4/xmms-plugin/xmms-plugin-pause.png
share/xfce4/xmms-plugin/xmms-plugin-stop.png
share/xfce4/xmms-plugin/xmms-plugin-next.png
@dirrm share/xfce4/xmms-plugin
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index 9468ad453617..1d8a943a1f39 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -126,37 +126,37 @@ share/xine/skins/xinetic/SmallArrowDown.png
share/xine/skins/xinetic/SmallArrowUp.png
share/xine/skins/xinetic/skinconfig
share/xine/visuals/default.avi
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de 2>/dev/null || true
-@unexec rmdir %D/man/es/man1 2>/dev/null || true
-@unexec rmdir %D/man/es 2>/dev/null || true
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/pl/man1 2>/dev/null || true
-@unexec rmdir %D/man/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/pl/man1
+@dirrmtry man/pl
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale
@dirrm share/xine/visuals
@dirrm share/xine/skins/xinetic
@dirrm share/xine/oxine
@dirrm share/xine/desktop
@dirrm share/xine/skins
-@unexec rmdir %D/share/xine 2>/dev/null || true
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/xine
+@dirrmtry share/pixmaps
@dirrm share/doc/xine-ui
@dirrm share/doc/xitk