aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 02:30:01 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 02:30:01 +0000
commita437d08ecacfe1693a6e9f6ee1906a6f425ca700 (patch)
tree547a63eef9c79ff429d082d13015036a6cfa4c85 /math
parent0416031c9ba13da33845bc762078065b482dd551 (diff)
downloadports-a437d08ecacfe1693a6e9f6ee1906a6f425ca700.tar.gz
ports-a437d08ecacfe1693a6e9f6ee1906a6f425ca700.zip
Notes
Diffstat (limited to 'math')
-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
73 files changed, 251 insertions, 251 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%%