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

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

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

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
+@dirrmtry share/texmf/tex/latex/misc
-@unexec rmdir %D/share/texmf/tex/latex 2>/dev/null || true
+@dirrmtry share/texmf/tex/latex
-@unexec rmdir %D/share/texmf/tex 2>/dev/null || true
+@dirrmtry share/texmf/tex
-@unexec rmdir %D/share/texmf 2>/dev/null || true
+@dirrmtry share/texmf

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
+@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo/progs
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins/drgeo 2>/dev/null || true
+@dirrmtry share/gnome/texmacs/TeXmacs/plugins/drgeo
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs/plugins 2>/dev/null || true
+@dirrmtry share/gnome/texmacs/TeXmacs/plugins
-@unexec rmdir %D/share/gnome/texmacs/TeXmacs 2>/dev/null || true
+@dirrmtry share/gnome/texmacs/TeXmacs
-@unexec rmdir %D/share/gnome/texmacs 2>/dev/null || true
+@dirrmtry share/gnome/texmacs
 @dirrm share/gnome/drgeo/scm
 @dirrm share/gnome/drgeo/glade
 @dirrm share/gnome/drgeo/examples/scheme

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
+@dirrmtry share/icons/hicolor/64x64/apps
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
+@dirrmtry share/mimelnk/application
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
+@dirrmtry share/mimelnk
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk
 @dirrm include/fung-calc
 @dirrm share/doc/HTML/en/fung-calc
 @dirrm share/fung-calc/translations

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

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
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/zh_HK
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@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

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
+@dirrmtry share/pixmaps
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
-@unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null || true
+@dirrmtry share/gnome/apps/Utilities
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@dirrmtry share/gnome/apps
-@unexec rmdir %D/share/gnome/ 2>/dev/null || true
+@dirrmtry share/gnome/
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk

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
+@dirrmtry share/applnk/share/apps
-@unexec rmdir %D/share/applnk/share 2>/dev/null || true
+@dirrmtry share/applnk/share
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/locolor/16x16/apps
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/locolor/16x16
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@dirrmtry share/icons/locolor

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
+@dirrmtry share/octave/site/api-v13/m
-@unexec rmdir %D/share/octave/site/api-v13 2>/dev/null || true
+@dirrmtry share/octave/site/api-v13
-@unexec rmdir %D/share/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry share/octave/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/share/octave/site/exec 2>/dev/null || true
+@dirrmtry share/octave/site/exec
-@unexec rmdir %D/share/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry share/octave/site/oct/%%GNU_HOST%%
-@unexec rmdir %D/share/octave/site/oct 2>/dev/null || true
+@dirrmtry share/octave/site/oct
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/m 2>/dev/null || true
+@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
+@dirrmtry libexec/octave/site/api-v13/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/api-v13/m 2>/dev/null || true
+@dirrmtry libexec/octave/site/api-v13/m
-@unexec rmdir %D/libexec/octave/site/api-v13 2>/dev/null || true
+@dirrmtry libexec/octave/site/api-v13
-@unexec rmdir %D/libexec/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/exec 2>/dev/null || true
+@dirrmtry libexec/octave/site/exec
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/api-v13/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/m 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/api-v13/m
-@unexec rmdir %D/libexec/octave/site/oct/api-v13 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/api-v13
-@unexec rmdir %D/libexec/octave/site/m 2>/dev/null || true
+@dirrmtry libexec/octave/site/m
-@unexec rmdir %D/libexec/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/oct 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/octave/%%OCTAVE_VERSION%%
 @dirrm libexec/octave/site

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
+@dirrmtry share/octave/site/api-v13/m
-@unexec rmdir %D/share/octave/site/api-v13 2>/dev/null || true
+@dirrmtry share/octave/site/api-v13
-@unexec rmdir %D/share/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry share/octave/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/share/octave/site/exec 2>/dev/null || true
+@dirrmtry share/octave/site/exec
-@unexec rmdir %D/share/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry share/octave/site/oct/%%GNU_HOST%%
-@unexec rmdir %D/share/octave/site/oct 2>/dev/null || true
+@dirrmtry share/octave/site/oct
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
+@dirrmtry share/octave/%%OCTAVE_VERSION%%/site/exec
-@unexec rmdir %D/share/octave/%%OCTAVE_VERSION%%/site/m 2>/dev/null || true
+@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
+@dirrmtry libexec/octave/site/api-v13/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/api-v13/m 2>/dev/null || true
+@dirrmtry libexec/octave/site/api-v13/m
-@unexec rmdir %D/libexec/octave/site/api-v13 2>/dev/null || true
+@dirrmtry libexec/octave/site/api-v13
-@unexec rmdir %D/libexec/octave/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/exec 2>/dev/null || true
+@dirrmtry libexec/octave/site/exec
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/api-v13/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/oct/api-v13/m 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/api-v13/m
-@unexec rmdir %D/libexec/octave/site/oct/api-v13 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/api-v13
-@unexec rmdir %D/libexec/octave/site/m 2>/dev/null || true
+@dirrmtry libexec/octave/site/m
-@unexec rmdir %D/libexec/octave/site/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/site/oct 2>/dev/null || true
+@dirrmtry libexec/octave/site/oct
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/exec 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/exec
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/oct 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/oct
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/exec 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/exec
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%% 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct/%%GNU_HOST%%
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site/oct 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site/oct
-@unexec rmdir %D/libexec/octave/%%OCTAVE_VERSION%%/site 2>/dev/null || true
+@dirrmtry libexec/octave/%%OCTAVE_VERSION%%/site
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/octave/%%OCTAVE_VERSION%%
 @dirrm libexec/octave/site

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/AI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
-@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/AI

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/NeuralNet
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
-@unexec rmdir %D/%%SITE_PERL%%/AI/NeuralNet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/AI/NeuralNet
-@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/AI

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

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bit

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit/Vector
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
-@unexec rmdir %D/%%SITE_PERL%%/Bit/Vector 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bit/Vector
-@unexec rmdir %D/%%SITE_PERL%%/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bit

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bit
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Carp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Carp
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bit

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
+@dirrmtry %%SITE_PERL%%/Chart/Math
-@unexec rmdir %D/%%SITE_PERL%%/Chart 2>/dev/null || true
+@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date

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
+@dirrmtry %%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@unexec rmdir %D/%%%SITE_PERL%%/Geo 2>/dev/null || true
+@dirrmtry %%%SITE_PERL%%/Geo

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph
-@unexec rmdir %D/%%SITE_PERL%%/Graph 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Graph

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
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/BaseCalc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/Math/Bezier
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Bezier
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math

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

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

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
+@dirrmtry %%SITE_PERL%%/Math/Calc/Units/Convert
-@unexec rmdir %D/%%SITE_PERL%%/Math/Calc/Units 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math/Calc/Units
-@unexec rmdir %D/%%SITE_PERL%%/Math/Calc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math/Calc
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc/Units
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Calc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/ConvexHull
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math

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

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

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
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math

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
+@dirrmtry %%SITE_PERL%%/mach/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/mach/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/Math

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
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Matrix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math

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
+@dirrmtry %%SITE_PERL%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %SITE_PERL%%/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Math

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
+@dirrmtry %%SITE_PERL%%/Math
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Math
-@unexec rmdir %D/%%SITE_PERL%%/Math 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Math

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

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
+@dirrmtry %%SITE_PERL%%/Number
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Set

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Set

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry %%SITE_PERL%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Statistics
-@unexec rmdir %D/%%SITE_PERL%%/Statistics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Statistics

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
+@dirrmtry share/doc/HTML/en
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@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
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@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
+@dirrmtry share/applnk/Office
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@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

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

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

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

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

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%%

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
+@dirrmtry %%EXAMPLESDIR%%
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%

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%%

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

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

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

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%%

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%%

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%%

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%%

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
+@dirrmtry share/icons/hicolor/64x64/apps
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/actions
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/actions
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/apps
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/actions
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/actions
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@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
+@dirrmtry share/doc/HTML/en
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/config
 @unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
