aboutsummaryrefslogtreecommitdiff
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
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
-rw-r--r--games/adonthell/pkg-plist2
-rw-r--r--games/afternoonstalker/pkg-plist4
-rw-r--r--games/asc/pkg-plist2
-rw-r--r--games/barrage/pkg-plist4
-rw-r--r--games/blobwars/pkg-plist2
-rw-r--r--games/briquolo/pkg-plist2
-rw-r--r--games/crossfire-server/pkg-plist16
-rw-r--r--games/dopewars/pkg-plist6
-rw-r--r--games/dsnake/pkg-plist2
-rw-r--r--games/duke3d/pkg-plist2
-rw-r--r--games/easysok/pkg-plist36
-rw-r--r--games/ember/pkg-plist6
-rw-r--r--games/enigma/pkg-plist12
-rw-r--r--games/freeciv/pkg-plist30
-rw-r--r--games/freesci/pkg-plist16
-rw-r--r--games/gcompris2/pkg-plist4
-rw-r--r--games/ggz-client-libs/pkg-plist8
-rw-r--r--games/ggz-gtk-client/pkg-plist4
-rw-r--r--games/ggz-sdl-games/pkg-plist2
-rw-r--r--games/ggz-txt-client/pkg-plist4
-rw-r--r--games/gnubg/pkg-plist4
-rw-r--r--games/gretools/pkg-plist4
-rw-r--r--games/gtkpool/pkg-plist2
-rw-r--r--games/halflifeserver/pkg-plist12
-rw-r--r--games/hlserver-admin/pkg-plist2
-rw-r--r--games/hlserver-esf/pkg-plist2
-rw-r--r--games/hlserver-existence/pkg-plist4
-rw-r--r--games/hlserver-fa/pkg-plist4
-rw-r--r--games/hlserver-flf/pkg-plist4
-rw-r--r--games/hlserver-opera/pkg-plist4
-rw-r--r--games/hlserver-opfor/pkg-plist4
-rw-r--r--games/hlserver-si/pkg-plist4
-rw-r--r--games/hlserver-vs/pkg-plist6
-rw-r--r--games/hlserver-wasteland/pkg-plist4
-rw-r--r--games/hlserver-wizwars/pkg-plist8
-rw-r--r--games/jfduke3d/pkg-plist2
-rw-r--r--games/kgeography/pkg-plist36
-rw-r--r--games/klondike/pkg-plist2
-rw-r--r--games/kpictorial/pkg-plist20
-rw-r--r--games/ktritoc/pkg-plist4
-rw-r--r--games/kwappen/pkg-plist50
-rw-r--r--games/lincity-ng/pkg-plist4
-rw-r--r--games/linux-enemyterritory-tce/pkg-plist2
-rw-r--r--games/linux-quake4/pkg-plist2
-rw-r--r--games/lm-solve/pkg-plist2
-rw-r--r--games/lucidlife/pkg-plist2
-rw-r--r--games/monsterz/pkg-plist2
-rw-r--r--games/mt_gtk_client/pkg-plist6
-rw-r--r--games/nethack32/pkg-plist4
-rw-r--r--games/nethack33/pkg-plist4
-rw-r--r--games/nethack34/pkg-plist2
-rw-r--r--games/netpanzer/pkg-plist2
-rw-r--r--games/noegnud-data/pkg-plist44
-rw-r--r--games/noegnud-littlehack/pkg-plist6
-rw-r--r--games/noegnud-nethack-deet/pkg-plist6
-rw-r--r--games/noegnud-nethack/pkg-plist6
-rw-r--r--games/noegnud-slashem/pkg-plist6
-rw-r--r--games/p5-Games-AlphaBeta/pkg-plist2
-rw-r--r--games/p5-Games-Bingo-Bot/pkg-plist8
-rw-r--r--games/p5-Games-Bingo-Print/pkg-plist8
-rw-r--r--games/p5-Games-Bingo/pkg-plist2
-rw-r--r--games/p5-Games-Dice/pkg-plist4
-rw-r--r--games/pvpgn/pkg-plist2
-rw-r--r--games/pydance/pkg-plist2
-rw-r--r--games/pysol-cardsets/pkg-plist4
-rw-r--r--games/pysol-music/pkg-plist4
-rw-r--r--games/q3base/pkg-plist10
-rw-r--r--games/quake2-data/pkg-plist6
-rw-r--r--games/quake3-data/pkg-plist4
-rw-r--r--games/quake3-q3base/pkg-plist10
-rw-r--r--games/rocksndiamonds/pkg-plist4
-rw-r--r--games/rtb/pkg-plist8
-rw-r--r--games/rtcw/pkg-plist4
-rw-r--r--games/scorched3d/pkg-plist66
-rw-r--r--games/six/pkg-plist4
-rw-r--r--games/stvef-server/pkg-plist2
-rw-r--r--games/supertux/pkg-plist2
-rw-r--r--games/torcs/pkg-plist2
-rw-r--r--games/tornado/pkg-plist2
-rw-r--r--games/tuxpaint/pkg-plist18
-rw-r--r--games/typespeed/pkg-plist2
-rw-r--r--games/viruskiller/pkg-plist4
-rw-r--r--games/wesnoth-devel/pkg-plist16
-rw-r--r--games/wesnoth/pkg-plist16
-rw-r--r--games/xarchon/pkg-plist6
-rw-r--r--games/xfce4-toys/pkg-plist16
-rw-r--r--games/xqf/pkg-plist2
-rw-r--r--games/xshisen/pkg-plist4
-rw-r--r--german/kheisereg/pkg-plist38
-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
-rw-r--r--irc/anope/pkg-plist6
-rw-r--r--irc/bopm/pkg-plist2
-rw-r--r--irc/eggdrop/pkg-plist2
-rw-r--r--irc/epic5/pkg-plist2
-rw-r--r--irc/insub/pkg-plist6
-rw-r--r--irc/ircd-hybrid-ru/pkg-plist4
-rw-r--r--irc/kmyirc/pkg-plist14
-rw-r--r--irc/konversation-kde4/pkg-plist118
-rw-r--r--irc/konversation/pkg-plist118
-rw-r--r--irc/kwirc/pkg-plist42
-rw-r--r--irc/p5-IRC/pkg-plist4
-rw-r--r--irc/p5-POE-Component-IRC-Object/pkg-plist8
-rw-r--r--irc/p5-POE-Component-IRC/pkg-plist8
-rw-r--r--irc/ptlink-ircd/pkg-plist2
-rw-r--r--irc/ptlink-services/pkg-plist2
-rw-r--r--irc/scrollz/pkg-plist28
-rw-r--r--irc/solid-ircd/pkg-plist4
-rw-r--r--irc/xchat-gnome/pkg-plist2
-rw-r--r--irc/xchat2/pkg-plist2
-rw-r--r--japanese/Canna/pkg-plist10
-rw-r--r--japanese/FreeWnn-lib/pkg-plist4
-rw-r--r--japanese/FreeWnn-server/pkg-plist4
-rw-r--r--japanese/canna-lib/pkg-plist10
-rw-r--r--japanese/canna-server/pkg-plist10
-rw-r--r--japanese/dvi2dvi/pkg-plist2
-rw-r--r--japanese/gauche-kakasi/pkg-plist2
-rw-r--r--japanese/jadetex-ptex/pkg-plist2
-rw-r--r--japanese/japaneseAFM/pkg-plist4
-rw-r--r--japanese/kdrill/pkg-plist2
-rw-r--r--japanese/kon2-16dot/pkg-plist2
-rw-r--r--japanese/kterm16c/pkg-plist2
-rw-r--r--japanese/leafrogue/pkg-plist2
-rw-r--r--japanese/lyx-doc/pkg-plist4
-rw-r--r--japanese/mell/pkg-plist2
-rw-r--r--japanese/nethack32/pkg-plist2
-rw-r--r--japanese/nethack34/pkg-plist2
-rw-r--r--japanese/p5-Date-Japanese-Era/pkg-plist8
-rw-r--r--japanese/p5-Text-ChaSen/pkg-plist6
-rw-r--r--japanese/p5-Text-Kakasi/pkg-plist6
-rw-r--r--japanese/perl5/pkg-plist154
-rw-r--r--japanese/prime-dict/pkg-plist6
-rw-r--r--japanese/prime-el/pkg-plist6
-rw-r--r--japanese/prime/pkg-plist14
-rw-r--r--japanese/ptex-tetex/pkg-plist6
-rw-r--r--japanese/ruby-man/pkg-plist2
-rw-r--r--japanese/ruby-usersguide/pkg-plist2
-rw-r--r--japanese/scim-anthy/pkg-plist6
-rw-r--r--japanese/scim-canna/pkg-plist6
-rw-r--r--japanese/scim-prime/pkg-plist6
-rw-r--r--japanese/scim-skk/pkg-plist6
-rw-r--r--japanese/scim-tables/pkg-plist2
-rw-r--r--japanese/scim-uim/pkg-plist4
-rw-r--r--japanese/stardict-dict-ja/pkg-plist2
-rw-r--r--japanese/stardict2-dict-ja/pkg-plist2
-rw-r--r--japanese/suikyo/pkg-plist8
-rw-r--r--japanese/texinfo/pkg-plist38
-rw-r--r--japanese/vftool/pkg-plist2
-rw-r--r--japanese/w3/pkg-plist4
-rw-r--r--japanese/xgate/pkg-plist10
-rw-r--r--java/diablo-jdk13/pkg-plist4
-rw-r--r--java/diablo-jre13/pkg-plist4
-rw-r--r--java/eclipse-cdt/pkg-plist6
-rw-r--r--java/eclipse-checkstyle/pkg-plist4
-rw-r--r--java/eclipse-examples/pkg-plist6
-rw-r--r--java/eclipse-gef-examples/pkg-plist6
-rw-r--r--java/eclipse-langpack/pkg-plist22
-rw-r--r--java/eclipse-log4e/pkg-plist6
-rw-r--r--java/eclipse-vep-examples/pkg-plist6
-rw-r--r--java/gj-jdk11/pkg-plist2
-rw-r--r--java/gj/pkg-plist2
-rw-r--r--java/jdk11/pkg-plist2
-rw-r--r--java/jdk13/pkg-plist4
-rw-r--r--java/jre/pkg-plist2
-rw-r--r--java/linux-blackdown-jdk12/pkg-plist2
-rw-r--r--java/linux-blackdown-jdk13/pkg-plist2
-rw-r--r--java/linux-blackdown-jdk14/pkg-plist2
-rw-r--r--java/linux-blackdown-jre11/pkg-plist2
-rw-r--r--java/linux-ibm-jdk13/pkg-plist2
-rw-r--r--java/linux-ibm-jdk14/pkg-plist2
-rw-r--r--java/linux-sun-jdk12/pkg-plist2
-rw-r--r--java/linux-sun-jdk13/pkg-plist2
-rw-r--r--java/phpeclipse/pkg-plist18
-rw-r--r--java/simplicity/pkg-plist2
-rw-r--r--korean/FreeWnn-lib/pkg-plist2
-rw-r--r--korean/hanemacs/pkg-plist6
-rw-r--r--korean/imhangul/pkg-plist2
-rw-r--r--korean/munhwafonts-cid/pkg-plist4
-rw-r--r--korean/scim-hangul/pkg-plist6
-rw-r--r--korean/scim-tables/pkg-plist2
-rw-r--r--lang/STk/pkg-plist2
-rw-r--r--lang/erlang/pkg-plist4
-rw-r--r--lang/erlang14/pkg-plist4
-rw-r--r--lang/gcc28/pkg-plist2
-rw-r--r--lang/gcc34/pkg-plist4
-rw-r--r--lang/ici/pkg-plist2
-rw-r--r--lang/klogoturtle/pkg-plist62
-rw-r--r--lang/kroc/pkg-plist10
-rw-r--r--lang/ml-pnet/pkg-plist6
-rw-r--r--lang/mono/pkg-plist12
-rw-r--r--lang/p5-Data-JavaScript/pkg-plist4
-rw-r--r--lang/p5-Error/pkg-plist2
-rw-r--r--lang/p5-Expect/pkg-plist2
-rw-r--r--lang/p5-ExtUtils-F77/pkg-plist4
-rw-r--r--lang/p5-F77/pkg-plist4
-rw-r--r--lang/p5-Interpolation/pkg-plist2
-rw-r--r--lang/p5-JavaScript-SpiderMonkey/pkg-plist4
-rw-r--r--lang/p5-JavaScript-Squish/pkg-plist6
-rw-r--r--lang/p5-List-MoreUtils/pkg-plist4
-rw-r--r--lang/p5-Perl6-Subs/pkg-plist6
-rw-r--r--lang/p5-Scalar-List-Utils/pkg-plist6
-rw-r--r--lang/p5-Switch/pkg-plist2
-rw-r--r--lang/perl5.10/pkg-plist352
-rw-r--r--lang/perl5.12/pkg-plist352
-rw-r--r--lang/perl5.14/pkg-plist352
-rw-r--r--lang/perl5.16/pkg-plist352
-rw-r--r--lang/perl5.6/pkg-plist162
-rw-r--r--lang/perl5.8/pkg-plist352
-rw-r--r--lang/perl5/pkg-plist162
-rw-r--r--lang/php4/pkg-plist6
-rw-r--r--lang/php5/pkg-plist6
-rw-r--r--lang/php53/pkg-plist6
-rw-r--r--lang/pike70/pkg-plist2
-rw-r--r--lang/pnet-base/pkg-plist2
-rw-r--r--lang/pnetc/pkg-plist22
-rw-r--r--lang/pnetlib/pkg-plist24
-rw-r--r--lang/pugs/pkg-plist12
-rw-r--r--lang/python-mode.el/pkg-plist4
-rw-r--r--lang/ruby-man/pkg-plist2
-rw-r--r--lang/ruby-programmingruby/pkg-plist2
-rw-r--r--lang/ruby-reference/pkg-plist2
-rw-r--r--lang/ruby-usersguide/pkg-plist2
-rw-r--r--lang/ruby16/pkg-plist10
-rw-r--r--lang/smalltalk/pkg-plist2
-rw-r--r--mail/assp/pkg-plist4
-rw-r--r--mail/balsa/pkg-plist4
-rw-r--r--mail/bincimap/pkg-plist2
-rw-r--r--mail/courier-imap/pkg-plist6
-rw-r--r--mail/courier/pkg-plist26
-rw-r--r--mail/couriergraph/pkg-plist2
-rw-r--r--mail/ezmlm-idx/pkg-plist2
-rw-r--r--mail/freepops/pkg-plist2
-rw-r--r--mail/gnubiff/pkg-plist12
-rw-r--r--mail/horde-imp/pkg-plist4
-rw-r--r--mail/horde-ingo/pkg-plist4
-rw-r--r--mail/horde-turba/pkg-plist4
-rw-r--r--mail/horde4-imp/pkg-plist4
-rw-r--r--mail/horde4-ingo/pkg-plist4
-rw-r--r--mail/horde4-turba/pkg-plist4
-rw-r--r--mail/imp/pkg-plist4
-rw-r--r--mail/ingo/pkg-plist4
-rw-r--r--mail/kbiff/pkg-plist4
-rw-r--r--mail/kshowmail/pkg-plist28
-rw-r--r--mail/mailgraph/pkg-plist2
-rw-r--r--mail/mailman/pkg-plist22
-rw-r--r--mail/majordomo/pkg-plist4
-rw-r--r--mail/mew-emacs20/pkg-plist4
-rw-r--r--mail/mew-mule/pkg-plist2
-rw-r--r--mail/mew/pkg-plist2
-rw-r--r--mail/mew2-emacs20/pkg-plist4
-rw-r--r--mail/mew2/pkg-plist4
-rw-r--r--mail/mew3-emacs20/pkg-plist4
-rw-r--r--mail/mew3/pkg-plist4
-rw-r--r--mail/mulberry/pkg-plist2
-rw-r--r--mail/p5-Email-Abstract/pkg-plist4
-rw-r--r--mail/p5-Email-Address/pkg-plist6
-rw-r--r--mail/p5-Email-Delete/pkg-plist8
-rw-r--r--mail/p5-Email-Filter/pkg-plist4
-rw-r--r--mail/p5-Email-Folder-IMAP/pkg-plist8
-rw-r--r--mail/p5-Email-Folder-IMAPS/pkg-plist8
-rw-r--r--mail/p5-Email-Folder-POP3/pkg-plist8
-rw-r--r--mail/p5-Email-Folder/pkg-plist4
-rw-r--r--mail/p5-Email-FolderType-Net/pkg-plist8
-rw-r--r--mail/p5-Email-FolderType/pkg-plist4
-rw-r--r--mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist10
-rw-r--r--mail/p5-Email-LocalDelivery/pkg-plist6
-rw-r--r--mail/p5-Email-MIME-Attachment-Stripper/pkg-plist14
-rw-r--r--mail/p5-Email-MIME-ContentType/pkg-plist10
-rw-r--r--mail/p5-Email-MIME-Encodings/pkg-plist10
-rw-r--r--mail/p5-Email-MIME-Modifier/pkg-plist8
-rw-r--r--mail/p5-Email-MIME/pkg-plist6
-rw-r--r--mail/p5-Email-MessageID/pkg-plist4
-rw-r--r--mail/p5-Email-Send/pkg-plist8
-rw-r--r--mail/p5-Email-Simple-Creator/pkg-plist10
-rw-r--r--mail/p5-Email-Simple/pkg-plist4
-rw-r--r--mail/p5-IMAP-Sieve/pkg-plist4
-rw-r--r--mail/p5-Log-Procmail/pkg-plist4
-rw-r--r--mail/p5-MIME-Fast/pkg-plist4
-rw-r--r--mail/p5-MIME-Lite-HTML/pkg-plist8
-rw-r--r--mail/p5-MIME-Lite/pkg-plist4
-rw-r--r--mail/p5-MIME-Tools/pkg-plist2
-rw-r--r--mail/p5-MIME-Types/pkg-plist4
-rw-r--r--mail/p5-Mail-Address-MobileJp/pkg-plist10
-rw-r--r--mail/p5-Mail-Alias/pkg-plist4
-rw-r--r--mail/p5-Mail-Audit/pkg-plist4
-rw-r--r--mail/p5-Mail-Box-Parser-C/pkg-plist12
-rw-r--r--mail/p5-Mail-Box/pkg-plist6
-rw-r--r--mail/p5-Mail-Box1/pkg-plist4
-rw-r--r--mail/p5-Mail-Bulkmail/pkg-plist4
-rw-r--r--mail/p5-Mail-CClient/pkg-plist4
-rw-r--r--mail/p5-Mail-CheckUser/pkg-plist4
-rw-r--r--mail/p5-Mail-ClamAV/pkg-plist4
-rw-r--r--mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist4
-rw-r--r--mail/p5-Mail-DomainKeys/pkg-plist4
-rw-r--r--mail/p5-Mail-Field-Received/pkg-plist8
-rw-r--r--mail/p5-Mail-Folder/pkg-plist4
-rw-r--r--mail/p5-Mail-Freshmeat/pkg-plist2
-rw-r--r--mail/p5-Mail-GnuPG/pkg-plist2
-rw-r--r--mail/p5-Mail-Graph/pkg-plist2
-rw-r--r--mail/p5-Mail-IMAPClient/pkg-plist4
-rw-r--r--mail/p5-Mail-ListDetector/pkg-plist6
-rw-r--r--mail/p5-Mail-MailStats/pkg-plist4
-rw-r--r--mail/p5-Mail-Mbox-MessageParser/pkg-plist10
-rw-r--r--mail/p5-Mail-POP3Client/pkg-plist4
-rw-r--r--mail/p5-Mail-Procmail/pkg-plist2
-rw-r--r--mail/p5-Mail-Procmailrc/pkg-plist4
-rw-r--r--mail/p5-Mail-QuoteWrap/pkg-plist4
-rw-r--r--mail/p5-Mail-RBL/pkg-plist4
-rw-r--r--mail/p5-Mail-SPF-Query/pkg-plist4
-rw-r--r--mail/p5-Mail-SRS/pkg-plist4
-rw-r--r--mail/p5-Mail-Sender/pkg-plist4
-rw-r--r--mail/p5-Mail-Sendmail/pkg-plist4
-rw-r--r--mail/p5-Mail-SpamAssassin/pkg-plist8
-rw-r--r--mail/p5-Mail-Tools/pkg-plist4
-rw-r--r--mail/p5-Mail-Verify/pkg-plist4
-rw-r--r--mail/p5-Mail-Webmail-Gmail/pkg-plist8
-rw-r--r--mail/p5-Net-IMAP-Simple-SSL/pkg-plist12
-rw-r--r--mail/p5-Net-IMAP-Simple/pkg-plist8
-rw-r--r--mail/p5-Net-SMTP-Server/pkg-plist12
-rw-r--r--mail/p5-Net-Server-Mail/pkg-plist8
-rw-r--r--mail/p5-POE-Component-Client-POP3/pkg-plist12
-rw-r--r--mail/p5-POE-Component-Client-SMTP/pkg-plist4
-rw-r--r--mail/p5-POE-Component-SMTP/pkg-plist12
-rw-r--r--mail/p5-Sendmail-AccessDB/pkg-plist4
-rw-r--r--mail/p5-URI-imap/pkg-plist4
-rw-r--r--mail/p5-URI-imaps/pkg-plist4
-rw-r--r--mail/popular/pkg-plist2
-rw-r--r--mail/postfix-current/pkg-plist2
-rw-r--r--mail/postfix/pkg-plist2
-rw-r--r--mail/postfix1/pkg-plist2
-rw-r--r--mail/postfix21/pkg-plist2
-rw-r--r--mail/postfix22/pkg-plist2
-rw-r--r--mail/postfix23/pkg-plist2
-rw-r--r--mail/postfix24/pkg-plist2
-rw-r--r--mail/postfix25/pkg-plist2
-rw-r--r--mail/postfix26/pkg-plist2
-rw-r--r--mail/postfix27/pkg-plist2
-rw-r--r--mail/postfix28/pkg-plist2
-rw-r--r--mail/postgrey/pkg-plist2
-rw-r--r--mail/qmail-conf/pkg-plist2
-rw-r--r--mail/qmail-scanner/pkg-plist28
-rw-r--r--mail/qmail-scanner1/pkg-plist28
-rw-r--r--mail/qsheff/pkg-plist2
-rw-r--r--mail/relay-ctrl/pkg-plist2
-rw-r--r--mail/spamass-rules_du_jour/pkg-plist6
-rw-r--r--mail/sqlgrey/pkg-plist4
-rw-r--r--mail/squirrelmail/pkg-plist10
-rw-r--r--mail/sylpheed2-devel/pkg-plist4
-rw-r--r--mail/sylpheed2/pkg-plist4
-rw-r--r--mail/sylpheed3/pkg-plist4
-rw-r--r--mail/teapop-devel/pkg-plist2
-rw-r--r--mail/teapop/pkg-plist2
-rw-r--r--mail/turba/pkg-plist4
-rw-r--r--mail/vmailmgr/pkg-plist2
-rw-r--r--mail/vpopmail-devel/pkg-plist6
-rw-r--r--mail/vpopmail/pkg-plist6
-rw-r--r--mail/wmmail/pkg-plist4
-rw-r--r--russian/ircd-hybrid-ru/pkg-plist4
-rw-r--r--russian/ircd-hybrid/pkg-plist4
423 files changed, 2753 insertions, 2753 deletions
diff --git a/games/adonthell/pkg-plist b/games/adonthell/pkg-plist
index e4c0308dbb4b..b972e6c9c9a9 100644
--- a/games/adonthell/pkg-plist
+++ b/games/adonthell/pkg-plist
@@ -472,4 +472,4 @@ share/pixmaps/wastesedge_32x32.xpm
@dirrm %%DATADIR%%/games
@dirrm %%DATADIR%%/modules
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
diff --git a/games/afternoonstalker/pkg-plist b/games/afternoonstalker/pkg-plist
index 88800bf96b7c..27db4787b89e 100644
--- a/games/afternoonstalker/pkg-plist
+++ b/games/afternoonstalker/pkg-plist
@@ -15,5 +15,5 @@ share/pixmaps/afternoonstalker.png
share/applications/afternoonstalker.desktop
@dirrm share/afternoonstalker/sounds
@dirrm share/afternoonstalker
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
index 175151bc594b..515f72e9f5ed 100644
--- a/games/asc/pkg-plist
+++ b/games/asc/pkg-plist
@@ -17,4 +17,4 @@ share/games/asc/units-mk3.con
%%MUSIC:%%share/games/asc/music/machine_wars.mp3
%%MUSIC:%%@dirrm share/games/asc/music
@dirrm share/games/asc
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
diff --git a/games/barrage/pkg-plist b/games/barrage/pkg-plist
index c3b41b7ca14c..560fa3bca43b 100644
--- a/games/barrage/pkg-plist
+++ b/games/barrage/pkg-plist
@@ -25,8 +25,8 @@ share/applnk/Applications/barrage.desktop
%%DATADIR%%/sounds/highlight.wav
%%DATADIR%%/sounds/scream1.wav
%%DATADIR%%/sounds/scream2.wav
-@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
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%/gfx
@dirrm %%DATADIR%%
diff --git a/games/blobwars/pkg-plist b/games/blobwars/pkg-plist
index 0ae326a45e78..5911e173390b 100644
--- a/games/blobwars/pkg-plist
+++ b/games/blobwars/pkg-plist
@@ -3,4 +3,4 @@ bin/blobwars
share/applications/blobwars.desktop
share/pixmaps/blobwars.png
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/briquolo/pkg-plist b/games/briquolo/pkg-plist
index 0ce1e8eb9e31..5be0214c9e3e 100644
--- a/games/briquolo/pkg-plist
+++ b/games/briquolo/pkg-plist
@@ -113,4 +113,4 @@ share/locale/sk/LC_MESSAGES/briquolo.mo
@dirrm %%DATADIR%%
@dirrm share/pixmaps
share/applications/briquolo.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index c48d2b425972..800736f1a360 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -3280,11 +3280,11 @@ var/crossfire/temp.maps
@exec mkdir -p %D/var/crossfire/maps
@exec mkdir -p %D/var/crossfire/players
@exec mkdir -p %D/var/crossfire/unique-items
-@unexec rmdir %D/var/crossfire/unique-items 2>/dev/null || true
-@unexec rmdir %D/var/crossfire/players 2>/dev/null || true
-@unexec rmdir %D/var/crossfire/maps 2>/dev/null || true
-@unexec rmdir %D/var/crossfire/datafiles 2>/dev/null || true
-@unexec rmdir %D/var/crossfire 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
-@unexec rmdir %D/lib/crossfire/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/crossfire 2>/dev/null || true
+@dirrmtry var/crossfire/unique-items
+@dirrmtry var/crossfire/players
+@dirrmtry var/crossfire/maps
+@dirrmtry var/crossfire/datafiles
+@dirrmtry var/crossfire
+@dirrmtry var
+@dirrmtry lib/crossfire/plugins
+@dirrmtry lib/crossfire
diff --git a/games/dopewars/pkg-plist b/games/dopewars/pkg-plist
index 05aeb2e359cf..6f90558629a4 100644
--- a/games/dopewars/pkg-plist
+++ b/games/dopewars/pkg-plist
@@ -48,9 +48,9 @@ share/locale/nn/LC_MESSAGES/dopewars.mo
share/locale/pl/LC_MESSAGES/dopewars.mo
share/locale/pt_BR/LC_MESSAGES/dopewars.mo
share/gnome/apps/Games/dopewars.desktop
-@unexec rmdir %D/share/gnome/apps/Games 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@dirrmtry share/gnome/apps/Games
+@dirrmtry share/gnome/apps
+@dirrmtry share/gnome
@dirrm share/dopewars/pixmaps
@dirrm share/dopewars
%%PORTDOCS%%@dirrm share/doc/dopewars/help
diff --git a/games/dsnake/pkg-plist b/games/dsnake/pkg-plist
index 99063c1b0d24..c4c5f638ed43 100644
--- a/games/dsnake/pkg-plist
+++ b/games/dsnake/pkg-plist
@@ -11,4 +11,4 @@ bin/dsnake
%%DATADIR%%/midi/The_Jayomon_Beat.mid
@dirrm %%DATADIR%%/midi
@dirrm %%DATADIR%%/data
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/games/duke3d/pkg-plist b/games/duke3d/pkg-plist
index c1c0e4201471..131304374aa5 100644
--- a/games/duke3d/pkg-plist
+++ b/games/duke3d/pkg-plist
@@ -12,4 +12,4 @@ bin/duke3d-build
%%PORTDOCS%%%%DOCSDIR%%/readme.txt
%%PORTDOCS%%%%DOCSDIR%%/gnu.txt
@dirrm share/duke3d/testdata
-@unexec rmdir %D/share/duke3d 2> /dev/null || true
+@dirrmtry share/duke3d
diff --git a/games/easysok/pkg-plist b/games/easysok/pkg-plist
index bf7c939b515a..182972ba0e5b 100644
--- a/games/easysok/pkg-plist
+++ b/games/easysok/pkg-plist
@@ -233,21 +233,21 @@ share/wallpapers/GreenBallThemeBackground.jpg
share/wallpapers/KSokobanThemeBackground.jpg
share/wallpapers/SpaceThemeBackground.png
share/wallpapers/WarehouseKeeperThemeBackground.jpg
-@unexec rmdir %D/share/wallpapers 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/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/wallpapers
+@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/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/easysok
-@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/easysok/themes/xsokoban
@dirrm share/apps/easysok/themes/warehousekeeper
@dirrm share/apps/easysok/themes/text
@@ -276,7 +276,7 @@ share/wallpapers/WarehouseKeeperThemeBackground.jpg
@dirrm share/apps/easysok/icons
@dirrm share/apps/easysok/deadlocks
@dirrm share/apps/easysok
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games/TacticStrategy 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Games/TacticStrategy
+@dirrmtry share/applnk/Games
+@dirrmtry share/applnk
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index 6c29139ddf5f..72fe864be270 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -73,7 +73,7 @@ share/icons/worldforge/ember.png
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/TODO
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@dirrm etc/ember
@dirrm share/games/ember/carpenter/blockspec
@dirrm share/games/ember/carpenter/blueprints
@@ -97,6 +97,6 @@ share/icons/worldforge/ember.png
@dirrm share/games/ember/media
@dirrm share/games/ember
@dirrm share/games
-@unexec rmdir %D/share/icons/worldforge 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/worldforge
+@dirrmtry share/icons
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/enigma/pkg-plist b/games/enigma/pkg-plist
index 3a09117002f6..fcd400fd1e17 100644
--- a/games/enigma/pkg-plist
+++ b/games/enigma/pkg-plist
@@ -2736,12 +2736,12 @@ share/locale/it/LC_MESSAGES/enigma.mo
share/locale/nl/LC_MESSAGES/enigma.mo
share/pixmaps/enigma.png
-@unexec rmdir %D/share/pixmaps 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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/applications/ 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/applications/
@dirrm share/enigma/sound
@dirrm share/enigma/levels/patches
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index 6cb32439694d..045bce4a85ac 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -324,20 +324,20 @@ share/locale/ru/LC_MESSAGES/freeciv.mo
share/locale/sv/LC_MESSAGES/freeciv.mo
share/locale/uk/LC_MESSAGES/freeciv.mo
share/applications/freeciv.desktop
-@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/he_IL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 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/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 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/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/he_IL/LC_MESSAGES
+@dirrmtry share/locale/he_IL
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrm %%DATADIR%%/trident
@dirrm %%DATADIR%%/scenario
@dirrm %%DATADIR%%/nation
@@ -350,4 +350,4 @@ share/applications/freeciv.desktop
@dirrm %%DATADIR%%/flags
@dirrm %%DATADIR%%/isophex
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/freesci/pkg-plist b/games/freesci/pkg-plist
index 7a9fc367e4fb..1fc65f66a6c3 100644
--- a/games/freesci/pkg-plist
+++ b/games/freesci/pkg-plist
@@ -6,18 +6,18 @@ bin/freesci
bin/freesci-setup
bin/sciv
share/applnk/Games/Adventure/FreeSCI.desktop
-@unexec rmdir %D/share/applnk/Games/Adventure 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Games/Adventure
+@dirrmtry share/applnk/Games
+@dirrmtry share/applnk
share/icons/hicolor/48x48/apps/freesci.png
-@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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
share/games/freesci/config.template
%%PORTDOCS%%share/games/freesci/sci.sgml
%%PORTDOCS%%share/games/freesci/sci-kernel.sgml
%%PORTDOCS%%share/games/freesci/freesci.sgml
%%PORTDOCS%%share/games/freesci/game-list.sgml
@dirrm share/games/freesci
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index 3ede6238d12d..392fb4df352f 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -3071,8 +3071,8 @@ share/locale/tr/LC_MESSAGES/gcompris.mo
share/locale/vi/LC_MESSAGES/gcompris.mo
share/locale/wa/LC_MESSAGES/gcompris.mo
share/locale/zh_CN/LC_MESSAGES/gcompris.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/help/gcompris/fr
@dirrm share/gnome/help/gcompris/eu
@dirrm share/gnome/help/gcompris/C
diff --git a/games/ggz-client-libs/pkg-plist b/games/ggz-client-libs/pkg-plist
index 7854d30ca4af..bc1f67b6b0e9 100644
--- a/games/ggz-client-libs/pkg-plist
+++ b/games/ggz-client-libs/pkg-plist
@@ -13,7 +13,7 @@ lib/libggzmod.so.4
share/desktop-directories/ggz-games.directory
share/desktop-directories/ggz.directory
share/locale/de/LC_MESSAGES/ggz-config.mo
-@unexec rmdir %D/share/desktop-directories 2>/dev/null || true
-@unexec rmdir %D/etc/xdg/menus/applications-merged 2>/dev/null || true
-@unexec rmdir %D/etc/xdg/menus 2>/dev/null || true
-@unexec rmdir %D/etc/xdg 2>/dev/null || true
+@dirrmtry share/desktop-directories
+@dirrmtry etc/xdg/menus/applications-merged
+@dirrmtry etc/xdg/menus
+@dirrmtry etc/xdg
diff --git a/games/ggz-gtk-client/pkg-plist b/games/ggz-gtk-client/pkg-plist
index 181c48ceda5d..a207bc93b07c 100644
--- a/games/ggz-gtk-client/pkg-plist
+++ b/games/ggz-gtk-client/pkg-plist
@@ -19,7 +19,7 @@ share/locale/de/LC_MESSAGES/ggz-gtk.mo
share/locale/es/LC_MESSAGES/ggz-gtk.mo
share/locale/pt_BR/LC_MESSAGES/ggz-gtk.mo
share/locale/sv/LC_MESSAGES/ggz-gtk.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@dirrm share/ggz/ggz-gtk/help
@dirrm share/ggz/ggz-gtk
-@unexec rmdir %D/share/ggz 2>/dev/null || true
+@dirrmtry share/ggz
diff --git a/games/ggz-sdl-games/pkg-plist b/games/ggz-sdl-games/pkg-plist
index abe4aa39f8e8..00ccc74ed61e 100644
--- a/games/ggz-sdl-games/pkg-plist
+++ b/games/ggz-sdl-games/pkg-plist
@@ -16,4 +16,4 @@ share/ggz/ttt3d/lines.bmp
@dirrm lib/ggz
@dirrm share/ggz/geekgame
@dirrm share/ggz/ttt3d
-@unexec rmdir %D/share/ggz 2>/dev/null || true
+@dirrmtry share/ggz
diff --git a/games/ggz-txt-client/pkg-plist b/games/ggz-txt-client/pkg-plist
index 27658b09897c..bafb2cf9250f 100644
--- a/games/ggz-txt-client/pkg-plist
+++ b/games/ggz-txt-client/pkg-plist
@@ -3,5 +3,5 @@ etc/ggz.modules
lib/ggz/tttxt
share/applications/ggz-txt.desktop
share/locale/de/LC_MESSAGES/ggz-txt.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/lib/ggz 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry lib/ggz
diff --git a/games/gnubg/pkg-plist b/games/gnubg/pkg-plist
index 90d2cfb5370c..1b053f0cd4bb 100644
--- a/games/gnubg/pkg-plist
+++ b/games/gnubg/pkg-plist
@@ -45,5 +45,5 @@ share/locale/is/LC_MESSAGES/gnubg.mo
share/locale/it/LC_MESSAGES/gnubg.mo
share/locale/ja/LC_MESSAGES/gnubg.mo
share/locale/tr/LC_MESSAGES/gnubg.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
diff --git a/games/gretools/pkg-plist b/games/gretools/pkg-plist
index 7e1772d340d4..a619a50743c0 100644
--- a/games/gretools/pkg-plist
+++ b/games/gretools/pkg-plist
@@ -19,5 +19,5 @@ share/gnome/pixmaps/gretools.png
@dirrm share/gnome/gretools/glade
@dirrm share/gnome/gretools
@dirrm %%PYTHON_SITELIBDIR%%/gretools
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/games/gtkpool/pkg-plist b/games/gtkpool/pkg-plist
index cc29931fc069..7a71ebb00b28 100644
--- a/games/gtkpool/pkg-plist
+++ b/games/gtkpool/pkg-plist
@@ -43,4 +43,4 @@ bin/gtkpool
%%DATADIR%%/ball_hit.raw
@dirrm %%DATADIR%%
share/icons/gtkpool.png
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons
diff --git a/games/halflifeserver/pkg-plist b/games/halflifeserver/pkg-plist
index c019c1ffff27..8475f4077f3b 100644
--- a/games/halflifeserver/pkg-plist
+++ b/games/halflifeserver/pkg-plist
@@ -1856,10 +1856,10 @@
@dirrm %%HLDSDIR%%dmc/events
@dirrm %%HLDSDIR%%dmc/dlls
@dirrm %%HLDSDIR%%dmc/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%valve 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%reslists 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%tfc 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%ricochet 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%dmc 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%valve
+@dirrmtry %%HLDSDIR%%reslists
+@dirrmtry %%HLDSDIR%%tfc
+@dirrmtry %%HLDSDIR%%ricochet
+@dirrmtry %%HLDSDIR%%dmc
@unexec rmdir %D/%%HLDSDIR%% 2>/dev/null || echo "If you are permanently removing this port and its mods, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%`` to remove any configuration files and logs left." | fmt
-@unexec rmdir %D/%%HLDSBASE%% 2>/dev/null || true
+@dirrmtry %%HLDSBASE%%
diff --git a/games/hlserver-admin/pkg-plist b/games/hlserver-admin/pkg-plist
index 8dceadb2c17c..ddeec380b8c0 100644
--- a/games/hlserver-admin/pkg-plist
+++ b/games/hlserver-admin/pkg-plist
@@ -230,4 +230,4 @@
@dirrm %%HLDSDIR%%Adminmod/config/Samples
@dirrm %%HLDSDIR%%Adminmod/config
@dirrm %%HLDSDIR%%Adminmod/.amdd
-@unexec rmdir %D/%%HLDSDIR%%Adminmod 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%Adminmod
diff --git a/games/hlserver-esf/pkg-plist b/games/hlserver-esf/pkg-plist
index ec0661f69b6b..b1b536e3583b 100644
--- a/games/hlserver-esf/pkg-plist
+++ b/games/hlserver-esf/pkg-plist
@@ -944,5 +944,5 @@
@dirrm %%HLDSDIR%%esf/dlls
@dirrm %%HLDSDIR%%esf/classes
@dirrm %%HLDSDIR%%esf/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%esf/SAVE 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%esf/SAVE
@unexec rmdir %D/%%HLDSDIR%%esf 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%esf`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-existence/pkg-plist b/games/hlserver-existence/pkg-plist
index de8e2f938126..7c57fd999d39 100644
--- a/games/hlserver-existence/pkg-plist
+++ b/games/hlserver-existence/pkg-plist
@@ -625,7 +625,7 @@
@dirrm %%HLDSDIR%%existence/sound/radio/accent_agent
@dirrm %%HLDSDIR%%existence/sound/radio
@dirrm %%HLDSDIR%%existence/sound/player
-@unexec rmdir %D/%%HLDSDIR%%existence/sound/plats 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%existence/sound/plats
@dirrm %%HLDSDIR%%existence/sound/oldman
@dirrm %%HLDSDIR%%existence/sound/misc
@dirrm %%HLDSDIR%%existence/sound/items
@@ -660,5 +660,5 @@
@dirrm %%HLDSDIR%%existence/events
@dirrm %%HLDSDIR%%existence/dlls
@dirrm %%HLDSDIR%%existence/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%existence/SAVE 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%existence/SAVE
@unexec rmdir %D/%%HLDSDIR%%existence 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%existence`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-fa/pkg-plist b/games/hlserver-fa/pkg-plist
index fc9e47e567f2..996324b3be6b 100644
--- a/games/hlserver-fa/pkg-plist
+++ b/games/hlserver-fa/pkg-plist
@@ -1611,6 +1611,6 @@
@dirrm %%HLDSDIR%%firearms/events
@dirrm %%HLDSDIR%%firearms/dlls
@dirrm %%HLDSDIR%%firearms/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%firearms/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%firearms/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%firearms/SAVE
+@dirrmtry %%HLDSDIR%%firearms/logs
@unexec rmdir %D/%%HLDSDIR%%firearms 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%firearms`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-flf/pkg-plist b/games/hlserver-flf/pkg-plist
index 72d352484222..9883c1b302fc 100644
--- a/games/hlserver-flf/pkg-plist
+++ b/games/hlserver-flf/pkg-plist
@@ -655,6 +655,6 @@
@dirrm %%HLDSDIR%%/frontline/events
@dirrm %%HLDSDIR%%/frontline/dlls
@dirrm %%HLDSDIR%%/frontline/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%frontline/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%frontline/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%frontline/SAVE
+@dirrmtry %%HLDSDIR%%frontline/logs
@unexec rmdir %D/%%HLDSDIR%%frontline 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%frontline`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-opera/pkg-plist b/games/hlserver-opera/pkg-plist
index 73b58b1ec2e3..b827eb3282b6 100644
--- a/games/hlserver-opera/pkg-plist
+++ b/games/hlserver-opera/pkg-plist
@@ -1092,7 +1092,7 @@
@dirrm %%HLDSDIR%%opera/sound
@dirrm %%HLDSDIR%%opera/schemes
@exec mkdir %D/%%HLDSDIR%%opera/nodes
-@unexec rmdir %D/%%HLDSDIR%%opera/nodes 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%opera/nodes
@dirrm %%HLDSDIR%%opera/models/player/yun
@dirrm %%HLDSDIR%%opera/models/player/ying
@dirrm %%HLDSDIR%%opera/models/player/yamishiro
@@ -1169,7 +1169,7 @@
@dirrm %%HLDSDIR%%opera/manual/images
@dirrm %%HLDSDIR%%opera/manual
@exec mkdir %D/%%HLDSDIR%%opera/logs
-@unexec rmdir %D/%%HLDSDIR%%opera/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%opera/logs
@dirrm %%HLDSDIR%%opera/gfx/shell
@dirrm %%HLDSDIR%%opera/gfx
@dirrm %%HLDSDIR%%opera/events
diff --git a/games/hlserver-opfor/pkg-plist b/games/hlserver-opfor/pkg-plist
index a09d723e837d..39391d4b36d6 100644
--- a/games/hlserver-opfor/pkg-plist
+++ b/games/hlserver-opfor/pkg-plist
@@ -593,6 +593,6 @@
@dirrm %%HLDSDIR%%gearbox/dlls
@dirrm %%HLDSDIR%%gearbox/classes
@dirrm %%HLDSDIR%%gearbox/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%gearbox/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%gearbox/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%gearbox/SAVE
+@dirrmtry %%HLDSDIR%%gearbox/logs
@unexec rmdir %D/%%HLDSDIR%%gearbox 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%gearbox`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-si/pkg-plist b/games/hlserver-si/pkg-plist
index 9f06714b75cc..d7a4ab0d284c 100644
--- a/games/hlserver-si/pkg-plist
+++ b/games/hlserver-si/pkg-plist
@@ -869,6 +869,6 @@
@dirrm %%HLDSDIR%%si/events
@dirrm %%HLDSDIR%%si/dlls
@dirrm %%HLDSDIR%%si/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%si/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%si/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%si/SAVE
+@dirrmtry %%HLDSDIR%%si/logs
@unexec rmdir %D/%%HLDSDIR%%si 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%si`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-vs/pkg-plist b/games/hlserver-vs/pkg-plist
index 998cffd6ffd0..3782a7037d88 100644
--- a/games/hlserver-vs/pkg-plist
+++ b/games/hlserver-vs/pkg-plist
@@ -687,7 +687,7 @@
@dirrm %%HLDSDIR%%VS/classes
@dirrm %%HLDSDIR%%VS/cl_dlls
@dirrm %%HLDSDIR%%VS/bots
-@unexec rmdir %D/%%HLDSDIR%%VS/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%VS/save 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%VS/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%VS/SAVE
+@dirrmtry %%HLDSDIR%%VS/save
+@dirrmtry %%HLDSDIR%%VS/logs
@unexec rmdir %D/%%HLDSDIR%%VS 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%VS`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-wasteland/pkg-plist b/games/hlserver-wasteland/pkg-plist
index 64941851d908..c46f1882fe4d 100644
--- a/games/hlserver-wasteland/pkg-plist
+++ b/games/hlserver-wasteland/pkg-plist
@@ -77,6 +77,6 @@
@dirrm %%HLDSDIR%%wasteland/events
@dirrm %%HLDSDIR%%wasteland/dlls
@dirrm %%HLDSDIR%%wasteland/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%wasteland/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%wasteland/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%wasteland/SAVE
+@dirrmtry %%HLDSDIR%%wasteland/logs
@unexec rmdir %D/%%HLDSDIR%%wasteland 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%wasteland`` to remove any configuration files and logs left." | fmt
diff --git a/games/hlserver-wizwars/pkg-plist b/games/hlserver-wizwars/pkg-plist
index 16f3983f6096..9cc880781a66 100644
--- a/games/hlserver-wizwars/pkg-plist
+++ b/games/hlserver-wizwars/pkg-plist
@@ -738,8 +738,8 @@
@dirrm %%HLDSDIR%%wizwars/conclaves
@dirrm %%HLDSDIR%%wizwars/class
@dirrm %%HLDSDIR%%wizwars/cl_dlls
-@unexec rmdir %D/%%HLDSDIR%%wizwars/SAVE 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%wizwars/save 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%wizwars/music 2>/dev/null || true
-@unexec rmdir %D/%%HLDSDIR%%wizwars/logs 2>/dev/null || true
+@dirrmtry %%HLDSDIR%%wizwars/SAVE
+@dirrmtry %%HLDSDIR%%wizwars/save
+@dirrmtry %%HLDSDIR%%wizwars/music
+@dirrmtry %%HLDSDIR%%wizwars/logs
@unexec rmdir %D/%%HLDSDIR%%wizwars 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/%%HLDSDIR%%wizwars`` to remove any configuration files and logs left." | fmt
diff --git a/games/jfduke3d/pkg-plist b/games/jfduke3d/pkg-plist
index 279e6ff6e0d2..6030c6d8af37 100644
--- a/games/jfduke3d/pkg-plist
+++ b/games/jfduke3d/pkg-plist
@@ -6,4 +6,4 @@
%%DATADIR%%/build.cfg
bin/duke3d
bin/duke3d-build
-@unexec rmdir %D/share/jfduke3d 2> /dev/null || true
+@dirrmtry share/jfduke3d
diff --git a/games/kgeography/pkg-plist b/games/kgeography/pkg-plist
index 7bb89b56a3d3..752dd429bd9c 100644
--- a/games/kgeography/pkg-plist
+++ b/games/kgeography/pkg-plist
@@ -352,24 +352,24 @@ share/locale/sv/LC_MESSAGES/kgeography.mo
share/locale/ta/LC_MESSAGES/kgeography.mo
share/locale/tr/LC_MESSAGES/kgeography.mo
share/locale/uk/LC_MESSAGES/kgeography.mo
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/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/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/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@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/en/kgeography
@dirrm share/apps/kgeography/flags/italy
@dirrm share/apps/kgeography/flags
diff --git a/games/klondike/pkg-plist b/games/klondike/pkg-plist
index bb79d727009a..5bcc8c72e6d3 100644
--- a/games/klondike/pkg-plist
+++ b/games/klondike/pkg-plist
@@ -68,4 +68,4 @@ share/games/klondike/CARDS/c_warnspace.xbm
@dirrm share/games/klondike/CARDS/
@dirrm share/games/klondike/SCORES/
@dirrm share/games/klondike/
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
diff --git a/games/kpictorial/pkg-plist b/games/kpictorial/pkg-plist
index a632ebbadb4e..4d78af201274 100644
--- a/games/kpictorial/pkg-plist
+++ b/games/kpictorial/pkg-plist
@@ -19,13 +19,13 @@ share/doc/HTML/en/kpictorial/common
@dirrm share/apps/kpictorial/icons
@dirrm share/doc/HTML/en/kpictorial
@dirrm share/apps/kpictorial
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor
+@dirrmtry share/applnk/Games
diff --git a/games/ktritoc/pkg-plist b/games/ktritoc/pkg-plist
index e296370952ae..9e61cd80b96c 100644
--- a/games/ktritoc/pkg-plist
+++ b/games/ktritoc/pkg-plist
@@ -68,5 +68,5 @@ share/icons/hicolor/48x48/apps/ktritoc.png
@dirrm share/apps/ktritoc/pics
@dirrm share/apps/ktritoc
@dirrm share/doc/HTML/en/ktritoc
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/48x48
diff --git a/games/kwappen/pkg-plist b/games/kwappen/pkg-plist
index bb396387e9c9..cfd99108aed6 100644
--- a/games/kwappen/pkg-plist
+++ b/games/kwappen/pkg-plist
@@ -42,33 +42,33 @@ share/icons/locolor/32x32/apps/kwappen.png
share/locale/de/LC_MESSAGES/kwappen.mo
share/locale/pt/LC_MESSAGES/kwappen.mo
share/locale/pt_BR/LC_MESSAGES/kwappen.mo
-@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/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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/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
+@dirrmtry share/icons
@dirrm share/doc/HTML/pt_BR/kwappen
-@unexec rmdir %D/share/doc/HTML/pt_BR 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt_BR
@dirrm share/doc/HTML/pt/kwappen
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/en/kwappen
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kwappen
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
@dirrm share/apps/kwappen
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/games/lincity-ng/pkg-plist b/games/lincity-ng/pkg-plist
index 04539298383f..5d4d415c63a6 100644
--- a/games/lincity-ng/pkg-plist
+++ b/games/lincity-ng/pkg-plist
@@ -975,7 +975,7 @@ share/applications/lincity-ng.desktop
%%DATADIR%%/sounds/WindowClose.wav
%%DATADIR%%/sounds/WindowOpen.wav
share/pixmaps/lincity-ng.png
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
@dirrm %%DATADIR%%/sounds
@dirrm %%DATADIR%%/opening
@dirrm %%DATADIR%%/music
@@ -1023,4 +1023,4 @@ share/pixmaps/lincity-ng.png
@dirrm %%DATADIR%%/fonts
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/linux-enemyterritory-tce/pkg-plist b/games/linux-enemyterritory-tce/pkg-plist
index ee32106c3a69..9abea519e8ab 100644
--- a/games/linux-enemyterritory-tce/pkg-plist
+++ b/games/linux-enemyterritory-tce/pkg-plist
@@ -16,5 +16,5 @@ lib/enemyterritory/tcetest/ui.mp.i386.so
%%PORTDOCS%%%%DOCSDIR%%/changelog.txt
%%PORTDOCS%%%%DOCSDIR%%/description.txt
@dirrm lib/enemyterritory/tcetest
-@unexec rmdir %D/lib/enemyterritory 2>/dev/null || true
+@dirrmtry lib/enemyterritory
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/linux-quake4/pkg-plist b/games/linux-quake4/pkg-plist
index 6d5676f87209..1468116d1ef9 100644
--- a/games/linux-quake4/pkg-plist
+++ b/games/linux-quake4/pkg-plist
@@ -375,7 +375,7 @@ bin/quake4
%%PORTDOCS%%%%DOCSDIR%%/README
@dirrm %%Q4DIR%%pb/htm
@dirrm %%Q4DIR%%pb
-@unexec rmdir %D/%%Q4DIR%%q4base 2>/dev/null || true
+@dirrmtry %%Q4DIR%%q4base
@unexec rmdir %D/%%Q4DIR%% 2>/dev/null || echo "Note: %D/%%Q4DIR%% not empty -- not deleted!"
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ENG/htm
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ENG/images
diff --git a/games/lm-solve/pkg-plist b/games/lm-solve/pkg-plist
index feb1c6c202c8..23662a3f6b36 100644
--- a/games/lm-solve/pkg-plist
+++ b/games/lm-solve/pkg-plist
@@ -19,4 +19,4 @@ bin/lm-solve
@dirrm %%SITE_PERL%%/Games/LMSolve/Tilt
@dirrm %%SITE_PERL%%/Games/LMSolve/Plank
@dirrm %%SITE_PERL%%/Games/LMSolve
-@unexec rmdir %D/%%SITE_PERL%%/Games 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/lucidlife/pkg-plist b/games/lucidlife/pkg-plist
index 8f06984fe9e9..ad707e925992 100644
--- a/games/lucidlife/pkg-plist
+++ b/games/lucidlife/pkg-plist
@@ -358,7 +358,7 @@ share/pixmaps/lucidlife.png
%%DOCSDIR%%/select.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/window.gif
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@dirrm %%DATADIR%%/patterns/lpa/synthesis
@dirrm %%DATADIR%%/patterns/lpa/spaceships
@dirrm %%DATADIR%%/patterns/lpa/space_fillers
diff --git a/games/monsterz/pkg-plist b/games/monsterz/pkg-plist
index 67dc98369463..b213f61920d3 100644
--- a/games/monsterz/pkg-plist
+++ b/games/monsterz/pkg-plist
@@ -21,4 +21,4 @@
@dirrm %%LINSTDIR%%/sound
@dirrm %%LINSTDIR%%/graphics
@dirrm %%LINSTDIR%%
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
diff --git a/games/mt_gtk_client/pkg-plist b/games/mt_gtk_client/pkg-plist
index c8916c07a941..a6de5dc9e247 100644
--- a/games/mt_gtk_client/pkg-plist
+++ b/games/mt_gtk_client/pkg-plist
@@ -3,6 +3,6 @@ share/locale/fr/LC_MESSAGES/mt_gtk_client.mo
%%DATADIR%%/data/maitretarot.png
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale
diff --git a/games/nethack32/pkg-plist b/games/nethack32/pkg-plist
index cdde3c3a69f8..15025aac704f 100644
--- a/games/nethack32/pkg-plist
+++ b/games/nethack32/pkg-plist
@@ -5,7 +5,7 @@ bin/%%HACKNAME%%
@exec chmod -R 775 %D/%%DATADIR%%
@exec chmod 2755 %D/%%DATADIR%%/%%HACKNAME%%
@exec chown games:games %D/%%DATADIR%%/save
-@unexec rmdir %D/%%DATADIR%%/save 2>/dev/null || true
+@dirrmtry %%DATADIR%%/save
%%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
%%DATADIR%%/pet_mark.xbm
%%DATADIR%%/rip.xpm
@@ -125,5 +125,5 @@ bin/%%HACKNAME%%
@exec touch %D/%%DATADIR%%/logfile && chmod 664 %D/%%DATADIR%%/logfile
@unexec [ -s %D/%%DATADIR%%/record ] || rm -f %D/%%DATADIR%%/record
@exec touch %D/%%DATADIR%%/record && chmod 664 %D/%%DATADIR%%/record
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/nethack33/pkg-plist b/games/nethack33/pkg-plist
index d036a3a836e4..4d661be32e45 100644
--- a/games/nethack33/pkg-plist
+++ b/games/nethack33/pkg-plist
@@ -5,7 +5,7 @@ bin/%%HACKNAME%%
@exec chmod -R 775 %D/%%DATADIR%%
@exec chmod 2755 %D/%%DATADIR%%/%%HACKNAME%%
@exec chown games:games %D/%%DATADIR%%/save
-@unexec rmdir %D/%%DATADIR%%/save 2>/dev/null || true
+@dirrmtry %%DATADIR%%/save
%%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
%%DATADIR%%/Arc-fila.lev
%%DATADIR%%/Arc-filb.lev
@@ -139,5 +139,5 @@ bin/%%HACKNAME%%
@exec touch %D/%%DATADIR%%/logfile && chmod 664 %D/%%DATADIR%%/logfile
@unexec [ -s %D/%%DATADIR%%/record ] || rm -f %D/%%DATADIR%%/record
@exec touch %D/%%DATADIR%%/record && chmod 664 %D/%%DATADIR%%/record
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/nethack34/pkg-plist b/games/nethack34/pkg-plist
index 442117563bf7..7a484f4e7dd4 100644
--- a/games/nethack34/pkg-plist
+++ b/games/nethack34/pkg-plist
@@ -5,7 +5,7 @@ bin/%%HACKNAME%%
@exec chmod -R 775 %D/%%HACKDIR%%
@exec chmod 2755 %D/%%HACKDIR%%/%%HACKNAME%%
@exec chown games:games %D/%%HACKDIR%%/save
-@unexec rmdir %D/%%HACKDIR%%/save 2>/dev/null || true
+@dirrmtry %%HACKDIR%%/save
%%HACKDIR%%/Arc-fila.lev
%%HACKDIR%%/Arc-filb.lev
%%HACKDIR%%/Arc-goal.lev
diff --git a/games/netpanzer/pkg-plist b/games/netpanzer/pkg-plist
index 85d08899bd80..a24c8d088dcb 100644
--- a/games/netpanzer/pkg-plist
+++ b/games/netpanzer/pkg-plist
@@ -9,4 +9,4 @@ share/applications/netpanzer.desktop
share/pixmaps/netpanzer.png
share/pixmaps/netpanzer.xpm
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/noegnud-data/pkg-plist b/games/noegnud-data/pkg-plist
index 339bfa72b7bf..43785eec718b 100644
--- a/games/noegnud-data/pkg-plist
+++ b/games/noegnud-data/pkg-plist
@@ -1542,25 +1542,25 @@ share/noegnud-0.8.0/data/widgetthemes/wooden/wooden_scrollbararea.theme
share/noegnud-0.8.0/data/widgetthemes/wooden/wooden_title.theme
share/noegnud-0.8.0/data/widgetthemes/wooden/wooden_title_active.theme
share/noegnud-0.8.0/data/widgetthemes/wooden/wooden_window.theme
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/title 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/shades 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/scrollbararea 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/scrollbar 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/minimap 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/default 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/buttonover 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden/button 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes/wooden 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/widgetthemes 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/variant-reference 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/tomb 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/tilesets/nethack 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/tilesets 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/textcolouring 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/minimap-fonts 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/lang 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/images 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/gui 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data/char 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/data 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0 2>/dev/null || true
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/title
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/shades
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/scrollbararea
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/scrollbar
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/minimap
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/default
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/buttonover
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden/button
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes/wooden
+@dirrmtry share/noegnud-0.8.0/data/widgetthemes
+@dirrmtry share/noegnud-0.8.0/data/variant-reference
+@dirrmtry share/noegnud-0.8.0/data/tomb
+@dirrmtry share/noegnud-0.8.0/data/tilesets/nethack
+@dirrmtry share/noegnud-0.8.0/data/tilesets
+@dirrmtry share/noegnud-0.8.0/data/textcolouring
+@dirrmtry share/noegnud-0.8.0/data/minimap-fonts
+@dirrmtry share/noegnud-0.8.0/data/lang
+@dirrmtry share/noegnud-0.8.0/data/images
+@dirrmtry share/noegnud-0.8.0/data/gui
+@dirrmtry share/noegnud-0.8.0/data/char
+@dirrmtry share/noegnud-0.8.0/data
+@dirrmtry share/noegnud-0.8.0
diff --git a/games/noegnud-littlehack/pkg-plist b/games/noegnud-littlehack/pkg-plist
index 82833d025ddf..4e4a4f6c23d1 100644
--- a/games/noegnud-littlehack/pkg-plist
+++ b/games/noegnud-littlehack/pkg-plist
@@ -9,6 +9,6 @@ share/noegnud-0.8.0/littlehack-0.0.1/record
share/noegnud-0.8.0/littlehack-0.0.1/recover
@exec chown games:bin %D/share/noegnud-0.8.0/littlehack-0.0.1
@exec chmod 775 %D/share/noegnud-0.8.0/littlehack-0.0.1
-@unexec rmdir %D/share/noegnud-0.8.0/littlehack-0.0.1/save 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/littlehack-0.0.1 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0 2>/dev/null || true
+@dirrmtry share/noegnud-0.8.0/littlehack-0.0.1/save
+@dirrmtry share/noegnud-0.8.0/littlehack-0.0.1
+@dirrmtry share/noegnud-0.8.0
diff --git a/games/noegnud-nethack-deet/pkg-plist b/games/noegnud-nethack-deet/pkg-plist
index 3b050bc6f0e3..721423459576 100644
--- a/games/noegnud-nethack-deet/pkg-plist
+++ b/games/noegnud-nethack-deet/pkg-plist
@@ -9,6 +9,6 @@ share/noegnud-0.8.0/nethack-3.4.2-deet/record
share/noegnud-0.8.0/nethack-3.4.2-deet/recover
@exec chown games:bin %D/share/noegnud-0.8.0/nethack-3.4.2-deet
@exec chmod 775 %D/share/noegnud-0.8.0/nethack-3.4.2-deet
-@unexec rmdir %D/share/noegnud-0.8.0/nethack-3.4.2-deet/save 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/nethack-3.4.2-deet 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0 2>/dev/null || true
+@dirrmtry share/noegnud-0.8.0/nethack-3.4.2-deet/save
+@dirrmtry share/noegnud-0.8.0/nethack-3.4.2-deet
+@dirrmtry share/noegnud-0.8.0
diff --git a/games/noegnud-nethack/pkg-plist b/games/noegnud-nethack/pkg-plist
index 52c7c45f7fcf..fc55d1537cfe 100644
--- a/games/noegnud-nethack/pkg-plist
+++ b/games/noegnud-nethack/pkg-plist
@@ -9,6 +9,6 @@ share/noegnud-0.8.0/nethack-3.4.3/record
share/noegnud-0.8.0/nethack-3.4.3/recover
@exec chown games:bin %D/share/noegnud-0.8.0/nethack-3.4.3
@exec chmod 775 %D/share/noegnud-0.8.0/nethack-3.4.3
-@unexec rmdir %D/share/noegnud-0.8.0/nethack-3.4.3/save 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/nethack-3.4.3 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0 2>/dev/null || true
+@dirrmtry share/noegnud-0.8.0/nethack-3.4.3/save
+@dirrmtry share/noegnud-0.8.0/nethack-3.4.3
+@dirrmtry share/noegnud-0.8.0
diff --git a/games/noegnud-slashem/pkg-plist b/games/noegnud-slashem/pkg-plist
index 07dc6230f237..d70c3f40d8db 100644
--- a/games/noegnud-slashem/pkg-plist
+++ b/games/noegnud-slashem/pkg-plist
@@ -181,6 +181,6 @@ share/noegnud-0.8.0/slashem-0.0.6E4F8/wizhelp
share/noegnud-0.8.0/slashem-0.0.6E4F8/yeenoghu.lev
@exec chown games:bin %D/share/noegnud-0.8.0/slashem-0.0.6E4F8
@exec chmod 775 %D/share/noegnud-0.8.0/slashem-0.0.6E4F8
-@unexec rmdir %D/share/noegnud-0.8.0/slashem-0.0.6E4F8/save 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0/slashem-0.0.6E4F8 2>/dev/null || true
-@unexec rmdir %D/share/noegnud-0.8.0 2>/dev/null || true
+@dirrmtry share/noegnud-0.8.0/slashem-0.0.6E4F8/save
+@dirrmtry share/noegnud-0.8.0/slashem-0.0.6E4F8
+@dirrmtry share/noegnud-0.8.0
diff --git a/games/p5-Games-AlphaBeta/pkg-plist b/games/p5-Games-AlphaBeta/pkg-plist
index b8f8404f2fbd..39f67e72aa02 100644
--- a/games/p5-Games-AlphaBeta/pkg-plist
+++ b/games/p5-Games-AlphaBeta/pkg-plist
@@ -6,4 +6,4 @@ bin/othello-demo
%%SITE_PERL%%/Games/Sequential/Position.pm
@dirrm %%SITE_PERL%%/Games/AlphaBeta
@dirrm %%SITE_PERL%%/Games/Sequential
-@unexec rmdir %D/%%SITE_PERL%%/Games 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Bingo-Bot/pkg-plist b/games/p5-Games-Bingo-Bot/pkg-plist
index 6bb4ee69b7da..51e8c5924f27 100644
--- a/games/p5-Games-Bingo-Bot/pkg-plist
+++ b/games/p5-Games-Bingo-Bot/pkg-plist
@@ -3,7 +3,7 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/bingobot.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo/Bot
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Games/Bingo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Games 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
+@dirrmtry %%SITE_PERL%%/Games/Bingo
+@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Bingo-Print/pkg-plist b/games/p5-Games-Bingo-Print/pkg-plist
index 2d6cee377ba0..fc210e3f8162 100644
--- a/games/p5-Games-Bingo-Print/pkg-plist
+++ b/games/p5-Games-Bingo-Print/pkg-plist
@@ -3,7 +3,7 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/bingo_print.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo/Print
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Games/Bingo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Games 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Bingo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
+@dirrmtry %%SITE_PERL%%/Games/Bingo
+@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Bingo/pkg-plist b/games/p5-Games-Bingo/pkg-plist
index 17b6388b48d3..293d71929d56 100644
--- a/games/p5-Games-Bingo/pkg-plist
+++ b/games/p5-Games-Bingo/pkg-plist
@@ -6,4 +6,4 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/bingo.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/Games/Bingo
-@unexec rmdir %D/%%SITE_PERL%%/Games 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/p5-Games-Dice/pkg-plist b/games/p5-Games-Dice/pkg-plist
index c1d04eb8a7a3..c846372751ff 100644
--- a/games/p5-Games-Dice/pkg-plist
+++ b/games/p5-Games-Dice/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Games/Dice.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Dice/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games/Dice
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Games 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Games 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Games
+@dirrmtry %%SITE_PERL%%/Games
diff --git a/games/pvpgn/pkg-plist b/games/pvpgn/pkg-plist
index 3878a22cf31d..d3e9405d1f02 100644
--- a/games/pvpgn/pkg-plist
+++ b/games/pvpgn/pkg-plist
@@ -119,6 +119,6 @@ sbin/bntrackd
@dirrm %%DATADIR%%/teams
@dirrm %%DATADIR%%/users
@dirrm %%DATADIR%%/userscdb
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
@dirrm etc/pvpgn
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/pydance/pkg-plist b/games/pydance/pkg-plist
index 8cd7e88cf8e4..56e4a4715410 100644
--- a/games/pydance/pkg-plist
+++ b/games/pydance/pkg-plist
@@ -376,7 +376,7 @@ share/games/pydance/util.py
@dirrm share/games/pydance/songs
@dirrm share/games/pydance/images
@dirrm share/games/pydance
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/games/pysol-cardsets/pkg-plist b/games/pysol-cardsets/pkg-plist
index 44869a7873b0..26f66a47a29b 100644
--- a/games/pysol-cardsets/pkg-plist
+++ b/games/pysol-cardsets/pkg-plist
@@ -6049,5 +6049,5 @@ share/pysol/cardset-xskat-german/shadow13.gif
@dirrm share/pysol/cardset-1815
@dirrm share/pysol/cardset-1750
@dirrm share/pysol/cardset-1567
-@unexec rmdir %D/share/pysol/data 2>/dev/null || true
-@unexec rmdir %D/share/pysol 2>/dev/null || true
+@dirrmtry share/pysol/data
+@dirrmtry share/pysol
diff --git a/games/pysol-music/pkg-plist b/games/pysol-music/pkg-plist
index 61fda394374e..f8c68ce7a00b 100644
--- a/games/pysol-music/pkg-plist
+++ b/games/pysol-music/pkg-plist
@@ -4,5 +4,5 @@ share/pysol/music/Past_and_Future.COPYRIGHT
share/pysol/music/Past_and_Future.it
share/pysol/music/Subsequential.COPYRIGHT
share/pysol/music/Subsequential.mod
-@unexec rmdir %D/share/pysol/music 2>/dev/null || true
-@unexec rmdir %D/share/pysol 2>/dev/null || true
+@dirrmtry share/pysol/music
+@dirrmtry share/pysol
diff --git a/games/q3base/pkg-plist b/games/q3base/pkg-plist
index 3a9ffc01f7dd..cae9f01cd4f0 100644
--- a/games/q3base/pkg-plist
+++ b/games/q3base/pkg-plist
@@ -7,8 +7,8 @@ lib/quake3/missionpack/qagame.so
lib/quake3/missionpack/ui.so
@dirrm lib/quake3/baseq3
@dirrm lib/quake3/missionpack
-@unexec rmdir %D/lib/quake3 2>/dev/null || true
-@unexec rmdir %D/share/quake3/q3base 2>/dev/null || true
-@unexec rmdir %D/share/quake3/missionpack 2>/dev/null || true
-@unexec rmdir %D/share/quake3/baseq3 2>/dev/null || true
-@unexec rmdir %D/share/quake3 2>/dev/null || true
+@dirrmtry lib/quake3
+@dirrmtry share/quake3/q3base
+@dirrmtry share/quake3/missionpack
+@dirrmtry share/quake3/baseq3
+@dirrmtry share/quake3
diff --git a/games/quake2-data/pkg-plist b/games/quake2-data/pkg-plist
index 27243575bf49..779fadba2c5f 100644
--- a/games/quake2-data/pkg-plist
+++ b/games/quake2-data/pkg-plist
@@ -338,7 +338,7 @@
@dirrm %%DATADIR%%/baseq2/players/cyborg
@dirrm %%DATADIR%%/baseq2/players/crakhor
@dirrm %%DATADIR%%/baseq2/players
-@unexec rmdir %D/%%DATADIR%%/baseq2 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/rogue 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/xatrix 2>/dev/null || true
+@dirrmtry %%DATADIR%%/baseq2
+@dirrmtry %%DATADIR%%/rogue
+@dirrmtry %%DATADIR%%/xatrix
@unexec rmdir %D/%%DATADIR%% 2>/dev/null || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
diff --git a/games/quake3-data/pkg-plist b/games/quake3-data/pkg-plist
index 126fe66236ad..641e635ba91b 100644
--- a/games/quake3-data/pkg-plist
+++ b/games/quake3-data/pkg-plist
@@ -10,7 +10,7 @@
%%TEAMARENA%%%%DATADIR%%/missionpack/pak2.pk3
%%TEAMARENA%%%%DATADIR%%/missionpack/pak3.pk3
share/pixmaps/quake3.xpm
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
%%TEAMARENA%%@unexec rmdir %D/%%DATADIR%%/missionpack 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/baseq3 2>/dev/null || true
+@dirrmtry %%DATADIR%%/baseq3
@unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
diff --git a/games/quake3-q3base/pkg-plist b/games/quake3-q3base/pkg-plist
index 3a9ffc01f7dd..cae9f01cd4f0 100644
--- a/games/quake3-q3base/pkg-plist
+++ b/games/quake3-q3base/pkg-plist
@@ -7,8 +7,8 @@ lib/quake3/missionpack/qagame.so
lib/quake3/missionpack/ui.so
@dirrm lib/quake3/baseq3
@dirrm lib/quake3/missionpack
-@unexec rmdir %D/lib/quake3 2>/dev/null || true
-@unexec rmdir %D/share/quake3/q3base 2>/dev/null || true
-@unexec rmdir %D/share/quake3/missionpack 2>/dev/null || true
-@unexec rmdir %D/share/quake3/baseq3 2>/dev/null || true
-@unexec rmdir %D/share/quake3 2>/dev/null || true
+@dirrmtry lib/quake3
+@dirrmtry share/quake3/q3base
+@dirrmtry share/quake3/missionpack
+@dirrmtry share/quake3/baseq3
+@dirrmtry share/quake3
diff --git a/games/rocksndiamonds/pkg-plist b/games/rocksndiamonds/pkg-plist
index 23f19e42750c..d02fda4bbe09 100644
--- a/games/rocksndiamonds/pkg-plist
+++ b/games/rocksndiamonds/pkg-plist
@@ -839,7 +839,7 @@ bin/rocksndiamonds
@dirrm %%DATADIR%%/levels
@dirrm %%DATADIR%%/graphics/gfx_classic
@dirrm %%DATADIR%%/graphics
-@unexec rmdir %D/%%DATADIR%%/scores 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/scores
+@dirrmtry %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/elements
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/rtb/pkg-plist b/games/rtb/pkg-plist
index 03d0a77997c7..6234e1024c43 100644
--- a/games/rtb/pkg-plist
+++ b/games/rtb/pkg-plist
@@ -152,10 +152,10 @@ share/locale/ja/LC_MESSAGES/RealTimeBattle.mo
share/locale/pl/LC_MESSAGES/RealTimeBattle.mo
share/locale/pt/LC_MESSAGES/RealTimeBattle.mo
share/locale/sv/LC_MESSAGES/RealTimeBattle.mo
-@unexec rmdir %D/share/locale/en@boldquot/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en@boldquot 2>/dev/null || true
-@unexec rmdir %D/share/locale/en@quot/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en@quot 2>/dev/null || true
+@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+@dirrmtry share/locale/en@boldquot
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/en@quot
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/RealTimeBattle/Robots/xt-bot
@dirrm lib/RealTimeBattle/Robots/thomas2
diff --git a/games/rtcw/pkg-plist b/games/rtcw/pkg-plist
index a1fb9bf09a4f..971561d9b864 100644
--- a/games/rtcw/pkg-plist
+++ b/games/rtcw/pkg-plist
@@ -222,9 +222,9 @@ share/pixmaps/WolfSP.xpm
@dirrm %%DATADIR%%/pb/htm
@dirrm %%DATADIR%%/pb
@dirrm %%DATADIR%%/main/scripts
-@unexec rmdir %D/%%DATADIR%%/main 2>/dev/null || true
+@dirrmtry %%DATADIR%%/main
@unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster/players
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster/admins
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Docs/PunkBuster
diff --git a/games/scorched3d/pkg-plist b/games/scorched3d/pkg-plist
index 76f4055c247c..7682f97fddfe 100644
--- a/games/scorched3d/pkg-plist
+++ b/games/scorched3d/pkg-plist
@@ -1158,7 +1158,7 @@ games/scorched3d/documentation/html/serverfiles.html
@dirrm games/scorched3d/data/tanks/tiger2
@dirrm games/scorched3d/data/tanks/thel
@dirrm games/scorched3d/data/tanks/t90
-@unexec rmdir %D/games/scorched3d/data/tanks/sonicring 2>/dev/null || true
+@dirrmtry games/scorched3d/data/tanks/sonicring
@dirrm games/scorched3d/data/tanks/sonic
@dirrm games/scorched3d/data/tanks/sa6
@dirrm games/scorched3d/data/tanks/photoncannon
@@ -1179,7 +1179,7 @@ games/scorched3d/documentation/html/serverfiles.html
@dirrm games/scorched3d/data/tanks/bm13
@dirrm games/scorched3d/data/tanks/bender
@dirrm games/scorched3d/data/tanks/battleship
-@unexec rmdir %D/games/scorched3d/data/tanks/CannonTower 2>/dev/null || true
+@dirrmtry games/scorched3d/data/tanks/CannonTower
@dirrm games/scorched3d/data/tanks/CF-104
@dirrm games/scorched3d/data/tanks
@dirrm games/scorched3d/data/talk/polish
@@ -1207,44 +1207,44 @@ games/scorched3d/documentation/html/serverfiles.html
@dirrm games/scorched3d/data/globalmods/apoc/data/landscapes/masks
@dirrm games/scorched3d/data/globalmods/apoc/data/landscapes
@dirrm games/scorched3d/data/globalmods/apoc/data/accessories/weapons
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/trailorhouse1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/store1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/smalloak 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/skyscraper1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/shotgun 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/shockrocket 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/shockbomblet 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/remorcebomblet 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/redhornet 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/officeplaza1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/office3 2>/dev/null || true
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/trailorhouse1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/store1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/smalloak
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/skyscraper1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/shotgun
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/shockrocket
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/shockbomblet
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/remorcebomblet
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/redhornet
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/officeplaza1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/office3
@dirrm games/scorched3d/data/globalmods/apoc/data/accessories/objects
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/napalm 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/m7a3grenade 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/logcabin1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/house1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/grenade 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/gasstation1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/fusionbarrel 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/farm1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/factory1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/deer 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/common 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/cityoffice 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/church1 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/cactus 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/bullet 2>/dev/null || true
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/napalm
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/m7a3grenade
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/logcabin1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/house1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/grenade
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/gasstation1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/fusionbarrel
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/farm1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/factory1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/deer
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/common
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/cityoffice
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/church1
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/cactus
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/bullet
@dirrm games/scorched3d/data/globalmods/apoc/data/accessories/buildings
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/brownboulders 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/boulders 2>/dev/null || true
-@unexec rmdir %D/games/scorched3d/data/globalmods/apoc/data/accessories/50cal 2>/dev/null || true
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/brownboulders
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/boulders
+@dirrmtry games/scorched3d/data/globalmods/apoc/data/accessories/50cal
@dirrm games/scorched3d/data/globalmods/apoc/data/accessories
@dirrm games/scorched3d/data/globalmods/apoc/data
@dirrm games/scorched3d/data/globalmods/apoc
@dirrm games/scorched3d/data/globalmods
@dirrm games/scorched3d/data/fonts
@dirrm games/scorched3d/data/avatars
-@unexec rmdir %D/games/scorched3d/data/acessories 2>/dev/null || true
+@dirrmtry games/scorched3d/data/acessories
@dirrm games/scorched3d/data/accessories/v2missile
@dirrm games/scorched3d/data/accessories/teleport
@dirrm games/scorched3d/data/accessories/sonicring
@@ -1275,4 +1275,4 @@ games/scorched3d/documentation/html/serverfiles.html
@dirrm games/scorched3d/data/accessories
@dirrm games/scorched3d/data
@dirrm games/scorched3d
-@unexec rmdir %D/games 2>/dev/null || true
+@dirrmtry games
diff --git a/games/six/pkg-plist b/games/six/pkg-plist
index 45a4c4ceefbd..55c89389710b 100644
--- a/games/six/pkg-plist
+++ b/games/six/pkg-plist
@@ -21,5 +21,5 @@ share/icons/locolor/32x32/apps/six.png
share/mimelnk/application/vnd.kde.six.desktop
@dirrm share/doc/HTML/en/six
@dirrm share/apps/six
-@unexec rmdir %D/share/applnk/Games/Board 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Games 2>/dev/null || true
+@dirrmtry share/applnk/Games/Board
+@dirrmtry share/applnk/Games
diff --git a/games/stvef-server/pkg-plist b/games/stvef-server/pkg-plist
index 013fba936c92..a0d30c9e7bbc 100644
--- a/games/stvef-server/pkg-plist
+++ b/games/stvef-server/pkg-plist
@@ -4,4 +4,4 @@ games/stvef/readme.txt
games/stvef/baseEF/server.cfg
@dirrm games/stvef/baseEF
@dirrm games/stvef
-@unexec rmdir %D/games 2>/dev/null || true
+@dirrmtry games
diff --git a/games/supertux/pkg-plist b/games/supertux/pkg-plist
index 4459b01b887e..4f9e6b88a6a6 100644
--- a/games/supertux/pkg-plist
+++ b/games/supertux/pkg-plist
@@ -794,4 +794,4 @@ share/pixmaps/supertux.png
@dirrm %%DATADIR%%/images/background
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/games/torcs/pkg-plist b/games/torcs/pkg-plist
index 7ee0a83ed0b0..a8f88fc87399 100644
--- a/games/torcs/pkg-plist
+++ b/games/torcs/pkg-plist
@@ -2810,7 +2810,7 @@ lib/torcs/trackgen-bin
@dirrm %%TORCSDIR%%/cars/155-DTM
@dirrm %%TORCSDIR%%/cars
@dirrm %%TORCSDIR%%
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
@dirrm lib/torcs/modules/track
@dirrm lib/torcs/modules/telemetry
@dirrm lib/torcs/modules/simu
diff --git a/games/tornado/pkg-plist b/games/tornado/pkg-plist
index 3ef04beb4087..5b715cf732c5 100644
--- a/games/tornado/pkg-plist
+++ b/games/tornado/pkg-plist
@@ -1,5 +1,5 @@
bin/tornado
-@unexec rmdir %D/share/games 2>/dev/null || true
+@dirrmtry share/games
share/games/tornado.scores
share/locale/de/LC_MESSAGES/tornado.mo
share/locale/es/LC_MESSAGES/tornado.mo
diff --git a/games/tuxpaint/pkg-plist b/games/tuxpaint/pkg-plist
index e9b85a75b7fe..6e70066f02e1 100644
--- a/games/tuxpaint/pkg-plist
+++ b/games/tuxpaint/pkg-plist
@@ -681,14 +681,14 @@ share/pixmaps/tuxpaint.png
@dirrm %%DATADIR%%/fonts
@dirrm %%DATADIR%%/brushes
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw 2>/dev/null || true
-@unexec rmdir %D/share/locale/gos/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gos 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/tlh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tlh 2>/dev/null || true
+@dirrmtry share/locale/sw/LC_MESSAGES
+@dirrmtry share/locale/sw
+@dirrmtry share/locale/gos/LC_MESSAGES
+@dirrmtry share/locale/gos
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/tlh/LC_MESSAGES
+@dirrmtry share/locale/tlh
@dirrm %%DOCSDIR%%/zh_tw/html
@dirrm %%DOCSDIR%%/zh_tw
@dirrm %%DOCSDIR%%/zh_cn
@@ -744,4 +744,4 @@ share/pixmaps/tuxpaint.png
@dirrm %%DOCSDIR%%/af
@dirrm %%DOCSDIR%%
@dirrm etc/tuxpaint
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
diff --git a/games/typespeed/pkg-plist b/games/typespeed/pkg-plist
index 8ca1337a7468..1581444d6fa8 100644
--- a/games/typespeed/pkg-plist
+++ b/games/typespeed/pkg-plist
@@ -16,4 +16,4 @@ lib/typespeed/words.portuguese
lib/typespeed/words.prog
lib/typespeed/words.spanish
lib/typespeed/words.unix
-@unexec rmdir %D/lib/typespeed 2>/dev/null || true
+@dirrmtry lib/typespeed
diff --git a/games/viruskiller/pkg-plist b/games/viruskiller/pkg-plist
index 0e25304b3ff2..323031bf5b8c 100644
--- a/games/viruskiller/pkg-plist
+++ b/games/viruskiller/pkg-plist
@@ -13,5 +13,5 @@ share/pixmaps/viruskiller.png
%%PORTDOCS%%%%DOCSDIR%%/virus3.gif
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 8f9b4516823b..4028e099c5b7 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -4015,14 +4015,14 @@ share/locale/tr/LC_MESSAGES/wesnoth.mo
@dirrm %%DATADIR%%/data/campaigns
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/la/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/la 2> /dev/null || true
-@unexec rmdir %D/man/sv/man6 2> /dev/null || true
-@unexec rmdir %D/man/sv 2> /dev/null || true
-@unexec rmdir %D/man/hu/man6 2> /dev/null || true
-@unexec rmdir %D/man/hu 2> /dev/null || true
-@unexec rmdir %D/man/de/man6 2> /dev/null || true
-@unexec rmdir %D/man/de 2> /dev/null || true
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
+@dirrmtry man/sv/man6
+@dirrmtry man/sv
+@dirrmtry man/hu/man6
+@dirrmtry man/hu
+@dirrmtry man/de/man6
+@dirrmtry man/de
%%GNOME:%%share/gnome/applications/wesnoth.desktop
%%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png
diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist
index 8f9b4516823b..4028e099c5b7 100644
--- a/games/wesnoth/pkg-plist
+++ b/games/wesnoth/pkg-plist
@@ -4015,14 +4015,14 @@ share/locale/tr/LC_MESSAGES/wesnoth.mo
@dirrm %%DATADIR%%/data/campaigns
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/la/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/la 2> /dev/null || true
-@unexec rmdir %D/man/sv/man6 2> /dev/null || true
-@unexec rmdir %D/man/sv 2> /dev/null || true
-@unexec rmdir %D/man/hu/man6 2> /dev/null || true
-@unexec rmdir %D/man/hu 2> /dev/null || true
-@unexec rmdir %D/man/de/man6 2> /dev/null || true
-@unexec rmdir %D/man/de 2> /dev/null || true
+@dirrmtry share/locale/la/LC_MESSAGES
+@dirrmtry share/locale/la
+@dirrmtry man/sv/man6
+@dirrmtry man/sv
+@dirrmtry man/hu/man6
+@dirrmtry man/hu
+@dirrmtry man/de/man6
+@dirrmtry man/de
%%GNOME:%%share/gnome/applications/wesnoth.desktop
%%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png
diff --git a/games/xarchon/pkg-plist b/games/xarchon/pkg-plist
index 5e53a2fb7732..52d4fc740684 100644
--- a/games/xarchon/pkg-plist
+++ b/games/xarchon/pkg-plist
@@ -485,9 +485,9 @@ share/xarchon/xarchon.default
@dirrm share/xarchon/archon/wav/side/dark
@dirrm share/xarchon/archon/wav/side
@dirrm share/xarchon/archon/wav/generic
-@unexec rmdir %D/share/xarchon/archon/wav/actor/weapon 2>/dev/null || true
-@unexec rmdir %D/share/xarchon/archon/wav/actor/piece 2>/dev/null || true
-@unexec rmdir %D/share/xarchon/archon/wav/actor 2>/dev/null || true
+@dirrmtry share/xarchon/archon/wav/actor/weapon
+@dirrmtry share/xarchon/archon/wav/actor/piece
+@dirrmtry share/xarchon/archon/wav/actor
@dirrm share/xarchon/archon/wav
@dirrm share/xarchon/archon/floor
@dirrm share/xarchon/archon/cursor
diff --git a/games/xfce4-toys/pkg-plist b/games/xfce4-toys/pkg-plist
index 4f7bf0be8baf..71c6da78473b 100644
--- a/games/xfce4-toys/pkg-plist
+++ b/games/xfce4-toys/pkg-plist
@@ -73,11 +73,11 @@ share/xfce4/tips/tips.dat
@dirrm share/xfce4/eyes/themes
@dirrm share/xfce4/eyes
@dirrm share/xfce4/tips
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true
+@dirrmtry share/xfce4
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
diff --git a/games/xqf/pkg-plist b/games/xqf/pkg-plist
index 91ee65b8ae31..192730e26f4c 100644
--- a/games/xqf/pkg-plist
+++ b/games/xqf/pkg-plist
@@ -136,4 +136,4 @@ share/pixmaps/xqf_48x48_2.png
@dirrm %%DATADIR%%/default
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/games/xshisen/pkg-plist b/games/xshisen/pkg-plist
index 87a5589e81a3..df3786b4af00 100644
--- a/games/xshisen/pkg-plist
+++ b/games/xshisen/pkg-plist
@@ -77,7 +77,7 @@ lib/X11/ja_JP.eucJP/app-defaults/XShisen
@dirrm %%DATADIR%%/s2
@dirrm %%DATADIR%%/s1
@dirrm %%DATADIR%%
-@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true
+@dirrmtry lib/X11/ja_JP.eucJP/app-defaults
+@dirrmtry lib/X11/ja_JP.eucJP
@exec [ -d %D/lib/X11/ja_JP.EUC/ -a -d %D/lib/X11/ja_JP.EUC/app-defaults ] && ln -s %D/lib/X11/ja_JP.eucJP/app-defaults/XShisen %D/lib/X11/ja_JP.EUC/app-defaults || true
@unexec rm %D/lib/X11/ja_JP.EUC/app-defaults/XShisen 2>/dev/null || true
diff --git a/german/kheisereg/pkg-plist b/german/kheisereg/pkg-plist
index e0f2c2db2cb5..d2b0a99b526f 100644
--- a/german/kheisereg/pkg-plist
+++ b/german/kheisereg/pkg-plist
@@ -22,24 +22,24 @@ share/icons/hicolor/48x48/apps/kheisereg.png
share/icons/locolor/16x16/apps/kheisereg.png
share/icons/locolor/32x32/apps/kheisereg.png
share/locale/de/LC_MESSAGES/kheisereg.mo
-@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/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@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/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/kheisereg
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kheisereg
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
@dirrm share/apps/kheisereg/pics
@dirrm share/apps/kheisereg/icons/hicolor/32x32/actions
@dirrm share/apps/kheisereg/icons/hicolor/32x32
@@ -50,6 +50,6 @@ share/locale/de/LC_MESSAGES/kheisereg.mo
@dirrm share/apps/kheisereg/icons/hicolor
@dirrm share/apps/kheisereg/icons
@dirrm share/apps/kheisereg
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/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
diff --git a/irc/anope/pkg-plist b/irc/anope/pkg-plist
index d971686a6365..d841f4be1f09 100644
--- a/irc/anope/pkg-plist
+++ b/irc/anope/pkg-plist
@@ -17,9 +17,9 @@ libexec/anope/listnicks
%%DATADIR%%/languages/ru
%%DATADIR%%/languages/tr
%%DATADIR%%/tables.sql
-@unexec rmdir %D/%%DATADIR%%/logs 2>/dev/null || true
+@dirrmtry %%DATADIR%%/logs
@dirrm %%DATADIR%%/languages
-@unexec rmdir %D/%%DATADIR%%/backups 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/backups
+@dirrmtry %%DATADIR%%
@dirrm libexec/anope
@dirrm lib/anope
diff --git a/irc/bopm/pkg-plist b/irc/bopm/pkg-plist
index e8f6fb58accf..f49f9a7a9996 100644
--- a/irc/bopm/pkg-plist
+++ b/irc/bopm/pkg-plist
@@ -11,4 +11,4 @@ lib/libopm.la
lib/libopm.a
@exec mkdir -m 755 /var/log/bopm
@exec chown bopm:bopm /var/log/bopm
-@unexec rmdir %D/var/log/bopm 2>/dev/null || true
+@dirrmtry var/log/bopm
diff --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist
index ba64f46aec34..fee61512922c 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -183,4 +183,4 @@ lib/eggdrop/wire.so
@dirrm %%DATADIR%%/language
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/text
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
index 165c8efa3b9b..1704f980d9cf 100644
--- a/irc/epic5/pkg-plist
+++ b/irc/epic5/pkg-plist
@@ -112,6 +112,6 @@ libexec/wserv4
%%DATADIR%%/script/window
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec mkdir -p %D/%%DATADIR%%/help
-@unexec rmdir %D/%%DATADIR%%/help 2>/dev/null || true
+@dirrmtry %%DATADIR%%/help
@dirrm %%DATADIR%%/script
@dirrm %%DATADIR%%
diff --git a/irc/insub/pkg-plist b/irc/insub/pkg-plist
index 589b9d5fb5b3..465d4c169361 100644
--- a/irc/insub/pkg-plist
+++ b/irc/insub/pkg-plist
@@ -58,7 +58,7 @@ share/cows/wtf-pony.cow
share/cows/wtf.cow
share/cows/wtf2.cow
share/cows/zig.cow
-@unexec rmdir %D/share/cows 2>/dev/null || true
+@dirrmtry share/cows
share/irssi/scripts/insub.pl
-@unexec rmdir %D/share/irssi/scripts 2>/dev/null || true
-@unexec rmdir %D/share/irssi 2>/dev/null || true
+@dirrmtry share/irssi/scripts
+@dirrmtry share/irssi
diff --git a/irc/ircd-hybrid-ru/pkg-plist b/irc/ircd-hybrid-ru/pkg-plist
index 1e44ca918581..8bbb6100cc1f 100644
--- a/irc/ircd-hybrid-ru/pkg-plist
+++ b/irc/ircd-hybrid-ru/pkg-plist
@@ -332,5 +332,5 @@ help/opers/whowas
@exec mkdir -m 755 /var/log/ircd-hybrid-ru
@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru/codepage 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true
+@dirrmtry etc/ircd-hybrid-ru/codepage
+@dirrmtry etc/ircd-hybrid-ru
diff --git a/irc/kmyirc/pkg-plist b/irc/kmyirc/pkg-plist
index 928e6e828321..1e0972297016 100644
--- a/irc/kmyirc/pkg-plist
+++ b/irc/kmyirc/pkg-plist
@@ -53,10 +53,10 @@ share/locale/pt_BR/LC_MESSAGES/kmyirc.mo
@dirrm share/apps/kmyirc/icons
@dirrm share/apps/kmyirc/pics
@dirrm share/apps/kmyirc
-@unexec rmdir %D/share/applnk/Internet 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/config 2>/dev/null || true
+@dirrmtry share/applnk/Internet
+@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/config
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index b41320acb687..0eb53fab5073 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -250,68 +250,68 @@ share/locale/tr/LC_MESSAGES/konversation.mo
share/locale/zh_CN/LC_MESSAGES/konversation.mo
share/services/konvirc.protocol
share/services/konvirc6.protocol
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@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/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/crystalsvg/scalable/actions
+@dirrmtry share/icons/crystalsvg/scalable
+@dirrmtry share/icons/crystalsvg/32x32/actions
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/actions
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/actions
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/konversation
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/pt/konversation
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/nl/konversation
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
@dirrm share/doc/HTML/it/konversation
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/et/konversation
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/en/konversation
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/da/konversation
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
@dirrm share/apps/konversation/themes/square
@dirrm share/apps/konversation/themes/smiling
@dirrm share/apps/konversation/themes/default
@@ -322,7 +322,7 @@ share/services/konvirc6.protocol
@dirrm share/apps/konversation/scripts
@dirrm share/apps/konversation/images
@dirrm share/apps/konversation
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@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/kconf_update
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/irc/konversation/pkg-plist b/irc/konversation/pkg-plist
index b41320acb687..0eb53fab5073 100644
--- a/irc/konversation/pkg-plist
+++ b/irc/konversation/pkg-plist
@@ -250,68 +250,68 @@ share/locale/tr/LC_MESSAGES/konversation.mo
share/locale/zh_CN/LC_MESSAGES/konversation.mo
share/services/konvirc.protocol
share/services/konvirc6.protocol
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@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/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/crystalsvg/scalable/actions
+@dirrmtry share/icons/crystalsvg/scalable
+@dirrmtry share/icons/crystalsvg/32x32/actions
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/actions
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/actions
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/konversation
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/pt/konversation
-@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt
@dirrm share/doc/HTML/nl/konversation
-@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true
+@dirrmtry share/doc/HTML/nl
@dirrm share/doc/HTML/it/konversation
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/et/konversation
-@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
+@dirrmtry share/doc/HTML/et
@dirrm share/doc/HTML/en/konversation
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/da/konversation
-@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/da
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
@dirrm share/apps/konversation/themes/square
@dirrm share/apps/konversation/themes/smiling
@dirrm share/apps/konversation/themes/default
@@ -322,7 +322,7 @@ share/services/konvirc6.protocol
@dirrm share/apps/konversation/scripts
@dirrm share/apps/konversation/images
@dirrm share/apps/konversation
-@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true
-@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/kconf_update
+@dirrmtry share/apps
+@dirrmtry share/applications/kde
+@dirrmtry share/applications
diff --git a/irc/kwirc/pkg-plist b/irc/kwirc/pkg-plist
index 3182a80840bd..3555343223c3 100644
--- a/irc/kwirc/pkg-plist
+++ b/irc/kwirc/pkg-plist
@@ -39,30 +39,30 @@ share/icons/hicolor/22x22/apps/kwirc.png
share/icons/hicolor/32x32/apps/kwirc.png
share/icons/hicolor/48x48/apps/kwirc.png
share/icons/hicolor/64x64/apps/kwirc.png
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale 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 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale
+@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
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/kwirc
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config.kcfg
@dirrm share/apps/kwirc/themes
@dirrm share/apps/kwirc/smileys
@dirrm share/apps/kwirc/scripts
@dirrm share/apps/kwirc/icons
@dirrm share/apps/kwirc
-@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/irc/p5-IRC/pkg-plist b/irc/p5-IRC/pkg-plist
index c825b379247d..5cdbc71e7e1a 100644
--- a/irc/p5-IRC/pkg-plist
+++ b/irc/p5-IRC/pkg-plist
@@ -6,7 +6,7 @@
%%SITE_PERL%%/Net/IRC/EventQueue/Entry.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IRC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IRC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
@dirrm %%SITE_PERL%%/Net/IRC/EventQueue
@dirrm %%SITE_PERL%%/Net/IRC
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/irc/p5-POE-Component-IRC-Object/pkg-plist b/irc/p5-POE-Component-IRC-Object/pkg-plist
index 75ac361b80eb..83561b4b4d0d 100644
--- a/irc/p5-POE-Component-IRC-Object/pkg-plist
+++ b/irc/p5-POE-Component-IRC-Object/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object/.packlist
%%SITE_PERL%%/POE/Component/IRC/Object.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC/Object
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/IRC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component/IRC
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
%%PORTDOCS%%%%EXAMPLESDIR%%/elizabot.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/p5-POE-Component-IRC/pkg-plist b/irc/p5-POE-Component-IRC/pkg-plist
index 37464adf60c9..29122b676dea 100644
--- a/irc/p5-POE-Component-IRC/pkg-plist
+++ b/irc/p5-POE-Component-IRC/pkg-plist
@@ -25,12 +25,12 @@
%%EXAMPLESDIR%%/tinyurl.pl
@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IRC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Filter
@dirrm %%SITE_PERL%%/POE/Component/IRC/Test
@dirrm %%SITE_PERL%%/POE/Component/IRC/Qnet
@dirrm %%SITE_PERL%%/POE/Component/IRC/Plugin
@dirrm %%SITE_PERL%%/POE/Component/IRC/State
@dirrm %%SITE_PERL%%/POE/Component/IRC
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
diff --git a/irc/ptlink-ircd/pkg-plist b/irc/ptlink-ircd/pkg-plist
index ed7752ed974c..147f32ab8210 100644
--- a/irc/ptlink-ircd/pkg-plist
+++ b/irc/ptlink-ircd/pkg-plist
@@ -24,4 +24,4 @@ etc/ptlink-ircd/network.dconf
etc/ptlink-ircd/opers.motd
etc/ptlink-ircd/version.info
@dirrm etc/ptlink-ircd/codepage
-@unexec rmdir %D/etc/ptlink-ircd 2> /dev/null || true
+@dirrmtry etc/ptlink-ircd
diff --git a/irc/ptlink-services/pkg-plist b/irc/ptlink-services/pkg-plist
index 92fbe27fdeb7..9b6d18827d40 100644
--- a/irc/ptlink-services/pkg-plist
+++ b/irc/ptlink-services/pkg-plist
@@ -122,4 +122,4 @@ var/modules/sql/os_sysstats.sql
@dirrm utils
@dirrm etc/ptlink-services/mails
@dirrm bin/modules
-@unexec rmdir %D/etc/ptlink-services 2> /dev/null || true
+@dirrmtry etc/ptlink-services
diff --git a/irc/scrollz/pkg-plist b/irc/scrollz/pkg-plist
index 5d75bc9eccd9..971c65279d09 100644
--- a/irc/scrollz/pkg-plist
+++ b/irc/scrollz/pkg-plist
@@ -716,18 +716,18 @@ share/scrollz/translation/SWISS
share/scrollz/translation/UNITED_KINGDOM
share/scrollz/translation/UNITED_KINGDOM_COM
@exec mkdir %D/share/scrollz/script
-@unexec rmdir %D/share/scrollz/translation 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/script 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/bind 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/alias 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/cdcc 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/dcc 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/note 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/on 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/scrollz 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/set 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/window 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help/ctcp 2>/dev/null || true
-@unexec rmdir %D/share/scrollz/help 2>/dev/null || true
+@dirrmtry share/scrollz/translation
+@dirrmtry share/scrollz/script
+@dirrmtry share/scrollz/help/bind
+@dirrmtry share/scrollz/help/alias
+@dirrmtry share/scrollz/help/cdcc
+@dirrmtry share/scrollz/help/dcc
+@dirrmtry share/scrollz/help/note
+@dirrmtry share/scrollz/help/on
+@dirrmtry share/scrollz/help/scrollz
+@dirrmtry share/scrollz/help/set
+@dirrmtry share/scrollz/help/window
+@dirrmtry share/scrollz/help/ctcp
+@dirrmtry share/scrollz/help
@dirrm share/scrollz/doc
-@unexec rmdir %D/share/scrollz 2>/dev/null || true
+@dirrmtry share/scrollz
diff --git a/irc/solid-ircd/pkg-plist b/irc/solid-ircd/pkg-plist
index d06ac76f50cb..44864799ccbe 100644
--- a/irc/solid-ircd/pkg-plist
+++ b/irc/solid-ircd/pkg-plist
@@ -12,5 +12,5 @@ solid-ircd/ssl/ssl.rnd
solid-ircd/ssl/vgc.pem
solid-ircd/ssl/vgckey.pem
@dirrm solid-ircd/ssl/CVS
-@unexec rmdir %D/solid-ircd/ssl 2>/dev/null || true
-@unexec rmdir %D/solid-ircd 2>/dev/null || true
+@dirrmtry solid-ircd/ssl
+@dirrmtry solid-ircd
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index d721eaac6a8c..f68a1b1bd321 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -79,6 +79,6 @@ share/xchat/red.png
share/xchat/voice.png
@exec mkdir -p %D/lib/xchat/plugins
@dirrm share/xchat
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@dirrm lib/xchat/plugins
@dirrm lib/xchat
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
index 64b57e63bab2..0c797be5d24a 100644
--- a/irc/xchat2/pkg-plist
+++ b/irc/xchat2/pkg-plist
@@ -18,7 +18,7 @@ share/locale/sq/LC_MESSAGES/xchat.mo
share/locale/vi/LC_MESSAGES/xchat.mo
share/locale/zh_TW/LC_MESSAGES/xchat.mo
share/pixmaps/xchat.png
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
@exec mkdir -p %D/lib/xchat/plugins
@dirrm lib/xchat/plugins
@dirrm lib/xchat
diff --git a/japanese/Canna/pkg-plist b/japanese/Canna/pkg-plist
index 3a51e34c0952..d49bf11c90d9 100644
--- a/japanese/Canna/pkg-plist
+++ b/japanese/Canna/pkg-plist
@@ -122,8 +122,8 @@ sbin/cannakill
@dirrm lib/canna/dic/group
@dirrm lib/canna/dic
@dirrm lib/canna
-@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/group 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic 2>/dev/null || true
-@unexec rmdir %D/share/canna 2>/dev/null || true
+@dirrmtry share/canna/dic/user/user
+@dirrmtry share/canna/dic/user
+@dirrmtry share/canna/dic/group
+@dirrmtry share/canna/dic
+@dirrmtry share/canna
diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist
index 40fbe8cf99d0..1b2ea3222b75 100644
--- a/japanese/FreeWnn-lib/pkg-plist
+++ b/japanese/FreeWnn-lib/pkg-plist
@@ -80,7 +80,7 @@ lib/libwnn.so
lib/libwnn.so.0
@dirrm lib/wnn/ja_JP/rk
@dirrm lib/wnn/ja_JP/rk.vi
-@unexec rmdir %D/lib/wnn/ja_JP 2> /dev/null || true
+@dirrmtry lib/wnn/ja_JP
@dirrm lib/wnn/lt_LN/rk
@dirrm lib/wnn/lt_LN
-@unexec rmdir %D/lib/wnn 2> /dev/null || true
+@dirrmtry lib/wnn
diff --git a/japanese/FreeWnn-server/pkg-plist b/japanese/FreeWnn-server/pkg-plist
index 466e5f902212..e3ce8cba26f6 100644
--- a/japanese/FreeWnn-server/pkg-plist
+++ b/japanese/FreeWnn-server/pkg-plist
@@ -38,5 +38,5 @@ lib/wnn/ja_JP/dic/wnncons/tankan3.dic
@dirrm lib/wnn/ja_JP/dic/pubdic
@dirrm lib/wnn/ja_JP/dic/src
@dirrm lib/wnn/ja_JP/dic/wnncons
-@unexec rmdir %D/lib/wnn/ja_JP/dic/usr 2> /dev/null || true
-@unexec rmdir %D/lib/wnn/ja_JP/dic 2> /dev/null || true
+@dirrmtry lib/wnn/ja_JP/dic/usr
+@dirrmtry lib/wnn/ja_JP/dic
diff --git a/japanese/canna-lib/pkg-plist b/japanese/canna-lib/pkg-plist
index 3a51e34c0952..d49bf11c90d9 100644
--- a/japanese/canna-lib/pkg-plist
+++ b/japanese/canna-lib/pkg-plist
@@ -122,8 +122,8 @@ sbin/cannakill
@dirrm lib/canna/dic/group
@dirrm lib/canna/dic
@dirrm lib/canna
-@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/group 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic 2>/dev/null || true
-@unexec rmdir %D/share/canna 2>/dev/null || true
+@dirrmtry share/canna/dic/user/user
+@dirrmtry share/canna/dic/user
+@dirrmtry share/canna/dic/group
+@dirrmtry share/canna/dic
+@dirrmtry share/canna
diff --git a/japanese/canna-server/pkg-plist b/japanese/canna-server/pkg-plist
index 3a51e34c0952..d49bf11c90d9 100644
--- a/japanese/canna-server/pkg-plist
+++ b/japanese/canna-server/pkg-plist
@@ -122,8 +122,8 @@ sbin/cannakill
@dirrm lib/canna/dic/group
@dirrm lib/canna/dic
@dirrm lib/canna
-@unexec rmdir %D/share/canna/dic/user/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/user 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic/group 2>/dev/null || true
-@unexec rmdir %D/share/canna/dic 2>/dev/null || true
-@unexec rmdir %D/share/canna 2>/dev/null || true
+@dirrmtry share/canna/dic/user/user
+@dirrmtry share/canna/dic/user
+@dirrmtry share/canna/dic/group
+@dirrmtry share/canna/dic
+@dirrmtry share/canna
diff --git a/japanese/dvi2dvi/pkg-plist b/japanese/dvi2dvi/pkg-plist
index f634cdc937c6..6afebe1bc16d 100644
--- a/japanese/dvi2dvi/pkg-plist
+++ b/japanese/dvi2dvi/pkg-plist
@@ -19,7 +19,7 @@ lib/dvi2dvi/p2n
lib/dvi2dvi/p2pn
lib/dvi2dvi/w2n
@exec mkdir -m 1777 %D/share/fonts/vf-rot
-@unexec rmdir %D/share/fonts/vf-rot 2>/dev/null || true
+@dirrmtry share/fonts/vf-rot
%%PORTDOCS%%%%DOCSDIR%%/bugs.doc
%%PORTDOCS%%%%DOCSDIR%%/changes.doc
%%PORTDOCS%%%%DOCSDIR%%/dvi2dvi.doc
diff --git a/japanese/gauche-kakasi/pkg-plist b/japanese/gauche-kakasi/pkg-plist
index 8a99df645347..d3dc16187778 100644
--- a/japanese/gauche-kakasi/pkg-plist
+++ b/japanese/gauche-kakasi/pkg-plist
@@ -1,4 +1,4 @@
lib/gauche/site/%%VERSION%%/%%TARGET%%/kakasi.so
share/gauche/site/lib/.packages/Gauche-kakasi.gpd
share/gauche/site/lib/text/kakasi.scm
-@unexec rmdir %D/share/gauche/site/lib/text 2>/dev/null || true
+@dirrmtry share/gauche/site/lib/text
diff --git a/japanese/jadetex-ptex/pkg-plist b/japanese/jadetex-ptex/pkg-plist
index 43147873e6ca..38e303ab6d34 100644
--- a/japanese/jadetex-ptex/pkg-plist
+++ b/japanese/jadetex-ptex/pkg-plist
@@ -8,4 +8,4 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%%%PKGNAMESUFFIX%%
@exec %%MKTEXLSR%%
@unexec %%MKTEXLSR%%
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/ptex/jadetex 2> /dev/null || true
+@dirrmtry %%TEXMFLOCALDIR%%/ptex/jadetex
diff --git a/japanese/japaneseAFM/pkg-plist b/japanese/japaneseAFM/pkg-plist
index 85e05a692466..dda15213e6ee 100644
--- a/japanese/japaneseAFM/pkg-plist
+++ b/japanese/japaneseAFM/pkg-plist
@@ -2,5 +2,5 @@ share/fonts/afm/GothicBBB-Medium-H
share/fonts/afm/GothicBBB-Medium-V
share/fonts/afm/Ryumin-Light-H
share/fonts/afm/Ryumin-Light-V
-@unexec rmdir %D/share/fonts/afm 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts/afm
+@dirrmtry share/fonts
diff --git a/japanese/kdrill/pkg-plist b/japanese/kdrill/pkg-plist
index 6fc4f604cf14..747106804d47 100644
--- a/japanese/kdrill/pkg-plist
+++ b/japanese/kdrill/pkg-plist
@@ -8,4 +8,4 @@ share/dict/kdrill/kata.edic
share/dict/kdrill/kataplus.edic
lib/X11/app-defaults/KDrill
@dirrm share/dict/kdrill
-@unexec rmdir %D/share/dict 2>/dev/null || true
+@dirrmtry share/dict
diff --git a/japanese/kon2-16dot/pkg-plist b/japanese/kon2-16dot/pkg-plist
index ac17c92f8a25..63cd22de2053 100644
--- a/japanese/kon2-16dot/pkg-plist
+++ b/japanese/kon2-16dot/pkg-plist
@@ -6,4 +6,4 @@ share/fonts/bdf/k14.bdf.gz
share/fonts/bdf/8x16rk.bdf.gz
share/fonts/bdf/jiskan16.bdf.gz
@dirrm share/fonts/bdf
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts
diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist
index 56b77b0eab10..24c840455bb0 100644
--- a/japanese/kterm16c/pkg-plist
+++ b/japanese/kterm16c/pkg-plist
@@ -6,4 +6,4 @@ lib/X11/fonts/misc/vga.pcf.gz
share/doc/kterm16c/dot.termcap
share/doc/kterm16c/kterm16c.doc
@dirrm share/doc/kterm16c
-@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true
+@dirrmtry lib/X11/fonts/misc
diff --git a/japanese/leafrogue/pkg-plist b/japanese/leafrogue/pkg-plist
index adfaf6f81e5e..a523e4472acc 100644
--- a/japanese/leafrogue/pkg-plist
+++ b/japanese/leafrogue/pkg-plist
@@ -1,6 +1,6 @@
bin/leafrogue
share/rogue/leaf.msg
-@unexec rmdir %D/share/rogue 2>/dev/null || true
+@dirrmtry share/rogue
%%PORTDOCS%%%%DOCSDIR%%/readme.txt
%%PORTDOCS%%%%DOCSDIR%%/lf_rogue.html
%%PORTDOCS%%%%DOCSDIR%%/lf_rogue.txt
diff --git a/japanese/lyx-doc/pkg-plist b/japanese/lyx-doc/pkg-plist
index 4d0dd812c886..1c1bf7f39f2c 100644
--- a/japanese/lyx-doc/pkg-plist
+++ b/japanese/lyx-doc/pkg-plist
@@ -6,5 +6,5 @@ share/lyx/doc/ja_Tutorial.lyx
share/lyx/doc/ja_UserGuide.lyx
share/lyx/doc/mobius.eps
share/lyx/doc/platypus.eps
-@unexec rmdir %D/share/lyx/doc 2>/dev/null || true
-@unexec rmdir %D/share/lyx 2>/dev/null || true
+@dirrmtry share/lyx/doc
+@dirrmtry share/lyx
diff --git a/japanese/mell/pkg-plist b/japanese/mell/pkg-plist
index 728f0b8f1cd2..d03071871457 100644
--- a/japanese/mell/pkg-plist
+++ b/japanese/mell/pkg-plist
@@ -8,6 +8,6 @@ share/emacs/site-lisp/mell/mell-sign.el
share/emacs/site-lisp/mell/mell-split.el
share/emacs/site-lisp/mell/mell-string.el
share/emacs/site-lisp/mell/mell.el
-@unexec rmdir %D/share/emacs/site-lisp/mell 2>/dev/null || true
+@dirrmtry share/emacs/site-lisp/mell
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
diff --git a/japanese/nethack32/pkg-plist b/japanese/nethack32/pkg-plist
index b29642a13853..e35e2b65b0c6 100644
--- a/japanese/nethack32/pkg-plist
+++ b/japanese/nethack32/pkg-plist
@@ -137,5 +137,5 @@ share/examples/ja/nethack/ibm.pcf.gz
share/examples/ja/nethack/nethack.rc
share/examples/ja/nethack/nh10.pcf.gz
@dirrm share/examples/ja/nethack
-@unexec rmdir %D/share/examples/ja 2>/dev/null || true
+@dirrmtry share/examples/ja
@dirrm share/doc/ja/nethack
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index 351ca70cb277..fb4e205d01d0 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -4,7 +4,7 @@ bin/%%HACKNAME%%
@exec chmod -R 775 %D/%%HACKDIR%%
@exec chmod 2755 %D/%%HACKDIR%%/%%HACKNAME%%
@exec chown games:games %D/%%HACKDIR%%/save
-@unexec rmdir %D/%%HACKDIR%%/save 2>/dev/null || true
+@dirrmtry %%HACKDIR%%/save
%%HACKDIR%%/Arc-fila.lev
%%HACKDIR%%/Arc-filb.lev
%%HACKDIR%%/Arc-goal.lev
diff --git a/japanese/p5-Date-Japanese-Era/pkg-plist b/japanese/p5-Date-Japanese-Era/pkg-plist
index 6abea648f8e0..f17ed63a6548 100644
--- a/japanese/p5-Date-Japanese-Era/pkg-plist
+++ b/japanese/p5-Date-Japanese-Era/pkg-plist
@@ -6,8 +6,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era/.packlist
@dirrm %%SITE_PERL%%/Date/Japanese/Era/Table
@dirrm %%SITE_PERL%%/Date/Japanese/Era
-@unexec rmdir %D/%%SITE_PERL%%/Date/Japanese 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date/Japanese
+@dirrmtry %%SITE_PERL%%/Date
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese/Era
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Japanese
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/japanese/p5-Text-ChaSen/pkg-plist b/japanese/p5-Text-ChaSen/pkg-plist
index d5fe30580ec6..bd62cf284505 100644
--- a/japanese/p5-Text-ChaSen/pkg-plist
+++ b/japanese/p5-Text-ChaSen/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen/ChaSen.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ChaSen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
%%PORTDOCS%%share/chasen/doc/README.perl
diff --git a/japanese/p5-Text-Kakasi/pkg-plist b/japanese/p5-Text-Kakasi/pkg-plist
index ee8ee8e8d6f3..903eb1a9af67 100644
--- a/japanese/p5-Text-Kakasi/pkg-plist
+++ b/japanese/p5-Text-Kakasi/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi/Kakasi.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Kakasi
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/japanese/perl5/pkg-plist b/japanese/perl5/pkg-plist
index b6fa53c98779..e416663df002 100644
--- a/japanese/perl5/pkg-plist
+++ b/japanese/perl5/pkg-plist
@@ -530,83 +530,83 @@ lib/perl5/%%JPERL_VERSION%%/validate.pl
lib/perl5/%%JPERL_VERSION%%/vars.pm
@unexec find %D/lib/perl5/%%JPERL_VER%%/ -name '*.ph' -delete 2>/dev/null || true
@unexec find %D/lib/perl5/site_perl/%%JPERL_VER%%/ -name '*.ph' -delete 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%JPERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/pod 2>/dev/null || true
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/sys
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%/machine
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%/%%JPERL_ARCH%%
+@dirrmtry lib/perl5/site_perl/%%JPERL_VER%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/pod
%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/man/man3 2>/dev/null || true
%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/auto/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%% 2>/dev/null || true
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/auto/Getopt/Long
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/auto/Getopt
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/auto
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/User
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Time
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Tie
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Text
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Test
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Term
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Sys
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Search
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Pod
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Net
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Math
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/IPC
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/I18N
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Getopt
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/File/Spec
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/ExtUtils
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Devel
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Data
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/Class
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/CPAN
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/CGI
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%
%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5
diff --git a/japanese/prime-dict/pkg-plist b/japanese/prime-dict/pkg-plist
index 781f81a19c5e..e231e6e8b24d 100644
--- a/japanese/prime-dict/pkg-plist
+++ b/japanese/prime-dict/pkg-plist
@@ -11,6 +11,6 @@
%%DATADIR%%/dict/prime-dict-en-pos_literal.ary
%%DATADIR%%/dict/prime-dict-en.ary
%%DATADIR%%/dict/prime-dict-en_literal.ary
-@unexec rmdir %D/%%DATADIR%%/dict 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime 2>/dev/null || true
+@dirrmtry %%DATADIR%%/dict
+@dirrmtry %%DATADIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%/prime
diff --git a/japanese/prime-el/pkg-plist b/japanese/prime-el/pkg-plist
index b38c063d84e8..fc73393a762a 100644
--- a/japanese/prime-el/pkg-plist
+++ b/japanese/prime-el/pkg-plist
@@ -13,10 +13,10 @@ share/emacs/site-lisp/prime-el/prime-socialite.el
share/emacs/site-lisp/prime-el/prime-style.el
share/emacs/site-lisp/prime-el/prime.el
share/emacs/site-lisp/init-prime.el
-@unexec rmdir %D/share/emacs/site-lisp/prime-el/contrib 2>/dev/null || true
-@unexec rmdir %D/share/emacs/site-lisp/prime-el 2>/dev/null || true
+@dirrmtry share/emacs/site-lisp/prime-el/contrib
+@dirrmtry share/emacs/site-lisp/prime-el
etc/prime/Custom_prime-el.el
-@unexec rmdir %D/etc/prime 2>/dev/null || true
+@dirrmtry etc/prime
%%PORTDOCS%%%%DOCSDIR%%/emacs/figures/screenshots/conversion_1.png
%%PORTDOCS%%%%DOCSDIR%%/emacs/figures/screenshots/conversion_2.png
%%PORTDOCS%%%%DOCSDIR%%/emacs/figures/screenshots/conversion_3.png
diff --git a/japanese/prime/pkg-plist b/japanese/prime/pkg-plist
index d3307a3ad3f1..b22e48286efc 100644
--- a/japanese/prime/pkg-plist
+++ b/japanese/prime/pkg-plist
@@ -6,11 +6,11 @@ bin/prime-userdict-convert
bin/prime-userdict-update
libdata/pkgconfig/prime.pc
etc/prime/Custom_prime.rb
-@unexec rmdir %D/etc/prime 2>/dev/null || true
+@dirrmtry etc/prime
%%DATADIR%%/grammar/prime-grammar
%%DATADIR%%/makedict/canna2prime.table
-@unexec rmdir %D/%%DATADIR%%/grammar 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/makedict 2>/dev/null || true
+@dirrmtry %%DATADIR%%/grammar
+@dirrmtry %%DATADIR%%/makedict
%%RUBY_SITELIBDIR%%/prime/engine/engine-adambnc.rb
%%RUBY_SITELIBDIR%%/prime/engine/engine-alphabet.rb
%%RUBY_SITELIBDIR%%/prime/engine/engine-basic.rb
@@ -53,10 +53,10 @@ etc/prime/Custom_prime.rb
%%RUBY_SITELIBDIR%%/prime/session-prime08.rb
%%RUBY_SITELIBDIR%%/prime/session.rb
%%RUBY_SITELIBDIR%%/prime/taiyaki.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime/engine 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime/grammar 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime/makedict 2>/dev/null || true
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/prime 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/prime/engine
+@dirrmtry %%RUBY_SITELIBDIR%%/prime/grammar
+@dirrmtry %%RUBY_SITELIBDIR%%/prime/makedict
+@dirrmtry %%RUBY_SITELIBDIR%%/prime
%%PORTDOCS%%%%DOCSDIR%%/examples/Custom_prime.rb
%%PORTDOCS%%%%DOCSDIR%%/figures/dict-format.png
%%PORTDOCS%%%%DOCSDIR%%/figures/predictive-input.png
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index 19f1a4ed8f42..06dbdedfcb3c 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -319,13 +319,13 @@ bin/updmap-sys-ptex
@dirrm %%TEXMFDIR%%/ptex/platex/config
%%TEXMFDIR%%/dvips/ptex/jis.map
%%TEXMFDIR%%/dvips/ptex/morisawa.map
-@unexec rmdir %D/%%TEXMFDIR%%/dvips/ptex 2> /dev/null || true
+@dirrmtry %%TEXMFDIR%%/dvips/ptex
@exec /bin/mkdir -p %D/%%TEXMFCONFIGDIR%%/dvips/ptex
-@unexec rmdir %D/%%TEXMFCONFIGDIR%%/dvips/ptex 2> /dev/null || true
+@dirrmtry %%TEXMFCONFIGDIR%%/dvips/ptex
%%TEXMFCONFIGDIR%%/texconfig/tcfmgr.map
@dirrm %%TEXMFCONFIGDIR%%/texconfig
%%TEXMFCONFIGDIR%%/web2c/ptex/updmap.cfg
-@unexec rmdir %D/%%TEXMFCONFIGDIR%%/web2c/ptex 2> /dev/null || true
+@dirrmtry %%TEXMFCONFIGDIR%%/web2c/ptex
@exec %%MKTEXLSR%%
@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvips/updmap
@exec /bin/mkdir -p %D/%%TEXMFDIR%%/fonts/map/ptex/dvipdfm/updmap
diff --git a/japanese/ruby-man/pkg-plist b/japanese/ruby-man/pkg-plist
index abf246c7b220..b1f58c8b7aaf 100644
--- a/japanese/ruby-man/pkg-plist
+++ b/japanese/ruby-man/pkg-plist
@@ -53,4 +53,4 @@
%%RUBY_MODDOCDIR%%/variable.html
%%RUBY_MODDOCDIR%%/yacc.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/japanese/ruby-usersguide/pkg-plist b/japanese/ruby-usersguide/pkg-plist
index fd491a2605bf..77703ccff12d 100644
--- a/japanese/ruby-usersguide/pkg-plist
+++ b/japanese/ruby-usersguide/pkg-plist
@@ -26,4 +26,4 @@
%%RUBY_MODDOCDIR%%/uguide24.html
%%RUBY_MODDOCDIR%%/uguide25.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/japanese/scim-anthy/pkg-plist b/japanese/scim-anthy/pkg-plist
index 7034ddc3fcbf..3d774dc4d4d2 100644
--- a/japanese/scim-anthy/pkg-plist
+++ b/japanese/scim-anthy/pkg-plist
@@ -19,6 +19,6 @@ share/scim/Anthy/style/wnn.sty
share/scim/icons/scim-anthy.png
share/scim/icons/scim-anthy-dict.png
share/scim/icons/scim-anthy-swap-colors.png
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/icons 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry lib/scim-1.0/icons
diff --git a/japanese/scim-canna/pkg-plist b/japanese/scim-canna/pkg-plist
index 6f6237b99508..4c7d92b126d4 100644
--- a/japanese/scim-canna/pkg-plist
+++ b/japanese/scim-canna/pkg-plist
@@ -2,6 +2,6 @@ lib/scim-1.0/IMEngine/canna.so
lib/scim-1.0/SetupUI/canna-imengine-setup.so
share/locale/ja/LC_MESSAGES/scim-canna.mo
share/scim/icons/scim-canna.png
-@unexec rmdir %D/share/scim/icons 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
+@dirrmtry share/scim/icons
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
diff --git a/japanese/scim-prime/pkg-plist b/japanese/scim-prime/pkg-plist
index b6c96a21966e..fce0fcc36519 100644
--- a/japanese/scim-prime/pkg-plist
+++ b/japanese/scim-prime/pkg-plist
@@ -2,6 +2,6 @@ lib/scim-1.0/IMEngine/prime.so
lib/scim-1.0/SetupUI/prime-imengine-setup.so
share/locale/ja/LC_MESSAGES/scim-prime.mo
share/scim/icons/scim-prime.png
-@unexec rmdir %D/share/scim/icons 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
+@dirrmtry share/scim/icons
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
diff --git a/japanese/scim-skk/pkg-plist b/japanese/scim-skk/pkg-plist
index 609a35138c3b..35b77ed7d550 100644
--- a/japanese/scim-skk/pkg-plist
+++ b/japanese/scim-skk/pkg-plist
@@ -2,6 +2,6 @@ lib/scim-1.0/IMEngine/skk.so
lib/scim-1.0/SetupUI/skk-imengine-setup.so
share/locale/ja/LC_MESSAGES/scim-skk.mo
share/scim/icons/scim-skk.png
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/icons 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
+@dirrmtry lib/scim-1.0/icons
diff --git a/japanese/scim-tables/pkg-plist b/japanese/scim-tables/pkg-plist
index 5e9b45217625..d20718525dbd 100644
--- a/japanese/scim-tables/pkg-plist
+++ b/japanese/scim-tables/pkg-plist
@@ -6,4 +6,4 @@ share/scim/tables/TUT-Code.bin
share/scim/icons/HIRAGANA.png
share/scim/icons/KATAKANA.png
share/scim/icons/Nippon.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+@dirrmtry share/scim/tables
diff --git a/japanese/scim-uim/pkg-plist b/japanese/scim-uim/pkg-plist
index 67ffbd9591a8..a8f327a8331f 100644
--- a/japanese/scim-uim/pkg-plist
+++ b/japanese/scim-uim/pkg-plist
@@ -1,4 +1,4 @@
lib/scim-1.0/IMEngine/uim.so
share/scim/icons/scim-uim.png
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/icons 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/icons
diff --git a/japanese/stardict-dict-ja/pkg-plist b/japanese/stardict-dict-ja/pkg-plist
index e93f73452bce..3d4a873d4438 100644
--- a/japanese/stardict-dict-ja/pkg-plist
+++ b/japanese/stardict-dict-ja/pkg-plist
@@ -4,4 +4,4 @@ share/gnome/stardict/dic/jmdict-en-ja.ifo
share/gnome/stardict/dic/jmdict-ja-en.dict.dz
share/gnome/stardict/dic/jmdict-ja-en.idx
share/gnome/stardict/dic/jmdict-ja-en.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/japanese/stardict2-dict-ja/pkg-plist b/japanese/stardict2-dict-ja/pkg-plist
index e93f73452bce..3d4a873d4438 100644
--- a/japanese/stardict2-dict-ja/pkg-plist
+++ b/japanese/stardict2-dict-ja/pkg-plist
@@ -4,4 +4,4 @@ share/gnome/stardict/dic/jmdict-en-ja.ifo
share/gnome/stardict/dic/jmdict-ja-en.dict.dz
share/gnome/stardict/dic/jmdict-ja-en.idx
share/gnome/stardict/dic/jmdict-ja-en.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/japanese/suikyo/pkg-plist b/japanese/suikyo/pkg-plist
index a8a8772baa9c..2894f4b27d3c 100644
--- a/japanese/suikyo/pkg-plist
+++ b/japanese/suikyo/pkg-plist
@@ -29,17 +29,17 @@
%%DATADIR%%/conv-table/tutcode
%%DATADIR%%/conv-table/tutcode_reverse
%%DATADIR%%/conv-table/wideascii-ascii
-@unexec rmdir %D/%%DATADIR%%/conv-table 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/conv-table
+@dirrmtry %%DATADIR%%
share/emacs/site-lisp/init-suikyo.el
share/emacs/site-lisp/suikyo/suikyo.el
share/emacs/site-lisp/suikyo/suikyo-config.el
-@unexec rmdir %D/share/emacs/site-lisp/suikyo 2>/dev/null || true
+@dirrmtry share/emacs/site-lisp/suikyo
libdata/pkgconfig/suikyo.pc
%%RUBY_SITELIBDIR%%/suikyo/suikyo-composer.rb
%%RUBY_SITELIBDIR%%/suikyo/suikyo-config.rb
%%RUBY_SITELIBDIR%%/suikyo/suikyo.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/suikyo 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/suikyo
%%PORTDOCS%%%%DOCSDIR%%/elisp/index.html
%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
diff --git a/japanese/texinfo/pkg-plist b/japanese/texinfo/pkg-plist
index 41d35c93ee5c..9e07888a4fac 100644
--- a/japanese/texinfo/pkg-plist
+++ b/japanese/texinfo/pkg-plist
@@ -53,22 +53,22 @@ share/locale/sv/LC_MESSAGES/texinfo.mo
share/locale/tr/LC_MESSAGES/texinfo.mo
share/locale/zh_CN/LC_MESSAGES/texinfo.mo
share/locale/zh_TW/LC_MESSAGES/texinfo.mo
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/de_AT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de_AT 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 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/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex 2>/dev/null || true
-@unexec rmdir %D/share/texinfo 2>/dev/null || true
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/de_AT/LC_MESSAGES
+@dirrmtry share/locale/de_AT
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry %%TEXMFLOCAL%%/tex/generic/dvips
+@dirrmtry %%TEXMFLOCAL%%/pdftex/plain/misc
+@dirrmtry %%TEXMFLOCAL%%/pdftex/plain
+@dirrmtry %%TEXMFLOCAL%%/pdftex
+@dirrmtry share/texinfo
diff --git a/japanese/vftool/pkg-plist b/japanese/vftool/pkg-plist
index 0a020665a3a7..53de5a164d96 100644
--- a/japanese/vftool/pkg-plist
+++ b/japanese/vftool/pkg-plist
@@ -660,4 +660,4 @@ share/fonts/vf-p2pn/tmin9.vf
@dirrm share/fonts/vf-a2n
@dirrm share/fonts/vf-n2a
@dirrm share/fonts/vf-p2pn
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts
diff --git a/japanese/w3/pkg-plist b/japanese/w3/pkg-plist
index a11926e91e66..f8c27a46d63c 100644
--- a/japanese/w3/pkg-plist
+++ b/japanese/w3/pkg-plist
@@ -64,7 +64,7 @@ share/examples/w3/dot.emacs
share/examples/w3/dot.mosaic-hotlist-default
share/examples/w3/user-install
@dirrm lib/mule/site-lisp/w3
-@unexec rmdir %D/lib/mule/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/mule 2>/dev/null || true
+@dirrmtry lib/mule/site-lisp
+@dirrmtry lib/mule
@dirrm share/doc/w3
@dirrm share/examples/w3
diff --git a/japanese/xgate/pkg-plist b/japanese/xgate/pkg-plist
index 005e3fea5f90..f53890afae97 100644
--- a/japanese/xgate/pkg-plist
+++ b/japanese/xgate/pkg-plist
@@ -2774,10 +2774,10 @@
@dirrm %%T%%/webapps/xgate/WEB-INF/classes/com/happysize
@dirrm %%T%%/webapps/xgate/WEB-INF/classes/com
@dirrm %%T%%/webapps/xgate/WEB-INF/classes
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF/conf 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF/address 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF/account 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate/WEB-INF 2>/dev/null || true
-@unexec rmdir %D/%%T%%/webapps/xgate 2>/dev/null || true
+@dirrmtry %%T%%/webapps/xgate/WEB-INF/conf
+@dirrmtry %%T%%/webapps/xgate/WEB-INF/address
+@dirrmtry %%T%%/webapps/xgate/WEB-INF/account
+@dirrmtry %%T%%/webapps/xgate/WEB-INF
+@dirrmtry %%T%%/webapps/xgate
@unexec rmdir /var/log/xgate 2>/dev/null || true
@exec install -d -o %%WWWUID%% -g %%WWWGID%% /var/log/xgate
diff --git a/java/diablo-jdk13/pkg-plist b/java/diablo-jdk13/pkg-plist
index 8ce0c6f6f727..7363480439f2 100644
--- a/java/diablo-jdk13/pkg-plist
+++ b/java/diablo-jdk13/pkg-plist
@@ -749,9 +749,9 @@ diablo-jdk%%JDK_VERSION%%/man/man1/serialver.1
diablo-jdk%%JDK_VERSION%%/man/man1/tnameserv.1
diablo-jdk%%JDK_VERSION%%/src.jar
@exec mkdir -p %D/diablo-jdk%%JDK_VERSION%%/jre/lib/ext/
-@unexec rmdir %D/diablo-jdk%%JDK_VERSION%%/jre/lib/ext 2>/dev/null || true
+@dirrmtry diablo-jdk%%JDK_VERSION%%/jre/lib/ext
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/diablo-jdk%%JDK_VERSION%%/bin/java # DiabloCaffe%%JDK_VERSION%%"
@dirrm diablo-jdk%%JDK_VERSION%%/man/man1
@dirrm diablo-jdk%%JDK_VERSION%%/man
diff --git a/java/diablo-jre13/pkg-plist b/java/diablo-jre13/pkg-plist
index ec3f96a1bcf4..232819962236 100644
--- a/java/diablo-jre13/pkg-plist
+++ b/java/diablo-jre13/pkg-plist
@@ -130,9 +130,9 @@ diablo-jre%%JRE_VERSION%%/man/man1/tnameserv.1
%%PLUGIN:%%diablo-jre%%JRE_VERSION%%/plugin/i386/ns600/libjavaplugin_oji.so
%%PLUGIN:%%diablo-jre%%JRE_VERSION%%/plugin/i386/ns600/libjavaplugin_oji_g.so
@exec mkdir -p %D/diablo-jre%%JRE_VERSION%%/lib/ext/
-@unexec rmdir %D/diablo-jre%%JRE_VERSION%%/lib/ext 2>/dev/null || true
+@dirrmtry diablo-jre%%JRE_VERSION%%/lib/ext
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/diablo-jre%%JRE_VERSION%%/bin/java # DiabloLatte%%JRE_VERSION%%"
%%PLUGIN:%%@dirrm diablo-jre%%JRE_VERSION%%/plugin/i386/ns600
%%PLUGIN:%%@dirrm diablo-jre%%JRE_VERSION%%/plugin/i386/ns4
diff --git a/java/eclipse-cdt/pkg-plist b/java/eclipse-cdt/pkg-plist
index a7ebc6cbe63f..c369fb25d93f 100644
--- a/java/eclipse-cdt/pkg-plist
+++ b/java/eclipse-cdt/pkg-plist
@@ -601,6 +601,6 @@ eclipse/features/org.eclipse.cdt_3.0.1/epl-v10.html
@dirrm eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1/os
@dirrm eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_3.0.1
@dirrm eclipse/features/org.eclipse.cdt_3.0.1
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-checkstyle/pkg-plist b/java/eclipse-checkstyle/pkg-plist
index 933f4e1ce9e8..b61e1d7ae087 100644
--- a/java/eclipse-checkstyle/pkg-plist
+++ b/java/eclipse-checkstyle/pkg-plist
@@ -70,6 +70,6 @@ eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/xmlParserAPIs.jar
@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc/csdocs
@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0/doc
@dirrm eclipse/plugins/com.atlassw.tools.eclipse.checkstyle_3.4.1.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse
diff --git a/java/eclipse-examples/pkg-plist b/java/eclipse-examples/pkg-plist
index b7c6f74566ed..6deda56edc1a 100644
--- a/java/eclipse-examples/pkg-plist
+++ b/java/eclipse-examples/pkg-plist
@@ -340,6 +340,6 @@ eclipse/features/org.eclipse.sdk.examples_3.0.0/license.html
@dirrm eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0/doc-html
@dirrm eclipse/plugins/org.eclipse.compare.examples.xml_3.0.0
@dirrm eclipse/features/org.eclipse.sdk.examples_3.0.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-gef-examples/pkg-plist b/java/eclipse-gef-examples/pkg-plist
index d64ab654f2eb..46d1ff359c69 100644
--- a/java/eclipse-gef-examples/pkg-plist
+++ b/java/eclipse-gef-examples/pkg-plist
@@ -27,6 +27,6 @@ eclipse/features/org.eclipse.gef.examples_3.0.0/feature.properties
@dirrm eclipse/plugins/org.eclipse.gef.examples.logic_3.0.0
@dirrm eclipse/plugins/org.eclipse.gef.examples.flow_3.0.0
@dirrm eclipse/features/org.eclipse.gef.examples_3.0.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-langpack/pkg-plist b/java/eclipse-langpack/pkg-plist
index 8d7ffb78c4d7..4b3ad6deaad8 100644
--- a/java/eclipse-langpack/pkg-plist
+++ b/java/eclipse-langpack/pkg-plist
@@ -419,41 +419,41 @@
@dirrm eclipse/plugins/org.eclipse.help.webapp.nl2_3.1.0
@dirrm eclipse/plugins/org.eclipse.help.webapp.nl1_3.1.0/META-INF
@dirrm eclipse/plugins/org.eclipse.help.webapp.nl1_3.1.0
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.sdk_3.1.1 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features/org.eclipse.sdk_3.1.1
@dirrm eclipse/features/org.eclipse.sdk.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.sdk.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.sdk.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.rcp_3.1.1 2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.rcp_3.1.1
@dirrm eclipse/features/org.eclipse.rcp.source.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.rcp.source.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.rcp.source.nls1_3.1.1
@dirrm eclipse/features/org.eclipse.rcp.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.rcp.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.rcp.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.platform_3.1.1 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.platform.source_3.1.1 2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.platform_3.1.1
+@dirrmtry eclipse/features/org.eclipse.platform.source_3.1.1
@dirrm eclipse/features/org.eclipse.platform.source.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.platform.source.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.platform.source.nls1_3.1.1
@dirrm eclipse/features/org.eclipse.platform.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.platform.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.platform.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.pde_3.1.1 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.pde.source_3.1.1 2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.pde_3.1.1
+@dirrmtry eclipse/features/org.eclipse.pde.source_3.1.1
@dirrm eclipse/features/org.eclipse.pde.source.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.pde.source.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.pde.source.nls1_3.1.1
@dirrm eclipse/features/org.eclipse.pde.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.pde.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.pde.nls1_3.1.1
-@unexec rmdir %D/eclipse/features/org.eclipse.jdt_3.1.1 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/org.eclipse.jdt.source_3.1.1 2>/dev/null || true
+@dirrmtry eclipse/features/org.eclipse.jdt_3.1.1
+@dirrmtry eclipse/features/org.eclipse.jdt.source_3.1.1
@dirrm eclipse/features/org.eclipse.jdt.source.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.jdt.source.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.jdt.source.nls1_3.1.1
@dirrm eclipse/features/org.eclipse.jdt.nlsBidi_3.1.1
@dirrm eclipse/features/org.eclipse.jdt.nls2_3.1.1
@dirrm eclipse/features/org.eclipse.jdt.nls1_3.1.1
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-log4e/pkg-plist b/java/eclipse-log4e/pkg-plist
index 11751773c551..8e6ca0a4e747 100644
--- a/java/eclipse-log4e/pkg-plist
+++ b/java/eclipse-log4e/pkg-plist
@@ -21,6 +21,6 @@ eclipse/plugins/de.jayefem.log4e_0.7.6/welcome.xml
@dirrm eclipse/plugins/de.jayefem.log4e_0.7.6/lib
@dirrm eclipse/plugins/de.jayefem.log4e_0.7.6
@dirrm eclipse/plugins/de.jayefem.log4e.help_0.7.6
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/eclipse-vep-examples/pkg-plist b/java/eclipse-vep-examples/pkg-plist
index 7420d016ee23..1c9b7cf8aa50 100644
--- a/java/eclipse-vep-examples/pkg-plist
+++ b/java/eclipse-vep-examples/pkg-plist
@@ -54,6 +54,6 @@ eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%/feature.properties
@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%/src
@dirrm eclipse/plugins/org.eclipse.ve.examples.source_%%RELEASEVERSION%%
@dirrm eclipse/features/org.eclipse.ve.examples_%%RELEASEVERSION%%
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/gj-jdk11/pkg-plist b/java/gj-jdk11/pkg-plist
index b1081b1915d5..784779c19767 100644
--- a/java/gj-jdk11/pkg-plist
+++ b/java/gj-jdk11/pkg-plist
@@ -251,4 +251,4 @@ lib/gj/%%JDKSUBDIR%%/com/sun/java/util/collections/Vector.class
@dirrm lib/gj/%%JDKSUBDIR%%/gjc/v6
@dirrm lib/gj/%%JDKSUBDIR%%/gjc
@dirrm lib/gj/%%JDKSUBDIR%%
-@unexec rmdir %D/lib/gj 2>/dev/null || true
+@dirrmtry lib/gj
diff --git a/java/gj/pkg-plist b/java/gj/pkg-plist
index 11b7819a72bb..dac77882a9a1 100644
--- a/java/gj/pkg-plist
+++ b/java/gj/pkg-plist
@@ -356,4 +356,4 @@ lib/gj/%%JDKSUBDIR%%/java/util/Vector.class
@dirrm lib/gj/%%JDKSUBDIR%%/java/util
@dirrm lib/gj/%%JDKSUBDIR%%/java
@dirrm lib/gj/%%JDKSUBDIR%%
-@unexec rmdir %D/lib/gj 2>/dev/null || true
+@dirrmtry lib/gj
diff --git a/java/jdk11/pkg-plist b/java/jdk11/pkg-plist
index 7c9186ce4fb4..b64d84868eaf 100644
--- a/java/jdk11/pkg-plist
+++ b/java/jdk11/pkg-plist
@@ -518,7 +518,7 @@ jdk%%JDK_VERSION%%/README.FreeBSD
jdk%%JDK_VERSION%%/CHANGES
jdk%%JDK_VERSION%%/index.html
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # JDK%%JDK_VERSION%%"
@dirrm jdk%%JDK_VERSION%%/lib/security
@dirrm jdk%%JDK_VERSION%%/lib/locale/ja_JP.UTF-8/app-defaults
diff --git a/java/jdk13/pkg-plist b/java/jdk13/pkg-plist
index 46421d6f989c..3896c2ae954a 100644
--- a/java/jdk13/pkg-plist
+++ b/java/jdk13/pkg-plist
@@ -925,9 +925,9 @@ jdk%%JDK_VERSION%%/man/man1/serialver.1
jdk%%JDK_VERSION%%/man/man1/tnameserv.1
jdk%%JDK_VERSION%%/src.jar
@exec mkdir -p %D/jdk%%JDK_VERSION%%/jre/lib/ext/
-@unexec rmdir %D/jdk%%JDK_VERSION%%/jre/lib/ext 2>/dev/null || true
+@dirrmtry jdk%%JDK_VERSION%%/jre/lib/ext
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/jdk%%JDK_VERSION%%/bin/java # FREEBSD-JDK%%JDK_VERSION%%"
@dirrm jdk%%JDK_VERSION%%/man/man1
@dirrm jdk%%JDK_VERSION%%/man
diff --git a/java/jre/pkg-plist b/java/jre/pkg-plist
index 062655480c8e..0b5c2ca3d895 100644
--- a/java/jre/pkg-plist
+++ b/java/jre/pkg-plist
@@ -49,7 +49,7 @@ jre%%JRE_VERSION%%/lib/rt.jar
jre%%JRE_VERSION%%/lib/security/java.security
jre%%JRE_VERSION%%/lib/serialver.properties
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/jre%%JRE_VERSION%%/bin/java # JRE%%JRE_VERSION%%"
@dirrm jre%%JRE_VERSION%%/lib/security
@dirrm jre%%JRE_VERSION%%/lib/i386/green_threads
diff --git a/java/linux-blackdown-jdk12/pkg-plist b/java/linux-blackdown-jdk12/pkg-plist
index 8b255e17c37f..5f33db3d1a3c 100644
--- a/java/linux-blackdown-jdk12/pkg-plist
+++ b/java/linux-blackdown-jdk12/pkg-plist
@@ -724,7 +724,7 @@
%%T%%/lib/tools.jar
%%T%%/src.jar
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%"
@dirrm %%T%%/lib
@dirrm %%T%%/jre/lib/security
diff --git a/java/linux-blackdown-jdk13/pkg-plist b/java/linux-blackdown-jdk13/pkg-plist
index 2a06e36789cf..7b016348b0a2 100644
--- a/java/linux-blackdown-jdk13/pkg-plist
+++ b/java/linux-blackdown-jdk13/pkg-plist
@@ -966,7 +966,7 @@
%%T%%/COPYRIGHT
%%T%%/src.jar
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%"
@dirrm %%T%%/jre/bin/i386/green_threads
@dirrm %%T%%/jre/bin/i386/native_threads
diff --git a/java/linux-blackdown-jdk14/pkg-plist b/java/linux-blackdown-jdk14/pkg-plist
index d295105aa113..80020de78502 100644
--- a/java/linux-blackdown-jdk14/pkg-plist
+++ b/java/linux-blackdown-jdk14/pkg-plist
@@ -1540,7 +1540,7 @@
%%T%%/man/man1/tnameserv.1.gz
%%T%%/src.zip
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Blackdown-JDK%%PORTVERSION%%"
@dirrm %%T%%/man/man1
@dirrm %%T%%/man/ja_JP.eucJP/man1
diff --git a/java/linux-blackdown-jre11/pkg-plist b/java/linux-blackdown-jre11/pkg-plist
index 7b0eced47287..a21858456544 100644
--- a/java/linux-blackdown-jre11/pkg-plist
+++ b/java/linux-blackdown-jre11/pkg-plist
@@ -70,7 +70,7 @@ linux-blackdown-jre%%JRE_VERSION%%/lib/rt.jar
linux-blackdown-jre%%JRE_VERSION%%/lib/security/java.security
linux-blackdown-jre%%JRE_VERSION%%/lib/serialver.properties
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/linux-blackdown-jre%%JRE_VERSION%%/bin/java # Linux-Blackdown-JRE%%JRE_VERSION%%"
@dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/security
@dirrm linux-blackdown-jre%%JRE_VERSION%%/lib/i686/native_threads
diff --git a/java/linux-ibm-jdk13/pkg-plist b/java/linux-ibm-jdk13/pkg-plist
index 7f7959b7cb2f..2e103c46674b 100644
--- a/java/linux-ibm-jdk13/pkg-plist
+++ b/java/linux-ibm-jdk13/pkg-plist
@@ -887,7 +887,7 @@
%%T%%/demo/jfc/TableExample/src/TableMap.java
%%T%%/demo/jfc/TableExample/src/TableSorter.java
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-IBM-JDK%%PORTVERSION%%"
@dirrm %%T%%/lib
@dirrm %%T%%/jre/lib/security
diff --git a/java/linux-ibm-jdk14/pkg-plist b/java/linux-ibm-jdk14/pkg-plist
index dfbb0db832e3..b4df5c762e55 100644
--- a/java/linux-ibm-jdk14/pkg-plist
+++ b/java/linux-ibm-jdk14/pkg-plist
@@ -770,7 +770,7 @@
%%T%%/lib/tools.jar
%%T%%/src.jar
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-IBM-JDK%%PORTVERSION%%"
@dirrm %%T%%/lib
@dirrm %%T%%/jre/lib/security
diff --git a/java/linux-sun-jdk12/pkg-plist b/java/linux-sun-jdk12/pkg-plist
index 26b9c67c1bf5..fecfbc6d04dd 100644
--- a/java/linux-sun-jdk12/pkg-plist
+++ b/java/linux-sun-jdk12/pkg-plist
@@ -721,7 +721,7 @@
%%T%%/lib/tools.jar
%%T%%/src.jar
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%JDK_VERSION%%"
@dirrm %%T%%/bin/i386/green_threads
@dirrm %%T%%/bin/i386/native_threads
diff --git a/java/linux-sun-jdk13/pkg-plist b/java/linux-sun-jdk13/pkg-plist
index 106b76acf8bc..47d493e2474f 100644
--- a/java/linux-sun-jdk13/pkg-plist
+++ b/java/linux-sun-jdk13/pkg-plist
@@ -798,7 +798,7 @@
%%T%%/man/man1/tnameserv.1
%%T%%/src.jar
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/doc/java 2>/dev/null || true
+@dirrmtry share/doc/java
@exec %%LOCALBASE%%/bin/registervm "%D/%%T%%/bin/java # Linux-Sun-JDK%%PORTVERSION%%"
@dirrm %%T%%/man/man1
@dirrm %%T%%/man/ja_JP.eucJP/man1
diff --git a/java/phpeclipse/pkg-plist b/java/phpeclipse/pkg-plist
index e07f1bcf1c00..b85ae50f3ceb 100644
--- a/java/phpeclipse/pkg-plist
+++ b/java/phpeclipse/pkg-plist
@@ -1381,13 +1381,13 @@ eclipse/plugins/%%OTS%%.subclipse_%%OTSVER%%/plugin.xml
@dirrm eclipse/features/org.eclipse.team.extras_%%TEAMVER%%
@dirrm eclipse/features/%%NSP%%_%%VER%%
@dirrm eclipse/features/net.sf.eclipsetidy.feature_%%TIDYVER%%
-@unexec rmdir %D/eclipse/features/%%QVER%%/lib 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/icons/unused 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/icons/.xvpics 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/icons 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/doc/images 2>/dev/null || true
-@unexec rmdir %D/eclipse/features/%%QVER%%/doc 2>/dev/null || true
+@dirrmtry eclipse/features/%%QVER%%/lib
+@dirrmtry eclipse/features/%%QVER%%/icons/unused
+@dirrmtry eclipse/features/%%QVER%%/icons/.xvpics
+@dirrmtry eclipse/features/%%QVER%%/icons
+@dirrmtry eclipse/features/%%QVER%%/doc/images
+@dirrmtry eclipse/features/%%QVER%%/doc
@dirrm eclipse/features/%%QVER%%
-@unexec rmdir %D/eclipse/plugins 2>/dev/null || true
-@unexec rmdir %D/eclipse/features 2>/dev/null || true
-@unexec rmdir %D/eclipse 2>/dev/null || true
+@dirrmtry eclipse/plugins
+@dirrmtry eclipse/features
+@dirrmtry eclipse
diff --git a/java/simplicity/pkg-plist b/java/simplicity/pkg-plist
index 659b9180c73a..0ba926c08c6e 100644
--- a/java/simplicity/pkg-plist
+++ b/java/simplicity/pkg-plist
@@ -429,4 +429,4 @@ share/java/Simplicity/icon32.bmp
@dirrm share/java/Simplicity/javadoc
@dirrm share/java/Simplicity/doc/images
@dirrm share/java/Simplicity/doc
-@dirrm share/java/Simplicity \ No newline at end of file
+@dirrm share/java/Simplicity
diff --git a/korean/FreeWnn-lib/pkg-plist b/korean/FreeWnn-lib/pkg-plist
index 05dda27ea63c..639e2d6f5af6 100644
--- a/korean/FreeWnn-lib/pkg-plist
+++ b/korean/FreeWnn-lib/pkg-plist
@@ -38,4 +38,4 @@ lib/libkwnn.so
lib/libkwnn.so.0
@dirrm lib/wnn/ko_KR/rk
@dirrm lib/wnn/ko_KR
-@unexec rmdir %D/lib/wnn 2> /dev/null || true
+@dirrmtry lib/wnn
diff --git a/korean/hanemacs/pkg-plist b/korean/hanemacs/pkg-plist
index e58c018dafc2..d2e59ffc159e 100644
--- a/korean/hanemacs/pkg-plist
+++ b/korean/hanemacs/pkg-plist
@@ -12,8 +12,8 @@ bin/emacsclient
etc/rc.d/emacs.sh
@comment these two can fail if other ports are installed, no need to
@comment scare user in that case
-@unexec rmdir %D/share/hanemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/hanemacs/19.34/site-lisp 2>/dev/null || true
+@dirrmtry share/hanemacs/site-lisp
+@dirrmtry share/hanemacs/19.34/site-lisp
@unexec install-info --delete %D/info/emacs %D/info/dir
@unexec install-info --delete %D/info/vip %D/info/dir
@unexec install-info --delete %D/info/viper %D/info/dir
@@ -126,7 +126,7 @@ libexec/hanemacs/19.34/i386--freebsd/vcdiff
libexec/hanemacs/19.34/i386--freebsd/yow
@dirrm libexec/hanemacs/19.34/i386--freebsd
@dirrm libexec/hanemacs/19.34
-@unexec rmdir %D/libexec/hanemacs 2>/dev/null || true
+@dirrmtry libexec/hanemacs
share/hanemacs/19.34/etc/3B-MAXMEM
share/hanemacs/19.34/etc/AIX.DUMP
share/hanemacs/19.34/etc/BABYL
diff --git a/korean/imhangul/pkg-plist b/korean/imhangul/pkg-plist
index 8eb251aba477..5c818d477d4e 100644
--- a/korean/imhangul/pkg-plist
+++ b/korean/imhangul/pkg-plist
@@ -1,4 +1,4 @@
lib/gtk-2.0/immodules/im-hangul.la
lib/gtk-2.0/immodules/im-hangul.so
@unexec %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
-@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true
+@dirrmtry lib/gtk-2.0/immodules
diff --git a/korean/munhwafonts-cid/pkg-plist b/korean/munhwafonts-cid/pkg-plist
index c6fe3aed10c2..be0dd9a35c95 100644
--- a/korean/munhwafonts-cid/pkg-plist
+++ b/korean/munhwafonts-cid/pkg-plist
@@ -30,5 +30,5 @@ share/ghostscript/fonts/MunhwaGothic-Bold-KSC-EUC-H.gsf
share/ghostscript/fonts/MunhwaGothic-Regular
share/ghostscript/fonts/MunhwaGothic-Regular-KSC-EUC-H.gsf
@dirrm share/ghostscript/fonts/CMap
-@unexec rmdir %D/share/ghostscript/fonts 2> /dev/null || true
-@unexec rmdir %D/share/ghostscript 2> /dev/null || true
+@dirrmtry share/ghostscript/fonts
+@dirrmtry share/ghostscript
diff --git a/korean/scim-hangul/pkg-plist b/korean/scim-hangul/pkg-plist
index d280e2a67ebb..8fd392d0f8de 100644
--- a/korean/scim-hangul/pkg-plist
+++ b/korean/scim-hangul/pkg-plist
@@ -6,6 +6,6 @@ share/locale/ja/LC_MESSAGES/scim-hangul.mo
share/locale/ko/LC_MESSAGES/scim-hangul.mo
share/locale/zh_CN/LC_MESSAGES/scim-hangul.mo
share/scim/icons/scim-hangul.png
-@unexec rmdir %D/share/scim/icons 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
+@dirrmtry share/scim/icons
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
diff --git a/korean/scim-tables/pkg-plist b/korean/scim-tables/pkg-plist
index 0777ce7ddf70..9987e4d27a18 100644
--- a/korean/scim-tables/pkg-plist
+++ b/korean/scim-tables/pkg-plist
@@ -3,4 +3,4 @@ share/scim/tables/HangulRomaja.bin
share/scim/tables/Hanja.bin
share/scim/icons/Hangul.png
share/scim/icons/Hanja.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+@dirrmtry share/scim/tables
diff --git a/lang/STk/pkg-plist b/lang/STk/pkg-plist
index 7590bff9ed33..2e4ac18d7330 100644
--- a/lang/STk/pkg-plist
+++ b/lang/STk/pkg-plist
@@ -550,7 +550,7 @@ lib/stk/%%STK_VERSION%%/STk/www-url.stk
lib/stk/%%STK_VERSION%%/STk/www.stk
@exec ln -sf %D/lib/stk/%%STK_VERSION%%/man %D/lib/stk/man
@exec mkdir -p %D/lib/stk/site-scheme
-@unexec rmdir %D/lib/stk/site-scheme 2>/dev/null || true
+@dirrmtry lib/stk/site-scheme
@unexec rm -f %D/lib/stk/man
@dirrm lib/stk/%%STK_VERSION%%/STk/Match
@dirrm lib/stk/%%STK_VERSION%%/STk
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index 9d57499b83e4..d3472efbd34a 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -11,5 +11,5 @@ bin/erlc
@dirrm lib/erlang/man/man3
@dirrm lib/erlang/man/man1
@dirrm lib/erlang/man
-@unexec rmdir %D/lib/erlang/lib 2>/dev/null || true
-@unexec rmdir %D/lib/erlang 2>/dev/null || true
+@dirrmtry lib/erlang/lib
+@dirrmtry lib/erlang
diff --git a/lang/erlang14/pkg-plist b/lang/erlang14/pkg-plist
index 9d57499b83e4..d3472efbd34a 100644
--- a/lang/erlang14/pkg-plist
+++ b/lang/erlang14/pkg-plist
@@ -11,5 +11,5 @@ bin/erlc
@dirrm lib/erlang/man/man3
@dirrm lib/erlang/man/man1
@dirrm lib/erlang/man
-@unexec rmdir %D/lib/erlang/lib 2>/dev/null || true
-@unexec rmdir %D/lib/erlang 2>/dev/null || true
+@dirrmtry lib/erlang/lib
+@dirrmtry lib/erlang
diff --git a/lang/gcc28/pkg-plist b/lang/gcc28/pkg-plist
index aa407d502a08..52fea6d25500 100644
--- a/lang/gcc28/pkg-plist
+++ b/lang/gcc28/pkg-plist
@@ -37,6 +37,6 @@ lib/gcc-lib/%%GNUHOST%%/2.8.1/libobjc.a
@dirrm lib/gcc-lib/%%GNUHOST%%/2.8.1/include
@dirrm lib/gcc-lib/%%GNUHOST%%/2.8.1
@dirrm lib/gcc-lib/%%GNUHOST%%
-@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true
+@dirrmtry lib/gcc-lib
@dirrm %%GNUHOST%%/include
@dirrm %%GNUHOST%%
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index c78e749ccda1..6e2f599b4350 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -20,7 +20,7 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%
-@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true
-@unexec rmdir %D/libexec/gcc 2>/dev/null || true
+@dirrmtry libexec/gcc/%%GNU_HOST%%
+@dirrmtry libexec/gcc
info/gcc%%SUFFIX%%/dir
@comment Insert PLIST.lib here
diff --git a/lang/ici/pkg-plist b/lang/ici/pkg-plist
index cf59c255edfd..5b84a0e4b033 100644
--- a/lang/ici/pkg-plist
+++ b/lang/ici/pkg-plist
@@ -7,5 +7,5 @@ lib/ici4/ici4core1.ici
lib/ici4/ici4core2.ici
lib/ici4/ici4core3.ici
share/doc/ici4/ici.pdf
-@unexec rmdir %D/lib/ici4 2>/dev/null || true
+@dirrmtry lib/ici4
@dirrm share/doc/ici4
diff --git a/lang/klogoturtle/pkg-plist b/lang/klogoturtle/pkg-plist
index f4ce839a88c7..a35a27b4275c 100644
--- a/lang/klogoturtle/pkg-plist
+++ b/lang/klogoturtle/pkg-plist
@@ -26,40 +26,40 @@ share/locale/de/LC_MESSAGES/klogoturtle.mo
share/locale/fr/LC_MESSAGES/klogoturtle.mo
share/locale/it/LC_MESSAGES/klogoturtle.mo
share/locale/pt_BR/LC_MESSAGES/klogoturtle.mo
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale 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/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale
+@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/pt_BR/klogoturtle
-@unexec rmdir %D/share/doc/HTML/pt_BR 2>/dev/null || true
+@dirrmtry share/doc/HTML/pt_BR
@dirrm share/doc/HTML/it/klogoturtle
-@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
+@dirrmtry share/doc/HTML/it
@dirrm share/doc/HTML/fr/klogoturtle
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/en/klogoturtle
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/klogoturtle
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
@dirrm share/apps/klogoturtle
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Edutainment/Miscellaneous 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Edutainment 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/Edutainment/Miscellaneous
+@dirrmtry share/applnk/Edutainment
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/lang/kroc/pkg-plist b/lang/kroc/pkg-plist
index 054b4dd2a866..80b1a6daf4cf 100644
--- a/lang/kroc/pkg-plist
+++ b/lang/kroc/pkg-plist
@@ -109,8 +109,8 @@ lib/kroc/libudc.so
%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/lib 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/html 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/vtlib 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/vtinclude 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/kroc 2>/dev/null || true
-@unexec rmdir %D/include/kroc 2>/dev/null || true
+@dirrmtry %%DATADIR%%/vtlib
+@dirrmtry %%DATADIR%%/vtinclude
+@dirrmtry %%DATADIR%%
+@dirrmtry lib/kroc
+@dirrmtry include/kroc
diff --git a/lang/ml-pnet/pkg-plist b/lang/ml-pnet/pkg-plist
index 1e30eacee99a..7081c8777f7f 100644
--- a/lang/ml-pnet/pkg-plist
+++ b/lang/ml-pnet/pkg-plist
@@ -61,6 +61,6 @@ lib/cscc/lib/nunit.framework.dll
lib/cscc/lib/nunit.util.dll
lib/cscc/lib/sqlsharp-pnet.exe
lib/cscc/lib/wsdl-pnet.exe
-@unexec rmdir %D/lib/cscc/lib/2.2.0.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/1.0.5000.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/0.7.6.1 2>/dev/null || true
+@dirrmtry lib/cscc/lib/2.2.0.0
+@dirrmtry lib/cscc/lib/1.0.5000.0
+@dirrmtry lib/cscc/lib/0.7.6.1
diff --git a/lang/mono/pkg-plist b/lang/mono/pkg-plist
index 186c1f7efea7..35a650377257 100644
--- a/lang/mono/pkg-plist
+++ b/lang/mono/pkg-plist
@@ -748,12 +748,12 @@ share/jay/skeleton.cs
@dirrm lib/mono/gac/Accessibility/2.0.0.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/Accessibility/1.0.5000.0__b03f5f7f11d50a3a
@dirrm lib/mono/gac/Accessibility
-@unexec rmdir %D/lib/mono/gac 2>/dev/null || true
-@unexec rmdir %D/lib/mono/compat-2.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono/compat-1.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono/2.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono/1.0 2>/dev/null || true
-@unexec rmdir %D/lib/mono 2>/dev/null || true
+@dirrmtry lib/mono/gac
+@dirrmtry lib/mono/compat-2.0
+@dirrmtry lib/mono/compat-1.0
+@dirrmtry lib/mono/2.0
+@dirrmtry lib/mono/1.0
+@dirrmtry lib/mono
@dirrm include/mono/utils
@dirrm include/mono/private
@dirrm include/mono/metadata
diff --git a/lang/p5-Data-JavaScript/pkg-plist b/lang/p5-Data-JavaScript/pkg-plist
index e12136637de9..673d91d6c2a1 100644
--- a/lang/p5-Data-JavaScript/pkg-plist
+++ b/lang/p5-Data-JavaScript/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Data/example.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/JavaScript
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/lang/p5-Error/pkg-plist b/lang/p5-Error/pkg-plist
index e8875e37ddc9..3ab31e87f67d 100644
--- a/lang/p5-Error/pkg-plist
+++ b/lang/p5-Error/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Error.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Error 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Error
diff --git a/lang/p5-Expect/pkg-plist b/lang/p5-Expect/pkg-plist
index edc73e0e5fce..67bd73f81431 100644
--- a/lang/p5-Expect/pkg-plist
+++ b/lang/p5-Expect/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Expect.pod
%%SITE_PERL%%/Expect.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Expect
diff --git a/lang/p5-ExtUtils-F77/pkg-plist b/lang/p5-ExtUtils-F77/pkg-plist
index 5db2c856338c..763bdeb2fd27 100644
--- a/lang/p5-ExtUtils-F77/pkg-plist
+++ b/lang/p5-ExtUtils-F77/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/ExtUtils/F77.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
+@dirrmtry %%SITE_PERL%%/ExtUtils
diff --git a/lang/p5-F77/pkg-plist b/lang/p5-F77/pkg-plist
index 5db2c856338c..763bdeb2fd27 100644
--- a/lang/p5-F77/pkg-plist
+++ b/lang/p5-F77/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/ExtUtils/F77.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/F77
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
+@dirrmtry %%SITE_PERL%%/ExtUtils
diff --git a/lang/p5-Interpolation/pkg-plist b/lang/p5-Interpolation/pkg-plist
index 0ed704d7d2a5..9e327a1566b2 100644
--- a/lang/p5-Interpolation/pkg-plist
+++ b/lang/p5-Interpolation/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Interpolation.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Interpolation
diff --git a/lang/p5-JavaScript-SpiderMonkey/pkg-plist b/lang/p5-JavaScript-SpiderMonkey/pkg-plist
index 13096faa43cf..e7ebc1119bfc 100644
--- a/lang/p5-JavaScript-SpiderMonkey/pkg-plist
+++ b/lang/p5-JavaScript-SpiderMonkey/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey/SpiderMonkey.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/JavaScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JavaScript
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/SpiderMonkey
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
diff --git a/lang/p5-JavaScript-Squish/pkg-plist b/lang/p5-JavaScript-Squish/pkg-plist
index 2d8cbf278c77..d185075be0cc 100644
--- a/lang/p5-JavaScript-Squish/pkg-plist
+++ b/lang/p5-JavaScript-Squish/pkg-plist
@@ -1,6 +1,6 @@
bin/js_compactor
%%SITE_PERL%%/JavaScript/Squish.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/JavaScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript/Squish
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JavaScript
+@dirrmtry %%SITE_PERL%%/JavaScript
diff --git a/lang/p5-List-MoreUtils/pkg-plist b/lang/p5-List-MoreUtils/pkg-plist
index b51add371cd1..84558dbd36ea 100644
--- a/lang/p5-List-MoreUtils/pkg-plist
+++ b/lang/p5-List-MoreUtils/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/MoreUtils.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils/MoreUtils.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/MoreUtils
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/List
diff --git a/lang/p5-Perl6-Subs/pkg-plist b/lang/p5-Perl6-Subs/pkg-plist
index 13e9e65b7b5d..ef2d9c455ce2 100644
--- a/lang/p5-Perl6-Subs/pkg-plist
+++ b/lang/p5-Perl6-Subs/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Perl6/Subs.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Perl6 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Subs
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
+@dirrmtry %%SITE_PERL%%/Perl6
diff --git a/lang/p5-Scalar-List-Utils/pkg-plist b/lang/p5-Scalar-List-Utils/pkg-plist
index c202f3eda11f..418b5ac67c5a 100644
--- a/lang/p5-Scalar-List-Utils/pkg-plist
+++ b/lang/p5-Scalar-List-Utils/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Scalar/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/List/Util.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Util
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Scalar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/List
diff --git a/lang/p5-Switch/pkg-plist b/lang/p5-Switch/pkg-plist
index 6dadc139d1ff..605311a4e920 100644
--- a/lang/p5-Switch/pkg-plist
+++ b/lang/p5-Switch/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch/.packlist
%%SITE_PERL%%/Switch.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Switch
diff --git a/lang/perl5.10/pkg-plist b/lang/perl5.10/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.10/pkg-plist
+++ b/lang/perl5.10/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
@dirrm lib/perl5/%%PERL_VER%%/unicore/To
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
@dirrm lib/perl5/%%PERL_VER%%/unicore/To
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
@dirrm lib/perl5/%%PERL_VER%%/unicore/To
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
@dirrm lib/perl5/%%PERL_VER%%/unicore/To
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5.6/pkg-plist b/lang/perl5.6/pkg-plist
index 99bb4c697e72..b9ca3a355c95 100644
--- a/lang/perl5.6/pkg-plist
+++ b/lang/perl5.6/pkg-plist
@@ -1035,79 +1035,79 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/To 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/Is 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/In 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/To
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/Is
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/In
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
@dirrm lib/perl5/%%PERL_VER%%/Test/Simple/t
@dirrm lib/perl5/%%PERL_VER%%/Test/Simple
@dirrm lib/perl5/%%PERL_VER%%/Test/t
@dirrm lib/perl5/%%PERL_VER%%/Test/Harness/t
@dirrm lib/perl5/%%PERL_VER%%/Test/Harness
@dirrm lib/perl5/%%PERL_VER%%/Test
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
@dirrm lib/perl5/%%PERL_VER%%/File/Temp/t
@dirrm lib/perl5/%%PERL_VER%%/File/Temp
@dirrm lib/perl5/%%PERL_VER%%/File/Spec/t
@@ -1118,17 +1118,17 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Command
@dirrm lib/perl5/%%PERL_VER%%/ExtUtils
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry lib/perl5
diff --git a/lang/perl5.8/pkg-plist b/lang/perl5.8/pkg-plist
index a02b3fa3191a..c75ede0c1aaf 100644
--- a/lang/perl5.8/pkg-plist
+++ b/lang/perl5.8/pkg-plist
@@ -1515,112 +1515,112 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Scalar 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/List 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Digest 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/DBM_Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX/SigAction
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/Typemap
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS/APItest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/XS
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode/Normalize
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time/HiRes
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Storable
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO/encoding
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME/Base64
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/List
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N/Langinfo
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util/Call
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest/MD5
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/PPPort
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cwd
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B/C
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter/Util
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Scalar
+@dirrmtry lib/perl5/%%PERL_VER%%/List
+@dirrmtry lib/perl5/%%PERL_VER%%/Digest
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/DBM_Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/CN
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/MIME
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/KR
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/JP
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
@dirrm lib/perl5/%%PERL_VER%%/unicore/To
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/gc_sc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/dt
@@ -1632,73 +1632,73 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/nt
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib/ccc
@dirrm lib/perl5/%%PERL_VER%%/unicore/lib
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicore 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode/Collate 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Thread 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/TabsWrap 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text/Balanced 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test/Harness 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Test 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term/ANSIColor 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Switch 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Perldoc 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/NEXT 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/Ping 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/FTP 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net/demos 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Memoize 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigInt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math/BigFloat 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale/Codes 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Locale 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N/LangTags 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Hash 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter/Simple 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Filter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File/Spec 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Encode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Constant 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/Liblist 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class/ISA 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI/eg 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Attribute 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/unicore
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode/Collate
+@dirrmtry lib/perl5/%%PERL_VER%%/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Thread
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/TabsWrap
+@dirrmtry lib/perl5/%%PERL_VER%%/Text/Balanced
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Test/Harness
+@dirrmtry lib/perl5/%%PERL_VER%%/Test
+@dirrmtry lib/perl5/%%PERL_VER%%/Term/ANSIColor
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Switch
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Perldoc
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO/via
+@dirrmtry lib/perl5/%%PERL_VER%%/PerlIO
+@dirrmtry lib/perl5/%%PERL_VER%%/NEXT
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/Ping
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/FTP
+@dirrmtry lib/perl5/%%PERL_VER%%/Net/demos
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Memoize
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigInt
+@dirrmtry lib/perl5/%%PERL_VER%%/Math/BigFloat
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Maketext
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale/Codes
+@dirrmtry lib/perl5/%%PERL_VER%%/Locale
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N/LangTags
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Hash
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter/Simple
+@dirrmtry lib/perl5/%%PERL_VER%%/Filter
+@dirrmtry lib/perl5/%%PERL_VER%%/File/Spec
+@dirrmtry lib/perl5/%%PERL_VER%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode/Unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/Encode
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Command
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Constant
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils/MakeMaker
+@dirrmtry lib/perl5/%%PERL_VER%%/ExtUtils
+@dirrmtry lib/perl5/%%PERL_VER%%/Class/ISA
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI/eg
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers/demo
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute/Handlers
+@dirrmtry lib/perl5/%%PERL_VER%%/Attribute
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/lang/perl5/pkg-plist b/lang/perl5/pkg-plist
index 99bb4c697e72..b9ca3a355c95 100644
--- a/lang/perl5/pkg-plist
+++ b/lang/perl5/pkg-plist
@@ -1035,79 +1035,79 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/BSDPAN
@unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true
%%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/%%PERL_ARCH%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO/Socket 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IO 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt/Long 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/auto 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/warnings 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/To 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/Is 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode/In 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/unicode 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/B 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/User 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Time 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Tie 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Text 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/re
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/attrs
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Syslog
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys/Hostname
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Sys
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/sdbm
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/SDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/POSIX
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Opcode
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/NDBM_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/Peek
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel/DProf
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data/Dumper
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/ByteLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/DynaLoader
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/CORE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
+@dirrmtry %%SITE_PERL%%/auto
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%
+@dirrmtry lib/perl5/%%PERL_VER%%/IO/Socket
+@dirrmtry lib/perl5/%%PERL_VER%%/IO
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt/Long
+@dirrmtry lib/perl5/%%PERL_VER%%/auto/Getopt
+@dirrmtry lib/perl5/%%PERL_VER%%/auto
+@dirrmtry lib/perl5/%%PERL_VER%%/warnings
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/To
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/Is
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode/In
+@dirrmtry lib/perl5/%%PERL_VER%%/unicode
+@dirrmtry lib/perl5/%%PERL_VER%%/B
+@dirrmtry lib/perl5/%%PERL_VER%%/User
+@dirrmtry lib/perl5/%%PERL_VER%%/Time
+@dirrmtry lib/perl5/%%PERL_VER%%/Tie
+@dirrmtry lib/perl5/%%PERL_VER%%/Text
@dirrm lib/perl5/%%PERL_VER%%/Test/Simple/t
@dirrm lib/perl5/%%PERL_VER%%/Test/Simple
@dirrm lib/perl5/%%PERL_VER%%/Test/t
@dirrm lib/perl5/%%PERL_VER%%/Test/Harness/t
@dirrm lib/perl5/%%PERL_VER%%/Test/Harness
@dirrm lib/perl5/%%PERL_VER%%/Test
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Term 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Math 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/IPC 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/I18N 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Getopt 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/Term
+@dirrmtry lib/perl5/%%PERL_VER%%/Search
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod/Text
+@dirrmtry lib/perl5/%%PERL_VER%%/Pod
+@dirrmtry lib/perl5/%%PERL_VER%%/Net
+@dirrmtry lib/perl5/%%PERL_VER%%/Math
+@dirrmtry lib/perl5/%%PERL_VER%%/IPC
+@dirrmtry lib/perl5/%%PERL_VER%%/I18N
+@dirrmtry lib/perl5/%%PERL_VER%%/Getopt
@dirrm lib/perl5/%%PERL_VER%%/File/Temp/t
@dirrm lib/perl5/%%PERL_VER%%/File/Temp
@dirrm lib/perl5/%%PERL_VER%%/File/Spec/t
@@ -1118,17 +1118,17 @@ lib/perl5/%%PERL_VER%%/warnings/register.pm
@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Liblist
@dirrm lib/perl5/%%PERL_VER%%/ExtUtils/Command
@dirrm lib/perl5/%%PERL_VER%%/ExtUtils
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CGI 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Exporter 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Devel 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/Carp 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/pod 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man/man3 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%%/man 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VER%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry lib/perl5/%%PERL_VER%%/CGI
+@dirrmtry lib/perl5/%%PERL_VER%%/Exporter
+@dirrmtry lib/perl5/%%PERL_VER%%/Devel
+@dirrmtry lib/perl5/%%PERL_VER%%/Class
+@dirrmtry lib/perl5/%%PERL_VER%%/Carp
+@dirrmtry lib/perl5/%%PERL_VER%%/CPAN
+@dirrmtry lib/perl5/%%PERL_VER%%/pod
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/perl/man
+@dirrmtry lib/perl5/%%PERL_VER%%/perl
+@dirrmtry lib/perl5/%%PERL_VER%%/man/man3
+@dirrmtry lib/perl5/%%PERL_VER%%/man
+@dirrmtry lib/perl5/%%PERL_VER%%
+@dirrmtry lib/perl5
diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index 754571e14918..209024ef1f08 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -172,9 +172,9 @@ lib/php/build/shtool
@dirrm include/php/TSRM
@dirrm include/php/Zend
@dirrm include/php/ext/standard
-@unexec rmdir %D/include/php/ext 2> /dev/null || true
+@dirrmtry include/php/ext
@dirrm include/php/main
@dirrm include/php/regex
-@unexec rmdir %D/include/php 2> /dev/null || true
+@dirrmtry include/php
@dirrm lib/php/build
-@unexec rmdir %D/lib/php 2> /dev/null || true
+@dirrmtry lib/php
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index a2fb357af332..4e08b934c5c3 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -207,10 +207,10 @@ lib/php/build/shtool
@dirrm include/php/ext/libxml
@dirrm include/php/ext/spl
@dirrm include/php/ext/standard
-@unexec rmdir %D/include/php/ext 2> /dev/null || true
+@dirrmtry include/php/ext
@dirrm include/php/main/streams
@dirrm include/php/main
@dirrm include/php/regex
-@unexec rmdir %D/include/php 2> /dev/null || true
+@dirrmtry include/php
@dirrm lib/php/build
-@unexec rmdir %D/lib/php 2> /dev/null || true
+@dirrmtry lib/php
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index a2fb357af332..4e08b934c5c3 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -207,10 +207,10 @@ lib/php/build/shtool
@dirrm include/php/ext/libxml
@dirrm include/php/ext/spl
@dirrm include/php/ext/standard
-@unexec rmdir %D/include/php/ext 2> /dev/null || true
+@dirrmtry include/php/ext
@dirrm include/php/main/streams
@dirrm include/php/main
@dirrm include/php/regex
-@unexec rmdir %D/include/php 2> /dev/null || true
+@dirrmtry include/php
@dirrm lib/php/build
-@unexec rmdir %D/lib/php 2> /dev/null || true
+@dirrmtry lib/php
diff --git a/lang/pike70/pkg-plist b/lang/pike70/pkg-plist
index 819f937298a9..b6649533f719 100644
--- a/lang/pike70/pkg-plist
+++ b/lang/pike70/pkg-plist
@@ -441,7 +441,7 @@ pike/%%PORTVERSION%%/man/man1/pike.1
@dirrm pike/%%PORTVERSION%%/lib/modules/Calendar.pmod
@dirrm pike/%%PORTVERSION%%/lib/modules/Debug.pmod
@dirrm pike/%%PORTVERSION%%/lib/modules/Filesystem.pmod
-@unexec rmdir %D/pike/%%PORTVERSION%%/lib/modules/GDKSupport.pmod 2> /dev/null || true
+@dirrmtry pike/%%PORTVERSION%%/lib/modules/GDKSupport.pmod
@dirrm pike/%%PORTVERSION%%/lib/modules/GTKSupport.pmod
@dirrm pike/%%PORTVERSION%%/lib/modules/Graphics.pmod/Graph.pmod
@dirrm pike/%%PORTVERSION%%/lib/modules/Graphics.pmod
diff --git a/lang/pnet-base/pkg-plist b/lang/pnet-base/pkg-plist
index f01e7676c14c..b41ce94131ad 100644
--- a/lang/pnet-base/pkg-plist
+++ b/lang/pnet-base/pkg-plist
@@ -141,5 +141,5 @@ lib/libILSupport.a
%%I386%%@dirrm lib/pnet/elf
%%I386%%@dirrm lib/pnet
@dirrm lib/cscc/plugins
-@unexec rmdir %D/lib/cscc 2>/dev/null || true
+@dirrmtry lib/cscc
%%I386%%@dirrm share/gc
diff --git a/lang/pnetc/pkg-plist b/lang/pnetc/pkg-plist
index 39159409dbee..53c0291c5dfc 100644
--- a/lang/pnetc/pkg-plist
+++ b/lang/pnetc/pkg-plist
@@ -118,14 +118,14 @@ share/cscc/include/varargs.h
share/cscc/include/wchar.h
share/cscc/include/wctype.h
share/cscc/include/xlocale.h
-@unexec rmdir %D/share/cscc/include/sys 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/netinet 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/gnu 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/bits 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/assembly 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include/arpa 2>/dev/null || true
-@unexec rmdir %D/share/cscc/include 2>/dev/null || true
-@unexec rmdir %D/share/cscc 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib 2>/dev/null || true
-@unexec rmdir %D/lib/cscc 2>/dev/null || true
+@dirrmtry share/cscc/include/sys
+@dirrmtry share/cscc/include/netinet
+@dirrmtry share/cscc/include/gnu
+@dirrmtry share/cscc/include/bits
+@dirrmtry share/cscc/include/assembly
+@dirrmtry share/cscc/include/arpa
+@dirrmtry share/cscc/include
+@dirrmtry share/cscc
+@dirrmtry lib/cscc/lib/2.0.3600.0
+@dirrmtry lib/cscc/lib
+@dirrmtry lib/cscc
diff --git a/lang/pnetlib/pkg-plist b/lang/pnetlib/pkg-plist
index 634f112f2ee1..39feee925eb6 100644
--- a/lang/pnetlib/pkg-plist
+++ b/lang/pnetlib/pkg-plist
@@ -130,15 +130,15 @@ lib/cscc/lib/pinvoke.map
lib/cscc/lib/sysglobl.dll
share/cscc/config/machine.default
@dirrm share/cscc/config
-@unexec rmdir %D/share/cscc 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/8.0.1200.0/de 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/8.0.1200.0/ca 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/8.0.1200.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0/de 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0/ca 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/2.0.3600.0 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/0.81.0.1407 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/ca 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib/de 2>/dev/null || true
-@unexec rmdir %D/lib/cscc/lib 2>/dev/null || true
-@unexec rmdir %D/lib/cscc 2>/dev/null || true
+@dirrmtry share/cscc
+@dirrmtry lib/cscc/lib/8.0.1200.0/de
+@dirrmtry lib/cscc/lib/8.0.1200.0/ca
+@dirrmtry lib/cscc/lib/8.0.1200.0
+@dirrmtry lib/cscc/lib/2.0.3600.0/de
+@dirrmtry lib/cscc/lib/2.0.3600.0/ca
+@dirrmtry lib/cscc/lib/2.0.3600.0
+@dirrmtry lib/cscc/lib/0.81.0.1407
+@dirrmtry lib/cscc/lib/ca
+@dirrmtry lib/cscc/lib/de
+@dirrmtry lib/cscc/lib
+@dirrmtry lib/cscc
diff --git a/lang/pugs/pkg-plist b/lang/pugs/pkg-plist
index 497241525c48..f88d9041ec57 100644
--- a/lang/pugs/pkg-plist
+++ b/lang/pugs/pkg-plist
@@ -457,9 +457,9 @@ lib/perl6/site_perl/mach/CORE/pugs/syck/yamlbyte.h
@dirrm lib/perl6
@dirrm %%SITE_PERL%%/Perl6/Pugs
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Pugs
-@unexec rmdir %D/lib/perl6/mach 2>/dev/null || true
-@unexec rmdir %D/lib/perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/pugs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6 2>/dev/null || true
+@dirrmtry lib/perl6/mach
+@dirrmtry lib/perl6
+@dirrmtry %%SITE_PERL%%/Inline
+@dirrmtry %%SITE_PERL%%/pugs
+@dirrmtry %%SITE_PERL%%/Perl6
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
diff --git a/lang/python-mode.el/pkg-plist b/lang/python-mode.el/pkg-plist
index ef1b6a89ea27..a6e51d4536bc 100644
--- a/lang/python-mode.el/pkg-plist
+++ b/lang/python-mode.el/pkg-plist
@@ -5,5 +5,5 @@ share/emacs/site-lisp/pycomplete.el
@exec ln -sf %D/%F %D/lib/xemacs/site-lisp/pycomplete.el
@unexec rm %D/lib/xemacs/site-lisp/python-mode.el 2>/dev/null || true
@unexec rm %D/lib/xemacs/site-lisp/pycomplete.el 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs
diff --git a/lang/ruby-man/pkg-plist b/lang/ruby-man/pkg-plist
index 9ffc2eeecd78..d2ffea6f93d9 100644
--- a/lang/ruby-man/pkg-plist
+++ b/lang/ruby-man/pkg-plist
@@ -48,4 +48,4 @@
%%RUBY_MODDOCDIR%%/variable.html
%%RUBY_MODDOCDIR%%/yacc.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby-programmingruby/pkg-plist b/lang/ruby-programmingruby/pkg-plist
index 3576369333fd..d96a2defc079 100644
--- a/lang/ruby-programmingruby/pkg-plist
+++ b/lang/ruby-programmingruby/pkg-plist
@@ -158,4 +158,4 @@
@dirrm %%RUBY_MODDOCDIR%%/html
@dirrm %%RUBY_MODDOCDIR%%/xml
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby-reference/pkg-plist b/lang/ruby-reference/pkg-plist
index 7b76ea2e42ff..a4274fdf42b6 100644
--- a/lang/ruby-reference/pkg-plist
+++ b/lang/ruby-reference/pkg-plist
@@ -45,4 +45,4 @@
%%RUBY_MODDOCDIR%%/ref_m_objectspace.html
%%RUBY_MODDOCDIR%%/ref_m_process.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby-usersguide/pkg-plist b/lang/ruby-usersguide/pkg-plist
index 4e4292666914..384a81591f84 100644
--- a/lang/ruby-usersguide/pkg-plist
+++ b/lang/ruby-usersguide/pkg-plist
@@ -34,4 +34,4 @@
%%RUBY_MODDOCDIR%%/variables.html
%%RUBY_MODDOCDIR%%/whatisruby.html
@dirrm %%RUBY_MODDOCDIR%%
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 8035fbe8e051..e1bc445114ba 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -141,7 +141,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
@dirrm %%RUBY_SITEARCHLIBDIR%%
%%RUBYLIB%%@dirrm %%RUBY_SITELIBDIR%%
-@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
+@dirrmtry lib/ruby/site_ruby
@dirrm %%RUBY_ARCHLIBDIR%%
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/uri
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/shell
@@ -153,8 +153,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%
@unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
%%RUBY_ELISPDIR%%/.keep_me.%%RUBY_NAME%%
-@unexec rmdir %D/%%RUBY_ELISPDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/ruby 2>/dev/null || true
+@dirrmtry %%RUBY_ELISPDIR%%
+@dirrmtry lib/ruby
%%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING
%%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog
@@ -190,7 +190,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/net
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
%%RUBY_DOCDIR%%/.keep_me
-@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_DOCDIR%%
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cal.rb
@@ -248,4 +248,4 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
%%RUBY_EXAMPLESDIR%%/.keep_me
-@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
+@dirrmtry %%RUBY_EXAMPLESDIR%%
diff --git a/lang/smalltalk/pkg-plist b/lang/smalltalk/pkg-plist
index 2fe05f25dd53..7f6f6016d8d4 100644
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@@ -454,4 +454,4 @@ share/smalltalk/xml/XSL.st
@dirrm share/smalltalk
@dirrm lib/smalltalk
@exec mkdir -p %D/include/snprintfv
-@unexec rmdir %D/include/snprintfv 2>/dev/null || true
+@dirrmtry include/snprintfv
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index 6da2c5fed99d..a93b91df75c8 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -1,6 +1,6 @@
etc/periodic/daily/510.assp
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
lib/assp/addservice.pl
lib/assp/assp.pl
lib/assp/move2num.pl
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 568bc94fb5e7..f6d509188dfc 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -135,8 +135,8 @@ share/locale/vi/LC_MESSAGES/balsa.mo
share/locale/wa/LC_MESSAGES/balsa.mo
share/locale/zh_CN/LC_MESSAGES/balsa.mo
share/locale/zh_TW/LC_MESSAGES/balsa.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/sounds/balsa
@dirrm share/gnome/omf/balsa
%%GTKICON%%@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
diff --git a/mail/bincimap/pkg-plist b/mail/bincimap/pkg-plist
index 345aedd99fc7..5fc2d690124b 100644
--- a/mail/bincimap/pkg-plist
+++ b/mail/bincimap/pkg-plist
@@ -2,7 +2,7 @@
bin/bincimapd
bin/bincimap-up
etc/bincimap/bincimap.conf.sample
-@unexec rmdir %D/etc/bincimap 2>/dev/null || true
+@dirrmtry etc/bincimap
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index 42909f31edc4..fb0c396abf60 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -47,11 +47,11 @@ share/courier-imap/mkpop3dcert
%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
%%PORTDOCS%%%%DOCSDIR%%/README.couriertls
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm share/courier-imap
-@unexec rmdir %D/%%LIBEXECDIR%%/authlib 2>/dev/null || true
+@dirrmtry %%LIBEXECDIR%%/authlib
@dirrm %%LIBEXECDIR%%
@dirrm %%CONFDIR%%/shared
@dirrm %%CONFDIR%%/shared.tmp
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 172d1ed5a7c3..31679fbba714 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -120,19 +120,19 @@ etc/courier/webmail.authpam
@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist
@exec [ -f %D/etc/courier/pop3d.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist
@exec [ -f %D/etc/courier/sqwebmaild.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/sqwebmaild.dist
-@unexec rmdir %D/etc/courier/aliasdir 2>/dev/null || true
-@unexec rmdir %D/etc/courier/aliases 2>/dev/null || true
-@unexec rmdir %D/etc/courier/esmtpacceptmailfor.dir 2>/dev/null || true
-@unexec rmdir %D/etc/courier/esmtppercentrelay.dir 2>/dev/null || true
-@unexec rmdir %D/etc/courier/filters/active 2>/dev/null || true
-@unexec rmdir %D/etc/courier/filters 2>/dev/null || true
-@unexec rmdir %D/etc/courier/shared 2>/dev/null || true
-@unexec rmdir %D/etc/courier/shared.tmp 2>/dev/null || true
-@unexec rmdir %D/etc/courier/smtpaccess 2>/dev/null || true
-@unexec rmdir %D/etc/courier/webadmin/added 2>/dev/null || true
-@unexec rmdir %D/etc/courier/webadmin/removed 2>/dev/null || true
-@unexec rmdir %D/etc/courier/webadmin 2>/dev/null || true
-@unexec rmdir %D/etc/courier 2>/dev/null || true
+@dirrmtry etc/courier/aliasdir
+@dirrmtry etc/courier/aliases
+@dirrmtry etc/courier/esmtpacceptmailfor.dir
+@dirrmtry etc/courier/esmtppercentrelay.dir
+@dirrmtry etc/courier/filters/active
+@dirrmtry etc/courier/filters
+@dirrmtry etc/courier/shared
+@dirrmtry etc/courier/shared.tmp
+@dirrmtry etc/courier/smtpaccess
+@dirrmtry etc/courier/webadmin/added
+@dirrmtry etc/courier/webadmin/removed
+@dirrmtry etc/courier/webadmin
+@dirrmtry etc/courier
libexec/courier/aliascombine
libexec/courier/aliascreate
libexec/courier/aliasexp
diff --git a/mail/couriergraph/pkg-plist b/mail/couriergraph/pkg-plist
index f84aa392679d..b8f98023f15f 100644
--- a/mail/couriergraph/pkg-plist
+++ b/mail/couriergraph/pkg-plist
@@ -1,4 +1,4 @@
etc/rc.d/couriergraph.sh
www/cgi-bin/couriergraph.cgi
sbin/couriergraph.pl
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index e4e0d81d0de7..ebc9cf7e902a 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -30,7 +30,7 @@ bin/ezmlm-weed
etc/ezmlm/ezmlmglrc.sample
etc/ezmlm/ezmlmrc.sample
etc/ezmlm/ezmlmsubrc.sample
-@unexec rmdir %D/etc/ezmlm 2>/dev/null || true
+@dirrmtry etc/ezmlm
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.idx
%%PORTDOCS%%%%DOCSDIR%%/DOWNGRADE.idx
%%PORTDOCS%%%%DOCSDIR%%/FAQ.idx
diff --git a/mail/freepops/pkg-plist b/mail/freepops/pkg-plist
index 921c4d8b7283..8df133c625e0 100644
--- a/mail/freepops/pkg-plist
+++ b/mail/freepops/pkg-plist
@@ -45,5 +45,5 @@ etc/freepops/config.lua.sample
@dirrm %%DATADIR%%/lua
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/freepops 2>/dev/null || true
+@dirrmtry etc/freepops
@exec mkdir -p %D/share/freepops/lua_unofficial
diff --git a/mail/gnubiff/pkg-plist b/mail/gnubiff/pkg-plist
index 0a9b90f52018..d1ed2f328689 100644
--- a/mail/gnubiff/pkg-plist
+++ b/mail/gnubiff/pkg-plist
@@ -32,10 +32,10 @@ share/locale/vi/LC_MESSAGES/gnubiff.mo
%%SHAREDIR%%/pixmaps/gnubiff.png
%%WITH_GNOME%%%%BONOBODIR%%/servers/GNOME_gnubiffApplet.server
%%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
-@unexec rmdir %D/share/locale/fr_CA/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_CA 2> /dev/null || true
-@unexec rmdir %D/%%BONOBODIR%%/servers 2> /dev/null || true
-@unexec rmdir %D/%%BONOBODIR%% 2> /dev/null || true
-@unexec rmdir %D/%%SHAREDIR%%/gnome-2.0/ui 2> /dev/null || true
-@unexec rmdir %D/%%SHAREDIR%%/gnome-2.0 2> /dev/null || true
+@dirrmtry share/locale/fr_CA/LC_MESSAGES
+@dirrmtry share/locale/fr_CA
+@dirrmtry %%BONOBODIR%%/servers
+@dirrmtry %%BONOBODIR%%
+@dirrmtry %%SHAREDIR%%/gnome-2.0/ui
+@dirrmtry %%SHAREDIR%%/gnome-2.0
@dirrm %%SHAREDIR%%/gnubiff
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index 4aed11a161f8..f4b7a7474b06 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -498,5 +498,5 @@
@dirrm %%IMPDIR%%/lib/Auth
@dirrm %%IMPDIR%%/lib
@dirrm %%IMPDIR%%/js
-@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true
+@dirrmtry %%IMPDIR%%/config
+@dirrmtry %%IMPDIR%%
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
index 697fac19d784..85af75074930 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde-ingo/pkg-plist
@@ -164,5 +164,5 @@
@dirrm %%INGODIR%%/lib/Script
@dirrm %%INGODIR%%/lib/Driver
@dirrm %%INGODIR%%/lib
-@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true
+@dirrmtry %%INGODIR%%/config
+@dirrmtry %%INGODIR%%
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index fdb89c479187..07ea12b087a2 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -257,5 +257,5 @@
@dirrm %%TURBADIR%%/themes/graphics/menu
@dirrm %%TURBADIR%%/themes/graphics
@dirrm %%TURBADIR%%/themes
-@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true
+@dirrmtry %%TURBADIR%%/config
+@dirrmtry %%TURBADIR%%
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index 4aed11a161f8..f4b7a7474b06 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -498,5 +498,5 @@
@dirrm %%IMPDIR%%/lib/Auth
@dirrm %%IMPDIR%%/lib
@dirrm %%IMPDIR%%/js
-@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true
+@dirrmtry %%IMPDIR%%/config
+@dirrmtry %%IMPDIR%%
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
index 697fac19d784..85af75074930 100644
--- a/mail/horde4-ingo/pkg-plist
+++ b/mail/horde4-ingo/pkg-plist
@@ -164,5 +164,5 @@
@dirrm %%INGODIR%%/lib/Script
@dirrm %%INGODIR%%/lib/Driver
@dirrm %%INGODIR%%/lib
-@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true
+@dirrmtry %%INGODIR%%/config
+@dirrmtry %%INGODIR%%
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index fdb89c479187..07ea12b087a2 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -257,5 +257,5 @@
@dirrm %%TURBADIR%%/themes/graphics/menu
@dirrm %%TURBADIR%%/themes/graphics
@dirrm %%TURBADIR%%/themes
-@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true
+@dirrmtry %%TURBADIR%%/config
+@dirrmtry %%TURBADIR%%
diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist
index 4aed11a161f8..f4b7a7474b06 100644
--- a/mail/imp/pkg-plist
+++ b/mail/imp/pkg-plist
@@ -498,5 +498,5 @@
@dirrm %%IMPDIR%%/lib/Auth
@dirrm %%IMPDIR%%/lib
@dirrm %%IMPDIR%%/js
-@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true
+@dirrmtry %%IMPDIR%%/config
+@dirrmtry %%IMPDIR%%
diff --git a/mail/ingo/pkg-plist b/mail/ingo/pkg-plist
index 697fac19d784..85af75074930 100644
--- a/mail/ingo/pkg-plist
+++ b/mail/ingo/pkg-plist
@@ -164,5 +164,5 @@
@dirrm %%INGODIR%%/lib/Script
@dirrm %%INGODIR%%/lib/Driver
@dirrm %%INGODIR%%/lib
-@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true
+@dirrmtry %%INGODIR%%/config
+@dirrmtry %%INGODIR%%
diff --git a/mail/kbiff/pkg-plist b/mail/kbiff/pkg-plist
index 5390eee2d243..e4ac25933a34 100644
--- a/mail/kbiff/pkg-plist
+++ b/mail/kbiff/pkg-plist
@@ -60,8 +60,8 @@ share/locale/sv/LC_MESSAGES/kbiff.mo
share/locale/tr/LC_MESSAGES/kbiff.mo
share/locale/uk/LC_MESSAGES/kbiff.mo
share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
-@unexec rmdir %D/share/locale/no_NY/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/no_NY 2> /dev/null || true
+@dirrmtry share/locale/no_NY/LC_MESSAGES
+@dirrmtry share/locale/no_NY
@dirrm share/doc/HTML/fr/kbiff
@dirrm share/doc/HTML/es/kbiff
@dirrm share/doc/HTML/en/kbiff
diff --git a/mail/kshowmail/pkg-plist b/mail/kshowmail/pkg-plist
index 94ee8fe5f90b..f9e376778bc5 100644
--- a/mail/kshowmail/pkg-plist
+++ b/mail/kshowmail/pkg-plist
@@ -35,26 +35,26 @@ share/locale/es/LC_MESSAGES/kshowmail.mo
share/locale/fr/LC_MESSAGES/kshowmail.mo
share/locale/hu/LC_MESSAGES/kshowmail.mo
share/locale/sv/LC_MESSAGES/kshowmail.mo
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/sv/kshowmail
-@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
+@dirrmtry share/doc/HTML/sv
@dirrm share/doc/HTML/hu/kshowmail
-@unexec rmdir %D/share/doc/HTML/hu 2>/dev/null || true
+@dirrmtry share/doc/HTML/hu
@dirrm share/doc/HTML/fr/kshowmail
-@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true
+@dirrmtry share/doc/HTML/fr
@dirrm share/doc/HTML/es/kshowmail
-@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true
+@dirrmtry share/doc/HTML/es
@dirrm share/doc/HTML/en/kshowmail
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/kshowmail
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
@dirrm share/apps/kshowmail/sounds
@dirrm share/apps/kshowmail/pics
@dirrm share/apps/kshowmail
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Internet
+@dirrmtry share/applnk
diff --git a/mail/mailgraph/pkg-plist b/mail/mailgraph/pkg-plist
index afe0e6531c85..7552a8b60cd2 100644
--- a/mail/mailgraph/pkg-plist
+++ b/mail/mailgraph/pkg-plist
@@ -1,3 +1,3 @@
www/cgi-bin/mailgraph.cgi
sbin/mailgraph.pl
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist
index 79841e2bbfbb..3d9e2bec166e 100644
--- a/mail/mailman/pkg-plist
+++ b/mail/mailman/pkg-plist
@@ -2095,15 +2095,15 @@ etc/rc.d/mailman.sh
@dirrm %%MMDIR%%/Mailman/Cgi
@dirrm %%MMDIR%%/Mailman/Bouncers
@dirrm %%MMDIR%%/Mailman/Archiver
-@unexec rmdir %D/%%MMDIR%%/spam 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/qfiles 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/logs 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/locks 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/lists 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/data 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/archives/public 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/archives/private 2>/dev/null || true
+@dirrmtry %%MMDIR%%/spam
+@dirrmtry %%MMDIR%%/qfiles
+@dirrmtry %%MMDIR%%/logs
+@dirrmtry %%MMDIR%%/locks
+@dirrmtry %%MMDIR%%/lists
+@dirrmtry %%MMDIR%%/data
+@dirrmtry %%MMDIR%%/archives/public
+@dirrmtry %%MMDIR%%/archives/private
%%SUB_HTDIG%%@unexec rmdir %D/%%MMDIR%%/archives/htdig 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/archives 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/Mailman 2>/dev/null || true
-@unexec rmdir %D/%%MMDIR%%/ 2>/dev/null || true
+@dirrmtry %%MMDIR%%/archives
+@dirrmtry %%MMDIR%%/Mailman
+@dirrmtry %%MMDIR%%/
diff --git a/mail/majordomo/pkg-plist b/mail/majordomo/pkg-plist
index a7bc415ad570..f6709a0883ce 100644
--- a/mail/majordomo/pkg-plist
+++ b/mail/majordomo/pkg-plist
@@ -48,7 +48,7 @@ majordomo/doc/post-install-notes
@dirrm majordomo/digests
@dirrm majordomo/lists/test-l-digest.archive
@dirrm majordomo/lists/test-l.archive
-@unexec rmdir %D/majordomo/lists 2>/dev/null || true
+@dirrmtry majordomo/lists
@dirrm majordomo/tmp
@dirrm majordomo/Tools
-@unexec rmdir %D/majordomo 2>/dev/null || true
+@dirrmtry majordomo
diff --git a/mail/mew-emacs20/pkg-plist b/mail/mew-emacs20/pkg-plist
index 0a95cc321cc2..c0e87333f155 100644
--- a/mail/mew-emacs20/pkg-plist
+++ b/mail/mew-emacs20/pkg-plist
@@ -147,10 +147,10 @@ bin/uumerge
%%EMACS_LIBDIR%%/site-lisp/mew/mew.el
%%EMACS_LIBDIR%%/site-lisp/mew/mew.elc
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/site-lisp
@dirrm %%EMACS_LIBDIR%%/etc/mew/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm %%MEW_DOCDIR%%/patches
@dirrm %%MEW_DOCDIR%%/contrib
@dirrm %%MEW_DOCDIR%%
diff --git a/mail/mew-mule/pkg-plist b/mail/mew-mule/pkg-plist
index 5856ad3bdfea..81e77bddd90b 100644
--- a/mail/mew-mule/pkg-plist
+++ b/mail/mew-mule/pkg-plist
@@ -150,7 +150,7 @@ bin/uumerge
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew
@dirrm %%EMACS_LIBDIR%%/etc/mew/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm %%MEW_DOCDIR%%/patches
@dirrm %%MEW_DOCDIR%%/contrib
@dirrm %%MEW_DOCDIR%%
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
index 5856ad3bdfea..81e77bddd90b 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -150,7 +150,7 @@ bin/uumerge
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew
@dirrm %%EMACS_LIBDIR%%/etc/mew/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm %%MEW_DOCDIR%%/patches
@dirrm %%MEW_DOCDIR%%/contrib
@dirrm %%MEW_DOCDIR%%
diff --git a/mail/mew2-emacs20/pkg-plist b/mail/mew2-emacs20/pkg-plist
index 1d80d8a5222c..7ce7981b7fec 100644
--- a/mail/mew2-emacs20/pkg-plist
+++ b/mail/mew2-emacs20/pkg-plist
@@ -157,9 +157,9 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/site-lisp
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
@dirrm share/doc/mew%%MEW_MAJOR_VER%%
diff --git a/mail/mew2/pkg-plist b/mail/mew2/pkg-plist
index 1d80d8a5222c..7ce7981b7fec 100644
--- a/mail/mew2/pkg-plist
+++ b/mail/mew2/pkg-plist
@@ -157,9 +157,9 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/site-lisp
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
@dirrm share/doc/mew%%MEW_MAJOR_VER%%
diff --git a/mail/mew3-emacs20/pkg-plist b/mail/mew3-emacs20/pkg-plist
index 3d969bc5ab29..4f5aff9b01b0 100644
--- a/mail/mew3-emacs20/pkg-plist
+++ b/mail/mew3-emacs20/pkg-plist
@@ -182,9 +182,9 @@ bin/mewls
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/site-lisp
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm %%DOCSDIR%%/contrib
@dirrm %%DOCSDIR%%
diff --git a/mail/mew3/pkg-plist b/mail/mew3/pkg-plist
index 3d969bc5ab29..4f5aff9b01b0 100644
--- a/mail/mew3/pkg-plist
+++ b/mail/mew3/pkg-plist
@@ -182,9 +182,9 @@ bin/mewls
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.el
%%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%/mew.elc
@dirrm %%EMACS_LIBDIR%%/site-lisp/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/site-lisp 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/site-lisp
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/etc
@dirrm %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%
-@unexec rmdir %D/%%EMACS_LIBDIR%%/etc 2>/dev/null || true
+@dirrmtry %%EMACS_LIBDIR%%/etc
@dirrm %%DOCSDIR%%/contrib
@dirrm %%DOCSDIR%%
diff --git a/mail/mulberry/pkg-plist b/mail/mulberry/pkg-plist
index 017820e9a805..a6f4d49c7662 100644
--- a/mail/mulberry/pkg-plist
+++ b/mail/mulberry/pkg-plist
@@ -28,4 +28,4 @@ lib/mulberry/Plug-ins/vCardAdbkIOPlugin.so
%%PORTDOCS%%@dirrm %%DOCSDIR%%
share/pixmaps/mulberry.png
share/pixmaps/mulberry.xpm
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
diff --git a/mail/p5-Email-Abstract/pkg-plist b/mail/p5-Email-Abstract/pkg-plist
index fcbd80dbfe74..c1cc4dc6828f 100644
--- a/mail/p5-Email-Abstract/pkg-plist
+++ b/mail/p5-Email-Abstract/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/Email/Abstract/MailMessage.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Abstract
-@unexec rmdir %D/%%SITE_PERL%%/Email/Abstract 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Email/Abstract
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Address/pkg-plist b/mail/p5-Email-Address/pkg-plist
index f27b4f3a4a25..529a570eebf4 100644
--- a/mail/p5-Email-Address/pkg-plist
+++ b/mail/p5-Email-Address/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Email/Address.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Address
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Delete/pkg-plist b/mail/p5-Email-Delete/pkg-plist
index b8fde326862e..2e54613ea3ef 100644
--- a/mail/p5-Email-Delete/pkg-plist
+++ b/mail/p5-Email-Delete/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Email/Delete/Maildir.pm
%%SITE_PERL%%/Email/Delete/Mbox.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/Delete 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Delete
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/Delete
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Filter/pkg-plist b/mail/p5-Email-Filter/pkg-plist
index e307b2f2cde4..9443abef42db 100644
--- a/mail/p5-Email-Filter/pkg-plist
+++ b/mail/p5-Email-Filter/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Email/Filter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Filter
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Email
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-Folder-IMAP/pkg-plist b/mail/p5-Email-Folder-IMAP/pkg-plist
index bd59b3fff733..9965a1a29b89 100644
--- a/mail/p5-Email-Folder-IMAP/pkg-plist
+++ b/mail/p5-Email-Folder-IMAP/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/Folder/IMAP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/Folder
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder-IMAPS/pkg-plist b/mail/p5-Email-Folder-IMAPS/pkg-plist
index 521b2e72ff38..538accefbc01 100644
--- a/mail/p5-Email-Folder-IMAPS/pkg-plist
+++ b/mail/p5-Email-Folder-IMAPS/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/Folder/IMAPS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/IMAPS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/Folder
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder-POP3/pkg-plist b/mail/p5-Email-Folder-POP3/pkg-plist
index b51077dad4a1..dc40555dfdec 100644
--- a/mail/p5-Email-Folder-POP3/pkg-plist
+++ b/mail/p5-Email-Folder-POP3/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/Folder/POP3.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder/POP3
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Folder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/Folder
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Folder/pkg-plist b/mail/p5-Email-Folder/pkg-plist
index 4014336d2ee0..7db801df2c90 100644
--- a/mail/p5-Email-Folder/pkg-plist
+++ b/mail/p5-Email-Folder/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/Email/Folder/Maildir.pm
%%SITE_PERL%%/Email/Folder/Mbox.pm
%%SITE_PERL%%/Email/Folder/Reader.pm
-@unexec rmdir %D/%%SITE_PERL%%/Email/Folder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Email/Folder
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-FolderType-Net/pkg-plist b/mail/p5-Email-FolderType-Net/pkg-plist
index 5daa7dd29d7f..058df05e5fd9 100644
--- a/mail/p5-Email-FolderType-Net/pkg-plist
+++ b/mail/p5-Email-FolderType-Net/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/FolderType/Net.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType/Net
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/FolderType 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/FolderType
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/FolderType
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-FolderType/pkg-plist b/mail/p5-Email-FolderType/pkg-plist
index 096ccac73a0b..f2b12bd2ddfb 100644
--- a/mail/p5-Email-FolderType/pkg-plist
+++ b/mail/p5-Email-FolderType/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Email/FolderType/MH.pm
%%SITE_PERL%%/Email/FolderType/Maildir.pm
%%SITE_PERL%%/Email/FolderType/Mbox.pm
-@unexec rmdir %D/%%SITE_PERL%%/Email/FolderType 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Email/FolderType
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
index 19e1cbdb3e6f..748ea98fdcef 100644
--- a/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
+++ b/mail/p5-Email-LocalDelivery-Ezmlm/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Email/LocalDelivery/Ezmlm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/Ezmlm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/LocalDelivery/Ezmlm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/LocalDelivery 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/LocalDelivery/Ezmlm
+@dirrmtry %%SITE_PERL%%/Email/LocalDelivery
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-LocalDelivery/pkg-plist b/mail/p5-Email-LocalDelivery/pkg-plist
index c0d481573216..558024105bcc 100644
--- a/mail/p5-Email-LocalDelivery/pkg-plist
+++ b/mail/p5-Email-LocalDelivery/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Email/LocalDelivery/Mbox.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/LocalDelivery
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/LocalDelivery 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/LocalDelivery
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
index 48891749897d..9b27aecec4ac 100644
--- a/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
+++ b/mail/p5-Email-MIME-Attachment-Stripper/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Email/MIME/Attachment/Stripper.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/MIME/Attachment 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment/Stripper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Attachment
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/MIME/Attachment
+@dirrmtry %%SITE_PERL%%/Email/MIME
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-ContentType/pkg-plist b/mail/p5-Email-MIME-ContentType/pkg-plist
index a8f45151952e..771d10698423 100644
--- a/mail/p5-Email-MIME-ContentType/pkg-plist
+++ b/mail/p5-Email-MIME-ContentType/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/MIME/ContentType.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/ContentType
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/MIME
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Encodings/pkg-plist b/mail/p5-Email-MIME-Encodings/pkg-plist
index 3e2fe541cac6..0db288d1d856 100644
--- a/mail/p5-Email-MIME-Encodings/pkg-plist
+++ b/mail/p5-Email-MIME-Encodings/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Email/MIME/Encodings.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Encodings
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/MIME/Encodings 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/MIME/Encodings
+@dirrmtry %%SITE_PERL%%/Email/MIME
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME-Modifier/pkg-plist b/mail/p5-Email-MIME-Modifier/pkg-plist
index 1988ad3ecbbb..9a21de7ff13d 100644
--- a/mail/p5-Email-MIME-Modifier/pkg-plist
+++ b/mail/p5-Email-MIME-Modifier/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/MIME/Modifier.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Modifier/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/Modifier
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/MIME
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MIME/pkg-plist b/mail/p5-Email-MIME/pkg-plist
index 55ffdfb7bd47..54bdd5ff6a00 100644
--- a/mail/p5-Email-MIME/pkg-plist
+++ b/mail/p5-Email-MIME/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Email/MIME.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-MessageID/pkg-plist b/mail/p5-Email-MessageID/pkg-plist
index 209112ff4556..9b1b938a8c77 100644
--- a/mail/p5-Email-MessageID/pkg-plist
+++ b/mail/p5-Email-MessageID/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Email/MessageID.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/MessageID
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Send/pkg-plist b/mail/p5-Email-Send/pkg-plist
index affd3d397f52..116d6efe3c51 100644
--- a/mail/p5-Email-Send/pkg-plist
+++ b/mail/p5-Email-Send/pkg-plist
@@ -5,7 +5,7 @@
%%SITE_PERL%%/Email/Send/SMTP.pm
%%SITE_PERL%%/Email/Send/Sendmail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email/Send 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Send
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
+@dirrmtry %%SITE_PERL%%/Email/Send
+@dirrmtry %%SITE_PERL%%/Email
diff --git a/mail/p5-Email-Simple-Creator/pkg-plist b/mail/p5-Email-Simple-Creator/pkg-plist
index bab286c8e0d6..b778ed6c92d8 100644
--- a/mail/p5-Email-Simple-Creator/pkg-plist
+++ b/mail/p5-Email-Simple-Creator/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Email/Simple/Creator.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Email/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Email/Simple
+@dirrmtry %%SITE_PERL%%/Email
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/Creator
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-Email-Simple/pkg-plist b/mail/p5-Email-Simple/pkg-plist
index 06d57e7388c1..5a169fe05983 100644
--- a/mail/p5-Email-Simple/pkg-plist
+++ b/mail/p5-Email-Simple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Email/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Simple
-@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Email
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email
diff --git a/mail/p5-IMAP-Sieve/pkg-plist b/mail/p5-IMAP-Sieve/pkg-plist
index f577f070fa57..8b4ee3a0d4ba 100644
--- a/mail/p5-IMAP-Sieve/pkg-plist
+++ b/mail/p5-IMAP-Sieve/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IMAP/Sieve.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP/Sieve
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IMAP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMAP
+@dirrmtry %%SITE_PERL%%/IMAP
diff --git a/mail/p5-Log-Procmail/pkg-plist b/mail/p5-Log-Procmail/pkg-plist
index 8a9ad6c35ba3..0ff6b870a2dc 100644
--- a/mail/p5-Log-Procmail/pkg-plist
+++ b/mail/p5-Log-Procmail/pkg-plist
@@ -3,5 +3,5 @@ bin/mailstat.pl
%%SITE_PERL%%/Log/Procmail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Procmail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/mail/p5-MIME-Fast/pkg-plist b/mail/p5-MIME-Fast/pkg-plist
index 67d4affa5df4..e2103c7884b5 100644
--- a/mail/p5-MIME-Fast/pkg-plist
+++ b/mail/p5-MIME-Fast/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/Fast.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/Fast.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast/autosplit.ix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Fast
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
diff --git a/mail/p5-MIME-Lite-HTML/pkg-plist b/mail/p5-MIME-Lite-HTML/pkg-plist
index 2a8a8d356a70..89da77011ea6 100644
--- a/mail/p5-MIME-Lite-HTML/pkg-plist
+++ b/mail/p5-MIME-Lite-HTML/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/MIME/Lite/HTML.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/HTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MIME/Lite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/MIME/Lite
+@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Lite/pkg-plist b/mail/p5-MIME-Lite/pkg-plist
index a023e7774470..37473c177b61 100644
--- a/mail/p5-MIME-Lite/pkg-plist
+++ b/mail/p5-MIME-Lite/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/MIME/changes.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Tools/pkg-plist b/mail/p5-MIME-Tools/pkg-plist
index 673a025e5ff2..26fd210e1eae 100644
--- a/mail/p5-MIME-Tools/pkg-plist
+++ b/mail/p5-MIME-Tools/pkg-plist
@@ -37,4 +37,4 @@
@dirrm %%SITE_PERL%%/MIME/Field
@dirrm %%SITE_PERL%%/MIME/Decoder
@dirrm %%SITE_PERL%%/MIME/Parser
-@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-MIME-Types/pkg-plist b/mail/p5-MIME-Types/pkg-plist
index 3096910ec4b1..a31cfbc26d89 100644
--- a/mail/p5-MIME-Types/pkg-plist
+++ b/mail/p5-MIME-Types/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/MIME/Types.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Types
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/MIME
diff --git a/mail/p5-Mail-Address-MobileJp/pkg-plist b/mail/p5-Mail-Address-MobileJp/pkg-plist
index 546efb5d106a..4cd58e88d345 100644
--- a/mail/p5-Mail-Address-MobileJp/pkg-plist
+++ b/mail/p5-Mail-Address-MobileJp/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Mail/Address/MobileJp.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Address 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address/MobileJp
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Address
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail/Address
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Alias/pkg-plist b/mail/p5-Mail-Alias/pkg-plist
index fed35a3bdfec..e473ff55a817 100644
--- a/mail/p5-Mail-Alias/pkg-plist
+++ b/mail/p5-Mail-Alias/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/Alias.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Alias
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist
index 5f3836ff4bf9..ee964d2ab05a 100644
--- a/mail/p5-Mail-Audit/pkg-plist
+++ b/mail/p5-Mail-Audit/pkg-plist
@@ -15,6 +15,6 @@ share/examples/p5-Mail-Audit/proc2ma
@dirrm share/examples/p5-Mail-Audit
%%PORTDOCS%%@dirrm share/doc/p5-Mail-Audit
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/Audit
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Box-Parser-C/pkg-plist b/mail/p5-Mail-Box-Parser-C/pkg-plist
index 19b83457e109..f89a6d7dffca 100644
--- a/mail/p5-Mail-Box-Parser-C/pkg-plist
+++ b/mail/p5-Mail-Box-Parser-C/pkg-plist
@@ -3,9 +3,9 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C/C.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser/C
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail/Box
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Box/pkg-plist b/mail/p5-Mail-Box/pkg-plist
index 0b9c60de360c..126fd7ee4c51 100644
--- a/mail/p5-Mail-Box/pkg-plist
+++ b/mail/p5-Mail-Box/pkg-plist
@@ -225,6 +225,6 @@
@dirrm %%SITE_PERL%%/Mail/Box/Dir
@dirrm %%SITE_PERL%%/Mail/Box/Dbx
@dirrm %%SITE_PERL%%/Mail/Box
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Message 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail/Message
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Box1/pkg-plist b/mail/p5-Mail-Box1/pkg-plist
index a9fb9b401ae7..e1bceba85ebd 100644
--- a/mail/p5-Mail-Box1/pkg-plist
+++ b/mail/p5-Mail-Box1/pkg-plist
@@ -17,10 +17,10 @@
%%SITE_PERL%%/Mail/Message.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Box
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/Box/Locker
@dirrm %%SITE_PERL%%/Mail/Box/Mbox
@dirrm %%SITE_PERL%%/Mail/Box/MH
@dirrm %%SITE_PERL%%/Mail/Box/Tie
@dirrm %%SITE_PERL%%/Mail/Box
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Bulkmail/pkg-plist b/mail/p5-Mail-Bulkmail/pkg-plist
index 2566fc8a90dc..8a69542706b1 100644
--- a/mail/p5-Mail-Bulkmail/pkg-plist
+++ b/mail/p5-Mail-Bulkmail/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/Mail/Bulkmail/DummyServer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Bulkmail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/Bulkmail
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-CClient/pkg-plist b/mail/p5-Mail-CClient/pkg-plist
index 0f7b391ff73d..042b31ed32a5 100644
--- a/mail/p5-Mail-CClient/pkg-plist
+++ b/mail/p5-Mail-CClient/pkg-plist
@@ -26,5 +26,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/utf8_mime2text.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Cclient
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
diff --git a/mail/p5-Mail-CheckUser/pkg-plist b/mail/p5-Mail-CheckUser/pkg-plist
index 1f50dd63234b..15ff74480076 100644
--- a/mail/p5-Mail-CheckUser/pkg-plist
+++ b/mail/p5-Mail-CheckUser/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser/.packlist
bin/cufilter
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/CheckUser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-ClamAV/pkg-plist b/mail/p5-Mail-ClamAV/pkg-plist
index ce15780212e9..910a1543ed84 100644
--- a/mail/p5-Mail-ClamAV/pkg-plist
+++ b/mail/p5-Mail-ClamAV/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/ClamAV.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV/ClamAV.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/ClamAV
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Mail
diff --git a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
index 4e5e3eabab94..b95a59537dac 100644
--- a/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
+++ b/mail/p5-Mail-DeliveryStatus-BounceParser/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus/BounceParser
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DeliveryStatus
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/DeliveryStatus
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-DomainKeys/pkg-plist b/mail/p5-Mail-DomainKeys/pkg-plist
index de48781e1736..5ce0f36b6216 100644
--- a/mail/p5-Mail-DomainKeys/pkg-plist
+++ b/mail/p5-Mail-DomainKeys/pkg-plist
@@ -10,5 +10,5 @@
@dirrm %%SITE_PERL%%/Mail/DomainKeys/Key
@dirrm %%SITE_PERL%%/Mail/DomainKeys
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/DomainKeys
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Field-Received/pkg-plist b/mail/p5-Mail-Field-Received/pkg-plist
index 36861884054f..285d1d2b2f5e 100644
--- a/mail/p5-Mail-Field-Received/pkg-plist
+++ b/mail/p5-Mail-Field-Received/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Mail/Field/Received.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field/Received
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Field 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Field
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail/Field
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Folder/pkg-plist b/mail/p5-Mail-Folder/pkg-plist
index de212414bc59..6ac9f5073120 100644
--- a/mail/p5-Mail-Folder/pkg-plist
+++ b/mail/p5-Mail-Folder/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/Mail/Folder/NNTP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Folder
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/Folder
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Freshmeat/pkg-plist b/mail/p5-Mail-Freshmeat/pkg-plist
index 0416ee2dce38..376afe06047c 100644
--- a/mail/p5-Mail-Freshmeat/pkg-plist
+++ b/mail/p5-Mail-Freshmeat/pkg-plist
@@ -5,4 +5,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Freshmeat
@dirrm %%SITE_PERL%%/Mail/Freshmeat
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-GnuPG/pkg-plist b/mail/p5-Mail-GnuPG/pkg-plist
index df05de3805e7..72b6b5691753 100644
--- a/mail/p5-Mail-GnuPG/pkg-plist
+++ b/mail/p5-Mail-GnuPG/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Mail/GnuPG.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/GnuPG
diff --git a/mail/p5-Mail-Graph/pkg-plist b/mail/p5-Mail-Graph/pkg-plist
index 0ac43e0a20dc..ef1c954a40c3 100644
--- a/mail/p5-Mail-Graph/pkg-plist
+++ b/mail/p5-Mail-Graph/pkg-plist
@@ -13,4 +13,4 @@
@dirrm %%EXAMPLESDIR%%/output
@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail-Graph
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-IMAPClient/pkg-plist b/mail/p5-Mail-IMAPClient/pkg-plist
index 25e885908002..350e5f4c514e 100644
--- a/mail/p5-Mail-IMAPClient/pkg-plist
+++ b/mail/p5-Mail-IMAPClient/pkg-plist
@@ -8,5 +8,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/IMAPClient
@dirrm %%SITE_PERL%%/Mail/IMAPClient/BodyStructure
@dirrm %%SITE_PERL%%/Mail/IMAPClient
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-ListDetector/pkg-plist b/mail/p5-Mail-ListDetector/pkg-plist
index e55f2b498970..8995d300b9d3 100644
--- a/mail/p5-Mail-ListDetector/pkg-plist
+++ b/mail/p5-Mail-ListDetector/pkg-plist
@@ -29,6 +29,6 @@
@dirrm %%SITE_PERL%%/auto/Mail/ListDetector
@dirrm %%SITE_PERL%%/Mail/ListDetector/Detector
@dirrm %%SITE_PERL%%/Mail/ListDetector
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-MailStats/pkg-plist b/mail/p5-Mail-MailStats/pkg-plist
index 6631fc615c67..84d5f6a12ccf 100644
--- a/mail/p5-Mail-MailStats/pkg-plist
+++ b/mail/p5-Mail-MailStats/pkg-plist
@@ -6,5 +6,5 @@ bin/countmail
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Stats
@dirrm %%SITE_PERL%%/Mail/Stats
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Mbox-MessageParser/pkg-plist b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
index 9e56ddb23191..8902346db21c 100644
--- a/mail/p5-Mail-Mbox-MessageParser/pkg-plist
+++ b/mail/p5-Mail-Mbox-MessageParser/pkg-plist
@@ -7,8 +7,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto//Mail/Mbox/MessageParser
@dirrm %%SITE_PERL%%/Mail/Mbox/MessageParser
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Mbox 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Mail/Mbox 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail/Mbox
+@dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Mbox/MessageParser
+@dirrmtry %%SITE_PERL%%/mach/auto/Mail/Mbox
+@dirrmtry %%SITE_PERL%%/mach/auto/Mail
diff --git a/mail/p5-Mail-POP3Client/pkg-plist b/mail/p5-Mail-POP3Client/pkg-plist
index 1d7be5665c8d..82845503e756 100644
--- a/mail/p5-Mail-POP3Client/pkg-plist
+++ b/mail/p5-Mail-POP3Client/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/POP3Client.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/POP3Client
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Procmail/pkg-plist b/mail/p5-Mail-Procmail/pkg-plist
index 1f13b4840736..69f7928f29b9 100644
--- a/mail/p5-Mail-Procmail/pkg-plist
+++ b/mail/p5-Mail-Procmail/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Mail/Procmail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-Procmailrc/pkg-plist b/mail/p5-Mail-Procmailrc/pkg-plist
index 72995c8f3996..bd33e05af9e7 100644
--- a/mail/p5-Mail-Procmailrc/pkg-plist
+++ b/mail/p5-Mail-Procmailrc/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/Procmailrc.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Procmailrc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-QuoteWrap/pkg-plist b/mail/p5-Mail-QuoteWrap/pkg-plist
index feb3473995ba..28257b995294 100644
--- a/mail/p5-Mail-QuoteWrap/pkg-plist
+++ b/mail/p5-Mail-QuoteWrap/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/QuoteWrap.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/QuoteWrap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-RBL/pkg-plist b/mail/p5-Mail-RBL/pkg-plist
index 2ccbd7513252..47b10e7f48c7 100644
--- a/mail/p5-Mail-RBL/pkg-plist
+++ b/mail/p5-Mail-RBL/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/RBL.pm
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/RBL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Mail-SPF-Query/pkg-plist b/mail/p5-Mail-SPF-Query/pkg-plist
index df75c8deea8a..f672427986e5 100644
--- a/mail/p5-Mail-SPF-Query/pkg-plist
+++ b/mail/p5-Mail-SPF-Query/pkg-plist
@@ -5,5 +5,5 @@ bin/spfquery
@dirrm %%SITE_PERL%%/Mail/SPF
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SPF/Query
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SPF
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SRS/pkg-plist b/mail/p5-Mail-SRS/pkg-plist
index d8be1ed57871..1c54ea3c6f00 100644
--- a/mail/p5-Mail-SRS/pkg-plist
+++ b/mail/p5-Mail-SRS/pkg-plist
@@ -9,6 +9,6 @@
bin/srs
bin/srsd
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SRS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/SRS
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sender/pkg-plist b/mail/p5-Mail-Sender/pkg-plist
index b1f3c25cc486..3f07b9a97f21 100644
--- a/mail/p5-Mail-Sender/pkg-plist
+++ b/mail/p5-Mail-Sender/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/Mail/Sender/CType/Win32.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sender
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/Sender/CType
@dirrm %%SITE_PERL%%/Mail/Sender
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Sendmail/pkg-plist b/mail/p5-Mail-Sendmail/pkg-plist
index 5e51bcc274e8..8edee29ecdb0 100644
--- a/mail/p5-Mail-Sendmail/pkg-plist
+++ b/mail/p5-Mail-Sendmail/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/Sendmail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Sendmail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index 20df547305f5..d8cca88ae8f6 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -141,7 +141,7 @@ etc/rc.d/sa-spamd.sh
%%TOOLS%%@dirrm %%DATADIR%%/tools
@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Util
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata
@@ -152,7 +152,7 @@ etc/rc.d/sa-spamd.sh
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes
@dirrm %%SITE_PERL%%/Mail/SpamAssassin
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
-@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true
-@unexec rmdir %D/etc/mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry etc/mail/spamassassin
+@dirrmtry etc/mail
@unexec rmdir /var/run/spamd 2>/dev/null || true
diff --git a/mail/p5-Mail-Tools/pkg-plist b/mail/p5-Mail-Tools/pkg-plist
index c7ed0911e393..bdf7de8785ad 100644
--- a/mail/p5-Mail-Tools/pkg-plist
+++ b/mail/p5-Mail-Tools/pkg-plist
@@ -29,10 +29,10 @@
%%SITE_PERL%%/auto/Mail/Util/maildomain.al
%%SITE_PERL%%/auto/Mail/Util/read_mbox.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@dirrm %%SITE_PERL%%/auto/Mail/Util
@dirrm %%SITE_PERL%%/auto/Mail/Internet
@dirrm %%SITE_PERL%%/auto/Mail
@dirrm %%SITE_PERL%%/Mail/Mailer
@dirrm %%SITE_PERL%%/Mail/Field
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Verify/pkg-plist b/mail/p5-Mail-Verify/pkg-plist
index e092fe55d7c5..4ec3a9291e68 100644
--- a/mail/p5-Mail-Verify/pkg-plist
+++ b/mail/p5-Mail-Verify/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Mail/Verify.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Verify
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
diff --git a/mail/p5-Mail-Webmail-Gmail/pkg-plist b/mail/p5-Mail-Webmail-Gmail/pkg-plist
index cc6cb53a224a..4278ed149552 100644
--- a/mail/p5-Mail-Webmail-Gmail/pkg-plist
+++ b/mail/p5-Mail-Webmail-Gmail/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Mail/Webmail/Gmail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail/Gmail
-@unexec rmdir %D/%%SITE_PERL%%/Mail/Webmail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail/Webmail
+@dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Webmail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
diff --git a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
index 91c436a759ad..f9d3986032f2 100644
--- a/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple-SSL/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Net/IMAP/Simple/SSL.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/SSL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/IMAP/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/IMAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/IMAP/Simple
+@dirrmtry %%SITE_PERL%%/Net/IMAP
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-IMAP-Simple/pkg-plist b/mail/p5-Net-IMAP-Simple/pkg-plist
index 127fd768ae24..0776d1de2b89 100644
--- a/mail/p5-Net-IMAP-Simple/pkg-plist
+++ b/mail/p5-Net-IMAP-Simple/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Net/IMAP/imap.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net/IMAP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IMAP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net/IMAP
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/mail/p5-Net-SMTP-Server/pkg-plist b/mail/p5-Net-SMTP-Server/pkg-plist
index 267f6efa5ba2..207657736b9c 100644
--- a/mail/p5-Net-SMTP-Server/pkg-plist
+++ b/mail/p5-Net-SMTP-Server/pkg-plist
@@ -6,13 +6,13 @@
%%SITE_PERL%%/auto/Net/SMTP/Server/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server/.packlist
@dirrm %%SITE_PERL%%/Net/SMTP/Server
-@unexec rmdir %D/%%SITE_PERL%%/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/SMTP
+@dirrmtry %%SITE_PERL%%/Net
@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Client
@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server/Relay
@dirrm %%SITE_PERL%%/auto/Net/SMTP/Server
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Net/SMTP
+@dirrmtry %%SITE_PERL%%/auto/Net
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP/Server
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-Net-Server-Mail/pkg-plist b/mail/p5-Net-Server-Mail/pkg-plist
index d8788c902572..b1d55c632107 100644
--- a/mail/p5-Net-Server-Mail/pkg-plist
+++ b/mail/p5-Net-Server-Mail/pkg-plist
@@ -8,8 +8,8 @@
%%SITE_PERL%%/Net/Server/Mail/SMTP.pm
@dirrm %%SITE_PERL%%/Net/Server/Mail/ESMTP
@dirrm %%SITE_PERL%%/Net/Server/Mail
-@unexec rmdir %D/%%SITE_PERL%%/Net/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net/Server
+@dirrmtry %%SITE_PERL%%/Net
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/Mail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-plist b/mail/p5-POE-Component-Client-POP3/pkg-plist
index 5dd93f06af76..faf9a10abe11 100644
--- a/mail/p5-POE-Component-Client-POP3/pkg-plist
+++ b/mail/p5-POE-Component-Client-POP3/pkg-plist
@@ -4,9 +4,9 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/term.perl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/POP3
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/mail/p5-POE-Component-Client-SMTP/pkg-plist b/mail/p5-POE-Component-Client-SMTP/pkg-plist
index 17998460f2cc..560b444b8502 100644
--- a/mail/p5-POE-Component-Client-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-Client-SMTP/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/POE/Component/Client/SMTP.pm
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/mail/p5-POE-Component-SMTP/pkg-plist b/mail/p5-POE-Component-SMTP/pkg-plist
index ec9d398c6c48..f09548ae6f0b 100644
--- a/mail/p5-POE-Component-SMTP/pkg-plist
+++ b/mail/p5-POE-Component-SMTP/pkg-plist
@@ -1,10 +1,10 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP/.packlist
%%SITE_PERL%%/POE/Component/Server/SMTP.pm
%%SITE_PERL%%/POE/Filter/SMTP.pm
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE/Filter
+@dirrmtry %%SITE_PERL%%/POE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SMTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/mail/p5-Sendmail-AccessDB/pkg-plist b/mail/p5-Sendmail-AccessDB/pkg-plist
index d36e8db1bf8c..6b62a27c6a9f 100644
--- a/mail/p5-Sendmail-AccessDB/pkg-plist
+++ b/mail/p5-Sendmail-AccessDB/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sendmail/AccessDB.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/AccessDB/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail/AccessDB
-@unexec rmdir %D/%%SITE_PERL%%/Sendmail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Sendmail
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sendmail
diff --git a/mail/p5-URI-imap/pkg-plist b/mail/p5-URI-imap/pkg-plist
index 44fbf5ef3867..ee98b783e21f 100644
--- a/mail/p5-URI-imap/pkg-plist
+++ b/mail/p5-URI-imap/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/URI/imap.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
+@dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/p5-URI-imaps/pkg-plist b/mail/p5-URI-imaps/pkg-plist
index 35c4bd09cc56..78d2079bbd3a 100644
--- a/mail/p5-URI-imaps/pkg-plist
+++ b/mail/p5-URI-imaps/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/URI/imaps.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/imaps
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
+@dirrmtry %%SITE_PERL%%/URI
diff --git a/mail/popular/pkg-plist b/mail/popular/pkg-plist
index fb1d949d4719..1456f55e9e87 100644
--- a/mail/popular/pkg-plist
+++ b/mail/popular/pkg-plist
@@ -35,4 +35,4 @@ sbin/pserv
sbin/ringd
@dirrm include/popular
@dirrm lib/popular
-@unexec rmdir %D/etc/popular 2>/dev/null || true
+@dirrmtry etc/popular
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 31c7b9ecabbe..2a8d68163687 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -235,4 +235,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix/pkg-plist
+++ b/mail/postfix/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist
index 5b6c3c55d5b6..8291aa7f2d28 100644
--- a/mail/postfix1/pkg-plist
+++ b/mail/postfix1/pkg-plist
@@ -170,4 +170,4 @@ bin/mailq
%%PORTDOCS%%share/doc/postfix/virtual.8.html
%%PORTDOCS%%@dirrm share/doc/postfix
@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist
index 37366b49d560..9d6f0766ba0b 100644
--- a/mail/postfix21/pkg-plist
+++ b/mail/postfix21/pkg-plist
@@ -208,4 +208,4 @@ bin/mailq
%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix22/pkg-plist
+++ b/mail/postfix22/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix23/pkg-plist
+++ b/mail/postfix23/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix24/pkg-plist
+++ b/mail/postfix24/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix26/pkg-plist
+++ b/mail/postfix26/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix27/pkg-plist
+++ b/mail/postfix27/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
index df52e5609066..84aaa9deaa28 100644
--- a/mail/postfix28/pkg-plist
+++ b/mail/postfix28/pkg-plist
@@ -231,4 +231,4 @@ bin/mailq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@dirrm etc/postfix/dist
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/postgrey/pkg-plist b/mail/postgrey/pkg-plist
index 05da48294884..397a6d11306c 100644
--- a/mail/postgrey/pkg-plist
+++ b/mail/postgrey/pkg-plist
@@ -5,4 +5,4 @@ sbin/postgreyreport
etc/rc.d/postgrey.sh
etc/postfix/dist-postgrey_whitelist_recipients
etc/postfix/dist-postgrey_whitelist_clients
-@unexec rmdir %D/etc/postfix 2>/dev/null || true
+@dirrmtry etc/postfix
diff --git a/mail/qmail-conf/pkg-plist b/mail/qmail-conf/pkg-plist
index a8242a961def..2b3f2532bff9 100644
--- a/mail/qmail-conf/pkg-plist
+++ b/mail/qmail-conf/pkg-plist
@@ -3,4 +3,4 @@ bin/qmail-pop3d-conf
bin/qmail-qmqpd-conf
bin/qmail-qmtpd-conf
bin/qmail-smtpd-conf
-@unexec rmdir %D/service 2>/dev/null || true
+@dirrmtry service
diff --git a/mail/qmail-scanner/pkg-plist b/mail/qmail-scanner/pkg-plist
index f7e3018df384..bbc89c5de733 100644
--- a/mail/qmail-scanner/pkg-plist
+++ b/mail/qmail-scanner/pkg-plist
@@ -7,17 +7,17 @@ share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
%%SPOOLDIR%%/quarantine-attachments.sample
@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt
%%SPOOLDIR%%/qmail-scanner-queue-version.txt
-@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true
+@dirrmtry %%SPOOLDIR%%/archives/cur
+@dirrmtry %%SPOOLDIR%%/archives/new
+@dirrmtry %%SPOOLDIR%%/archives/tmp
+@dirrmtry %%SPOOLDIR%%/archives
+@dirrmtry %%SPOOLDIR%%/quarantine/cur
+@dirrmtry %%SPOOLDIR%%/quarantine/new
+@dirrmtry %%SPOOLDIR%%/quarantine/tmp
+@dirrmtry %%SPOOLDIR%%/quarantine
+@dirrmtry %%SPOOLDIR%%/working/cur
+@dirrmtry %%SPOOLDIR%%/working/new
+@dirrmtry %%SPOOLDIR%%/working/tmp
+@dirrmtry %%SPOOLDIR%%/working
+@dirrmtry %%SPOOLDIR%%/tmp
+@dirrmtry %%SPOOLDIR%%
diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist
index f7e3018df384..bbc89c5de733 100644
--- a/mail/qmail-scanner1/pkg-plist
+++ b/mail/qmail-scanner1/pkg-plist
@@ -7,17 +7,17 @@ share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
%%SPOOLDIR%%/quarantine-attachments.sample
@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt
%%SPOOLDIR%%/qmail-scanner-queue-version.txt
-@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true
-@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true
+@dirrmtry %%SPOOLDIR%%/archives/cur
+@dirrmtry %%SPOOLDIR%%/archives/new
+@dirrmtry %%SPOOLDIR%%/archives/tmp
+@dirrmtry %%SPOOLDIR%%/archives
+@dirrmtry %%SPOOLDIR%%/quarantine/cur
+@dirrmtry %%SPOOLDIR%%/quarantine/new
+@dirrmtry %%SPOOLDIR%%/quarantine/tmp
+@dirrmtry %%SPOOLDIR%%/quarantine
+@dirrmtry %%SPOOLDIR%%/working/cur
+@dirrmtry %%SPOOLDIR%%/working/new
+@dirrmtry %%SPOOLDIR%%/working/tmp
+@dirrmtry %%SPOOLDIR%%/working
+@dirrmtry %%SPOOLDIR%%/tmp
+@dirrmtry %%SPOOLDIR%%
diff --git a/mail/qsheff/pkg-plist b/mail/qsheff/pkg-plist
index 9ad58a5171a8..b53772970a75 100644
--- a/mail/qsheff/pkg-plist
+++ b/mail/qsheff/pkg-plist
@@ -18,7 +18,7 @@ etc/qsheff/uninstall-wrapper.sh
%%DATADIR%%/sample-OK.msg
%%DATADIR%%/sample-SPAM.msg
%%DATADIR%%/sample-VIRUS.msg
-@unexec rmdir %D/etc/qsheff 2>/dev/null || true
+@dirrmtry etc/qsheff
@dirrm %%DATADIR%%
@unexec echo
@unexec echo "Type '%%PREFIX%%/etc/qsheff/uninstall-wrapper.sh' to uninstall qSheff completely."
diff --git a/mail/relay-ctrl/pkg-plist b/mail/relay-ctrl/pkg-plist
index d873f95e5236..080a0de1aa6c 100644
--- a/mail/relay-ctrl/pkg-plist
+++ b/mail/relay-ctrl/pkg-plist
@@ -7,7 +7,7 @@ bin/relay-ctrl-send
bin/relay-ctrl-udp
etc/relay-ctrl/RELAY_CTRL_DIR
etc/relay-ctrl/RELAY_CTRL_EXPIRY
-@unexec rmdir %D/etc/relay-ctrl 2>/dev/null || true
+@dirrmtry etc/relay-ctrl
%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCEMENT
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/mail/spamass-rules_du_jour/pkg-plist b/mail/spamass-rules_du_jour/pkg-plist
index cdc66b37a554..73eec5cc9115 100644
--- a/mail/spamass-rules_du_jour/pkg-plist
+++ b/mail/spamass-rules_du_jour/pkg-plist
@@ -1,4 +1,4 @@
@exec mkdir -p %D/etc/mail/spamassassin/RulesDuJour
-@unexec rmdir %D/etc/mail/spamassassin/RulesDuJour 2>/dev/null || true
-@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true
-@unexec rmdir %D/etc/mail 2>/dev/null || true
+@dirrmtry etc/mail/spamassassin/RulesDuJour
+@dirrmtry etc/mail/spamassassin
+@dirrmtry etc/mail
diff --git a/mail/sqlgrey/pkg-plist b/mail/sqlgrey/pkg-plist
index 1c0204d06b5c..f6f53acc76eb 100644
--- a/mail/sqlgrey/pkg-plist
+++ b/mail/sqlgrey/pkg-plist
@@ -20,5 +20,5 @@
bin/sqlgrey-logstats.pl
sbin/sqlgrey
sbin/update_sqlgrey_config
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
+@dirrmtry %%ETCDIR%%
diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist
index 195191d479a7..a3569ceb67ef 100644
--- a/mail/squirrelmail/pkg-plist
+++ b/mail/squirrelmail/pkg-plist
@@ -948,8 +948,8 @@ etc/periodic/daily/111.clean-squirrelmail
%%SQUIRRELDIR%%/themes/spice_of_life.php
%%SQUIRRELDIR%%/themes/spice_of_life_dark.php
%%SQUIRRELDIR%%/themes/spice_of_life_lite.php
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/abook_take
%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/administrator
%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/bug_report
@@ -996,7 +996,7 @@ etc/periodic/daily/111.clean-squirrelmail
@dirrm %%SQUIRRELDIR%%/plugins/bug_report
@dirrm %%SQUIRRELDIR%%/plugins/administrator
@dirrm %%SQUIRRELDIR%%/plugins/abook_take
-@unexec rmdir %D/%%SQUIRRELDIR%%/plugins 2>/dev/null || true
+@dirrmtry %%SQUIRRELDIR%%/plugins
@dirrm %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES
@dirrm %%SQUIRRELDIR%%/locale/zh_TW
@dirrm %%SQUIRRELDIR%%/locale/zh_CN/LC_MESSAGES
@@ -1116,9 +1116,9 @@ etc/periodic/daily/111.clean-squirrelmail
@dirrm %%SQUIRRELDIR%%/functions/decode
@dirrm %%SQUIRRELDIR%%/functions
@dirrm %%SQUIRRELDIR%%/data
-@unexec rmdir %D/%%SQUIRRELDIR%%/config 2>/dev/null || true
+@dirrmtry %%SQUIRRELDIR%%/config
@dirrm %%SQUIRRELDIR%%/class/mime
@dirrm %%SQUIRRELDIR%%/class/helper
@dirrm %%SQUIRRELDIR%%/class/deliver
@dirrm %%SQUIRRELDIR%%/class
-@unexec rmdir %D/%%SQUIRRELDIR%% 2>/dev/null || true
+@dirrmtry %%SQUIRRELDIR%%
diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist
index 687cbd975ef8..04a5f954dac3 100644
--- a/mail/sylpheed2-devel/pkg-plist
+++ b/mail/sylpheed2-devel/pkg-plist
@@ -109,5 +109,5 @@ share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt 2>/dev/null || true
+@dirrmtry share/locale/lt/LC_MESSAGES
+@dirrmtry share/locale/lt
diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist
index e26db6784e9e..7045f6254f37 100644
--- a/mail/sylpheed2/pkg-plist
+++ b/mail/sylpheed2/pkg-plist
@@ -108,5 +108,5 @@ share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt 2>/dev/null || true
+@dirrmtry share/locale/lt/LC_MESSAGES
+@dirrmtry share/locale/lt
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
index e26db6784e9e..7045f6254f37 100644
--- a/mail/sylpheed3/pkg-plist
+++ b/mail/sylpheed3/pkg-plist
@@ -108,5 +108,5 @@ share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt 2>/dev/null || true
+@dirrmtry share/locale/lt/LC_MESSAGES
+@dirrmtry share/locale/lt
diff --git a/mail/teapop-devel/pkg-plist b/mail/teapop-devel/pkg-plist
index 412cff1416b5..83b019008a2a 100644
--- a/mail/teapop-devel/pkg-plist
+++ b/mail/teapop-devel/pkg-plist
@@ -1,4 +1,4 @@
etc/teapop.passwd.sample
libexec/teapop
sbin/cronpopauth.pl
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var
diff --git a/mail/teapop/pkg-plist b/mail/teapop/pkg-plist
index 412cff1416b5..83b019008a2a 100644
--- a/mail/teapop/pkg-plist
+++ b/mail/teapop/pkg-plist
@@ -1,4 +1,4 @@
etc/teapop.passwd.sample
libexec/teapop
sbin/cronpopauth.pl
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry var
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index fdb89c479187..07ea12b087a2 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -257,5 +257,5 @@
@dirrm %%TURBADIR%%/themes/graphics/menu
@dirrm %%TURBADIR%%/themes/graphics
@dirrm %%TURBADIR%%/themes
-@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true
+@dirrmtry %%TURBADIR%%/config
+@dirrmtry %%TURBADIR%%
diff --git a/mail/vmailmgr/pkg-plist b/mail/vmailmgr/pkg-plist
index 5d0922cb1ac9..f25a5e32519a 100644
--- a/mail/vmailmgr/pkg-plist
+++ b/mail/vmailmgr/pkg-plist
@@ -26,7 +26,7 @@ bin/showvconfig
%%CGI_DIR%%/vchattr
%%CGI_DIR%%/vchforwards
%%CGI_DIR%%/listvdomain
-@unexec rmdir %D/%%CGI_DIR%% 2>/dev/null || true
+@dirrmtry %%CGI_DIR%%
etc/vmailmgr/default-username
etc/vmailmgr/vdeliver-postdeliver
lib/courier-imap/libexec/authlib/authvmailmgr
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
index 98ff8626c947..bac90d663d92 100644
--- a/mail/vpopmail-devel/pkg-plist
+++ b/mail/vpopmail-devel/pkg-plist
@@ -55,10 +55,10 @@ vpopmail/include/vpopmail_config.h
vpopmail/lib/libvpopmail.a
@dirrm vpopmail/lib
@dirrm vpopmail/include
-@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
-@unexec rmdir %D/vpopmail/domains 2>/dev/null || true
+@dirrmtry vpopmail/etc
+@dirrmtry vpopmail/domains
@dirrm vpopmail/doc/man_html
@dirrm vpopmail/doc/doc_html
@dirrm vpopmail/doc
@dirrm vpopmail/bin
-@unexec rmdir %D/vpopmail 2>/dev/null || true
+@dirrmtry vpopmail
diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist
index 04b83fdcc359..e25fac686691 100644
--- a/mail/vpopmail/pkg-plist
+++ b/mail/vpopmail/pkg-plist
@@ -59,10 +59,10 @@ vpopmail/lib/libvpopmail.a
%%LDAP%%@dirrm vpopmail/ldap
@dirrm vpopmail/lib
@dirrm vpopmail/include
-@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
-@unexec rmdir %D/vpopmail/domains 2>/dev/null || true
+@dirrmtry vpopmail/etc
+@dirrmtry vpopmail/domains
@dirrm vpopmail/doc/man_html
@dirrm vpopmail/doc/doc_html
@dirrm vpopmail/doc
@dirrm vpopmail/bin
-@unexec rmdir %D/vpopmail 2>/dev/null || true
+@dirrmtry vpopmail
diff --git a/mail/wmmail/pkg-plist b/mail/wmmail/pkg-plist
index 2aeda846da44..923d4d377579 100644
--- a/mail/wmmail/pkg-plist
+++ b/mail/wmmail/pkg-plist
@@ -50,5 +50,5 @@ GNUstep/Apps/WMMail.app/Sounds/monkey.au
@dirrm GNUstep/Apps/WMMail.app/Defaults
@dirrm GNUstep/Apps/WMMail.app/Sounds
@dirrm GNUstep/Apps/WMMail.app
-@unexec rmdir %D/GNUstep/Apps 2>/dev/null || true
-@unexec rmdir %D/GNUstep 2>/dev/null || true
+@dirrmtry GNUstep/Apps
+@dirrmtry GNUstep
diff --git a/russian/ircd-hybrid-ru/pkg-plist b/russian/ircd-hybrid-ru/pkg-plist
index 1e44ca918581..8bbb6100cc1f 100644
--- a/russian/ircd-hybrid-ru/pkg-plist
+++ b/russian/ircd-hybrid-ru/pkg-plist
@@ -332,5 +332,5 @@ help/opers/whowas
@exec mkdir -m 755 /var/log/ircd-hybrid-ru
@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru/codepage 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true
+@dirrmtry etc/ircd-hybrid-ru/codepage
+@dirrmtry etc/ircd-hybrid-ru
diff --git a/russian/ircd-hybrid/pkg-plist b/russian/ircd-hybrid/pkg-plist
index 1e44ca918581..8bbb6100cc1f 100644
--- a/russian/ircd-hybrid/pkg-plist
+++ b/russian/ircd-hybrid/pkg-plist
@@ -332,5 +332,5 @@ help/opers/whowas
@exec mkdir -m 755 /var/log/ircd-hybrid-ru
@exec chown ircdru:ircdru /var/log/ircd-hybrid-ru
@unexec rmdir /var/log/ircd-hybrid-ru 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru/codepage 2>/dev/null || true
-@unexec rmdir %D/etc/ircd-hybrid-ru 2>/dev/null || true
+@dirrmtry etc/ircd-hybrid-ru/codepage
+@dirrmtry etc/ircd-hybrid-ru