aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 02:20:05 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 02:20:05 +0000
commit0416031c9ba13da33845bc762078065b482dd551 (patch)
treebe4d2554a35fe96c98b1eaa2d243964ae3c4f602 /graphics
parent93189653b53dbb03ea40ad1126155b1ef52bb27c (diff)
downloadports-0416031c9ba13da33845bc762078065b482dd551.tar.gz
ports-0416031c9ba13da33845bc762078065b482dd551.zip
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Notes
Notes: svn path=/head/; revision=154113
Diffstat (limited to 'graphics')
-rw-r--r--graphics/comix/pkg-plist2
-rw-r--r--graphics/djvulibre/pkg-plist8
-rw-r--r--graphics/dore/pkg-plist2
-rw-r--r--graphics/dri-devel/pkg-plist2
-rw-r--r--graphics/dri/pkg-plist2
-rw-r--r--graphics/eog/pkg-plist24
-rw-r--r--graphics/epix/pkg-plist4
-rw-r--r--graphics/eps2png/pkg-plist2
-rw-r--r--graphics/eterm-bg/pkg-plist8
-rw-r--r--graphics/evince/pkg-plist4
-rw-r--r--graphics/f-spot/pkg-plist4
-rw-r--r--graphics/fraqtive/pkg-plist14
-rw-r--r--graphics/gimageview/pkg-plist4
-rw-r--r--graphics/gimp-ufraw/pkg-plist2
-rw-r--r--graphics/gliv/pkg-plist12
-rw-r--r--graphics/gwenview-kde4/pkg-plist64
-rw-r--r--graphics/gwenview/pkg-plist64
-rw-r--r--graphics/hobbes-icons-xpm/pkg-plist2
-rw-r--r--graphics/jgv/pkg-plist2
-rw-r--r--graphics/kalbum/pkg-plist36
-rw-r--r--graphics/kbarcode/pkg-plist22
-rw-r--r--graphics/kimdaba/pkg-plist96
-rw-r--r--graphics/kphotoalbum-kde4/pkg-plist96
-rw-r--r--graphics/kphotoalbum/pkg-plist96
-rw-r--r--graphics/libgnomecanvas/pkg-plist8
-rw-r--r--graphics/p5-Chart-Graph/pkg-plist4
-rw-r--r--graphics/p5-Chart/pkg-plist2
-rw-r--r--graphics/p5-Color-Rgb/pkg-plist4
-rw-r--r--graphics/p5-GD-Arrow/pkg-plist4
-rw-r--r--graphics/p5-GD-Barcode/pkg-plist4
-rw-r--r--graphics/p5-GD-Graph/pkg-plist4
-rw-r--r--graphics/p5-GD-Graph3d/pkg-plist6
-rw-r--r--graphics/p5-GD-SVG/pkg-plist4
-rw-r--r--graphics/p5-GD-TextUtil/pkg-plist4
-rw-r--r--graphics/p5-GD/pkg-plist4
-rw-r--r--graphics/p5-Graph-Easy/pkg-plist16
-rw-r--r--graphics/p5-GraphViz-Data-Structure/pkg-plist4
-rw-r--r--graphics/p5-GraphViz/pkg-plist6
-rw-r--r--graphics/p5-Graphics-ColorNames/pkg-plist4
-rw-r--r--graphics/p5-Image-ExifTool-devel/pkg-plist6
-rw-r--r--graphics/p5-Image-ExifTool/pkg-plist6
-rw-r--r--graphics/p5-Image-Grab/pkg-plist4
-rw-r--r--graphics/p5-Image-Imlib2/pkg-plist4
-rw-r--r--graphics/p5-Image-Info/pkg-plist4
-rw-r--r--graphics/p5-Image-Size/pkg-plist6
-rw-r--r--graphics/p5-Imager-Graph/pkg-plist4
-rw-r--r--graphics/p5-Imager-Plot/pkg-plist6
-rw-r--r--graphics/p5-SVG-Graph/pkg-plist4
-rw-r--r--graphics/p5-SVG-Metadata/pkg-plist6
-rw-r--r--graphics/p5-SWF-Builder/pkg-plist4
-rw-r--r--graphics/p5-SWF-File/pkg-plist4
-rw-r--r--graphics/p5-SpringGraph/pkg-plist2
-rw-r--r--graphics/p5-Tk-JPEG-Lite/pkg-plist4
-rw-r--r--graphics/p5-chart/pkg-plist2
-rw-r--r--graphics/sane-backends/pkg-plist8
-rw-r--r--graphics/sane-frontends/pkg-plist2
-rw-r--r--graphics/showimg/pkg-plist52
-rw-r--r--graphics/tcm/pkg-plist2
-rw-r--r--graphics/ufraw/pkg-plist2
-rw-r--r--graphics/wmicons/pkg-plist2
-rw-r--r--graphics/xfig-devel/pkg-plist2
-rw-r--r--graphics/xfig/pkg-plist2
-rw-r--r--graphics/xfree86-dri/pkg-plist2
-rw-r--r--graphics/xpcd/pkg-plist2
-rw-r--r--graphics/xsane/pkg-plist2
-rw-r--r--graphics/zphoto/pkg-plist4
66 files changed, 399 insertions, 399 deletions
diff --git a/graphics/comix/pkg-plist b/graphics/comix/pkg-plist
index b1c0f90465c7..24672f02d600 100644
--- a/graphics/comix/pkg-plist
+++ b/graphics/comix/pkg-plist
@@ -14,4 +14,4 @@ share/pixmaps/comix/stock-rotate-270-16.png
share/pixmaps/comix/stock-rotate-90-16.png
@dirrm share/pixmaps/comix
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index 7b80454f4f55..2f329d682327 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -61,8 +61,8 @@ share/djvu/pubtext/DjVuXML-s.dtd
@dirrm lib/djvulibre/plugins
@dirrm lib/djvulibre
@dirrm include/libdjvu
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de 2>/dev/null || true
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/de/man1
+@dirrmtry man/de
@unexec rmdir %%X11BASE%%/lib/browser_plugins 2>/dev/null || true
diff --git a/graphics/dore/pkg-plist b/graphics/dore/pkg-plist
index c7944158adaf..c09c5d7680e0 100644
--- a/graphics/dore/pkg-plist
+++ b/graphics/dore/pkg-plist
@@ -98,4 +98,4 @@ share/dore/fonts/unused.df
@dirrm share/dore
@dirrm include/dore_develop/private
@dirrm include/dore_develop
-@unexec rmdir %D/include/fortran 2>/dev/null || true
+@dirrmtry include/fortran
diff --git a/graphics/dri-devel/pkg-plist b/graphics/dri-devel/pkg-plist
index 962357ad8760..337a52357957 100644
--- a/graphics/dri-devel/pkg-plist
+++ b/graphics/dri-devel/pkg-plist
@@ -12,4 +12,4 @@ lib/modules/dri/sis_dri.so
%%I386%%lib/modules/dri/tdfx_dri.so
%%I386%%lib/modules/dri/unichrome_dri.so
@dirrm lib/modules/dri
-@unexec rmdir %D/lib/modules 2>/dev/null || true
+@dirrmtry lib/modules
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 962357ad8760..337a52357957 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -12,4 +12,4 @@ lib/modules/dri/sis_dri.so
%%I386%%lib/modules/dri/tdfx_dri.so
%%I386%%lib/modules/dri/unichrome_dri.so
@dirrm lib/modules/dri
-@unexec rmdir %D/lib/modules 2>/dev/null || true
+@dirrmtry lib/modules
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 9ab737a65952..e3bc8a08420a 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -137,18 +137,18 @@ share/locale/xh/LC_MESSAGES/eog.mo
share/locale/zh_CN/LC_MESSAGES/eog.mo
share/locale/zh_TW/LC_MESSAGES/eog.mo
share/locale/zu/LC_MESSAGES/eog.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/gnome/pixmaps/eog
@dirrm share/gnome/omf/eog
@dirrm share/gnome/help/eog/zh_TW/figures
diff --git a/graphics/epix/pkg-plist b/graphics/epix/pkg-plist
index b2e7efe4d6a7..06496686ffa5 100644
--- a/graphics/epix/pkg-plist
+++ b/graphics/epix/pkg-plist
@@ -32,5 +32,5 @@ lib/libepix.a
@dirrm %%DATADIR%%/samples
@dirrm %%DATADIR%%/notes
@dirrm %%DATADIR%%/config
-@unexec rmdir %D/%%DATADIR%%/tutorial 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/tutorial
+@dirrmtry %%DATADIR%%
diff --git a/graphics/eps2png/pkg-plist b/graphics/eps2png/pkg-plist
index 863541afba00..3ca8dfc603bd 100644
--- a/graphics/eps2png/pkg-plist
+++ b/graphics/eps2png/pkg-plist
@@ -1,3 +1,3 @@
bin/eps2png
%%SITE_PERL%%/%%PERL_ARCH%%/auto/eps2png/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/eps2png 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/eps2png
diff --git a/graphics/eterm-bg/pkg-plist b/graphics/eterm-bg/pkg-plist
index 3b8066c22fe0..b0bcae21ca49 100644
--- a/graphics/eterm-bg/pkg-plist
+++ b/graphics/eterm-bg/pkg-plist
@@ -52,7 +52,7 @@ share/Eterm/pix/tile/violetta.png
share/Eterm/pix/tile/water_into_wine.png
share/Eterm/pix/tile/wormhole.png
share/Eterm/pix/tile/woven_memories.png
-@unexec rmdir %D/share/Eterm/pix/scale 2>/dev/null || true
-@unexec rmdir %D/share/Eterm/pix/tile 2>/dev/null || true
-@unexec rmdir %D/share/Eterm/pix 2>/dev/null || true
-@unexec rmdir %D/share/Eterm 2>/dev/null || true
+@dirrmtry share/Eterm/pix/scale
+@dirrmtry share/Eterm/pix/tile
+@dirrmtry share/Eterm/pix
+@dirrmtry share/Eterm
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 19fe298a8fd8..26aa14ef3ae0 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -66,8 +66,8 @@ share/locale/uk/LC_MESSAGES/evince.mo
share/locale/wa/LC_MESSAGES/evince.mo
share/locale/zh_CN/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/omf/evince
@dirrm share/gnome/help/evince/uk/figures
@dirrm share/gnome/help/evince/uk
diff --git a/graphics/f-spot/pkg-plist b/graphics/f-spot/pkg-plist
index e0ea0d1753c8..61d5a739656b 100644
--- a/graphics/f-spot/pkg-plist
+++ b/graphics/f-spot/pkg-plist
@@ -44,6 +44,6 @@ share/locale/sr@Latn/LC_MESSAGES/f-spot.mo
share/locale/sv/LC_MESSAGES/f-spot.mo
share/locale/zh_CN/LC_MESSAGES/f-spot.mo
share/locale/zh_TW/LC_MESSAGES/f-spot.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm lib/f-spot
diff --git a/graphics/fraqtive/pkg-plist b/graphics/fraqtive/pkg-plist
index eaeb1dc91dc6..63d2de292761 100644
--- a/graphics/fraqtive/pkg-plist
+++ b/graphics/fraqtive/pkg-plist
@@ -30,15 +30,15 @@ share/locale/ru/LC_MESSAGES/fraqtive.mo
share/locale/sr/LC_MESSAGES/fraqtive.mo
share/locale/sv/LC_MESSAGES/fraqtive.mo
share/locale/vi/LC_MESSAGES/fraqtive.mo
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
@dirrm share/doc/HTML/en/fraqtive
@dirrm share/doc/HTML/de/fraqtive
-@unexec rmdir %D/share/config 2>/dev/null || true
+@dirrmtry share/config
@dirrm share/apps/fraqtive/icons/hicolor/22x22/actions
@dirrm share/apps/fraqtive/icons/hicolor/22x22
@dirrm share/apps/fraqtive/icons/hicolor/16x16/actions
diff --git a/graphics/gimageview/pkg-plist b/graphics/gimageview/pkg-plist
index 9a1ce2b80728..1b2aba47f5d0 100644
--- a/graphics/gimageview/pkg-plist
+++ b/graphics/gimageview/pkg-plist
@@ -124,7 +124,7 @@ share/pixmaps/gimv.png
@dirrm lib/gimageview/archiver
@dirrm lib/gimageview/image_loader
@dirrm lib/gimageview/image_saver
-@unexec rmdir %D/lib/gimageview/image_view 2>/dev/null || true
+@dirrmtry lib/gimageview/image_view
@dirrm lib/gimageview/io_stream
@dirrm lib/gimageview/thumbnail
@dirrm lib/gimageview/thumbnail_view
@@ -138,4 +138,4 @@ share/pixmaps/gimv.png
@dirrm share/gimageview/pixmaps/default
@dirrm share/gimageview/pixmaps
@dirrm share/gimageview
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@dirrmtry share/locale/ja/LC_MESSAGES
diff --git a/graphics/gimp-ufraw/pkg-plist b/graphics/gimp-ufraw/pkg-plist
index 4de3dbfa450e..42c0d666fa69 100644
--- a/graphics/gimp-ufraw/pkg-plist
+++ b/graphics/gimp-ufraw/pkg-plist
@@ -3,4 +3,4 @@ bin/ufraw-batch
libexec/gimp/2.2/plug-ins/ufraw-gimp
share/applications/ufraw.desktop
share/pixmaps/ufraw.png
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/graphics/gliv/pkg-plist b/graphics/gliv/pkg-plist
index 76a130926b2a..6c9395496467 100644
--- a/graphics/gliv/pkg-plist
+++ b/graphics/gliv/pkg-plist
@@ -12,9 +12,9 @@ share/locale/rw/LC_MESSAGES/gliv.mo
share/locale/sk/LC_MESSAGES/gliv.mo
share/locale/tr/LC_MESSAGES/gliv.mo
share/locale/vi/LC_MESSAGES/gliv.mo
-@unexec rmdir %D/man/ru/man1 2>/dev/null || true
-@unexec rmdir %D/man/ru 2>/dev/null || true
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de 2>/dev/null || true
+@dirrmtry man/ru/man1
+@dirrmtry man/ru
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/de/man1
+@dirrmtry man/de
diff --git a/graphics/gwenview-kde4/pkg-plist b/graphics/gwenview-kde4/pkg-plist
index d5e95f519b68..499e68b79c84 100644
--- a/graphics/gwenview-kde4/pkg-plist
+++ b/graphics/gwenview-kde4/pkg-plist
@@ -199,36 +199,36 @@ share/locale/zh_TW/LC_MESSAGES/gwenview.mo
share/locale/zu/LC_MESSAGES/gwenview.mo
share/services/gvdirpart.desktop
share/services/gvimagepart.desktop
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zu 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xh 2>/dev/null || true
-@unexec rmdir %D/share/locale/ven/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ven 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nso 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fo 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ven/LC_MESSAGES
+@dirrmtry share/locale/ven
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fo/LC_MESSAGES
+@dirrmtry share/locale/fo
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/doc/HTML/ru/gwenview
@dirrm share/doc/HTML/pt_BR/gwenview
@dirrm share/doc/HTML/nl/gwenview
@@ -238,7 +238,7 @@ share/services/gvimagepart.desktop
@dirrm share/doc/HTML/en/gwenview
@dirrm share/doc/HTML/de/gwenview
@dirrm share/doc/HTML/da/gwenview
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
@dirrm share/apps/gwenview/tools
@dirrm share/apps/gwenview/thumbnail
@dirrm share/apps/gwenview/icons/hicolor/scalable/actions
@@ -257,4 +257,4 @@ share/services/gvimagepart.desktop
@dirrm share/apps/gwenview
@dirrm share/apps/gvimagepart
@dirrm share/apps/gvdirpart
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@dirrmtry share/applications/kde
diff --git a/graphics/gwenview/pkg-plist b/graphics/gwenview/pkg-plist
index d5e95f519b68..499e68b79c84 100644
--- a/graphics/gwenview/pkg-plist
+++ b/graphics/gwenview/pkg-plist
@@ -199,36 +199,36 @@ share/locale/zh_TW/LC_MESSAGES/gwenview.mo
share/locale/zu/LC_MESSAGES/gwenview.mo
share/services/gvdirpart.desktop
share/services/gvimagepart.desktop
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zu 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xh 2>/dev/null || true
-@unexec rmdir %D/share/locale/ven/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ven 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nso 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fo 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+@dirrmtry share/locale/zu/LC_MESSAGES
+@dirrmtry share/locale/zu
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ven/LC_MESSAGES
+@dirrmtry share/locale/ven
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nso/LC_MESSAGES
+@dirrmtry share/locale/nso
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fo/LC_MESSAGES
+@dirrmtry share/locale/fo
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
@dirrm share/doc/HTML/ru/gwenview
@dirrm share/doc/HTML/pt_BR/gwenview
@dirrm share/doc/HTML/nl/gwenview
@@ -238,7 +238,7 @@ share/services/gvimagepart.desktop
@dirrm share/doc/HTML/en/gwenview
@dirrm share/doc/HTML/de/gwenview
@dirrm share/doc/HTML/da/gwenview
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
+@dirrmtry share/apps/kconf_update
@dirrm share/apps/gwenview/tools
@dirrm share/apps/gwenview/thumbnail
@dirrm share/apps/gwenview/icons/hicolor/scalable/actions
@@ -257,4 +257,4 @@ share/services/gvimagepart.desktop
@dirrm share/apps/gwenview
@dirrm share/apps/gvimagepart
@dirrm share/apps/gvdirpart
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@dirrmtry share/applications/kde
diff --git a/graphics/hobbes-icons-xpm/pkg-plist b/graphics/hobbes-icons-xpm/pkg-plist
index 83fa785e204e..49e5ab9d2b31 100644
--- a/graphics/hobbes-icons-xpm/pkg-plist
+++ b/graphics/hobbes-icons-xpm/pkg-plist
@@ -3417,4 +3417,4 @@ include/X11/pixmaps/z/zug2.xpm
@dirrm include/X11/pixmaps/x
@dirrm include/X11/pixmaps/y
@dirrm include/X11/pixmaps/z
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/graphics/jgv/pkg-plist b/graphics/jgv/pkg-plist
index fce71659170b..6d7cb5818ff1 100644
--- a/graphics/jgv/pkg-plist
+++ b/graphics/jgv/pkg-plist
@@ -28,4 +28,4 @@ bin/JGV.app
@dirrm JDE/JGV/menu
@dirrm JDE/JGV/modules
@dirrm JDE/JGV
-@unexec rmdir %D/JDE 2>/dev/null || true
+@dirrmtry JDE
diff --git a/graphics/kalbum/pkg-plist b/graphics/kalbum/pkg-plist
index ce1bdf54ee16..62694eb7cd43 100644
--- a/graphics/kalbum/pkg-plist
+++ b/graphics/kalbum/pkg-plist
@@ -51,22 +51,22 @@ share/locale/fr/LC_MESSAGES/kalbum.mo
share/locale/hu/LC_MESSAGES/kalbum.mo
share/locale/it/LC_MESSAGES/kalbum.mo
share/mimelnk/application/x-kalbum.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 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/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/kalbum
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/kalbum/icons/hicolor/32x32/actions
@dirrm share/apps/kalbum/icons/hicolor/32x32
@dirrm share/apps/kalbum/icons/hicolor/16x16/actions
@@ -80,6 +80,6 @@ share/mimelnk/application/x-kalbum.desktop
@dirrm share/apps/kalbum/data/icons
@dirrm share/apps/kalbum/data
@dirrm share/apps/kalbum
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/graphics/kbarcode/pkg-plist b/graphics/kbarcode/pkg-plist
index cab46e778bde..e826f9c58637 100644
--- a/graphics/kbarcode/pkg-plist
+++ b/graphics/kbarcode/pkg-plist
@@ -31,16 +31,16 @@ share/locale/nl/LC_MESSAGES/kbarcode.mo
share/locale/pl/LC_MESSAGES/kbarcode.mo
share/locale/sv/LC_MESSAGES/kbarcode.mo
share/services/kfile_kbarcode.desktop
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32/actions
+@dirrmtry share/icons/hicolor/22x22/actions
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16/actions
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/apps/kbarcode
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps
@dirrm share/applnk/Applications/KBarcode
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/graphics/kimdaba/pkg-plist b/graphics/kimdaba/pkg-plist
index be2a98ee1e5d..8fb1d1443768 100644
--- a/graphics/kimdaba/pkg-plist
+++ b/graphics/kimdaba/pkg-plist
@@ -317,61 +317,61 @@ share/locale/ta/LC_MESSAGES/kimdaba.mo
share/locale/tr/LC_MESSAGES/kimdaba.mo
share/locale/zh_CN/LC_MESSAGES/kimdaba.mo
share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/kimdaba
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/kimdaba
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt/kimdaba
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/nl/kimdaba
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
@dirrm share/doc/HTML/it/kimdaba
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/kimdaba
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/kimdaba
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/en/kimdaba
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kimdaba
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/kimdaba
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
@dirrm share/apps/kimdaba/themes/rounded
@dirrm share/apps/kimdaba/themes/grey
@dirrm share/apps/kimdaba/themes/blue
@@ -386,6 +386,6 @@ share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
@dirrm share/apps/kimdaba/demo/CategoryImages
@dirrm share/apps/kimdaba/demo
@dirrm share/apps/kimdaba
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/graphics/kphotoalbum-kde4/pkg-plist b/graphics/kphotoalbum-kde4/pkg-plist
index be2a98ee1e5d..8fb1d1443768 100644
--- a/graphics/kphotoalbum-kde4/pkg-plist
+++ b/graphics/kphotoalbum-kde4/pkg-plist
@@ -317,61 +317,61 @@ share/locale/ta/LC_MESSAGES/kimdaba.mo
share/locale/tr/LC_MESSAGES/kimdaba.mo
share/locale/zh_CN/LC_MESSAGES/kimdaba.mo
share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/kimdaba
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/kimdaba
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt/kimdaba
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/nl/kimdaba
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
@dirrm share/doc/HTML/it/kimdaba
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/kimdaba
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/kimdaba
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/en/kimdaba
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kimdaba
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/kimdaba
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
@dirrm share/apps/kimdaba/themes/rounded
@dirrm share/apps/kimdaba/themes/grey
@dirrm share/apps/kimdaba/themes/blue
@@ -386,6 +386,6 @@ share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
@dirrm share/apps/kimdaba/demo/CategoryImages
@dirrm share/apps/kimdaba/demo
@dirrm share/apps/kimdaba
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/graphics/kphotoalbum/pkg-plist b/graphics/kphotoalbum/pkg-plist
index be2a98ee1e5d..8fb1d1443768 100644
--- a/graphics/kphotoalbum/pkg-plist
+++ b/graphics/kphotoalbum/pkg-plist
@@ -317,61 +317,61 @@ share/locale/ta/LC_MESSAGES/kimdaba.mo
share/locale/tr/LC_MESSAGES/kimdaba.mo
share/locale/zh_CN/LC_MESSAGES/kimdaba.mo
share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/kimdaba
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/ru/kimdaba
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/pt/kimdaba
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/nl/kimdaba
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
@dirrm share/doc/HTML/it/kimdaba
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/kimdaba
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/et/kimdaba
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/en/kimdaba
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kimdaba
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
@dirrm share/doc/HTML/da/kimdaba
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
@dirrm share/apps/kimdaba/themes/rounded
@dirrm share/apps/kimdaba/themes/grey
@dirrm share/apps/kimdaba/themes/blue
@@ -386,6 +386,6 @@ share/mimelnk/application/x-vnd.kde.kimdaba-import.desktop
@dirrm share/apps/kimdaba/demo/CategoryImages
@dirrm share/apps/kimdaba/demo
@dirrm share/apps/kimdaba
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applications/kde 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 1fc4c55602e7..a497e4371dde 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -115,10 +115,10 @@ share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
@dirrm %%DOCSDIR%%
@dirrm include/libgnomecanvas-2.0/libgnomecanvas
@dirrm include/libgnomecanvas-2.0
diff --git a/graphics/p5-Chart-Graph/pkg-plist b/graphics/p5-Chart-Graph/pkg-plist
index a36895281bba..21332d78fb1e 100644
--- a/graphics/p5-Chart-Graph/pkg-plist
+++ b/graphics/p5-Chart-Graph/pkg-plist
@@ -19,7 +19,7 @@
%%SITE_PERL%%/Chart/Graph/XrtUtils.pm
@dirrm %%SITE_PERL%%/Chart/Graph/Xmgrace
@dirrm %%SITE_PERL%%/Chart/Graph
-@unexec rmdir %D/%%SITE_PERL%%/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Chart
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Graph/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/Graph
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart
diff --git a/graphics/p5-Chart/pkg-plist b/graphics/p5-Chart/pkg-plist
index 8c0d1b30e73a..716ecc92f2db 100644
--- a/graphics/p5-Chart/pkg-plist
+++ b/graphics/p5-Chart/pkg-plist
@@ -13,5 +13,5 @@
%%SITE_PERL%%/Chart/Split.pm
%%SITE_PERL%%/Chart/StackedBars.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart
@dirrm %%SITE_PERL%%/Chart
diff --git a/graphics/p5-Color-Rgb/pkg-plist b/graphics/p5-Color-Rgb/pkg-plist
index 7e1162869bb3..a2df6d69a736 100644
--- a/graphics/p5-Color-Rgb/pkg-plist
+++ b/graphics/p5-Color-Rgb/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Rgb/.packlist
%%SITE_PERL%%/Color/Rgb.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Color/Rgb
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Color 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Color 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Color
+@dirrmtry %%SITE_PERL%%/Color
diff --git a/graphics/p5-GD-Arrow/pkg-plist b/graphics/p5-GD-Arrow/pkg-plist
index d4c03c2b7f0c..2981e5908a31 100644
--- a/graphics/p5-GD-Arrow/pkg-plist
+++ b/graphics/p5-GD-Arrow/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/GD/Arrow.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Arrow/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Arrow
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
diff --git a/graphics/p5-GD-Barcode/pkg-plist b/graphics/p5-GD-Barcode/pkg-plist
index c2060f75ce96..2479f01e796e 100644
--- a/graphics/p5-GD-Barcode/pkg-plist
+++ b/graphics/p5-GD-Barcode/pkg-plist
@@ -186,7 +186,7 @@
%%SITE_PERL%%/GD/Barcode/UPCE.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Barcode/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Barcode
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
@dirrm %%SITE_PERL%%/GD/Barcode/QRcode
@dirrm %%SITE_PERL%%/GD/Barcode
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GD
diff --git a/graphics/p5-GD-Graph/pkg-plist b/graphics/p5-GD-Graph/pkg-plist
index e7d79978a6bd..762b48928e40 100644
--- a/graphics/p5-GD-Graph/pkg-plist
+++ b/graphics/p5-GD-Graph/pkg-plist
@@ -15,6 +15,6 @@
%%SITE_PERL%%/GD/Graph/utils.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
@dirrm %%SITE_PERL%%/GD/Graph
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GD
diff --git a/graphics/p5-GD-Graph3d/pkg-plist b/graphics/p5-GD-Graph3d/pkg-plist
index a172d13064eb..31a14292ad22 100644
--- a/graphics/p5-GD-Graph3d/pkg-plist
+++ b/graphics/p5-GD-Graph3d/pkg-plist
@@ -6,6 +6,6 @@
%%SITE_PERL%%/GD/Graph/lines3d.pm
%%SITE_PERL%%/GD/Graph/pie3d.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph3d/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/GD/Graph 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph3d 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GD/Graph
+@dirrmtry %%SITE_PERL%%/GD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Graph3d
diff --git a/graphics/p5-GD-SVG/pkg-plist b/graphics/p5-GD-SVG/pkg-plist
index b0aa6a22e439..62865b76c69f 100644
--- a/graphics/p5-GD-SVG/pkg-plist
+++ b/graphics/p5-GD-SVG/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SVG/.packlist
%%SITE_PERL%%/GD/SVG.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SVG
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
+@dirrmtry %%SITE_PERL%%/GD
diff --git a/graphics/p5-GD-TextUtil/pkg-plist b/graphics/p5-GD-TextUtil/pkg-plist
index 15aa59ac29e9..e72d8c2bb429 100644
--- a/graphics/p5-GD-TextUtil/pkg-plist
+++ b/graphics/p5-GD-TextUtil/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/GD/Text/Align.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Text/.packlist
@dirrm %%SITE_PERL%%/GD/Text
-@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/Text
diff --git a/graphics/p5-GD/pkg-plist b/graphics/p5-GD/pkg-plist
index edfa0b1ce070..d8667b53542b 100644
--- a/graphics/p5-GD/pkg-plist
+++ b/graphics/p5-GD/pkg-plist
@@ -7,5 +7,5 @@ bin/bdf2gdfont.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/GD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/GD
diff --git a/graphics/p5-Graph-Easy/pkg-plist b/graphics/p5-Graph-Easy/pkg-plist
index 2f5035c78da5..29fe8ddab73b 100644
--- a/graphics/p5-Graph-Easy/pkg-plist
+++ b/graphics/p5-Graph-Easy/pkg-plist
@@ -19,11 +19,11 @@
%%SITE_PERL%%/Graph/Easy/Node/Empty.pm
%%SITE_PERL%%/Graph/Easy/Parser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/Easy/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/Easy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph/Easy/Layout 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph/Easy/Group 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph/Easy/Node 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph/Easy/Edge 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph/Easy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Graph 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph/Easy
+@dirrmtry %%SITE_PERL%%/Graph/Easy/Layout
+@dirrmtry %%SITE_PERL%%/Graph/Easy/Group
+@dirrmtry %%SITE_PERL%%/Graph/Easy/Node
+@dirrmtry %%SITE_PERL%%/Graph/Easy/Edge
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graph
+@dirrmtry %%SITE_PERL%%/Graph/Easy
+@dirrmtry %%SITE_PERL%%/Graph
diff --git a/graphics/p5-GraphViz-Data-Structure/pkg-plist b/graphics/p5-GraphViz-Data-Structure/pkg-plist
index f5428044dbc4..b7f33b329dc0 100644
--- a/graphics/p5-GraphViz-Data-Structure/pkg-plist
+++ b/graphics/p5-GraphViz-Data-Structure/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/GraphViz/Data/Structure.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/GraphViz/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GraphViz/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data/Structure
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/Data
diff --git a/graphics/p5-GraphViz/pkg-plist b/graphics/p5-GraphViz/pkg-plist
index a603e205bf2c..b6f1cf8d5392 100644
--- a/graphics/p5-GraphViz/pkg-plist
+++ b/graphics/p5-GraphViz/pkg-plist
@@ -11,6 +11,6 @@
%%SITE_PERL%%/GraphViz/Data/Grapher.pm
@dirrm %%SITE_PERL%%/GraphViz/Parse
@dirrm %%SITE_PERL%%/GraphViz/Data
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/GraphViz 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/GraphViz
diff --git a/graphics/p5-Graphics-ColorNames/pkg-plist b/graphics/p5-Graphics-ColorNames/pkg-plist
index 35ccbcce6960..6a7344a0d549 100644
--- a/graphics/p5-Graphics-ColorNames/pkg-plist
+++ b/graphics/p5-Graphics-ColorNames/pkg-plist
@@ -6,6 +6,6 @@
%%SITE_PERL%%/Graphics/ColourNames.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/ColorNames
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics
@dirrm %%SITE_PERL%%/Graphics/ColorNames
-@unexec rmdir %D/%%SITE_PERL%%/Graphics 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Graphics
diff --git a/graphics/p5-Image-ExifTool-devel/pkg-plist b/graphics/p5-Image-ExifTool-devel/pkg-plist
index f00534194b1a..6a11d3bf460f 100644
--- a/graphics/p5-Image-ExifTool-devel/pkg-plist
+++ b/graphics/p5-Image-ExifTool-devel/pkg-plist
@@ -122,9 +122,9 @@ bin/exiftool
%%PORTDOCS%%%%DOCSDIR%%/TagNames/XMP.html
%%PORTDOCS%%%%DOCSDIR%%/TagNames/index.html
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/ExifTool
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
@dirrm %%SITE_PERL%%/Image/ExifTool
-@unexec rmdir %D/%%SITE_PERL%%/Image 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Image
+@dirrmtry %%SITE_PERL%%/File
%%PORTDOCS%%@dirrm %%DOCSDIR%%/TagNames
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/p5-Image-ExifTool/pkg-plist b/graphics/p5-Image-ExifTool/pkg-plist
index f00534194b1a..6a11d3bf460f 100644
--- a/graphics/p5-Image-ExifTool/pkg-plist
+++ b/graphics/p5-Image-ExifTool/pkg-plist
@@ -122,9 +122,9 @@ bin/exiftool
%%PORTDOCS%%%%DOCSDIR%%/TagNames/XMP.html
%%PORTDOCS%%%%DOCSDIR%%/TagNames/index.html
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/ExifTool
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
@dirrm %%SITE_PERL%%/Image/ExifTool
-@unexec rmdir %D/%%SITE_PERL%%/Image 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Image
+@dirrmtry %%SITE_PERL%%/File
%%PORTDOCS%%@dirrm %%DOCSDIR%%/TagNames
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/p5-Image-Grab/pkg-plist b/graphics/p5-Image-Grab/pkg-plist
index df12191a66c0..9f305d24f47e 100644
--- a/graphics/p5-Image-Grab/pkg-plist
+++ b/graphics/p5-Image-Grab/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Image/Grab.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Grab/.packlist
@dirrm %%SITE_PERL%%/Image/Grab
-@unexec rmdir %D/%%SITE_PERL%%/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Image
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Grab
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
diff --git a/graphics/p5-Image-Imlib2/pkg-plist b/graphics/p5-Image-Imlib2/pkg-plist
index 28650cb5e272..b3e2b8fa9c8f 100644
--- a/graphics/p5-Image-Imlib2/pkg-plist
+++ b/graphics/p5-Image-Imlib2/pkg-plist
@@ -7,5 +7,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/maeda.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Imlib2
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Image
diff --git a/graphics/p5-Image-Info/pkg-plist b/graphics/p5-Image-Info/pkg-plist
index 14adbb442321..577741e25d1c 100644
--- a/graphics/p5-Image-Info/pkg-plist
+++ b/graphics/p5-Image-Info/pkg-plist
@@ -12,5 +12,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Info/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Info
@dirrm %%SITE_PERL%%/Image/Info
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
+@dirrmtry %%SITE_PERL%%/Image
diff --git a/graphics/p5-Image-Size/pkg-plist b/graphics/p5-Image-Size/pkg-plist
index 01c6bd7f11d3..9536e50f0888 100644
--- a/graphics/p5-Image-Size/pkg-plist
+++ b/graphics/p5-Image-Size/pkg-plist
@@ -17,6 +17,6 @@ bin/imgsize
%%SITE_PERL%%/auto/Image/Size/xpmsize.al
@dirrm %%SITE_PERL%%/auto/Image/Size
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Size
-@unexec rmdir %D/%%SITE_PERL%%/auto/Image 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Image 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Image
+@dirrmtry %%SITE_PERL%%/Image
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
diff --git a/graphics/p5-Imager-Graph/pkg-plist b/graphics/p5-Imager-Graph/pkg-plist
index 1ef795d80202..2b596f390be8 100644
--- a/graphics/p5-Imager-Graph/pkg-plist
+++ b/graphics/p5-Imager-Graph/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Imager/Graph/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Graph/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Graph
-@unexec rmdir %D/%%SITE_PERL%%/Imager/Graph 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Imager 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Imager/Graph
+@dirrmtry %%SITE_PERL%%/Imager
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager 2>/dev/null ||true
diff --git a/graphics/p5-Imager-Plot/pkg-plist b/graphics/p5-Imager-Plot/pkg-plist
index 13fe45c27181..8fd3f083d45f 100644
--- a/graphics/p5-Imager-Plot/pkg-plist
+++ b/graphics/p5-Imager-Plot/pkg-plist
@@ -5,10 +5,10 @@
%%SITE_PERL%%/Imager/Plot/Util.pm
%%SITE_PERL%%/Imager/plot.pl
@dirrm %%SITE_PERL%%/Imager/Plot
-@unexec rmdir %D/%%SITE_PERL%%/Imager 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Imager
%%SITE_PERL%%/auto/Imager/Plot/autosplit.ix
@dirrm %%SITE_PERL%%/auto/Imager/Plot
-@unexec rmdir %D/%%SITE_PERL%%/auto/Imager 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Imager
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Plot/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Plot
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager
diff --git a/graphics/p5-SVG-Graph/pkg-plist b/graphics/p5-SVG-Graph/pkg-plist
index 68f1ee2da4c8..5db3cbfaf4e6 100644
--- a/graphics/p5-SVG-Graph/pkg-plist
+++ b/graphics/p5-SVG-Graph/pkg-plist
@@ -20,8 +20,8 @@
%%SITE_PERL%%/SVG/Graph/Glyph/heatmap.pm
%%SITE_PERL%%/SVG/Graph/Glyph/scatter.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/Graph
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG
@dirrm %%SITE_PERL%%/SVG/Graph/Data
@dirrm %%SITE_PERL%%/SVG/Graph/Glyph
@dirrm %%SITE_PERL%%/SVG/Graph
-@unexec rmdir %D/%%SITE_PERL%%/SVG 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVG
diff --git a/graphics/p5-SVG-Metadata/pkg-plist b/graphics/p5-SVG-Metadata/pkg-plist
index c76e7a182ed6..a72a9551f422 100644
--- a/graphics/p5-SVG-Metadata/pkg-plist
+++ b/graphics/p5-SVG-Metadata/pkg-plist
@@ -2,6 +2,6 @@ bin/svg_annotate
bin/svg_validate
%%SITE_PERL%%/SVG/Metadata.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/Metadata/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/Metadata 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SVG 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG/Metadata
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG
+@dirrmtry %%SITE_PERL%%/SVG
diff --git a/graphics/p5-SWF-Builder/pkg-plist b/graphics/p5-SWF-Builder/pkg-plist
index c69eeb1cee18..a9f9b36bebba 100644
--- a/graphics/p5-SWF-Builder/pkg-plist
+++ b/graphics/p5-SWF-Builder/pkg-plist
@@ -28,6 +28,6 @@ bin/asc.plx
@dirrm %%SITE_PERL%%/SWF/Builder/Character/Sound
@dirrm %%SITE_PERL%%/SWF/Builder/Character
@dirrm %%SITE_PERL%%/SWF/Builder
-@unexec rmdir %D/%%SITE_PERL%%/SWF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SWF
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/Builder
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF
diff --git a/graphics/p5-SWF-File/pkg-plist b/graphics/p5-SWF-File/pkg-plist
index 3a0c9e6d0bc3..9b1359894354 100644
--- a/graphics/p5-SWF-File/pkg-plist
+++ b/graphics/p5-SWF-File/pkg-plist
@@ -10,6 +10,6 @@ bin/dumpswf.plx
%%SITE_PERL%%/SWF/Parser.pm
@dirrm %%SITE_PERL%%/SWF/BinStream/Codec
@dirrm %%SITE_PERL%%/SWF/BinStream
-@unexec rmdir %D/%%SITE_PERL%%/SWF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SWF
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SWF
diff --git a/graphics/p5-SpringGraph/pkg-plist b/graphics/p5-SpringGraph/pkg-plist
index 22e0586d4d5e..69b7dc44b9fd 100644
--- a/graphics/p5-SpringGraph/pkg-plist
+++ b/graphics/p5-SpringGraph/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SpringGraph/.packlist
%%SITE_PERL%%/SpringGraph.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SpringGraph
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
diff --git a/graphics/p5-Tk-JPEG-Lite/pkg-plist b/graphics/p5-Tk-JPEG-Lite/pkg-plist
index f9f4eb518bc3..a817192576e0 100644
--- a/graphics/p5-Tk-JPEG-Lite/pkg-plist
+++ b/graphics/p5-Tk-JPEG-Lite/pkg-plist
@@ -4,5 +4,5 @@ bin/tkjpeg-lite
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG/Lite/Lite.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG/Lite/Lite.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/JPEG 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/JPEG
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/JPEG
diff --git a/graphics/p5-chart/pkg-plist b/graphics/p5-chart/pkg-plist
index 8c0d1b30e73a..716ecc92f2db 100644
--- a/graphics/p5-chart/pkg-plist
+++ b/graphics/p5-chart/pkg-plist
@@ -13,5 +13,5 @@
%%SITE_PERL%%/Chart/Split.pm
%%SITE_PERL%%/Chart/StackedBars.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart
@dirrm %%SITE_PERL%%/Chart
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 6413fdbbf00d..298c44184f9f 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -281,10 +281,10 @@ sbin/saned
@exec mkdir %D/share/sane/artec_eplus48u
@exec mkdir %D/share/sane/gt68xx
@exec mkdir %D/share/sane/snapscan
-@unexec rmdir %D/share/sane/snapscan 2>/dev/null || true
-@unexec rmdir %D/share/sane/gt68xx 2>/dev/null || true
-@unexec rmdir %D/share/sane/artec_eplus48u 2>/dev/null || true
-@unexec rmdir %D/share/sane 2>/dev/null || true
+@dirrmtry share/sane/snapscan
+@dirrmtry share/sane/gt68xx
+@dirrmtry share/sane/artec_eplus48u
+@dirrmtry share/sane
%%PORTDOCS%%@dirrm %%DOCSDIR%%/umax
%%PORTDOCS%%@dirrm %%DOCSDIR%%/u12
%%PORTDOCS%%@dirrm %%DOCSDIR%%/teco
diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist
index 8e12e9929fcc..d888a2f317cb 100644
--- a/graphics/sane-frontends/pkg-plist
+++ b/graphics/sane-frontends/pkg-plist
@@ -2,4 +2,4 @@ bin/scanadf
bin/xcam
bin/xscanimage
share/sane/sane-style.rc
-@unexec rmdir %D/share/sane 2>/dev/null || true
+@dirrmtry share/sane
diff --git a/graphics/showimg/pkg-plist b/graphics/showimg/pkg-plist
index db569d226b69..fd1efa62fb1b 100644
--- a/graphics/showimg/pkg-plist
+++ b/graphics/showimg/pkg-plist
@@ -202,35 +202,35 @@ share/services/showimgpart.desktop
share/services/showimg_kexidb_sqlite3driver.desktop
share/services/showimg_kexidb_sqlite2driver.desktop
share/servicetypes/showimg_kexidb_driver.desktop
-@unexec rmdir %D/share/mimelnk/image 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/image
+@dirrmtry share/mimelnk
+@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
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/showimg
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/da/showimg
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
@dirrm share/doc/HTML/es/showimg
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
@dirrm share/doc/HTML/et/showimg
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/fr/showimg
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/it/showimg
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/pt/showimg
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/ru/showimg
-@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true
+@dirrmtry share/doc/HTML/ru
@dirrm share/doc/HTML/sv/showimg
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
+@dirrmtry share/doc/HTML
@dirrm share/apps/showimg/pics
@dirrm share/apps/showimg/icons/hicolor/64x64/mimetypes
@dirrm share/apps/showimg/icons/hicolor/64x64
@@ -254,9 +254,9 @@ share/servicetypes/showimg_kexidb_driver.desktop
@dirrm share/apps/showimg/icons/crystalsvg
@dirrm share/apps/showimg/icons
@dirrm share/apps/showimg
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
-@unexec rmdir %D/share/apps/showimgpart 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Graphics 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
+@dirrmtry share/apps/showimgpart
+@dirrmtry share/apps
+@dirrmtry share/applnk/Graphics
+@dirrmtry share/applnk
diff --git a/graphics/tcm/pkg-plist b/graphics/tcm/pkg-plist
index b9af780e8ade..c3abae725f7d 100644
--- a/graphics/tcm/pkg-plist
+++ b/graphics/tcm/pkg-plist
@@ -346,7 +346,7 @@ tcm/lib/help/Version
tcm/lib/help/Welcome
tcm/lib/tcm.conf
@dirrm tcm/man/man1
-@unexec rmdir %D/tcm/man 2>/dev/null || true
+@dirrmtry tcm/man
@dirrm tcm/lib/help
@dirrm tcm/lib
@dirrm tcm/doc/wishlist
diff --git a/graphics/ufraw/pkg-plist b/graphics/ufraw/pkg-plist
index 4de3dbfa450e..42c0d666fa69 100644
--- a/graphics/ufraw/pkg-plist
+++ b/graphics/ufraw/pkg-plist
@@ -3,4 +3,4 @@ bin/ufraw-batch
libexec/gimp/2.2/plug-ins/ufraw-gimp
share/applications/ufraw.desktop
share/pixmaps/ufraw.png
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/graphics/wmicons/pkg-plist b/graphics/wmicons/pkg-plist
index 7a806d04d051..b4a9536462fc 100644
--- a/graphics/wmicons/pkg-plist
+++ b/graphics/wmicons/pkg-plist
@@ -481,4 +481,4 @@ share/doc/wmicons/README.vf_tif
@dirrm share/WindowMaker/Themes
@dirrm share/WindowMaker/Pixmaps
@dirrm share/WindowMaker/Icons
-@unexec rmdir %D/share/WindowMaker 2>/dev/null || true
+@dirrmtry share/WindowMaker
diff --git a/graphics/xfig-devel/pkg-plist b/graphics/xfig-devel/pkg-plist
index f403cae14291..a0a6bbfb1297 100644
--- a/graphics/xfig-devel/pkg-plist
+++ b/graphics/xfig-devel/pkg-plist
@@ -2997,4 +2997,4 @@ lib/X11/xfig/CompKeyDB
%%PORTDOCS%%@dirrm lib/X11/xfig/Libraries/Audiovisual
%%PORTDOCS%%@dirrm lib/X11/xfig/Libraries/Arrows
%%PORTDOCS%%@dirrm lib/X11/xfig/Libraries
-@unexec rmdir %D/lib/X11/xfig 2>/dev/null || true
+@dirrmtry lib/X11/xfig
diff --git a/graphics/xfig/pkg-plist b/graphics/xfig/pkg-plist
index 8a578dda4c84..fc6236d1c40f 100644
--- a/graphics/xfig/pkg-plist
+++ b/graphics/xfig/pkg-plist
@@ -1900,4 +1900,4 @@ lib/X11/xfig/CompKeyDB
%%PORTDOCS%%@dirrm lib/X11/xfig/Libraries/Audiovisual
%%PORTDOCS%%@dirrm lib/X11/xfig/Libraries/Arrows
%%PORTDOCS%%@dirrm lib/X11/xfig/Libraries
-@unexec rmdir %D/lib/X11/xfig 2>/dev/null || true
+@dirrmtry lib/X11/xfig
diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist
index 6f11f4ea69f2..559430917d63 100644
--- a/graphics/xfree86-dri/pkg-plist
+++ b/graphics/xfree86-dri/pkg-plist
@@ -8,4 +8,4 @@ lib/modules/dri/radeon_dri.so
%%I386%%lib/modules/dri/sis_dri.so
%%AMD64_NA%%lib/modules/dri/tdfx_dri.so
@dirrm lib/modules/dri
-@unexec rmdir %D/lib/modules 2>/dev/null || true
+@dirrmtry lib/modules
diff --git a/graphics/xpcd/pkg-plist b/graphics/xpcd/pkg-plist
index 06f6878533e0..be8fd6ff9f0f 100644
--- a/graphics/xpcd/pkg-plist
+++ b/graphics/xpcd/pkg-plist
@@ -11,4 +11,4 @@ lib/X11/xpcd/system.xpcdrc
@dirrm lib/X11/de/app-defaults
@dirrm lib/X11/de
@dirrm lib/X11/xpcd
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps
diff --git a/graphics/xsane/pkg-plist b/graphics/xsane/pkg-plist
index 98a5b3bff0cf..af89f2f1921e 100644
--- a/graphics/xsane/pkg-plist
+++ b/graphics/xsane/pkg-plist
@@ -146,4 +146,4 @@ share/sane/xsane/xsane-startimage.pnm
share/sane/xsane/xsane-style.rc
@dirrm share/sane/xsane/doc
@dirrm share/sane/xsane
-@unexec rmdir %D/share/sane 2> /dev/null || true
+@dirrmtry share/sane
diff --git a/graphics/zphoto/pkg-plist b/graphics/zphoto/pkg-plist
index e30b2cf9ec9e..0eabaf6724e3 100644
--- a/graphics/zphoto/pkg-plist
+++ b/graphics/zphoto/pkg-plist
@@ -32,8 +32,8 @@ share/zphoto/doc/images/wxzphoto.png
share/zphoto/fonts/EfontSerifB.fdb
share/locale/ja/LC_MESSAGES/zphoto.mo
share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo
-@unexec rmdir %D/share/locale/ja_JP.SJIS/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP.SJIS 2> /dev/null || true
+@dirrmtry share/locale/ja_JP.SJIS/LC_MESSAGES
+@dirrmtry share/locale/ja_JP.SJIS
@dirrm share/zphoto/templates/default/en
@dirrm share/zphoto/templates/default/ja
@dirrm share/zphoto/templates/default/all