+@dirrmtry share/apps/bibletime
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk

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
+@dirrmtry share/icons/hicolor/64x64/apps
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/actions
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/actions
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/apps
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/actions
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/actions
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@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
+@dirrmtry share/doc/HTML/en
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/config
 @unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
+@dirrmtry share/apps/bibletime
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk

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
+@dirrmtry share/icons/hicolor/64x64/apps
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/actions
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/actions
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/apps
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/actions
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/actions
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@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
+@dirrmtry share/doc/HTML/en
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/config
 @unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
+@dirrmtry share/apps/bibletime
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk

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
+@dirrmtry share/icons/hicolor/64x64/apps
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/actions
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/actions
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/apps
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22/actions
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@dirrmtry share/icons/hicolor/22x22
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/actions
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@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
+@dirrmtry share/doc/HTML/en
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/config
 @unexec rmdir %D/share/apps/bibletime/pics
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
+@dirrmtry share/apps/bibletime
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/applnk/Applications
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk

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

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

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

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

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
+@dirrmtry share/games/fortune
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games

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
+@dirrmtry share/games/fortune
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games

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

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

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
+@dirrmtry share/locale/xh/LC_MESSAGES
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@dirrmtry share/locale/xh
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@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

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
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
+@dirrmtry share/locale/sr@ije
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/yi/LC_MESSAGES
-@unexec rmdir %D/share/locale/yi 2>/dev/null || true
+@dirrmtry share/locale/yi

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
+@dirrmtry %%PYTHON_SITELIBDIR%%
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@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

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
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@unexec rmdir %D/share/locale/sr@ije 2>/dev/null || true
+@dirrmtry share/locale/sr@ije
-@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/yi/LC_MESSAGES
-@unexec rmdir %D/share/locale/yi 2>/dev/null || true
+@dirrmtry share/locale/yi

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
+@dirrmtry share/locale/de_DE/LC_MESSAGES
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@dirrmtry share/locale/de_DE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

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
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+@dirrmtry share/locale/zh_CN
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/uk/LC_MESSAGES
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
+@dirrmtry share/locale/uk
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/sr/LC_MESSAGES
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
+@dirrmtry share/locale/sr
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/sl/LC_MESSAGES
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+@dirrmtry share/locale/sl
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/ro/LC_MESSAGES
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@dirrmtry share/locale/ro
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/pt/LC_MESSAGES
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@dirrmtry share/locale/pt
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/pl/LC_MESSAGES
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@dirrmtry share/locale/pl
-@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/nn/LC_MESSAGES
-@unexec rmdir %D/share/locale/nn 2>/dev/null || true
+@dirrmtry share/locale/nn
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/el/LC_MESSAGES
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
+@dirrmtry share/locale/el
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/cs/LC_MESSAGES
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@dirrmtry share/locale/cs
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/ca/LC_MESSAGES
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/ca
 @dirrm share/doc/HTML/sv/k3b
 @dirrm share/doc/HTML/ru/k3b
 @dirrm share/doc/HTML/pt_BR/k3b

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
+@dirrmtry share/services
-@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true
+@dirrmtry share/mimelnk/inode
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
+@dirrmtry share/mimelnk/application
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
+@dirrmtry share/mimelnk
-@unexec rmdir %D/share/icons/crystalsvg/64x64/mimetypes 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/64x64/mimetypes
-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/64x64
-@unexec rmdir %D/share/icons/crystalsvg/48x48/mimetypes 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/48x48/mimetypes
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/48x48
-@unexec rmdir %D/share/icons/crystalsvg/32x32/mimetypes 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/32x32/mimetypes
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/32x32
-@unexec rmdir %D/share/icons/crystalsvg/22x22/mimetypes 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/22x22/mimetypes
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/22x22
-@unexec rmdir %D/share/icons/crystalsvg/16x16/mimetypes 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/16x16/mimetypes
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg/16x16
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
+@dirrmtry share/icons/crystalsvg
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@dirrmtry share/apps/konqueror/servicemenus
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@dirrmtry share/apps/konqueror
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps

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
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
-@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_GB.UTF-8
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_US.UTF-8

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
+@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES
-@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_GB.UTF-8
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@dirrmtry share/locale/en_US.UTF-8

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
+@dirrmtry share/icons/locolor/32x32/apps
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/locolor/16x16/apps
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/locolor/16x16
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@dirrmtry share/icons/locolor
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@dirrmtry share/icons/hicolor
 @dirrm share/doc/HTML/default/kwatch
-@unexec rmdir %D/share/doc/HTML/default 2>/dev/null || true
+@dirrmtry share/doc/HTML/default
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML
 @dirrm share/apps/kwatch
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@dirrmtry share/applnk/Utilities

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
+@dirrmtry share/locale/da/LC_MESSAGES
-@unexec rmdir %D/share/locale/da 2> /dev/null || true
+@dirrmtry share/locale/da
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/de/LC_MESSAGES
-@unexec rmdir %D/share/locale/de 2> /dev/null || true
+@dirrmtry share/locale/de
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/el/LC_MESSAGES
-@unexec rmdir %D/share/locale/el 2> /dev/null || true
+@dirrmtry share/locale/el
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/fr/LC_MESSAGES
-@unexec rmdir %D/share/locale/fr 2> /dev/null || true
+@dirrmtry share/locale/fr
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/it/LC_MESSAGES
-@unexec rmdir %D/share/locale/it 2> /dev/null || true
+@dirrmtry share/locale/it
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/sv/LC_MESSAGES
-@unexec rmdir %D/share/locale/sv 2> /dev/null || true
+@dirrmtry share/locale/sv
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/pl/LC_MESSAGES
-@unexec rmdir %D/share/locale/pl 2> /dev/null || true
+@dirrmtry share/locale/pl
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/nl/LC_MESSAGES
-@unexec rmdir %D/share/locale/nl 2> /dev/null || true
+@dirrmtry share/locale/nl
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw
 %%DATADIR%%/2ppage.ll
 %%DATADIR%%/4gen1.ll
 %%DATADIR%%/6gen1.ll

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
+@dirrmtry lib/xemacs/site-packages/lisp
-@unexec rmdir %D/lib/xemacs/site-packages/pkginfo 2> /dev/null || true
+@dirrmtry lib/xemacs/site-packages/pkginfo
-@unexec rmdir %D/lib/xemacs/site-packages 2> /dev/null || true
+@dirrmtry lib/xemacs/site-packages
-@unexec rmdir %D/lib/xemacs 2> /dev/null || true
+@dirrmtry lib/xemacs
 @dirrm share/doc/i18n-man

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
+@dirrmtry %%NAGIOSWWWDIR%%/images/logos
-@unexec rmdir %D/%%NAGIOSWWWDIR%%/images 2>/dev/null || true
+@dirrmtry %%NAGIOSWWWDIR%%/images
-@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true
+@dirrmtry %%NAGIOSWWWDIR%%

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

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