aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 01:55:36 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 01:55:36 +0000
commite33233f948fa75569942bda3f34c065ad24f1576 (patch)
tree7b858f4e784b4f518405b5a934eaa29ec91c8256 /devel
parent913a5a5cbae4d0f429ae82617b4e1fca51867d49 (diff)
downloadports-e33233f948fa75569942bda3f34c065ad24f1576.tar.gz
ports-e33233f948fa75569942bda3f34c065ad24f1576.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/ZendOptimizer/pkg-plist2
-rw-r--r--devel/aap/pkg-plist2
-rw-r--r--devel/agenda-snow-libs/pkg-plist4
-rw-r--r--devel/agenda-static-libs/pkg-plist4
-rw-r--r--devel/agide/pkg-plist2
-rw-r--r--devel/autodia/pkg-plist2
-rw-r--r--devel/baz/pkg-plist24
-rw-r--r--devel/bazaar/pkg-plist24
-rw-r--r--devel/bison2/pkg-plist2
-rw-r--r--devel/bug-buddy/pkg-plist16
-rw-r--r--devel/bugbuddy/pkg-plist16
-rw-r--r--devel/bugzilla/pkg-plist10
-rw-r--r--devel/bugzilla2/pkg-plist10
-rw-r--r--devel/bugzilla3/pkg-plist10
-rw-r--r--devel/c2lib/pkg-plist4
-rw-r--r--devel/chora/pkg-plist4
-rw-r--r--devel/codeville/pkg-plist4
-rw-r--r--devel/cogito/pkg-plist8
-rw-r--r--devel/cvsmonitor/pkg-plist2
-rw-r--r--devel/cvsweb3/pkg-plist2
-rw-r--r--devel/dbus/pkg-plist4
-rw-r--r--devel/evolution-gconf-tools/pkg-plist4
-rw-r--r--devel/gconf2/pkg-plist4
-rw-r--r--devel/glib20/pkg-plist32
-rw-r--r--devel/gnome-vfs/pkg-plist12
-rw-r--r--devel/gnomevfs2/pkg-plist12
-rw-r--r--devel/goffice/pkg-plist4
-rw-r--r--devel/goffice04/pkg-plist4
-rw-r--r--devel/goffice1/pkg-plist4
-rw-r--r--devel/horde-chora/pkg-plist4
-rw-r--r--devel/kcachegrind/pkg-plist32
-rw-r--r--devel/kdbg/pkg-plist4
-rw-r--r--devel/kprof/pkg-plist24
-rw-r--r--devel/kscope/pkg-plist10
-rw-r--r--devel/libgii/pkg-plist4
-rw-r--r--devel/libgtop2/pkg-plist20
-rw-r--r--devel/liboil/pkg-plist4
-rw-r--r--devel/libslang2-devel/pkg-plist2
-rw-r--r--devel/libslang2/pkg-plist2
-rw-r--r--devel/libticalcs/pkg-plist2
-rw-r--r--devel/libtifiles/pkg-plist2
-rw-r--r--devel/meta-cvs/pkg-plist2
-rw-r--r--devel/mingw32-gcc/pkg-plist4
-rw-r--r--devel/mipsel-linux-kernel-headers/pkg-plist2
-rw-r--r--devel/mono-tools/pkg-plist2
-rw-r--r--devel/msp430-gcc/pkg-plist4
-rw-r--r--devel/msp430-gcc3/pkg-plist4
-rw-r--r--devel/msp430-libc/pkg-plist2
-rw-r--r--devel/noweb/pkg-plist8
-rw-r--r--devel/ocaml-event/pkg-plist4
-rw-r--r--devel/p5-AI-Pathfinding-AStar/pkg-plist8
-rw-r--r--devel/p5-Algorithm-Accounting/pkg-plist8
-rw-r--r--devel/p5-Algorithm-Bucketizer/pkg-plist4
-rw-r--r--devel/p5-Algorithm-ChooseSubsets/pkg-plist4
-rw-r--r--devel/p5-Algorithm-Cluster/pkg-plist4
-rw-r--r--devel/p5-Algorithm-Dependency/pkg-plist4
-rw-r--r--devel/p5-Algorithm-Diff/pkg-plist4
-rw-r--r--devel/p5-Algorithm-Interval2Prefix/pkg-plist4
-rw-r--r--devel/p5-Algorithm-LCS/pkg-plist6
-rw-r--r--devel/p5-Algorithm-LUHN/pkg-plist4
-rw-r--r--devel/p5-Algorithm-MinMax/pkg-plist4
-rw-r--r--devel/p5-Algorithm-NaiveBayes/pkg-plist2
-rw-r--r--devel/p5-Algorithm-Networksort/pkg-plist4
-rw-r--r--devel/p5-Algorithm-Numerical-Shuffle/pkg-plist8
-rw-r--r--devel/p5-Algorithm-Permute/pkg-plist4
-rw-r--r--devel/p5-Algorithm-SVM/pkg-plist6
-rw-r--r--devel/p5-Alzabo-GUI-Mason/pkg-plist4
-rw-r--r--devel/p5-App-CLI/pkg-plist10
-rw-r--r--devel/p5-App-Info/pkg-plist2
-rw-r--r--devel/p5-Array-Iterator/pkg-plist4
-rw-r--r--devel/p5-Array-Window/pkg-plist4
-rw-r--r--devel/p5-Attribute-Handlers-Prospective/pkg-plist8
-rw-r--r--devel/p5-Attribute-Persistent/pkg-plist4
-rw-r--r--devel/p5-B-Deobfuscate/pkg-plist4
-rw-r--r--devel/p5-B-Keywords/pkg-plist4
-rw-r--r--devel/p5-B-Size/pkg-plist4
-rw-r--r--devel/p5-BSD-Resource/pkg-plist4
-rw-r--r--devel/p5-BSD-stat/pkg-plist4
-rw-r--r--devel/p5-Bundle-Perl6/pkg-plist4
-rw-r--r--devel/p5-CPAN-DistnameInfo/pkg-plist4
-rw-r--r--devel/p5-CPAN-Mini/pkg-plist6
-rw-r--r--devel/p5-CPAN-YACSmoke/pkg-plist4
-rw-r--r--devel/p5-Cache-Cache/pkg-plist4
-rw-r--r--devel/p5-Cache-FastMmap/pkg-plist4
-rw-r--r--devel/p5-Cache-Mmap/pkg-plist4
-rw-r--r--devel/p5-Cache-Simple-TimedExpiry/pkg-plist6
-rw-r--r--devel/p5-Cache/pkg-plist12
-rw-r--r--devel/p5-Calendar-Simple/pkg-plist2
-rw-r--r--devel/p5-Carp-Assert/pkg-plist4
-rw-r--r--devel/p5-Carp-Clan/pkg-plist6
-rw-r--r--devel/p5-Carp-Datum/pkg-plist4
-rw-r--r--devel/p5-Class-Accessor-Chained/pkg-plist4
-rw-r--r--devel/p5-Class-Accessor-Lvalue/pkg-plist6
-rw-r--r--devel/p5-Class-Accessor/pkg-plist4
-rw-r--r--devel/p5-Class-AlzaboWrapper/pkg-plist2
-rw-r--r--devel/p5-Class-ArrayObjects/pkg-plist4
-rw-r--r--devel/p5-Class-AutoClass/pkg-plist4
-rw-r--r--devel/p5-Class-Autouse/pkg-plist4
-rw-r--r--devel/p5-Class-Base/pkg-plist4
-rw-r--r--devel/p5-Class-BlackHole/pkg-plist4
-rw-r--r--devel/p5-Class-C3/pkg-plist6
-rw-r--r--devel/p5-Class-Container/pkg-plist4
-rw-r--r--devel/p5-Class-Contract/pkg-plist4
-rw-r--r--devel/p5-Class-Data-Inheritable/pkg-plist8
-rw-r--r--devel/p5-Class-Date/pkg-plist4
-rw-r--r--devel/p5-Class-Default/pkg-plist4
-rw-r--r--devel/p5-Class-Delegation/pkg-plist4
-rw-r--r--devel/p5-Class-ErrorHandler/pkg-plist4
-rw-r--r--devel/p5-Class-Factory-Util/pkg-plist8
-rw-r--r--devel/p5-Class-Factory/pkg-plist6
-rw-r--r--devel/p5-Class-Fields/pkg-plist4
-rw-r--r--devel/p5-Class-Gomor-Hash/pkg-plist4
-rw-r--r--devel/p5-Class-Handle/pkg-plist4
-rw-r--r--devel/p5-Class-Hook/pkg-plist4
-rw-r--r--devel/p5-Class-ISA/pkg-plist4
-rw-r--r--devel/p5-Class-Inner/pkg-plist4
-rw-r--r--devel/p5-Class-Inspector/pkg-plist4
-rw-r--r--devel/p5-Class-Loader/pkg-plist4
-rw-r--r--devel/p5-Class-MethodMaker/pkg-plist8
-rw-r--r--devel/p5-Class-MethodMapper/pkg-plist6
-rw-r--r--devel/p5-Class-NamedParms/pkg-plist4
-rw-r--r--devel/p5-Class-ObjectTemplate-DB/pkg-plist6
-rw-r--r--devel/p5-Class-ObjectTemplate/pkg-plist4
-rw-r--r--devel/p5-Class-Observable/pkg-plist4
-rw-r--r--devel/p5-Class-ParmList/pkg-plist4
-rw-r--r--devel/p5-Class-ReturnValue/pkg-plist4
-rw-r--r--devel/p5-Class-Spiffy/pkg-plist6
-rw-r--r--devel/p5-Class-StateMachine/pkg-plist6
-rw-r--r--devel/p5-Class-Tangram/pkg-plist4
-rw-r--r--devel/p5-Class-Throwable/pkg-plist4
-rw-r--r--devel/p5-Class-Tom/pkg-plist4
-rw-r--r--devel/p5-Class-Trigger/pkg-plist4
-rw-r--r--devel/p5-Class-Virtual/pkg-plist2
-rw-r--r--devel/p5-Class-WhiteHole/pkg-plist4
-rw-r--r--devel/p5-Class-XPath/pkg-plist4
-rw-r--r--devel/p5-Commands-Guarded/pkg-plist6
-rw-r--r--devel/p5-Config-Auto/pkg-plist4
-rw-r--r--devel/p5-Config-Fast/pkg-plist4
-rw-r--r--devel/p5-Config-General/pkg-plist4
-rw-r--r--devel/p5-Config-IniFiles/pkg-plist4
-rw-r--r--devel/p5-Config-Objective/pkg-plist8
-rw-r--r--devel/p5-Config-Setting/pkg-plist4
-rw-r--r--devel/p5-Config-Simple/pkg-plist6
-rw-r--r--devel/p5-Config-Tiny/pkg-plist4
-rw-r--r--devel/p5-ConfigReader-Simple/pkg-plist4
-rw-r--r--devel/p5-Curses-UI/pkg-plist2
-rw-r--r--devel/p5-Curses-Widgets/pkg-plist4
-rw-r--r--devel/p5-DB_File-Lock/pkg-plist6
-rw-r--r--devel/p5-Danga-Socket/pkg-plist4
-rw-r--r--devel/p5-Data-ACL/pkg-plist8
-rw-r--r--devel/p5-Data-Compare/pkg-plist4
-rw-r--r--devel/p5-Data-Dump-Streamer/pkg-plist8
-rw-r--r--devel/p5-Data-Dump/pkg-plist4
-rw-r--r--devel/p5-Data-DumpXML/pkg-plist8
-rw-r--r--devel/p5-Data-Dumper-Simple/pkg-plist4
-rw-r--r--devel/p5-Data-Dumper/pkg-plist4
-rw-r--r--devel/p5-Data-Flow/pkg-plist6
-rw-r--r--devel/p5-Data-HexDump/pkg-plist4
-rw-r--r--devel/p5-Data-Hierarchy/pkg-plist2
-rw-r--r--devel/p5-Data-Lazy/pkg-plist4
-rw-r--r--devel/p5-Data-Random/pkg-plist4
-rw-r--r--devel/p5-Data-Serializer/pkg-plist6
-rw-r--r--devel/p5-Data-Stag/pkg-plist4
-rw-r--r--devel/p5-Data-Table/pkg-plist6
-rw-r--r--devel/p5-Data-Taxonomy-Tags/pkg-plist4
-rw-r--r--devel/p5-Data-TemporaryBag/pkg-plist4
-rw-r--r--devel/p5-Data-TreeDumper/pkg-plist6
-rw-r--r--devel/p5-Data-UUID/pkg-plist4
-rw-r--r--devel/p5-Date-Calc/pkg-plist10
-rw-r--r--devel/p5-Date-DayOfWeek/pkg-plist4
-rw-r--r--devel/p5-Date-Easter/pkg-plist4
-rw-r--r--devel/p5-Date-Holidays-DK/pkg-plist10
-rw-r--r--devel/p5-Date-ICal/pkg-plist4
-rw-r--r--devel/p5-Date-Leapyear/pkg-plist4
-rw-r--r--devel/p5-Date-Manip/pkg-plist4
-rw-r--r--devel/p5-Date-Roman/pkg-plist4
-rw-r--r--devel/p5-Date-Set/pkg-plist2
-rw-r--r--devel/p5-Date-Simple/pkg-plist8
-rw-r--r--devel/p5-DateTime-Calendar-Christian/pkg-plist8
-rw-r--r--devel/p5-DateTime-Calendar-FrenchRevolutionary/pkg-plist4
-rw-r--r--devel/p5-DateTime-Calendar-Hebrew/pkg-plist8
-rw-r--r--devel/p5-DateTime-Calendar-Julian/pkg-plist8
-rw-r--r--devel/p5-DateTime-Calendar-Mayan/pkg-plist4
-rw-r--r--devel/p5-DateTime-Calendar-Pataphysical/pkg-plist8
-rw-r--r--devel/p5-DateTime-Event-Cron/pkg-plist8
-rw-r--r--devel/p5-DateTime-Event-Easter/pkg-plist8
-rw-r--r--devel/p5-DateTime-Event-ICal/pkg-plist8
-rw-r--r--devel/p5-DateTime-Event-NameDay/pkg-plist4
-rw-r--r--devel/p5-DateTime-Event-Random/pkg-plist8
-rw-r--r--devel/p5-DateTime-Event-Recurrence/pkg-plist8
-rw-r--r--devel/p5-DateTime-Event-Sunrise/pkg-plist8
-rw-r--r--devel/p5-DateTime-Fiscal-Year/pkg-plist2
-rw-r--r--devel/p5-DateTime-Format-Baby/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-Bork/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-Builder/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-DBI/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-DateManip/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-Duration/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-Epoch/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-Excel/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-HTTP/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-IBeat/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-ICal/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-ISO8601/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-Mail/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-MySQL/pkg-plist4
-rw-r--r--devel/p5-DateTime-Format-Pg/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-Roman/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-Strptime/pkg-plist8
-rw-r--r--devel/p5-DateTime-Format-W3CDTF/pkg-plist8
-rw-r--r--devel/p5-DateTime-Functions/pkg-plist4
-rw-r--r--devel/p5-DateTime-HiRes/pkg-plist2
-rw-r--r--devel/p5-DateTime-Incomplete/pkg-plist4
-rw-r--r--devel/p5-DateTime-Locale/pkg-plist2
-rw-r--r--devel/p5-DateTime-Precise/pkg-plist4
-rw-r--r--devel/p5-DateTime-Set/pkg-plist6
-rw-r--r--devel/p5-DateTime-TimeZone-Alias/pkg-plist4
-rw-r--r--devel/p5-DateTime-TimeZone-LMT/pkg-plist8
-rw-r--r--devel/p5-DateTime-TimeZone/pkg-plist2
-rw-r--r--devel/p5-DateTime/pkg-plist4
-rw-r--r--devel/p5-Decision-ACL/pkg-plist4
-rw-r--r--devel/p5-Devel-Arena/pkg-plist4
-rw-r--r--devel/p5-Devel-Constants/pkg-plist4
-rw-r--r--devel/p5-Devel-Cover/pkg-plist4
-rw-r--r--devel/p5-Devel-Cycle/pkg-plist4
-rw-r--r--devel/p5-Devel-DProf/pkg-plist4
-rw-r--r--devel/p5-Devel-DProfPP/pkg-plist4
-rw-r--r--devel/p5-Devel-Diagram/pkg-plist4
-rw-r--r--devel/p5-Devel-Leak/pkg-plist4
-rw-r--r--devel/p5-Devel-LeakTrace/pkg-plist4
-rw-r--r--devel/p5-Devel-Modlist/pkg-plist4
-rw-r--r--devel/p5-Devel-ObjectTracker/pkg-plist4
-rw-r--r--devel/p5-Devel-PPPort/pkg-plist4
-rw-r--r--devel/p5-Devel-Peek/pkg-plist4
-rw-r--r--devel/p5-Devel-Pointer/pkg-plist4
-rw-r--r--devel/p5-Devel-Profile/pkg-plist4
-rw-r--r--devel/p5-Devel-Profiler/pkg-plist4
-rw-r--r--devel/p5-Devel-SimpleTrace/pkg-plist4
-rw-r--r--devel/p5-Devel-Size/pkg-plist4
-rw-r--r--devel/p5-Devel-SmallProf/pkg-plist4
-rw-r--r--devel/p5-Devel-StackTrace/pkg-plist4
-rw-r--r--devel/p5-Devel-Symdump/pkg-plist4
-rw-r--r--devel/p5-Devel-Trace/pkg-plist4
-rw-r--r--devel/p5-Devel-TraceCalls/pkg-plist4
-rw-r--r--devel/p5-Encode-compat/pkg-plist4
-rw-r--r--devel/p5-Encode/pkg-plist32
-rw-r--r--devel/p5-Env-PS1/pkg-plist4
-rw-r--r--devel/p5-Event/pkg-plist4
-rw-r--r--devel/p5-Exporter-Lite/pkg-plist4
-rw-r--r--devel/p5-Exporter-Tidy/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-AutoInstall/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-CBuilder/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-Constant/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-Depends/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist8
-rw-r--r--devel/p5-ExtUtils-MakeMaker/pkg-plist10
-rw-r--r--devel/p5-ExtUtils-ParseXS/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-PkgConfig/pkg-plist4
-rw-r--r--devel/p5-ExtUtils-XSBuilder/pkg-plist4
-rw-r--r--devel/p5-File-BaseDir/pkg-plist6
-rw-r--r--devel/p5-File-Copy-Recursive/pkg-plist8
-rw-r--r--devel/p5-File-Find-Rule/pkg-plist6
-rw-r--r--devel/p5-File-Flat/pkg-plist4
-rw-r--r--devel/p5-File-Flock/pkg-plist4
-rw-r--r--devel/p5-File-Grep/pkg-plist4
-rw-r--r--devel/p5-File-HomeDir/pkg-plist4
-rw-r--r--devel/p5-File-Lock/pkg-plist2
-rw-r--r--devel/p5-File-MMagic/pkg-plist4
-rw-r--r--devel/p5-File-MimeInfo/pkg-plist8
-rw-r--r--devel/p5-File-Modified/pkg-plist4
-rw-r--r--devel/p5-File-NCopy/pkg-plist4
-rw-r--r--devel/p5-File-NFSLock/pkg-plist4
-rw-r--r--devel/p5-File-Path-Expand/pkg-plist4
-rw-r--r--devel/p5-File-PathConvert/pkg-plist6
-rw-r--r--devel/p5-File-Random/pkg-plist4
-rw-r--r--devel/p5-File-ReadBackwards/pkg-plist4
-rw-r--r--devel/p5-File-Remove/pkg-plist4
-rw-r--r--devel/p5-File-ShareDir/pkg-plist4
-rw-r--r--devel/p5-File-Slurp/pkg-plist4
-rw-r--r--devel/p5-File-Sync/pkg-plist2
-rw-r--r--devel/p5-File-Tail/pkg-plist4
-rw-r--r--devel/p5-File-Temp/pkg-plist4
-rw-r--r--devel/p5-File-Type/pkg-plist4
-rw-r--r--devel/p5-File-chdir/pkg-plist4
-rw-r--r--devel/p5-File-pushd/pkg-plist6
-rw-r--r--devel/p5-FileHandle-Unget/pkg-plist4
-rw-r--r--devel/p5-Filesys-Statvfs_Df/pkg-plist8
-rw-r--r--devel/p5-Filesys-Virtual-Plain/pkg-plist6
-rw-r--r--devel/p5-Filesys-Virtual/pkg-plist6
-rw-r--r--devel/p5-Geo-ShapeFile/pkg-plist6
-rw-r--r--devel/p5-Getopt-ArgvFile/pkg-plist4
-rw-r--r--devel/p5-Getopt-Declare/pkg-plist4
-rw-r--r--devel/p5-Getopt-Long/pkg-plist4
-rw-r--r--devel/p5-Getopt-Popt/pkg-plist4
-rw-r--r--devel/p5-Glib2/pkg-plist2
-rw-r--r--devel/p5-Gnome2-GConf/pkg-plist4
-rw-r--r--devel/p5-Heap-Simple-Perl/pkg-plist12
-rw-r--r--devel/p5-Heap-Simple-XS/pkg-plist8
-rw-r--r--devel/p5-Heap-Simple/pkg-plist6
-rw-r--r--devel/p5-Heap/pkg-plist8
-rw-r--r--devel/p5-Hook-LexWrap/pkg-plist4
-rw-r--r--devel/p5-IO-All/pkg-plist4
-rw-r--r--devel/p5-IO-Capture/pkg-plist8
-rw-r--r--devel/p5-IO-CaptureOutput/pkg-plist4
-rw-r--r--devel/p5-IO-Digest/pkg-plist4
-rw-r--r--devel/p5-IO-KQueue/pkg-plist4
-rw-r--r--devel/p5-IO-LockedFile/pkg-plist8
-rw-r--r--devel/p5-IO-Multiplex/pkg-plist6
-rw-r--r--devel/p5-IO-NestedCapture/pkg-plist2
-rw-r--r--devel/p5-IO-Pager/pkg-plist6
-rw-r--r--devel/p5-IO-Prompt/pkg-plist4
-rw-r--r--devel/p5-IO-String/pkg-plist4
-rw-r--r--devel/p5-IO-Tee/pkg-plist6
-rw-r--r--devel/p5-IO-Tty/pkg-plist6
-rw-r--r--devel/p5-IO-Util/pkg-plist4
-rw-r--r--devel/p5-IO-stringy/pkg-plist4
-rw-r--r--devel/p5-IPC-Cmd/pkg-plist6
-rw-r--r--devel/p5-IPC-DirQueue/pkg-plist8
-rw-r--r--devel/p5-IPC-Locker/pkg-plist4
-rw-r--r--devel/p5-IPC-MM/pkg-plist4
-rw-r--r--devel/p5-IPC-Run/pkg-plist4
-rw-r--r--devel/p5-IPC-Run3/pkg-plist4
-rw-r--r--devel/p5-IPC-ShareLite/pkg-plist4
-rw-r--r--devel/p5-IPC-SharedCache/pkg-plist6
-rw-r--r--devel/p5-Inline-ASM/pkg-plist4
-rw-r--r--devel/p5-Inline-CPP/pkg-plist4
-rw-r--r--devel/p5-Inline-Filters/pkg-plist4
-rw-r--r--devel/p5-Inline-Tcl/pkg-plist4
-rw-r--r--devel/p5-Inline/pkg-plist6
-rw-r--r--devel/p5-List-Cycle/pkg-plist6
-rw-r--r--devel/p5-List-Group/pkg-plist2
-rw-r--r--devel/p5-Locale-Maketext-Fuzzy/pkg-plist6
-rw-r--r--devel/p5-Locale-Maketext-Gettext/pkg-plist4
-rw-r--r--devel/p5-Locale-Maketext-Lexicon/pkg-plist10
-rw-r--r--devel/p5-Locale-Maketext-Simple/pkg-plist8
-rw-r--r--devel/p5-Locale-Maketext/pkg-plist2
-rw-r--r--devel/p5-Locale-gettext/pkg-plist4
-rw-r--r--devel/p5-Locale-libintl/pkg-plist2
-rw-r--r--devel/p5-Log-Accounting-SVK/pkg-plist4
-rw-r--r--devel/p5-Log-Agent/pkg-plist12
-rw-r--r--devel/p5-Log-Dispatch-FileRotate/pkg-plist8
-rw-r--r--devel/p5-Log-Dispatch-Perl/pkg-plist8
-rw-r--r--devel/p5-Log-Dispatch/pkg-plist2
-rw-r--r--devel/p5-Log-Log4perl/pkg-plist4
-rw-r--r--devel/p5-Log-TraceMessages/pkg-plist6
-rw-r--r--devel/p5-Mac-FileSpec-Unixish/pkg-plist8
-rw-r--r--devel/p5-Memoize/pkg-plist4
-rw-r--r--devel/p5-Module-Build/pkg-plist2
-rw-r--r--devel/p5-Module-CoreList/pkg-plist6
-rw-r--r--devel/p5-Module-Find/pkg-plist4
-rw-r--r--devel/p5-Module-Info/pkg-plist6
-rw-r--r--devel/p5-Module-Install/pkg-plist6
-rw-r--r--devel/p5-Module-Load-Conditional/pkg-plist8
-rw-r--r--devel/p5-Module-Load/pkg-plist6
-rw-r--r--devel/p5-Module-Pluggable-Fast/pkg-plist8
-rw-r--r--devel/p5-Module-Pluggable-Ordered/pkg-plist10
-rw-r--r--devel/p5-Module-Pluggable/pkg-plist2
-rw-r--r--devel/p5-Module-Refresh/pkg-plist4
-rw-r--r--devel/p5-Module-Release/pkg-plist2
-rw-r--r--devel/p5-Module-Reload-Sel/pkg-plist8
-rw-r--r--devel/p5-Module-Reload/pkg-plist4
-rw-r--r--devel/p5-Module-ScanDeps/pkg-plist4
-rw-r--r--devel/p5-Module-Starter-PBP/pkg-plist8
-rw-r--r--devel/p5-Module-Starter/pkg-plist4
-rw-r--r--devel/p5-Net-DBus/pkg-plist4
-rw-r--r--devel/p5-OLE-Storage_Lite/pkg-plist6
-rw-r--r--devel/p5-OOTools/pkg-plist6
-rw-r--r--devel/p5-Object-Accessor/pkg-plist4
-rw-r--r--devel/p5-Object-InsideOut/pkg-plist8
-rw-r--r--devel/p5-Object-MultiType/pkg-plist4
-rw-r--r--devel/p5-Object-Realize-Later/pkg-plist4
-rw-r--r--devel/p5-Object-Signature/pkg-plist6
-rw-r--r--devel/p5-P4-Client/pkg-plist4
-rw-r--r--devel/p5-P4/pkg-plist4
-rw-r--r--devel/p5-PAR/pkg-plist8
-rw-r--r--devel/p5-POE-API-Hooks/pkg-plist8
-rw-r--r--devel/p5-POE-API-Peek/pkg-plist8
-rw-r--r--devel/p5-POE-Component-Child/pkg-plist8
-rw-r--r--devel/p5-POE-Component-DebugShell/pkg-plist4
-rw-r--r--devel/p5-POE-Component-DirWatch/pkg-plist8
-rw-r--r--devel/p5-POE-Component-IKC/pkg-plist8
-rw-r--r--devel/p5-POE-Component-JobQueue/pkg-plist8
-rw-r--r--devel/p5-POE-Component-Logger/pkg-plist10
-rw-r--r--devel/p5-POE-Component-RSS/pkg-plist8
-rw-r--r--devel/p5-POE-Component-Server-XMLRPC/pkg-plist12
-rw-r--r--devel/p5-POE-Devel-Profiler/pkg-plist8
-rw-r--r--devel/p5-POE-Exceptions/pkg-plist8
-rw-r--r--devel/p5-POE-Session-MultiDispatch/pkg-plist8
-rw-r--r--devel/p5-POE/pkg-plist16
-rw-r--r--devel/p5-PadWalker/pkg-plist2
-rw-r--r--devel/p5-Parallel-ForkManager/pkg-plist4
-rw-r--r--devel/p5-Params-CallbackRequest/pkg-plist2
-rw-r--r--devel/p5-Params-Check/pkg-plist6
-rw-r--r--devel/p5-Params-Util/pkg-plist4
-rw-r--r--devel/p5-Params-Validate/pkg-plist4
-rw-r--r--devel/p5-Parse-CPAN-Packages/pkg-plist4
-rw-r--r--devel/p5-Parse-PerlConfig/pkg-plist4
-rw-r--r--devel/p5-Parse-RecDescent/pkg-plist4
-rw-r--r--devel/p5-Parse-Yapp/pkg-plist6
-rw-r--r--devel/p5-ParseLex/pkg-plist6
-rw-r--r--devel/p5-PatchReader/pkg-plist4
-rw-r--r--devel/p5-Path-Class/pkg-plist2
-rw-r--r--devel/p5-PathTools/pkg-plist2
-rw-r--r--devel/p5-Perl6-Export/pkg-plist4
-rw-r--r--devel/p5-Perl6-Form/pkg-plist4
-rw-r--r--devel/p5-PerlIO-eol/pkg-plist6
-rw-r--r--devel/p5-PerlIO-via-MD5/pkg-plist8
-rw-r--r--devel/p5-PerlIO-via-dynamic/pkg-plist8
-rw-r--r--devel/p5-PerlIO-via-symlink/pkg-plist10
-rw-r--r--devel/p5-Pod-Coverage/pkg-plist4
-rw-r--r--devel/p5-Proc-Background/pkg-plist4
-rw-r--r--devel/p5-Proc-Daemon/pkg-plist4
-rw-r--r--devel/p5-Proc-Fork/pkg-plist6
-rw-r--r--devel/p5-Proc-PID-File/pkg-plist8
-rw-r--r--devel/p5-Proc-PIDFile/pkg-plist4
-rw-r--r--devel/p5-Proc-Queue/pkg-plist6
-rw-r--r--devel/p5-Proc-Reliable/pkg-plist10
-rw-r--r--devel/p5-Project-Gantt/pkg-plist4
-rw-r--r--devel/p5-Rcs-Agent/pkg-plist4
-rw-r--r--devel/p5-Rcs/pkg-plist2
-rw-r--r--devel/p5-ReadLine-Gnu/pkg-plist8
-rw-r--r--devel/p5-ReadLine-Perl/pkg-plist6
-rw-r--r--devel/p5-Regexp-Assemble/pkg-plist4
-rw-r--r--devel/p5-Regexp-Shellish/pkg-plist4
-rw-r--r--devel/p5-Return-Value/pkg-plist6
-rw-r--r--devel/p5-SSN-Validate/pkg-plist6
-rw-r--r--devel/p5-SVN-ACL/pkg-plist4
-rw-r--r--devel/p5-SVN-Mirror/pkg-plist8
-rw-r--r--devel/p5-SVN-Notify/pkg-plist6
-rw-r--r--devel/p5-SVN-Simple/pkg-plist4
-rw-r--r--devel/p5-SVN-Web/pkg-plist4
-rw-r--r--devel/p5-Search-Binary/pkg-plist4
-rw-r--r--devel/p5-Set-Crontab/pkg-plist4
-rw-r--r--devel/p5-Set-Infinite/pkg-plist4
-rw-r--r--devel/p5-Set-NestedGroups/pkg-plist4
-rw-r--r--devel/p5-Set-Object/pkg-plist4
-rw-r--r--devel/p5-Set-Scalar/pkg-plist4
-rw-r--r--devel/p5-Shape/pkg-plist2
-rw-r--r--devel/p5-Shell-Parser/pkg-plist4
-rw-r--r--devel/p5-Smart-Comments/pkg-plist4
-rw-r--r--devel/p5-Sort-Array/pkg-plist4
-rw-r--r--devel/p5-Sort-Key-DateTime/pkg-plist10
-rw-r--r--devel/p5-Sort-Key/pkg-plist8
-rw-r--r--devel/p5-Sort-Tree/pkg-plist4
-rw-r--r--devel/p5-Sort-Versions/pkg-plist4
-rw-r--r--devel/p5-String-Similarity/pkg-plist4
-rw-r--r--devel/p5-Sub-Installer/pkg-plist6
-rw-r--r--devel/p5-Sub-Name/pkg-plist6
-rw-r--r--devel/p5-Sub-Override/pkg-plist4
-rw-r--r--devel/p5-Sub-Uplevel/pkg-plist4
-rw-r--r--devel/p5-Sys-Mmap/pkg-plist4
-rw-r--r--devel/p5-Term-ANSIColor/pkg-plist4
-rw-r--r--devel/p5-Term-Animation/pkg-plist4
-rw-r--r--devel/p5-Term-ProgressBar/pkg-plist4
-rw-r--r--devel/p5-Term-Prompt/pkg-plist2
-rw-r--r--devel/p5-Term-ReadKey/pkg-plist4
-rw-r--r--devel/p5-Term-ReadLine-Zoid/pkg-plist8
-rw-r--r--devel/p5-Term-ReadPassword/pkg-plist4
-rw-r--r--devel/p5-Term-Screen/pkg-plist4
-rw-r--r--devel/p5-Term-Shell/pkg-plist4
-rw-r--r--devel/p5-Term-Size/pkg-plist6
-rw-r--r--devel/p5-Test-Base/pkg-plist8
-rw-r--r--devel/p5-Test-Class/pkg-plist2
-rw-r--r--devel/p5-Test-ClassAPI/pkg-plist4
-rw-r--r--devel/p5-Test-Cmd/pkg-plist4
-rw-r--r--devel/p5-Test-Deep/pkg-plist4
-rw-r--r--devel/p5-Test-Differences/pkg-plist4
-rw-r--r--devel/p5-Test-Exception/pkg-plist4
-rw-r--r--devel/p5-Test-File/pkg-plist4
-rw-r--r--devel/p5-Test-Harness/pkg-plist4
-rw-r--r--devel/p5-Test-Inline/pkg-plist6
-rw-r--r--devel/p5-Test-LectroTest/pkg-plist2
-rw-r--r--devel/p5-Test-LongString/pkg-plist4
-rw-r--r--devel/p5-Test-Manifest/pkg-plist4
-rw-r--r--devel/p5-Test-MockModule/pkg-plist4
-rw-r--r--devel/p5-Test-MockObject/pkg-plist4
-rw-r--r--devel/p5-Test-NoWarnings/pkg-plist4
-rw-r--r--devel/p5-Test-Pod/pkg-plist4
-rw-r--r--devel/p5-Test-Reporter/pkg-plist4
-rw-r--r--devel/p5-Test-Simple/pkg-plist8
-rw-r--r--devel/p5-Test-Strict/pkg-plist4
-rw-r--r--devel/p5-Test-SubCalls/pkg-plist4
-rw-r--r--devel/p5-Test-Tester/pkg-plist4
-rw-r--r--devel/p5-Test-Unit/pkg-plist4
-rw-r--r--devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist6
-rw-r--r--devel/p5-Test-WWW-Mechanize/pkg-plist8
-rw-r--r--devel/p5-Test-Warn/pkg-plist4
-rw-r--r--devel/p5-Test-XML/pkg-plist8
-rw-r--r--devel/p5-Text-LevenshteinXS/pkg-plist4
-rw-r--r--devel/p5-Text-vFile-asData/pkg-plist4
-rw-r--r--devel/p5-Tie-Array-Sorted/pkg-plist8
-rw-r--r--devel/p5-Tie-Cache/pkg-plist4
-rw-r--r--devel/p5-Tie-DB_File-SplitHash/pkg-plist4
-rw-r--r--devel/p5-Tie-File/pkg-plist4
-rw-r--r--devel/p5-Tie-FileLRUCache/pkg-plist4
-rw-r--r--devel/p5-Tie-Hash-Sorted/pkg-plist10
-rw-r--r--devel/p5-Tie-Hash-TwoWay/pkg-plist10
-rw-r--r--devel/p5-Tie-ShareLite/pkg-plist4
-rw-r--r--devel/p5-Tie-iCal/pkg-plist4
-rw-r--r--devel/p5-Time-Duration/pkg-plist4
-rw-r--r--devel/p5-Time-HiRes/pkg-plist4
-rw-r--r--devel/p5-Time-Local/pkg-plist4
-rw-r--r--devel/p5-Time-Object/pkg-plist4
-rw-r--r--devel/p5-Time-Period/pkg-plist4
-rw-r--r--devel/p5-Time-Piece/pkg-plist4
-rw-r--r--devel/p5-Time-modules/pkg-plist4
-rw-r--r--devel/p5-TimeDate/pkg-plist4
-rw-r--r--devel/p5-Tree-Binary/pkg-plist4
-rw-r--r--devel/p5-Tree-Node/pkg-plist4
-rw-r--r--devel/p5-Tree-Parser/pkg-plist4
-rw-r--r--devel/p5-Tree-Simple-View/pkg-plist8
-rw-r--r--devel/p5-Tree-Simple-VisitorFactory/pkg-plist8
-rw-r--r--devel/p5-Tree-Simple/pkg-plist4
-rw-r--r--devel/p5-UNIVERSAL-can/pkg-plist2
-rw-r--r--devel/p5-UNIVERSAL-exports/pkg-plist2
-rw-r--r--devel/p5-UNIVERSAL-isa/pkg-plist2
-rw-r--r--devel/p5-UNIVERSAL-moniker/pkg-plist4
-rw-r--r--devel/p5-UNIVERSAL-require/pkg-plist4
-rw-r--r--devel/p5-Unix-Statgrab/pkg-plist4
-rw-r--r--devel/p5-User-Identity/pkg-plist6
-rw-r--r--devel/p5-VCP-Dest-svk/pkg-plist10
-rw-r--r--devel/p5-VCP-Source-cvsbk/pkg-plist10
-rw-r--r--devel/p5-VCP/pkg-plist2
-rw-r--r--devel/p5-VCS/pkg-plist4
-rw-r--r--devel/p5-iCal-Parser/pkg-plist4
-rw-r--r--devel/p5-prefork/pkg-plist2
-rw-r--r--devel/p5-release/pkg-plist2
-rw-r--r--devel/pear/pkg-plist20
-rw-r--r--devel/perltidy/pkg-plist4
-rw-r--r--devel/php-dbg/pkg-plist2
-rw-r--r--devel/php-dbg2/pkg-plist2
-rw-r--r--devel/php-xdebug/pkg-plist2
-rw-r--r--devel/prepstools/pkg-plist2
-rw-r--r--devel/py-dateutil/pkg-plist4
-rw-r--r--devel/py-kid/pkg-plist4
-rw-r--r--devel/qsa/pkg-plist6
-rw-r--r--devel/sdl12/pkg-plist2
-rw-r--r--devel/sfslite/pkg-plist4
-rw-r--r--devel/silc-toolkit/pkg-plist10
-rw-r--r--devel/simpletest/pkg-plist2
-rw-r--r--devel/svk/pkg-plist2
-rw-r--r--devel/xfc/pkg-plist6
542 files changed, 1428 insertions, 1428 deletions
diff --git a/devel/ZendOptimizer/pkg-plist b/devel/ZendOptimizer/pkg-plist
index 061418875efd..8592e5220dd8 100644
--- a/devel/ZendOptimizer/pkg-plist
+++ b/devel/ZendOptimizer/pkg-plist
@@ -6,4 +6,4 @@ lib/php/%%PHP_EXT_DIR%%/Optimizer_TS/php-%%ZEND_PATH%%/ZendOptimizer.so
@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer_TS
@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer/php-%%ZEND_PATH%%
@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
diff --git a/devel/aap/pkg-plist b/devel/aap/pkg-plist
index de2a836e5c27..823a89825449 100644
--- a/devel/aap/pkg-plist
+++ b/devel/aap/pkg-plist
@@ -163,4 +163,4 @@ lib/aap/Exec-%%PORTVERSION%%/tools/msvc.pyc
%%PORTDOCS%%@dirrm lib/aap/Exec-%%PORTVERSION%%/doc/html
%%PORTDOCS%%@dirrm lib/aap/Exec-%%PORTVERSION%%/doc
@dirrm lib/aap/Exec-%%PORTVERSION%%
-@unexec rmdir %D/lib/aap 2>/dev/null || true
+@dirrmtry lib/aap
diff --git a/devel/agenda-snow-libs/pkg-plist b/devel/agenda-snow-libs/pkg-plist
index 45ab298a42c1..c28144cb8db2 100644
--- a/devel/agenda-snow-libs/pkg-plist
+++ b/devel/agenda-snow-libs/pkg-plist
@@ -185,5 +185,5 @@ mipsel-linux/lib/snow/specs
@dirrm mipsel-linux/etc
@dirrm mipsel-linux/lib/snow-specs
@dirrm mipsel-linux/lib/snow
-@unexec rmdir %D/mipsel-linux/lib 2> /dev/null || true
-@unexec rmdir %D/mipsel-linux 2> /dev/null || true
+@dirrmtry mipsel-linux/lib
+@dirrmtry mipsel-linux
diff --git a/devel/agenda-static-libs/pkg-plist b/devel/agenda-static-libs/pkg-plist
index ad06890cacbc..0bb1efe6cd0a 100644
--- a/devel/agenda-static-libs/pkg-plist
+++ b/devel/agenda-static-libs/pkg-plist
@@ -28,5 +28,5 @@ mipsel-linux/lib/libsupc++.a
mipsel-linux/lib/libsupc++.la
mipsel-linux/lib/libtermcap.a
mipsel-linux/lib/libutil.a
-@unexec rmdir %D/mipsel-linux/lib 2> /dev/null || true
-@unexec rmdir %D/mipsel-linux 2> /dev/null || true
+@dirrmtry mipsel-linux/lib
+@dirrmtry mipsel-linux
diff --git a/devel/agide/pkg-plist b/devel/agide/pkg-plist
index 6bfaca609e12..031a5e7a6284 100644
--- a/devel/agide/pkg-plist
+++ b/devel/agide/pkg-plist
@@ -71,4 +71,4 @@ lib/aap/Agide-%%PORTVERSION%%/startup.vim
@dirrm lib/aap/Agide-%%PORTVERSION%%/Tools/GrepToolUtil
@dirrm lib/aap/Agide-%%PORTVERSION%%/Tools
@dirrm lib/aap/Agide-%%PORTVERSION%%
-@unexec rmdir %D/lib/aap 2>/dev/null || true
+@dirrmtry lib/aap
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index 8259970e8a80..4fa155ee5c18 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -32,7 +32,7 @@ bin/autodia_java.pl
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
@dirrm %%SITE_PERL%%/Autodia/Diagram
@dirrm %%SITE_PERL%%/Autodia/Handler
@dirrm %%SITE_PERL%%/Autodia
diff --git a/devel/baz/pkg-plist b/devel/baz/pkg-plist
index 75120f5fc799..73df136029b8 100644
--- a/devel/baz/pkg-plist
+++ b/devel/baz/pkg-plist
@@ -24,15 +24,15 @@ share/locale/nl_BE/LC_MESSAGES/bazaar.mo
share/locale/pt_BR/LC_MESSAGES/bazaar.mo
share/locale/pt_PT/LC_MESSAGES/bazaar.mo
share/locale/zh_CN/LC_MESSAGES/bazaar.mo
-@unexec rmdir %D/share/locale/nl_BE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl_BE 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_IT 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_FR 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_BE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_BE 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_AR 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_AU/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_AU 2>/dev/null || true
+@dirrmtry share/locale/nl_BE/LC_MESSAGES
+@dirrmtry share/locale/nl_BE
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
+@dirrmtry share/locale/fr_BE/LC_MESSAGES
+@dirrmtry share/locale/fr_BE
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
diff --git a/devel/bazaar/pkg-plist b/devel/bazaar/pkg-plist
index 75120f5fc799..73df136029b8 100644
--- a/devel/bazaar/pkg-plist
+++ b/devel/bazaar/pkg-plist
@@ -24,15 +24,15 @@ share/locale/nl_BE/LC_MESSAGES/bazaar.mo
share/locale/pt_BR/LC_MESSAGES/bazaar.mo
share/locale/pt_PT/LC_MESSAGES/bazaar.mo
share/locale/zh_CN/LC_MESSAGES/bazaar.mo
-@unexec rmdir %D/share/locale/nl_BE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl_BE 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it_IT 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_FR 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_BE/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr_BE 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_AR 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_AU/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_AU 2>/dev/null || true
+@dirrmtry share/locale/nl_BE/LC_MESSAGES
+@dirrmtry share/locale/nl_BE
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
+@dirrmtry share/locale/fr_BE/LC_MESSAGES
+@dirrmtry share/locale/fr_BE
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index f1cbdfa9633f..8a7c7ddba574 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -57,4 +57,4 @@ share/aclocal/bison-i18n.m4
%%NLS%%@unexec rmdir %D/share/locale/rw 2>/dev/null || true
@dirrm %%DATADIR%%/m4sugar
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@dirrmtry share/aclocal
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index ea36fa1c04a7..06832c1205cd 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -97,14 +97,14 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo
share/locale/xh/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.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/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/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/gnome/omf/bug-buddy
@dirrm share/gnome/help/bug-buddy/uk
@dirrm share/gnome/help/bug-buddy/sr
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index ea36fa1c04a7..06832c1205cd 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -97,14 +97,14 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo
share/locale/xh/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.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/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/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@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/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/gnome/omf/bug-buddy
@dirrm share/gnome/help/bug-buddy/uk
@dirrm share/gnome/help/bug-buddy/sr
diff --git a/devel/bugzilla/pkg-plist b/devel/bugzilla/pkg-plist
index 541a04723f33..68c409247eec 100644
--- a/devel/bugzilla/pkg-plist
+++ b/devel/bugzilla/pkg-plist
@@ -533,7 +533,7 @@
@dirrm %%BUGZILLADIR%%/template/en/default/account
@dirrm %%BUGZILLADIR%%/template/en/default
@dirrm %%BUGZILLADIR%%/template/en
-@unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%/template
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/bugzilla-submit
@@ -548,16 +548,16 @@
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth
-@unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
-@unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
-@unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%/Bugzilla
+@dirrmtry %%BUGZILLADIR%%/data
+@dirrmtry %%BUGZILLADIR%%/graphs
@dirrm %%BUGZILLADIR%%/images
@dirrm %%BUGZILLADIR%%/js
@dirrm %%BUGZILLADIR%%/skins/standard/index
@dirrm %%BUGZILLADIR%%/skins/standard/global
@dirrm %%BUGZILLADIR%%/skins/standard
@dirrm %%BUGZILLADIR%%/skins
-@unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
diff --git a/devel/bugzilla2/pkg-plist b/devel/bugzilla2/pkg-plist
index 541a04723f33..68c409247eec 100644
--- a/devel/bugzilla2/pkg-plist
+++ b/devel/bugzilla2/pkg-plist
@@ -533,7 +533,7 @@
@dirrm %%BUGZILLADIR%%/template/en/default/account
@dirrm %%BUGZILLADIR%%/template/en/default
@dirrm %%BUGZILLADIR%%/template/en
-@unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%/template
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/bugzilla-submit
@@ -548,16 +548,16 @@
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth
-@unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
-@unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
-@unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%/Bugzilla
+@dirrmtry %%BUGZILLADIR%%/data
+@dirrmtry %%BUGZILLADIR%%/graphs
@dirrm %%BUGZILLADIR%%/images
@dirrm %%BUGZILLADIR%%/js
@dirrm %%BUGZILLADIR%%/skins/standard/index
@dirrm %%BUGZILLADIR%%/skins/standard/global
@dirrm %%BUGZILLADIR%%/skins/standard
@dirrm %%BUGZILLADIR%%/skins
-@unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
diff --git a/devel/bugzilla3/pkg-plist b/devel/bugzilla3/pkg-plist
index 541a04723f33..68c409247eec 100644
--- a/devel/bugzilla3/pkg-plist
+++ b/devel/bugzilla3/pkg-plist
@@ -533,7 +533,7 @@
@dirrm %%BUGZILLADIR%%/template/en/default/account
@dirrm %%BUGZILLADIR%%/template/en/default
@dirrm %%BUGZILLADIR%%/template/en
-@unexec rmdir %D/%%BUGZILLADIR%%/template 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%/template
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/gnatsparse
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/cmdline
%%CONTRIB%%@dirrm %%BUGZILLADIR%%/contrib/bugzilla-submit
@@ -548,16 +548,16 @@
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login/WWW
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth/Login
@dirrm %%BUGZILLADIR%%/Bugzilla/Auth
-@unexec rmdir %D/%%BUGZILLADIR%%/Bugzilla 2>/dev/null || true
-@unexec rmdir %D/%%BUGZILLADIR%%/data 2>/dev/null || true
-@unexec rmdir %D/%%BUGZILLADIR%%/graphs 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%/Bugzilla
+@dirrmtry %%BUGZILLADIR%%/data
+@dirrmtry %%BUGZILLADIR%%/graphs
@dirrm %%BUGZILLADIR%%/images
@dirrm %%BUGZILLADIR%%/js
@dirrm %%BUGZILLADIR%%/skins/standard/index
@dirrm %%BUGZILLADIR%%/skins/standard/global
@dirrm %%BUGZILLADIR%%/skins/standard
@dirrm %%BUGZILLADIR%%/skins
-@unexec rmdir %D/%%BUGZILLADIR%% 2>/dev/null || true
+@dirrmtry %%BUGZILLADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml
%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
diff --git a/devel/c2lib/pkg-plist b/devel/c2lib/pkg-plist
index a8d787a76cfc..793ce75e1895 100644
--- a/devel/c2lib/pkg-plist
+++ b/devel/c2lib/pkg-plist
@@ -11,5 +11,5 @@ lib/libc2lib.so
lib/libc2lib.so.1
lib/libc2lib.so.%%VERSION%%
share/rws/symtabs/libc2lib.syms
-@unexec rmdir %D/share/rws/symtabs 2>/dev/null || true
-@unexec rmdir %D/share/rws 2>/dev/null || true
+@dirrmtry share/rws/symtabs
+@dirrmtry share/rws
diff --git a/devel/chora/pkg-plist b/devel/chora/pkg-plist
index 5498173e4f45..b5f16266a49e 100644
--- a/devel/chora/pkg-plist
+++ b/devel/chora/pkg-plist
@@ -161,5 +161,5 @@
@dirrm %%CHORADIR%%/locale/cs_CZ
@dirrm %%CHORADIR%%/locale
@dirrm %%CHORADIR%%/lib
-@unexec rmdir %D/%%CHORADIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%CHORADIR%% 2>/dev/null || true
+@dirrmtry %%CHORADIR%%/config
+@dirrmtry %%CHORADIR%%
diff --git a/devel/codeville/pkg-plist b/devel/codeville/pkg-plist
index 96afb58e21f2..bad9c3d1d533 100644
--- a/devel/codeville/pkg-plist
+++ b/devel/codeville/pkg-plist
@@ -91,5 +91,5 @@ bin/cdvupgrade
@dirrm %%EXAMPLESDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/Codeville/old
@dirrm %%PYTHON_SITELIBDIR%%/Codeville
-@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/devel/cogito/pkg-plist b/devel/cogito/pkg-plist
index f86afe0e034a..d647a3d526d5 100644
--- a/devel/cogito/pkg-plist
+++ b/devel/cogito/pkg-plist
@@ -98,12 +98,12 @@ bin/git-write-blob
bin/git-write-tree
bin/gitfeedmaillist.sh
bin/ciabot.pl
-@unexec rmdir %D/bin/ 2>/dev/null || true
+@dirrmtry bin/
lib/cogito/cg-Xlib
lib/cogito/cg-Xmergefile
lib/cogito/cg-Xnormid
@dirrm lib/cogito
-@unexec rmdir %D/lib/ 2>/dev/null || true
+@dirrmtry lib/
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/diff-format.txt
%%PORTDOCS%%%%DOCSDIR%%/cvs-migration.txt
@@ -149,5 +149,5 @@ lib/cogito/cg-Xnormid
%%PORTDOCS%%%%DOCSDIR%%/git.txt
%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/doc/ 2>/dev/null || true
-@unexec rmdir %D/share/ 2>/dev/null || true
+@dirrmtry share/doc/
+@dirrmtry share/
diff --git a/devel/cvsmonitor/pkg-plist b/devel/cvsmonitor/pkg-plist
index a0978e7da6b2..980c25d6dd6a 100644
--- a/devel/cvsmonitor/pkg-plist
+++ b/devel/cvsmonitor/pkg-plist
@@ -121,4 +121,4 @@
@dirrm %%CVSMON%%/static/style
@dirrm %%CVSMON%%/static/images
@dirrm %%CVSMON%%/static
-@unexec rmdir %D/%%CVSMON%% 2>/dev/null || true
+@dirrmtry %%CVSMON%%
diff --git a/devel/cvsweb3/pkg-plist b/devel/cvsweb3/pkg-plist
index 09882b3b9bfd..60190298ce91 100644
--- a/devel/cvsweb3/pkg-plist
+++ b/devel/cvsweb3/pkg-plist
@@ -26,4 +26,4 @@ etc/cvsweb/cvsweb.conf-ruby.dist
@dirrm %%CSSDIR%%/cvsweb
share/enscript/hl/lang_cvsweb.st
share/enscript/hl/lang_cvsweb_diff.st
-@unexec rmdir %D/share/enscript/hl 2>/dev/null || true
+@dirrmtry share/enscript/hl
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 54bedc86c8cf..5883f6ddff10 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -45,8 +45,8 @@ libdata/pkgconfig/dbus-glib-1.pc
@exec mkdir -p %D/etc/dbus-1/system.d
@exec mkdir -p %D/share/dbus-1/services
@exec mkdir -p %%X11BASE%%/share/dbus-1/services
-@unexec rmdir %D/share/dbus-1/services 2>/dev/null || true
-@unexec rmdir %D/share/dbus-1 2>/dev/null || true
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1
@unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
@unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
@dirrm include/dbus-%%VERSION%%/include/dbus
diff --git a/devel/evolution-gconf-tools/pkg-plist b/devel/evolution-gconf-tools/pkg-plist
index c44281f01b63..f18d7ea1b6e6 100644
--- a/devel/evolution-gconf-tools/pkg-plist
+++ b/devel/evolution-gconf-tools/pkg-plist
@@ -21,6 +21,6 @@ etc/gconf/evolution-gconf-tools/prototype-data.xml
%%PYTHON_SITELIBDIR%%/evolutiongconftools/personalizevisitor.pyo
@dirrm %%PYTHON_SITELIBDIR%%/evolutiongconftools
@dirrm %%PYTHON_SITELIBDIR%%/evolution-gconf-tools
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
@dirrm etc/gconf/evolution-gconf-tools
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 17b77a70bb64..b136bd3e18ca 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -111,8 +111,8 @@ share/locale/zh_CN/LC_MESSAGES/GConf2.mo
share/locale/zh_TW/LC_MESSAGES/GConf2.mo
share/sgml/gconf/gconf-1.0.dtd
@dirrm share/sgml/gconf
-@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/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
@dirrm share/doc/gconf
%%LDAP%%@dirrm share/GConf/schema
%%LDAP%%@dirrm share/GConf
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 6dd0a195c528..80f9caf55bb3 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -169,22 +169,22 @@ share/locale/yi/LC_MESSAGES/glib20.mo
share/locale/zh_CN/LC_MESSAGES/glib20.mo
share/locale/zh_HK/LC_MESSAGES/glib20.mo
share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@unexec rmdir %D/share/locale/ne/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ne 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/sr@ije/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
-@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/te 2> /dev/null || true
-@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tl 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/yi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/yi 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/glib-2.0/gettext/po
@dirrm share/glib-2.0/gettext
@dirrm share/glib-2.0
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 72d0978104e5..2f71faa5b68a 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -157,9 +157,9 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0/libgnomevfs
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
-@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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 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/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 72d0978104e5..2f71faa5b68a 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -157,9 +157,9 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm include/gnome-vfs-2.0/libgnomevfs
@dirrm include/gnome-vfs-2.0/include
@dirrm include/gnome-vfs-2.0
-@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/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 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/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index 18dcdd908178..0a114e23d4ba 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -311,8 +311,8 @@ share/locale/uk/LC_MESSAGES/goffice.mo
share/locale/vi/LC_MESSAGES/goffice.mo
share/locale/zh_CN/LC_MESSAGES/goffice.mo
share/locale/zh_TW/LC_MESSAGES/goffice.mo
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/gnome/pixmaps/goffice
@dirrm share/gnome/goffice/%%VERSION%%/patterns
@dirrm share/gnome/goffice/%%VERSION%%/glade
diff --git a/devel/goffice04/pkg-plist b/devel/goffice04/pkg-plist
index 18dcdd908178..0a114e23d4ba 100644
--- a/devel/goffice04/pkg-plist
+++ b/devel/goffice04/pkg-plist
@@ -311,8 +311,8 @@ share/locale/uk/LC_MESSAGES/goffice.mo
share/locale/vi/LC_MESSAGES/goffice.mo
share/locale/zh_CN/LC_MESSAGES/goffice.mo
share/locale/zh_TW/LC_MESSAGES/goffice.mo
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/gnome/pixmaps/goffice
@dirrm share/gnome/goffice/%%VERSION%%/patterns
@dirrm share/gnome/goffice/%%VERSION%%/glade
diff --git a/devel/goffice1/pkg-plist b/devel/goffice1/pkg-plist
index 18dcdd908178..0a114e23d4ba 100644
--- a/devel/goffice1/pkg-plist
+++ b/devel/goffice1/pkg-plist
@@ -311,8 +311,8 @@ share/locale/uk/LC_MESSAGES/goffice.mo
share/locale/vi/LC_MESSAGES/goffice.mo
share/locale/zh_CN/LC_MESSAGES/goffice.mo
share/locale/zh_TW/LC_MESSAGES/goffice.mo
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/gnome/pixmaps/goffice
@dirrm share/gnome/goffice/%%VERSION%%/patterns
@dirrm share/gnome/goffice/%%VERSION%%/glade
diff --git a/devel/horde-chora/pkg-plist b/devel/horde-chora/pkg-plist
index 5498173e4f45..b5f16266a49e 100644
--- a/devel/horde-chora/pkg-plist
+++ b/devel/horde-chora/pkg-plist
@@ -161,5 +161,5 @@
@dirrm %%CHORADIR%%/locale/cs_CZ
@dirrm %%CHORADIR%%/locale
@dirrm %%CHORADIR%%/lib
-@unexec rmdir %D/%%CHORADIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%CHORADIR%% 2>/dev/null || true
+@dirrmtry %%CHORADIR%%/config
+@dirrmtry %%CHORADIR%%
diff --git a/devel/kcachegrind/pkg-plist b/devel/kcachegrind/pkg-plist
index 90f33857ac1b..5038a2d7b984 100644
--- a/devel/kcachegrind/pkg-plist
+++ b/devel/kcachegrind/pkg-plist
@@ -33,19 +33,19 @@ share/mimelnk/application/x-kcachegrind.desktop
@dirrm share/apps/kcachegrind/icons
@dirrm share/apps/kcachegrind
@dirrm share/doc/HTML/en/kcachegrind
-@unexec rmdir %D/share/applnk/Development 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-@unexec rmdir %D/share/apps 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/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/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/icons 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
+@dirrmtry share/applnk/Development
+@dirrmtry share/applnk
+@dirrmtry share/apps
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
diff --git a/devel/kdbg/pkg-plist b/devel/kdbg/pkg-plist
index 3656760ae6c2..2d98a0a8d595 100644
--- a/devel/kdbg/pkg-plist
+++ b/devel/kdbg/pkg-plist
@@ -102,8 +102,8 @@ share/locale/sr/LC_MESSAGES/kdbg.mo
share/locale/sv/LC_MESSAGES/kdbg.mo
share/locale/tr/LC_MESSAGES/kdbg.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.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/ru/kdbg
@dirrm share/doc/HTML/en/kdbg
@dirrm share/doc/HTML/de/kdbg
diff --git a/devel/kprof/pkg-plist b/devel/kprof/pkg-plist
index d4b93ad493d7..6bbb503f5d22 100644
--- a/devel/kprof/pkg-plist
+++ b/devel/kprof/pkg-plist
@@ -7,17 +7,17 @@ share/doc/HTML/en/kprof/index.docbook
share/doc/HTML/en/kprof/redo.png
share/icons/locolor/16x16/apps/kprof.png
share/icons/locolor/32x32/apps/kprof.png
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/kprof
-@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/kprof
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Development 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/Development
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/devel/kscope/pkg-plist b/devel/kscope/pkg-plist
index 4414a61154fd..7afdc98ca0d2 100644
--- a/devel/kscope/pkg-plist
+++ b/devel/kscope/pkg-plist
@@ -25,11 +25,11 @@ share/apps/kscope/pics/file_save.png
share/apps/kscope/pics/query_locked.png
share/apps/kscope/pics/query_unlocked.png
share/apps/kscope/pics/tab_list.png
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/applnk/Utilities
@dirrm %%DOCSDIR%%
@dirrm share/apps/kscope/pics
@dirrm share/apps/kscope
diff --git a/devel/libgii/pkg-plist b/devel/libgii/pkg-plist
index e318668cb2a6..ce96e6ef1e83 100644
--- a/devel/libgii/pkg-plist
+++ b/devel/libgii/pkg-plist
@@ -57,5 +57,5 @@ lib/libgii.so.1
@dirrm include/ggi/internal
@dirrm include/ggi/input
@dirrm include/ggi
-@unexec rmdir %D/etc/ggi/filter 2>/dev/null || true
-@unexec rmdir %D/etc/ggi 2>/dev/null || true
+@dirrmtry etc/ggi/filter
+@dirrmtry etc/ggi
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index b8fcecff57a1..6b00d67afdb2 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -114,13 +114,13 @@ share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
@dirrm include/libgtop-2.0/glibtop
@dirrm include/libgtop-2.0
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
-@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mi 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ky 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/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
diff --git a/devel/liboil/pkg-plist b/devel/liboil/pkg-plist
index bb29a80bebaf..cbe91a2993cb 100644
--- a/devel/liboil/pkg-plist
+++ b/devel/liboil/pkg-plist
@@ -44,7 +44,7 @@ share/gtk-doc/html/liboil/right.png
share/gtk-doc/html/liboil/style.css
share/gtk-doc/html/liboil/up.png
@dirrm share/gtk-doc/html/liboil
-@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true
-@unexec rmdir %D/share/gtk-doc 2>/dev/null || true
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
@dirrm include/liboil-%%VERSION%%/liboil
@dirrm include/liboil-%%VERSION%%
diff --git a/devel/libslang2-devel/pkg-plist b/devel/libslang2-devel/pkg-plist
index 7acc8e26552f..a03af85778ba 100644
--- a/devel/libslang2-devel/pkg-plist
+++ b/devel/libslang2-devel/pkg-plist
@@ -61,7 +61,7 @@ lib/slang/v2/modules/varray-module.so
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%/cmaps
-@unexec rmdir %D/%%DATADIR%%/local-packages 2>/dev/null || true
+@dirrmtry %%DATADIR%%/local-packages
@dirrm %%DATADIR%%
@dirrm lib/slang/v2/modules
@dirrm lib/slang/v2
diff --git a/devel/libslang2/pkg-plist b/devel/libslang2/pkg-plist
index 7acc8e26552f..a03af85778ba 100644
--- a/devel/libslang2/pkg-plist
+++ b/devel/libslang2/pkg-plist
@@ -61,7 +61,7 @@ lib/slang/v2/modules/varray-module.so
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%/cmaps
-@unexec rmdir %D/%%DATADIR%%/local-packages 2>/dev/null || true
+@dirrmtry %%DATADIR%%/local-packages
@dirrm %%DATADIR%%
@dirrm lib/slang/v2/modules
@dirrm lib/slang/v2
diff --git a/devel/libticalcs/pkg-plist b/devel/libticalcs/pkg-plist
index d7287570362e..6dd3eee4f73e 100644
--- a/devel/libticalcs/pkg-plist
+++ b/devel/libticalcs/pkg-plist
@@ -17,4 +17,4 @@ lib/libticalcs.so
lib/libticalcs.so.9
libdata/pkgconfig/ticalcs.pc
share/locale/fr/LC_MESSAGES/libticalcs.mo
-@unexec rmdir %D/include/tilp 2>/dev/null || true
+@dirrmtry include/tilp
diff --git a/devel/libtifiles/pkg-plist b/devel/libtifiles/pkg-plist
index c7d98f61a0dd..be793d26ac68 100644
--- a/devel/libtifiles/pkg-plist
+++ b/devel/libtifiles/pkg-plist
@@ -25,4 +25,4 @@ lib/libtifiles.so
lib/libtifiles.so.6
libdata/pkgconfig/tifiles.pc
share/locale/fr/LC_MESSAGES/libtifiles.mo
-@unexec rmdir %D/include/tilp 2>/dev/null || true
+@dirrmtry include/tilp
diff --git a/devel/meta-cvs/pkg-plist b/devel/meta-cvs/pkg-plist
index 380f1a49cc49..0b9396ea5fef 100644
--- a/devel/meta-cvs/pkg-plist
+++ b/devel/meta-cvs/pkg-plist
@@ -2,7 +2,7 @@ bin/mcvs
lib/clisp/meta-cvs/lispinit.mem
lib/clisp/meta-cvs/lisp.run
@dirrm lib/clisp/meta-cvs
-@unexec rmdir %D/lib/clisp 2>/dev/null || true
+@dirrmtry lib/clisp
%%PORTDOCS%%%%DOCSDIR%%/Meta-CVS-PAPER
%%PORTDOCS%%%%DOCSDIR%%/QUICK-GUIDE
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/mingw32-gcc/pkg-plist b/devel/mingw32-gcc/pkg-plist
index 20e6ebe8462c..2ed48f8f6198 100644
--- a/devel/mingw32-gcc/pkg-plist
+++ b/devel/mingw32-gcc/pkg-plist
@@ -2371,5 +2371,5 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/jvgenmain
@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
@dirrm libexec/gcc/%%GCC_TARG%%
@dirrm libexec/gcc
-@unexec rmdir %D/lib/gcc 2> /dev/null || true
-@unexec rmdir %D/%%GCC_TARG%%/share 2> /dev/null || true
+@dirrmtry lib/gcc
+@dirrmtry %%GCC_TARG%%/share
diff --git a/devel/mipsel-linux-kernel-headers/pkg-plist b/devel/mipsel-linux-kernel-headers/pkg-plist
index ed62fe926376..cedd48d341d9 100644
--- a/devel/mipsel-linux-kernel-headers/pkg-plist
+++ b/devel/mipsel-linux-kernel-headers/pkg-plist
@@ -759,4 +759,4 @@ mipsel-linux/include/asm
@dirrm mipsel-linux/include/linux/sunrpc
@dirrm mipsel-linux/include/linux
@dirrm mipsel-linux/include
-@unexec rmdir %D/mipsel-linux 2> /dev/null || true
+@dirrmtry mipsel-linux
diff --git a/devel/mono-tools/pkg-plist b/devel/mono-tools/pkg-plist
index 762835ffde0d..dff993e6a8c3 100644
--- a/devel/mono-tools/pkg-plist
+++ b/devel/mono-tools/pkg-plist
@@ -10,4 +10,4 @@ lib/monodoc/GtkHtmlHtmlRender.dll
lib/monodoc/browser.exe
share/applications/monodoc.desktop
share/pixmaps/monodoc.png
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/devel/msp430-gcc/pkg-plist b/devel/msp430-gcc/pkg-plist
index 76c3d450c83f..7615dabc3079 100644
--- a/devel/msp430-gcc/pkg-plist
+++ b/devel/msp430-gcc/pkg-plist
@@ -42,9 +42,9 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2
@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%
@dirrm lib/gcc/%%GCC_TARG%%
-@unexec rmdir %D/lib/gcc 2> /dev/null || true
+@dirrmtry lib/gcc
@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
@dirrm libexec/gcc/%%GCC_TARG%%
-@unexec rmdir %D/libexec/gcc 2> /dev/null || true
+@dirrmtry libexec/gcc
diff --git a/devel/msp430-gcc3/pkg-plist b/devel/msp430-gcc3/pkg-plist
index 76c3d450c83f..7615dabc3079 100644
--- a/devel/msp430-gcc3/pkg-plist
+++ b/devel/msp430-gcc3/pkg-plist
@@ -42,9 +42,9 @@ libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools/mkheaders
@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%/msp2
@dirrm lib/gcc/%%GCC_TARG%%/%%GCC_REV%%
@dirrm lib/gcc/%%GCC_TARG%%
-@unexec rmdir %D/lib/gcc 2> /dev/null || true
+@dirrmtry lib/gcc
@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%/install-tools
@dirrm libexec/gcc/%%GCC_TARG%%/%%GCC_REV%%
@dirrm libexec/gcc/%%GCC_TARG%%
-@unexec rmdir %D/libexec/gcc 2> /dev/null || true
+@dirrmtry libexec/gcc
diff --git a/devel/msp430-libc/pkg-plist b/devel/msp430-libc/pkg-plist
index 6df5f2730b61..fc76003f6c14 100644
--- a/devel/msp430-libc/pkg-plist
+++ b/devel/msp430-libc/pkg-plist
@@ -819,4 +819,4 @@
@dirrm %%LIBC_TARG%%/share/mspgcc/examples
@dirrm %%LIBC_TARG%%/share/mspgcc/doc
@dirrm %%LIBC_TARG%%/share/mspgcc
-@unexec rmdir %D/%%LIBC_TARG%%/share 2>/dev/null || true \ No newline at end of file
+@dirrmtry %%LIBC_TARG%%/share
diff --git a/devel/noweb/pkg-plist b/devel/noweb/pkg-plist
index 9a9ccea91858..90eda704f71f 100644
--- a/devel/noweb/pkg-plist
+++ b/devel/noweb/pkg-plist
@@ -46,10 +46,10 @@ share/texmf-local/tex/latex/noweb/noweb.sty
share/noweb/xchunks
@dirrm share/texmf-local/tex/latex/noweb
@dirrm share/texmf-local/tex/plain/noweb
-@unexec rmdir %D/share/texmf-local/tex/latex 2>/dev/null || true
-@unexec rmdir %D/share/texmf-local/tex/plain 2>/dev/null || true
-@unexec rmdir %D/share/texmf-local/tex 2>/dev/null || true
+@dirrmtry share/texmf-local/tex/latex
+@dirrmtry share/texmf-local/tex/plain
+@dirrmtry share/texmf-local/tex
@unexec rm %D/share/texmf-local/ls-R 2>/dev/null || true
-@unexec rmdir %D/share/texmf-local 2>/dev/null || true
+@dirrmtry share/texmf-local
@unexec mktexlsr 2>/dev/null || true
@dirrm share/noweb
diff --git a/devel/ocaml-event/pkg-plist b/devel/ocaml-event/pkg-plist
index 3b24f5073ded..cfe6647147e2 100644
--- a/devel/ocaml-event/pkg-plist
+++ b/devel/ocaml-event/pkg-plist
@@ -1,2 +1,2 @@
-@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true
-@unexec rmdir %D/lib/ocaml 2>/dev/null || true
+@dirrmtry lib/ocaml/stublibs
+@dirrmtry lib/ocaml
diff --git a/devel/p5-AI-Pathfinding-AStar/pkg-plist b/devel/p5-AI-Pathfinding-AStar/pkg-plist
index 6691273a0070..0b18eb2325a5 100644
--- a/devel/p5-AI-Pathfinding-AStar/pkg-plist
+++ b/devel/p5-AI-Pathfinding-AStar/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/AI/Pathfinding/AStar.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Pathfinding/AStar/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Pathfinding/AStar
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Pathfinding 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AI/Pathfinding 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI/Pathfinding
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AI
+@dirrmtry %%SITE_PERL%%/AI/Pathfinding
+@dirrmtry %%SITE_PERL%%/AI
diff --git a/devel/p5-Algorithm-Accounting/pkg-plist b/devel/p5-Algorithm-Accounting/pkg-plist
index 940212338bf8..6ea2571ba3ae 100644
--- a/devel/p5-Algorithm-Accounting/pkg-plist
+++ b/devel/p5-Algorithm-Accounting/pkg-plist
@@ -5,8 +5,8 @@
%%SITE_PERL%%/Algorithm/Accounting/Report/GDGraph.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Accounting/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Accounting
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Accounting 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Accounting
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
@dirrm %%SITE_PERL%%/Algorithm/Accounting/Report
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm/Accounting 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Algorithm/Accounting
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Bucketizer/pkg-plist b/devel/p5-Algorithm-Bucketizer/pkg-plist
index 3d848b077fb4..ecf446736823 100644
--- a/devel/p5-Algorithm-Bucketizer/pkg-plist
+++ b/devel/p5-Algorithm-Bucketizer/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Bucketizer/.packlist
%%SITE_PERL%%/Algorithm/Bucketizer.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Bucketizer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-ChooseSubsets/pkg-plist b/devel/p5-Algorithm-ChooseSubsets/pkg-plist
index 3d91514a836b..0d421dcf7781 100644
--- a/devel/p5-Algorithm-ChooseSubsets/pkg-plist
+++ b/devel/p5-Algorithm-ChooseSubsets/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Algorithm/ChooseSubsets.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/ChooseSubsets/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/ChooseSubsets
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Cluster/pkg-plist b/devel/p5-Algorithm-Cluster/pkg-plist
index f857472737fd..9771d3eda1c5 100644
--- a/devel/p5-Algorithm-Cluster/pkg-plist
+++ b/devel/p5-Algorithm-Cluster/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Cluster/Cluster.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Cluster/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Cluster
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
diff --git a/devel/p5-Algorithm-Dependency/pkg-plist b/devel/p5-Algorithm-Dependency/pkg-plist
index e142306a86a1..bc934c8b4a76 100644
--- a/devel/p5-Algorithm-Dependency/pkg-plist
+++ b/devel/p5-Algorithm-Dependency/pkg-plist
@@ -7,7 +7,7 @@
%%SITE_PERL%%/Algorithm/Dependency/Weight.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Dependency/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Dependency
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
@dirrm %%SITE_PERL%%/Algorithm/Dependency/Source
@dirrm %%SITE_PERL%%/Algorithm/Dependency
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Diff/pkg-plist b/devel/p5-Algorithm-Diff/pkg-plist
index fdfdd6b3a417..8185f69b443a 100644
--- a/devel/p5-Algorithm-Diff/pkg-plist
+++ b/devel/p5-Algorithm-Diff/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/Algorithm/diffnew.pl
%%SITE_PERL%%/Algorithm/htmldiff.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Diff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Interval2Prefix/pkg-plist b/devel/p5-Algorithm-Interval2Prefix/pkg-plist
index b4cb9a65b5cf..9e577f780b29 100644
--- a/devel/p5-Algorithm-Interval2Prefix/pkg-plist
+++ b/devel/p5-Algorithm-Interval2Prefix/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Algorithm/Interval2Prefix.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Interval2Prefix/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Interval2Prefix
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-LCS/pkg-plist b/devel/p5-Algorithm-LCS/pkg-plist
index 70cb23917c00..9a05c8a9d407 100644
--- a/devel/p5-Algorithm-LCS/pkg-plist
+++ b/devel/p5-Algorithm-LCS/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS/LCS.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS/LCS.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LCS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
diff --git a/devel/p5-Algorithm-LUHN/pkg-plist b/devel/p5-Algorithm-LUHN/pkg-plist
index 0e561b69d92b..fb8404725d3d 100644
--- a/devel/p5-Algorithm-LUHN/pkg-plist
+++ b/devel/p5-Algorithm-LUHN/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Algorithm/LUHN.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LUHN/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/LUHN
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-MinMax/pkg-plist b/devel/p5-Algorithm-MinMax/pkg-plist
index 97d7fd24de50..ae850959418a 100644
--- a/devel/p5-Algorithm-MinMax/pkg-plist
+++ b/devel/p5-Algorithm-MinMax/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Algorithm/MinMax.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MinMax/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MinMax
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-NaiveBayes/pkg-plist b/devel/p5-Algorithm-NaiveBayes/pkg-plist
index 5612bd3b181b..f7a4a6644c57 100644
--- a/devel/p5-Algorithm-NaiveBayes/pkg-plist
+++ b/devel/p5-Algorithm-NaiveBayes/pkg-plist
@@ -5,4 +5,4 @@
%%SITE_PERL%%/Algorithm/NaiveBayes/Util.pm
@dirrm %%SITE_PERL%%/Algorithm/NaiveBayes/Model
@dirrm %%SITE_PERL%%/Algorithm/NaiveBayes
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Networksort/pkg-plist b/devel/p5-Algorithm-Networksort/pkg-plist
index 73c7c9d98fb0..559898eb617e 100644
--- a/devel/p5-Algorithm-Networksort/pkg-plist
+++ b/devel/p5-Algorithm-Networksort/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Algorithm/Networksort.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Networksort/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Networksort
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist b/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist
index 6f4558dbfd33..e50fa786dc8d 100644
--- a/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist
+++ b/devel/p5-Algorithm-Numerical-Shuffle/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Algorithm/Numerical/Shuffle.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Numerical/Shuffle/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Numerical/Shuffle
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Numerical 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm/Numerical 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Numerical
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/Algorithm/Numerical
+@dirrmtry %%SITE_PERL%%/Algorithm
diff --git a/devel/p5-Algorithm-Permute/pkg-plist b/devel/p5-Algorithm-Permute/pkg-plist
index 3d9034650aac..9cfdc02d9e23 100644
--- a/devel/p5-Algorithm-Permute/pkg-plist
+++ b/devel/p5-Algorithm-Permute/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Permute/Permute.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Permute/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Permute
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
diff --git a/devel/p5-Algorithm-SVM/pkg-plist b/devel/p5-Algorithm-SVM/pkg-plist
index 8a144e6ff073..9dd4f82aa53b 100644
--- a/devel/p5-Algorithm-SVM/pkg-plist
+++ b/devel/p5-Algorithm-SVM/pkg-plist
@@ -6,6 +6,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVM/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVM
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVM
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVM 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
diff --git a/devel/p5-Alzabo-GUI-Mason/pkg-plist b/devel/p5-Alzabo-GUI-Mason/pkg-plist
index b1510e8b0457..d0a11ececa51 100644
--- a/devel/p5-Alzabo-GUI-Mason/pkg-plist
+++ b/devel/p5-Alzabo-GUI-Mason/pkg-plist
@@ -50,5 +50,5 @@
%%DATADIR%%/view_table_other.mhtml
@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/Alzabo/GUI/Mason
-@unexec rmdir %D/%%SITE_PERL%%/Alzabo/GUI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Alzabo 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Alzabo/GUI
+@dirrmtry %%SITE_PERL%%/Alzabo
diff --git a/devel/p5-App-CLI/pkg-plist b/devel/p5-App-CLI/pkg-plist
index d4429eaac902..d98b8568c219 100644
--- a/devel/p5-App-CLI/pkg-plist
+++ b/devel/p5-App-CLI/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/App/CLI.pm
%%SITE_PERL%%/App/CLI/Command.pm
%%SITE_PERL%%/App/CLI/Command/Help.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/CLI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/App 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/App/CLI/Command 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/App/CLI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/App 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/CLI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
+@dirrmtry %%SITE_PERL%%/App/CLI/Command
+@dirrmtry %%SITE_PERL%%/App/CLI
+@dirrmtry %%SITE_PERL%%/App
diff --git a/devel/p5-App-Info/pkg-plist b/devel/p5-App-Info/pkg-plist
index 1520f7d27362..5f9986fb9e54 100644
--- a/devel/p5-App-Info/pkg-plist
+++ b/devel/p5-App-Info/pkg-plist
@@ -18,4 +18,4 @@
@dirrm %%SITE_PERL%%/App/Info/RDBMS
@dirrm %%SITE_PERL%%/App/Info/HTTPD
@dirrm %%SITE_PERL%%/App/Info
-@unexec rmdir %D/%%SITE_PERL%%/App 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/App
diff --git a/devel/p5-Array-Iterator/pkg-plist b/devel/p5-Array-Iterator/pkg-plist
index 5deb225df7ca..d5dfcdcf7e9a 100644
--- a/devel/p5-Array-Iterator/pkg-plist
+++ b/devel/p5-Array-Iterator/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/Array/Iterator/Reusable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Iterator/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Iterator
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
@dirrm %%SITE_PERL%%/Array/Iterator
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Array
diff --git a/devel/p5-Array-Window/pkg-plist b/devel/p5-Array-Window/pkg-plist
index b7ba8ff54a8c..8a58c8257208 100644
--- a/devel/p5-Array-Window/pkg-plist
+++ b/devel/p5-Array-Window/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Window/.packlist
%%SITE_PERL%%/Array/Window.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array/Window
-@unexec rmdir %D/%%SITE_PERL%%/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Array 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Array
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Array
diff --git a/devel/p5-Attribute-Handlers-Prospective/pkg-plist b/devel/p5-Attribute-Handlers-Prospective/pkg-plist
index a328f283ca02..0ca48f7c4c87 100644
--- a/devel/p5-Attribute-Handlers-Prospective/pkg-plist
+++ b/devel/p5-Attribute-Handlers-Prospective/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Attribute/Handlers/Prospective.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/Prospective/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers/Prospective
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Attribute/Handlers 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Attribute 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Handlers
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute
+@dirrmtry %%SITE_PERL%%/Attribute/Handlers
+@dirrmtry %%SITE_PERL%%/Attribute
diff --git a/devel/p5-Attribute-Persistent/pkg-plist b/devel/p5-Attribute-Persistent/pkg-plist
index 73894cc652b5..036a68440a86 100644
--- a/devel/p5-Attribute-Persistent/pkg-plist
+++ b/devel/p5-Attribute-Persistent/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Attribute/Persistent.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Persistent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute/Persistent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Attribute 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attribute
+@dirrmtry %%SITE_PERL%%/Attribute
diff --git a/devel/p5-B-Deobfuscate/pkg-plist b/devel/p5-B-Deobfuscate/pkg-plist
index a413f728a141..66c0740b2018 100644
--- a/devel/p5-B-Deobfuscate/pkg-plist
+++ b/devel/p5-B-Deobfuscate/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/B/Deobfuscate.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Deobfuscate/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Deobfuscate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/B 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
+@dirrmtry %%SITE_PERL%%/B
diff --git a/devel/p5-B-Keywords/pkg-plist b/devel/p5-B-Keywords/pkg-plist
index ac9d6136f505..fab2334cf45d 100644
--- a/devel/p5-B-Keywords/pkg-plist
+++ b/devel/p5-B-Keywords/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/B/Keywords.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Keywords/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Keywords
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/B 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
+@dirrmtry %%SITE_PERL%%/B
diff --git a/devel/p5-B-Size/pkg-plist b/devel/p5-B-Size/pkg-plist
index 8e1c96c54de5..0d3d22181d1f 100644
--- a/devel/p5-B-Size/pkg-plist
+++ b/devel/p5-B-Size/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size/Size.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Size
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/B 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B
diff --git a/devel/p5-BSD-Resource/pkg-plist b/devel/p5-BSD-Resource/pkg-plist
index dd71c6bb7b2b..e4be71dceeed 100644
--- a/devel/p5-BSD-Resource/pkg-plist
+++ b/devel/p5-BSD-Resource/pkg-plist
@@ -30,5 +30,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/times.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource/utime.al
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/Resource
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/BSD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
diff --git a/devel/p5-BSD-stat/pkg-plist b/devel/p5-BSD-stat/pkg-plist
index ef56630a3308..c8d6efd9daef 100644
--- a/devel/p5-BSD-stat/pkg-plist
+++ b/devel/p5-BSD-stat/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat/stat.so
%%SITE_PERL%%/%%PERL_ARCH%%/BSD/stat.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD/stat
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/BSD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/BSD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/BSD
diff --git a/devel/p5-Bundle-Perl6/pkg-plist b/devel/p5-Bundle-Perl6/pkg-plist
index 84f92b20cae5..0a32bd325544 100644
--- a/devel/p5-Bundle-Perl6/pkg-plist
+++ b/devel/p5-Bundle-Perl6/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Perl6
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
diff --git a/devel/p5-CPAN-DistnameInfo/pkg-plist b/devel/p5-CPAN-DistnameInfo/pkg-plist
index 61291852d880..7cba813fa33d 100644
--- a/devel/p5-CPAN-DistnameInfo/pkg-plist
+++ b/devel/p5-CPAN-DistnameInfo/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CPAN/DistnameInfo.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/DistnameInfo/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/DistnameInfo
-@unexec rmdir %D/%%SITE_PERL%%/CPAN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CPAN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN
diff --git a/devel/p5-CPAN-Mini/pkg-plist b/devel/p5-CPAN-Mini/pkg-plist
index 16f6e4d8c0e5..5415c4c2d996 100644
--- a/devel/p5-CPAN-Mini/pkg-plist
+++ b/devel/p5-CPAN-Mini/pkg-plist
@@ -1,6 +1,6 @@
bin/minicpan
%%SITE_PERL%%/CPAN/Mini.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Mini/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Mini 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CPAN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/Mini
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN
+@dirrmtry %%SITE_PERL%%/CPAN
diff --git a/devel/p5-CPAN-YACSmoke/pkg-plist b/devel/p5-CPAN-YACSmoke/pkg-plist
index ac4fa481b806..0ba17ec5b7eb 100644
--- a/devel/p5-CPAN-YACSmoke/pkg-plist
+++ b/devel/p5-CPAN-YACSmoke/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/YACSmoke/.packlist
@dirrm %%SITE_PERL%%/CPAN/YACSmoke/Plugin
@dirrm %%SITE_PERL%%/CPAN/YACSmoke
-@unexec rmdir %D/%%SITE_PERL%%/CPAN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CPAN
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN/YACSmoke
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CPAN
diff --git a/devel/p5-Cache-Cache/pkg-plist b/devel/p5-Cache-Cache/pkg-plist
index 64482339086d..911a84440bc7 100644
--- a/devel/p5-Cache-Cache/pkg-plist
+++ b/devel/p5-Cache-Cache/pkg-plist
@@ -20,5 +20,5 @@
%%SITE_PERL%%/Cache/SizeAwareSharedMemoryCache.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Cache/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Cache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/Cache
diff --git a/devel/p5-Cache-FastMmap/pkg-plist b/devel/p5-Cache-FastMmap/pkg-plist
index 6a8a5260ac9a..e01f3793241c 100644
--- a/devel/p5-Cache-FastMmap/pkg-plist
+++ b/devel/p5-Cache-FastMmap/pkg-plist
@@ -6,5 +6,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cache/FastMmap
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/FastMmap/CImpl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/FastMmap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Cache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
diff --git a/devel/p5-Cache-Mmap/pkg-plist b/devel/p5-Cache-Mmap/pkg-plist
index 38133f0bc79c..3b354f00aded 100644
--- a/devel/p5-Cache-Mmap/pkg-plist
+++ b/devel/p5-Cache-Mmap/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/Cache/Mmap.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Mmap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Cache
diff --git a/devel/p5-Cache-Simple-TimedExpiry/pkg-plist b/devel/p5-Cache-Simple-TimedExpiry/pkg-plist
index cac83376290d..a5087ec18fb9 100644
--- a/devel/p5-Cache-Simple-TimedExpiry/pkg-plist
+++ b/devel/p5-Cache-Simple-TimedExpiry/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Cache/Simple/TimedExpiry.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Simple/TimedExpiry
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/Cache/Simple
+@dirrmtry %%SITE_PERL%%/Cache
diff --git a/devel/p5-Cache/pkg-plist b/devel/p5-Cache/pkg-plist
index 3fa11c044518..ee49bf99ba56 100644
--- a/devel/p5-Cache/pkg-plist
+++ b/devel/p5-Cache/pkg-plist
@@ -15,9 +15,9 @@
%%SITE_PERL%%/Cache/RemovalStrategy/LRU.pm
%%SITE_PERL%%/Cache/Tester.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Cache/RemovalStrategy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache/Memory 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache/Null 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Cache/RemovalStrategy
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/Cache/Memory
+@dirrmtry %%SITE_PERL%%/Cache/File
+@dirrmtry %%SITE_PERL%%/Cache/Null
+@dirrmtry %%SITE_PERL%%/Cache
diff --git a/devel/p5-Calendar-Simple/pkg-plist b/devel/p5-Calendar-Simple/pkg-plist
index 0cabbe309f8a..35bf6c8e11dd 100644
--- a/devel/p5-Calendar-Simple/pkg-plist
+++ b/devel/p5-Calendar-Simple/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Calendar/Simple.pm
-@unexec rmdir %D/%%SITE_PERL%%/Calendar 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Calendar
diff --git a/devel/p5-Carp-Assert/pkg-plist b/devel/p5-Carp-Assert/pkg-plist
index 9ae66fc4624d..608008fd3ef9 100644
--- a/devel/p5-Carp-Assert/pkg-plist
+++ b/devel/p5-Carp-Assert/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Assert/.packlist
%%SITE_PERL%%/Carp/Assert.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Assert
-@unexec rmdir %D/%%SITE_PERL%%/Carp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Carp
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp
diff --git a/devel/p5-Carp-Clan/pkg-plist b/devel/p5-Carp-Clan/pkg-plist
index 785f54a61476..b8a74e88fbbc 100644
--- a/devel/p5-Carp-Clan/pkg-plist
+++ b/devel/p5-Carp-Clan/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Carp/Clan.pm
%%SITE_PERL%%/Carp/Clan.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Clan/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Clan 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Carp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Clan
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp
+@dirrmtry %%SITE_PERL%%/Carp
diff --git a/devel/p5-Carp-Datum/pkg-plist b/devel/p5-Carp-Datum/pkg-plist
index 13d87ca2860e..ff3c0a6db672 100644
--- a/devel/p5-Carp-Datum/pkg-plist
+++ b/devel/p5-Carp-Datum/pkg-plist
@@ -11,5 +11,5 @@ bin/datum_strip
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Datum/.packlist
@dirrm %%SITE_PERL%%/Carp/Datum
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp/Datum
-@unexec rmdir %D/%%SITE_PERL%%/Carp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Carp
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Carp
diff --git a/devel/p5-Class-Accessor-Chained/pkg-plist b/devel/p5-Class-Accessor-Chained/pkg-plist
index f2d6d3b0fcfe..bf00ac38cf53 100644
--- a/devel/p5-Class-Accessor-Chained/pkg-plist
+++ b/devel/p5-Class-Accessor-Chained/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Accessor/Chained.pm
%%SITE_PERL%%/Class/Accessor/Chained/Fast.pm
@dirrm %%SITE_PERL%%/Class/Accessor/Chained
-@unexec rmdir %D/%%SITE_PERL%%/Class/Accessor 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/Accessor
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Accessor-Lvalue/pkg-plist b/devel/p5-Class-Accessor-Lvalue/pkg-plist
index 58b49e17bd74..6212986e0f54 100644
--- a/devel/p5-Class-Accessor-Lvalue/pkg-plist
+++ b/devel/p5-Class-Accessor-Lvalue/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Accessor/Lvalue.pm
%%SITE_PERL%%/Class/Accessor/Lvalue/Fast.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class/Accessor/Lvalue 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/Accessor 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/Accessor/Lvalue
+@dirrmtry %%SITE_PERL%%/Class/Accessor
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Accessor/pkg-plist b/devel/p5-Class-Accessor/pkg-plist
index a667a7006b7d..b2edbb545d54 100644
--- a/devel/p5-Class-Accessor/pkg-plist
+++ b/devel/p5-Class-Accessor/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Class/Accessor/Fast.pm
@dirrm %%SITE_PERL%%/Class/Accessor
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Accessor
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-AlzaboWrapper/pkg-plist b/devel/p5-Class-AlzaboWrapper/pkg-plist
index 795f7a7db33c..4f2716f02d2c 100644
--- a/devel/p5-Class-AlzaboWrapper/pkg-plist
+++ b/devel/p5-Class-AlzaboWrapper/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Class/AlzaboWrapper.pm
%%SITE_PERL%%/Class/AlzaboWrapper/Cursor.pm
@dirrm %%SITE_PERL%%/Class/AlzaboWrapper
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-ArrayObjects/pkg-plist b/devel/p5-Class-ArrayObjects/pkg-plist
index d8d012277191..153747f2bb16 100644
--- a/devel/p5-Class-ArrayObjects/pkg-plist
+++ b/devel/p5-Class-ArrayObjects/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ArrayObjects/.packlist
%%SITE_PERL%%/Class/ArrayObjects.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ArrayObjects
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-AutoClass/pkg-plist b/devel/p5-Class-AutoClass/pkg-plist
index 4f6d99f29f25..ea6a90beeddd 100644
--- a/devel/p5-Class-AutoClass/pkg-plist
+++ b/devel/p5-Class-AutoClass/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Class/AutoClass/Root.pm
%%SITE_PERL%%/Class/AutoClass/Args.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/AutoClass
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
@dirrm %%SITE_PERL%%/Class/AutoClass
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Autouse/pkg-plist b/devel/p5-Class-Autouse/pkg-plist
index 06cdee98e152..2434edb20cd3 100644
--- a/devel/p5-Class-Autouse/pkg-plist
+++ b/devel/p5-Class-Autouse/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Class/Autouse.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Autouse
@dirrm %%SITE_PERL%%/Class/Autouse
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Base/pkg-plist b/devel/p5-Class-Base/pkg-plist
index f057be5cdfb1..7f8f6cad56f0 100644
--- a/devel/p5-Class-Base/pkg-plist
+++ b/devel/p5-Class-Base/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Base.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Base/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Base
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-BlackHole/pkg-plist b/devel/p5-Class-BlackHole/pkg-plist
index 06e0d3ee40dc..f400d578f0d7 100644
--- a/devel/p5-Class-BlackHole/pkg-plist
+++ b/devel/p5-Class-BlackHole/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/BlackHole/.packlist
%%SITE_PERL%%/Class/BlackHole.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/BlackHole
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-C3/pkg-plist b/devel/p5-Class-C3/pkg-plist
index 6655a963ac95..c78dd8dd3174 100644
--- a/devel/p5-Class-C3/pkg-plist
+++ b/devel/p5-Class-C3/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3/.packlist
%%SITE_PERL%%/Class/C3.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/C3
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Container/pkg-plist b/devel/p5-Class-Container/pkg-plist
index 3466357ecd54..ebab413648c8 100644
--- a/devel/p5-Class-Container/pkg-plist
+++ b/devel/p5-Class-Container/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Container.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Container/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Container
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Contract/pkg-plist b/devel/p5-Class-Contract/pkg-plist
index f1933c591230..a6f93f2909d5 100644
--- a/devel/p5-Class-Contract/pkg-plist
+++ b/devel/p5-Class-Contract/pkg-plist
@@ -5,5 +5,5 @@
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/Class/Contract
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Contract
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Data-Inheritable/pkg-plist b/devel/p5-Class-Data-Inheritable/pkg-plist
index 6c86a1d05c42..98b8a1061c45 100644
--- a/devel/p5-Class-Data-Inheritable/pkg-plist
+++ b/devel/p5-Class-Data-Inheritable/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable/.packlist
%%SITE_PERL%%/Class/Data/Inheritable.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data/Inheritable
-@unexec rmdir %D/%%SITE_PERL%%/Class/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/Data
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Date/pkg-plist b/devel/p5-Class-Date/pkg-plist
index cd13f7bb71e4..d9635f61d7a4 100644
--- a/devel/p5-Class-Date/pkg-plist
+++ b/devel/p5-Class-Date/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/Date.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date/Date.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Date
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Class/Date
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class
diff --git a/devel/p5-Class-Default/pkg-plist b/devel/p5-Class-Default/pkg-plist
index 9c8910bf99d0..61c1ee031f7c 100644
--- a/devel/p5-Class-Default/pkg-plist
+++ b/devel/p5-Class-Default/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Default/.packlist
%%SITE_PERL%%/Class/Default.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Default
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Delegation/pkg-plist b/devel/p5-Class-Delegation/pkg-plist
index 6164bf5d5de3..a613df8f367e 100644
--- a/devel/p5-Class-Delegation/pkg-plist
+++ b/devel/p5-Class-Delegation/pkg-plist
@@ -8,5 +8,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/demo_pseudo.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Delegation
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-ErrorHandler/pkg-plist b/devel/p5-Class-ErrorHandler/pkg-plist
index e5260e07b6bb..0b2e2aac4def 100644
--- a/devel/p5-Class-ErrorHandler/pkg-plist
+++ b/devel/p5-Class-ErrorHandler/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/ErrorHandler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ErrorHandler/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ErrorHandler
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Factory-Util/pkg-plist b/devel/p5-Class-Factory-Util/pkg-plist
index 468f45710308..383286e97226 100644
--- a/devel/p5-Class-Factory-Util/pkg-plist
+++ b/devel/p5-Class-Factory-Util/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory/Util/.packlist
%%SITE_PERL%%/Class/Factory/Util.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory/Util
-@unexec rmdir %D/%%SITE_PERL%%/Class/Factory 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/Factory
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Factory/pkg-plist b/devel/p5-Class-Factory/pkg-plist
index a864894a10e1..d4487b2db852 100644
--- a/devel/p5-Class-Factory/pkg-plist
+++ b/devel/p5-Class-Factory/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Factory.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Factory
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Fields/pkg-plist b/devel/p5-Class-Fields/pkg-plist
index 6ef9553e815a..c14ed6556c0c 100644
--- a/devel/p5-Class-Fields/pkg-plist
+++ b/devel/p5-Class-Fields/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Fields/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Fields
@dirrm %%SITE_PERL%%/Class/Fields
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Gomor-Hash/pkg-plist b/devel/p5-Class-Gomor-Hash/pkg-plist
index 08fd82fba108..81c81abe2f8b 100644
--- a/devel/p5-Class-Gomor-Hash/pkg-plist
+++ b/devel/p5-Class-Gomor-Hash/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Gomor/Hash/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Gomor/Hash
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Gomor
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
@dirrm %%SITE_PERL%%/Class/Gomor
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Handle/pkg-plist b/devel/p5-Class-Handle/pkg-plist
index 43de7d1e0b12..14c45775914c 100644
--- a/devel/p5-Class-Handle/pkg-plist
+++ b/devel/p5-Class-Handle/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Handle/.packlist
%%SITE_PERL%%/Class/Handle.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Handle
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Hook/pkg-plist b/devel/p5-Class-Hook/pkg-plist
index f00bdf1b2309..de36a9d7c3ab 100644
--- a/devel/p5-Class-Hook/pkg-plist
+++ b/devel/p5-Class-Hook/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Class/FOO.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Hook/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Hook
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-ISA/pkg-plist b/devel/p5-Class-ISA/pkg-plist
index 0ac9ecc99ead..25a1ff645d9f 100644
--- a/devel/p5-Class-ISA/pkg-plist
+++ b/devel/p5-Class-ISA/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ISA/.packlist
%%SITE_PERL%%/Class/ISA.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ISA
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Inner/pkg-plist b/devel/p5-Class-Inner/pkg-plist
index c1ede60f095b..7666f54e6386 100644
--- a/devel/p5-Class-Inner/pkg-plist
+++ b/devel/p5-Class-Inner/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inner/.packlist
%%SITE_PERL%%/Class/Inner.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inner
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Inspector/pkg-plist b/devel/p5-Class-Inspector/pkg-plist
index efa39266eae5..2d9316e32b30 100644
--- a/devel/p5-Class-Inspector/pkg-plist
+++ b/devel/p5-Class-Inspector/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inspector/.packlist
%%SITE_PERL%%/Class/Inspector.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Inspector
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Loader/pkg-plist b/devel/p5-Class-Loader/pkg-plist
index 0bd75aec555b..8f18f48ac3ca 100644
--- a/devel/p5-Class-Loader/pkg-plist
+++ b/devel/p5-Class-Loader/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Class/Loader.pm
%%SITE_PERL%%/Class/LoaderTest.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Loader
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-MethodMaker/pkg-plist b/devel/p5-Class-MethodMaker/pkg-plist
index 7b341b66e279..1d95dd6aadcd 100644
--- a/devel/p5-Class-MethodMaker/pkg-plist
+++ b/devel/p5-Class-MethodMaker/pkg-plist
@@ -885,7 +885,7 @@
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MethodMaker/scalar
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MethodMaker/array
@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MethodMaker/Engine
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MethodMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class/MethodMaker 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class 2>/dev/null || true
+@dirrmtry lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class/MethodMaker
+@dirrmtry lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class/MethodMaker
+@dirrmtry lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Class
diff --git a/devel/p5-Class-MethodMapper/pkg-plist b/devel/p5-Class-MethodMapper/pkg-plist
index 9840a0feb129..e66719e28c3a 100644
--- a/devel/p5-Class-MethodMapper/pkg-plist
+++ b/devel/p5-Class-MethodMapper/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMapper/.packlist
@dirrm %%SITE_PERL%%/auto/Class/MethodMapper
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MethodMapper
-@unexec rmdir %D/%%SITE_PERL%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-NamedParms/pkg-plist b/devel/p5-Class-NamedParms/pkg-plist
index b6e33ba021b7..75f113de68c2 100644
--- a/devel/p5-Class-NamedParms/pkg-plist
+++ b/devel/p5-Class-NamedParms/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Class/NamedParms.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/NamedParms/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/NamedParms
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-ObjectTemplate-DB/pkg-plist b/devel/p5-Class-ObjectTemplate-DB/pkg-plist
index 7359e3e0cc08..1fcf625dea5d 100644
--- a/devel/p5-Class-ObjectTemplate-DB/pkg-plist
+++ b/devel/p5-Class-ObjectTemplate-DB/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate/DB/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate/DB
@dirrm %%SITE_PERL%%/Class/ObjectTemplate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-ObjectTemplate/pkg-plist b/devel/p5-Class-ObjectTemplate/pkg-plist
index 947810d70cba..769620876dd6 100644
--- a/devel/p5-Class-ObjectTemplate/pkg-plist
+++ b/devel/p5-Class-ObjectTemplate/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/ObjectTemplate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ObjectTemplate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Observable/pkg-plist b/devel/p5-Class-Observable/pkg-plist
index d9d4d41c97e2..6e5c61a4d4d0 100644
--- a/devel/p5-Class-Observable/pkg-plist
+++ b/devel/p5-Class-Observable/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Observable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Observable/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Observable
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-ParmList/pkg-plist b/devel/p5-Class-ParmList/pkg-plist
index 2afa40312dff..6c74f387cc19 100644
--- a/devel/p5-Class-ParmList/pkg-plist
+++ b/devel/p5-Class-ParmList/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Class/ParmList.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ParmList/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ParmList
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-ReturnValue/pkg-plist b/devel/p5-Class-ReturnValue/pkg-plist
index c75871ac96ae..a5338f1be4a3 100644
--- a/devel/p5-Class-ReturnValue/pkg-plist
+++ b/devel/p5-Class-ReturnValue/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ReturnValue/.packlist
%%SITE_PERL%%/Class/ReturnValue.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/ReturnValue
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Spiffy/pkg-plist b/devel/p5-Class-Spiffy/pkg-plist
index 151691016a7f..ccc56f1ddf8d 100644
--- a/devel/p5-Class-Spiffy/pkg-plist
+++ b/devel/p5-Class-Spiffy/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Spiffy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Spiffy/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Spiffy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Spiffy
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-StateMachine/pkg-plist b/devel/p5-Class-StateMachine/pkg-plist
index c03d35c667f8..b2900cc9832a 100644
--- a/devel/p5-Class-StateMachine/pkg-plist
+++ b/devel/p5-Class-StateMachine/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/StateMachine.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/StateMachine/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/StateMachine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/StateMachine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Tangram/pkg-plist b/devel/p5-Class-Tangram/pkg-plist
index 42392b43f506..ceee4175a9cf 100644
--- a/devel/p5-Class-Tangram/pkg-plist
+++ b/devel/p5-Class-Tangram/pkg-plist
@@ -6,5 +6,5 @@
@dirrm %%SITE_PERL%%/Class/Tangram/Generator
@dirrm %%SITE_PERL%%/Class/Tangram
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tangram
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Throwable/pkg-plist b/devel/p5-Class-Throwable/pkg-plist
index 61005db9236d..e93e23870ce1 100644
--- a/devel/p5-Class-Throwable/pkg-plist
+++ b/devel/p5-Class-Throwable/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/Throwable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Throwable/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Throwable
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Tom/pkg-plist b/devel/p5-Class-Tom/pkg-plist
index 2c0dc9d8d1e3..933a234e0283 100644
--- a/devel/p5-Class-Tom/pkg-plist
+++ b/devel/p5-Class-Tom/pkg-plist
@@ -6,5 +6,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Tom
@dirrm %%SITE_PERL%%/Class/Tom/Encode
@dirrm %%SITE_PERL%%/Class/Tom
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-Trigger/pkg-plist b/devel/p5-Class-Trigger/pkg-plist
index b9d8377fddb9..18733c612866 100644
--- a/devel/p5-Class-Trigger/pkg-plist
+++ b/devel/p5-Class-Trigger/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Trigger/.packlist
%%SITE_PERL%%/Class/Trigger.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Trigger
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-Virtual/pkg-plist b/devel/p5-Class-Virtual/pkg-plist
index c63ad2b323fb..cff0a1a6d251 100644
--- a/devel/p5-Class-Virtual/pkg-plist
+++ b/devel/p5-Class-Virtual/pkg-plist
@@ -3,4 +3,4 @@
%%SITE_PERL%%/Class/Virtually/Abstract.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Virtual
@dirrm %%SITE_PERL%%/Class/Virtually
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/devel/p5-Class-WhiteHole/pkg-plist b/devel/p5-Class-WhiteHole/pkg-plist
index 48798fbb2a00..6b3e3f672595 100644
--- a/devel/p5-Class-WhiteHole/pkg-plist
+++ b/devel/p5-Class-WhiteHole/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/WhiteHole/.packlist
%%SITE_PERL%%/Class/WhiteHole.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/WhiteHole
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Class-XPath/pkg-plist b/devel/p5-Class-XPath/pkg-plist
index 375255a62860..090b8ebf663b 100644
--- a/devel/p5-Class-XPath/pkg-plist
+++ b/devel/p5-Class-XPath/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XPath/.packlist
%%SITE_PERL%%/Class/XPath.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/XPath
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/devel/p5-Commands-Guarded/pkg-plist b/devel/p5-Commands-Guarded/pkg-plist
index 8c3f91fb3fb7..a2664068653c 100644
--- a/devel/p5-Commands-Guarded/pkg-plist
+++ b/devel/p5-Commands-Guarded/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Commands/Guarded.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Commands/Guarded/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Commands/Guarded 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Commands 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Commands 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Commands/Guarded
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Commands
+@dirrmtry %%SITE_PERL%%/Commands
diff --git a/devel/p5-Config-Auto/pkg-plist b/devel/p5-Config-Auto/pkg-plist
index 8910c7d5fdd1..6fa6c64e2de5 100644
--- a/devel/p5-Config-Auto/pkg-plist
+++ b/devel/p5-Config-Auto/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Config/Auto.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Auto/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Auto
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-Fast/pkg-plist b/devel/p5-Config-Fast/pkg-plist
index 4bf508184110..b0a19ba7c8d4 100644
--- a/devel/p5-Config-Fast/pkg-plist
+++ b/devel/p5-Config-Fast/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Config/Fast.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Fast/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Fast
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-General/pkg-plist b/devel/p5-Config-General/pkg-plist
index 55643b5ec3b6..247ce297998a 100644
--- a/devel/p5-Config-General/pkg-plist
+++ b/devel/p5-Config-General/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/General/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/General
@dirrm %%SITE_PERL%%/Config/General
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-IniFiles/pkg-plist b/devel/p5-Config-IniFiles/pkg-plist
index 040d4343b1fd..d10507aabd9f 100644
--- a/devel/p5-Config-IniFiles/pkg-plist
+++ b/devel/p5-Config-IniFiles/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Config/IniFiles.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/IniFiles/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/IniFiles
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-Objective/pkg-plist b/devel/p5-Config-Objective/pkg-plist
index dc91e5e85804..22021d686f71 100644
--- a/devel/p5-Config-Objective/pkg-plist
+++ b/devel/p5-Config-Objective/pkg-plist
@@ -8,7 +8,7 @@
%%SITE_PERL%%/Config/Objective/String.pm
%%SITE_PERL%%/Config/Objective/DataType.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Objective/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Objective 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config/Objective 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Objective
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config/Objective
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-Setting/pkg-plist b/devel/p5-Config-Setting/pkg-plist
index c10b58d1b6d7..7719ca909bf3 100644
--- a/devel/p5-Config-Setting/pkg-plist
+++ b/devel/p5-Config-Setting/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/Config/Setting/XMLParser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Setting/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Setting
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
@dirrm %%SITE_PERL%%/Config/Setting
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-Simple/pkg-plist b/devel/p5-Config-Simple/pkg-plist
index 0e18a502da69..73bd0ab11f0a 100644
--- a/devel/p5-Config-Simple/pkg-plist
+++ b/devel/p5-Config-Simple/pkg-plist
@@ -21,7 +21,7 @@
%%SITE_PERL%%/auto/Config/Simple/write_string.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
@dirrm %%SITE_PERL%%/auto/Config/Simple
-@unexec rmdir %D/%%SITE_PERL%%/auto/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Config
+@dirrmtry %%SITE_PERL%%/Config
diff --git a/devel/p5-Config-Tiny/pkg-plist b/devel/p5-Config-Tiny/pkg-plist
index e2ff4e74ad25..f0aa5021498a 100644
--- a/devel/p5-Config-Tiny/pkg-plist
+++ b/devel/p5-Config-Tiny/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Tiny/.packlist
%%SITE_PERL%%/Config/Tiny.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config/Tiny
-@unexec rmdir %D/%%SITE_PERL%%/Config 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Config 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Config
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Config
diff --git a/devel/p5-ConfigReader-Simple/pkg-plist b/devel/p5-ConfigReader-Simple/pkg-plist
index 2a3d6fdb8185..3e05f6e8a6f5 100644
--- a/devel/p5-ConfigReader-Simple/pkg-plist
+++ b/devel/p5-ConfigReader-Simple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ConfigReader/Simple/.packlist
%%SITE_PERL%%/ConfigReader/Simple.pm
-@unexec rmdir %D/%%SITE_PERL%%/ConfigReader 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ConfigReader
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ConfigReader/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ConfigReader 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ConfigReader
diff --git a/devel/p5-Curses-UI/pkg-plist b/devel/p5-Curses-UI/pkg-plist
index 7b328295decf..f4069bd05217 100644
--- a/devel/p5-Curses-UI/pkg-plist
+++ b/devel/p5-Curses-UI/pkg-plist
@@ -46,4 +46,4 @@
@dirrm %%SITE_PERL%%/Curses/UI/Dialog
@dirrm %%SITE_PERL%%/Curses/UI/Language
@dirrm %%SITE_PERL%%/Curses/UI
-@unexec rmdir %D/%%SITE_PERL%%/Curses 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Curses
diff --git a/devel/p5-Curses-Widgets/pkg-plist b/devel/p5-Curses-Widgets/pkg-plist
index f8799608be14..0ee1b090fae8 100644
--- a/devel/p5-Curses-Widgets/pkg-plist
+++ b/devel/p5-Curses-Widgets/pkg-plist
@@ -16,5 +16,5 @@
@dirrm %%SITE_PERL%%/Curses/Widgets
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Widgets/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses/Widgets
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Curses 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Curses
+@dirrmtry %%SITE_PERL%%/Curses
diff --git a/devel/p5-DB_File-Lock/pkg-plist b/devel/p5-DB_File-Lock/pkg-plist
index ac59f0a78742..df02dc7851ed 100644
--- a/devel/p5-DB_File-Lock/pkg-plist
+++ b/devel/p5-DB_File-Lock/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DB_File/Lock.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File/Lock/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File/Lock 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DB_File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File/Lock
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DB_File
+@dirrmtry %%SITE_PERL%%/DB_File
diff --git a/devel/p5-Danga-Socket/pkg-plist b/devel/p5-Danga-Socket/pkg-plist
index d4b24c8ff7ce..44331663df97 100644
--- a/devel/p5-Danga-Socket/pkg-plist
+++ b/devel/p5-Danga-Socket/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Danga/Socket.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Danga/Socket/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Danga/Socket
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Danga 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Danga 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Danga
+@dirrmtry %%SITE_PERL%%/Danga
diff --git a/devel/p5-Data-ACL/pkg-plist b/devel/p5-Data-ACL/pkg-plist
index 67144389ecbb..643dce969e76 100644
--- a/devel/p5-Data-ACL/pkg-plist
+++ b/devel/p5-Data-ACL/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Data/ACL.pm
%%SITE_PERL%%/Data/ACL/Realm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ACL/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ACL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/ACL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ACL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data/ACL
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Compare/pkg-plist b/devel/p5-Data-Compare/pkg-plist
index 166b4eabab91..8e74ea8e97e9 100644
--- a/devel/p5-Data-Compare/pkg-plist
+++ b/devel/p5-Data-Compare/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/Data/Compare/Plugins/Scalar/Properties.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Compare/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Compare
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/Data/Compare/Plugins/Scalar
@dirrm %%SITE_PERL%%/Data/Compare/Plugins
@dirrm %%SITE_PERL%%/Data/Compare
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Dump-Streamer/pkg-plist b/devel/p5-Data-Dump-Streamer/pkg-plist
index bcf80bb80f0b..2b59055c283a 100644
--- a/devel/p5-Data-Dump-Streamer/pkg-plist
+++ b/devel/p5-Data-Dump-Streamer/pkg-plist
@@ -6,9 +6,9 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump/Streamer/Streamer.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump/Streamer/Streamer.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump/Streamer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Data/Dump/Streamer/_
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Data/Dump/Streamer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Data/Dump 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Data/Dump
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Data
diff --git a/devel/p5-Data-Dump/pkg-plist b/devel/p5-Data-Dump/pkg-plist
index 7556668ae1d4..19e104764923 100644
--- a/devel/p5-Data-Dump/pkg-plist
+++ b/devel/p5-Data-Dump/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Data/Dump.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dump
-@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/devel/p5-Data-DumpXML/pkg-plist b/devel/p5-Data-DumpXML/pkg-plist
index b4847c9f1602..fb704951aab6 100644
--- a/devel/p5-Data-DumpXML/pkg-plist
+++ b/devel/p5-Data-DumpXML/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Data/DumpXML.pm
%%SITE_PERL%%/Data/DumpXML/Parser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/DumpXML/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Data/DumpXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/DumpXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data/DumpXML
+@dirrmtry %%SITE_PERL%%/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/DumpXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Data-Dumper-Simple/pkg-plist b/devel/p5-Data-Dumper-Simple/pkg-plist
index bf9fd35158d9..92d5f3640b15 100644
--- a/devel/p5-Data-Dumper-Simple/pkg-plist
+++ b/devel/p5-Data-Dumper-Simple/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Data/Dumper/Simple.pm
-@unexec rmdir %D/%%SITE_PERL%%/Data/Dumper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data/Dumper
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Dumper/pkg-plist b/devel/p5-Data-Dumper/pkg-plist
index 686a0bbcacb5..ed59dacf97eb 100644
--- a/devel/p5-Data-Dumper/pkg-plist
+++ b/devel/p5-Data-Dumper/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper/Dumper.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper/Dumper.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Dumper
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Data
diff --git a/devel/p5-Data-Flow/pkg-plist b/devel/p5-Data-Flow/pkg-plist
index 596139837dad..329bb5b20726 100644
--- a/devel/p5-Data-Flow/pkg-plist
+++ b/devel/p5-Data-Flow/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/auto/Data/Flow/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Flow/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Flow
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/auto/Data/Flow
-@unexec rmdir %D/%%SITE_PERL%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-HexDump/pkg-plist b/devel/p5-Data-HexDump/pkg-plist
index 32d0209704f7..c836dcefc85b 100644
--- a/devel/p5-Data-HexDump/pkg-plist
+++ b/devel/p5-Data-HexDump/pkg-plist
@@ -2,5 +2,5 @@
bin/hexdump
%%SITE_PERL%%/Data/HexDump.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/HexDump
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Data-Hierarchy/pkg-plist b/devel/p5-Data-Hierarchy/pkg-plist
index 9173adc0e044..ea535ed40350 100644
--- a/devel/p5-Data-Hierarchy/pkg-plist
+++ b/devel/p5-Data-Hierarchy/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hierarchy/.packlist
@dirrm %%SITE_PERL%%/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hierarchy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Data-Lazy/pkg-plist b/devel/p5-Data-Lazy/pkg-plist
index 0c946d762d90..76dbe0d6d78c 100644
--- a/devel/p5-Data-Lazy/pkg-plist
+++ b/devel/p5-Data-Lazy/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Lazy/.packlist
%%SITE_PERL%%/Data/Lazy.pm
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Lazy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Data-Random/pkg-plist b/devel/p5-Data-Random/pkg-plist
index 6b08ecb7b552..8164151bd3e7 100644
--- a/devel/p5-Data-Random/pkg-plist
+++ b/devel/p5-Data-Random/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Data/Random/WordList.pm
%%SITE_PERL%%/Data/Random/dict
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/Data/Random
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Serializer/pkg-plist b/devel/p5-Data-Serializer/pkg-plist
index 51d340f57116..13b590d8b78f 100644
--- a/devel/p5-Data-Serializer/pkg-plist
+++ b/devel/p5-Data-Serializer/pkg-plist
@@ -88,6 +88,6 @@
@dirrm %%SITE_PERL%%/Data/Serializer/Data
@dirrm %%SITE_PERL%%/Data/Serializer/Config
@dirrm %%SITE_PERL%%/Data/Serializer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/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%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Stag/pkg-plist b/devel/p5-Data-Stag/pkg-plist
index c6a2b3828b2d..5c88353fa6de 100644
--- a/devel/p5-Data-Stag/pkg-plist
+++ b/devel/p5-Data-Stag/pkg-plist
@@ -46,6 +46,6 @@ bin/stag-query.pl
%%SITE_PERL%%/Data/Stag/SAX2Stag.pm
%%SITE_PERL%%/Data/Stag/XSLTHandler.pm
%%SITE_PERL%%/Data/Stag/Base.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/Data/Stag
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Table/pkg-plist b/devel/p5-Data-Table/pkg-plist
index 840b71b8fc8b..e89a051ac058 100644
--- a/devel/p5-Data-Table/pkg-plist
+++ b/devel/p5-Data-Table/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/auto/Data/Table/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Table/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Table
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/auto/Data/Table
-@unexec rmdir %D/%%SITE_PERL%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-Taxonomy-Tags/pkg-plist b/devel/p5-Data-Taxonomy-Tags/pkg-plist
index 623f50d800b5..5eacd43bf479 100644
--- a/devel/p5-Data-Taxonomy-Tags/pkg-plist
+++ b/devel/p5-Data-Taxonomy-Tags/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Data/Taxonomy/Tags.pm
%%SITE_PERL%%/Data/Taxonomy/Tags/Tag.pm
@dirrm %%SITE_PERL%%/Data/Taxonomy/Tags
-@unexec rmdir %D/%%SITE_PERL%%/Data/Taxonomy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data/Taxonomy
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-TemporaryBag/pkg-plist b/devel/p5-Data-TemporaryBag/pkg-plist
index 5aacae6c7115..1ae787db4cd7 100644
--- a/devel/p5-Data-TemporaryBag/pkg-plist
+++ b/devel/p5-Data-TemporaryBag/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Data/TemporaryBag.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TemporaryBag/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TemporaryBag
-@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/devel/p5-Data-TreeDumper/pkg-plist b/devel/p5-Data-TreeDumper/pkg-plist
index 595d895be92f..f2aff744b215 100644
--- a/devel/p5-Data-TreeDumper/pkg-plist
+++ b/devel/p5-Data-TreeDumper/pkg-plist
@@ -7,7 +7,7 @@
%%SITE_PERL%%/auto/Data/TreeDumper/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
@dirrm %%SITE_PERL%%/auto/Data/TreeDumper
-@unexec rmdir %D/%%SITE_PERL%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/devel/p5-Data-UUID/pkg-plist b/devel/p5-Data-UUID/pkg-plist
index a5ea2660f247..7912027f6620 100644
--- a/devel/p5-Data-UUID/pkg-plist
+++ b/devel/p5-Data-UUID/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/UUID/UUID.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/UUID/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/UUID
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Data
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
diff --git a/devel/p5-Date-Calc/pkg-plist b/devel/p5-Date-Calc/pkg-plist
index ac50746e80c5..e09aaddbbdbf 100644
--- a/devel/p5-Date-Calc/pkg-plist
+++ b/devel/p5-Date-Calc/pkg-plist
@@ -12,8 +12,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc/Calc.bs
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Calc
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Date/Calendar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Date/Calc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Date-DayOfWeek/pkg-plist b/devel/p5-Date-DayOfWeek/pkg-plist
index f61888e719b1..19056245cc87 100644
--- a/devel/p5-Date-DayOfWeek/pkg-plist
+++ b/devel/p5-Date-DayOfWeek/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/Date/DayOfWeek/Sneeze.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/DayOfWeek/.packlist
@dirrm %%SITE_PERL%%/Date/DayOfWeek
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/DayOfWeek
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/devel/p5-Date-Easter/pkg-plist b/devel/p5-Date-Easter/pkg-plist
index 8c1f4b9ec305..7fea42f581f4 100644
--- a/devel/p5-Date-Easter/pkg-plist
+++ b/devel/p5-Date-Easter/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Date/Easter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Easter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Easter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Date-Holidays-DK/pkg-plist b/devel/p5-Date-Holidays-DK/pkg-plist
index 76062fd15e74..15b10f31b478 100644
--- a/devel/p5-Date-Holidays-DK/pkg-plist
+++ b/devel/p5-Date-Holidays-DK/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Date/Holidays/DK.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Holidays/DK/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Holidays/DK 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Holidays 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date/Holidays 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Holidays/DK
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Holidays
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date/Holidays
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Date-ICal/pkg-plist b/devel/p5-Date-ICal/pkg-plist
index 5644a0ed26aa..116296092055 100644
--- a/devel/p5-Date-ICal/pkg-plist
+++ b/devel/p5-Date-ICal/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Date/ICal.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ICal/.packlist
@dirrm %%SITE_PERL%%/Date/ICal
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ICal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/devel/p5-Date-Leapyear/pkg-plist b/devel/p5-Date-Leapyear/pkg-plist
index 626a0af1ceae..cbabe4338028 100644
--- a/devel/p5-Date-Leapyear/pkg-plist
+++ b/devel/p5-Date-Leapyear/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Date/Leapyear.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Leapyear/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Leapyear
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist
index 791f0ab8fb22..984a4def84c4 100644
--- a/devel/p5-Date-Manip/pkg-plist
+++ b/devel/p5-Date-Manip/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Date/Manip.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Manip/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Manip
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Date
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
diff --git a/devel/p5-Date-Roman/pkg-plist b/devel/p5-Date-Roman/pkg-plist
index f78d6ef6a2c5..d6605e74fcd6 100644
--- a/devel/p5-Date-Roman/pkg-plist
+++ b/devel/p5-Date-Roman/pkg-plist
@@ -3,5 +3,5 @@ bin/RomanDate
%%SITE_PERL%%/Date/Roman.pm
man/man1/RomanDate.1
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Roman
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Date-Set/pkg-plist b/devel/p5-Date-Set/pkg-plist
index 221d876afd93..5c86c1aa0637 100644
--- a/devel/p5-Date-Set/pkg-plist
+++ b/devel/p5-Date-Set/pkg-plist
@@ -7,4 +7,4 @@
@dirrm %%SITE_PERL%%/auto/Date/Set/ICal
@dirrm %%SITE_PERL%%/auto/Date/Set
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Set
-@unexec rmdir %D/%%SITE_PERL%%/auto/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Date
diff --git a/devel/p5-Date-Simple/pkg-plist b/devel/p5-Date-Simple/pkg-plist
index 7229ec7c91d9..07cd372d5379 100644
--- a/devel/p5-Date-Simple/pkg-plist
+++ b/devel/p5-Date-Simple/pkg-plist
@@ -7,7 +7,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple/Simple.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Date 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Date/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-DateTime-Calendar-Christian/pkg-plist b/devel/p5-DateTime-Calendar-Christian/pkg-plist
index af4a790b786a..0087815626c0 100644
--- a/devel/p5-DateTime-Calendar-Christian/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Christian/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Calendar/Christian.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Christian/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Christian
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/pkg-plist b/devel/p5-DateTime-Calendar-FrenchRevolutionary/pkg-plist
index 30ab9d3253c2..4054a5b37b15 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/pkg-plist
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/DateTime/Calendar/FrenchRevolutionary/Locale/fr.pm
@dirrm %%SITE_PERL%%/DateTime/Calendar/FrenchRevolutionary/Locale
@dirrm %%SITE_PERL%%/DateTime/Calendar/FrenchRevolutionary
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Calendar-Hebrew/pkg-plist b/devel/p5-DateTime-Calendar-Hebrew/pkg-plist
index e09f8d11b012..85c7d71e5a88 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Hebrew/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Calendar/Hebrew.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Hebrew/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Hebrew
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Calendar-Julian/pkg-plist b/devel/p5-DateTime-Calendar-Julian/pkg-plist
index 232068abe40d..b892c24c744c 100644
--- a/devel/p5-DateTime-Calendar-Julian/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Julian/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Calendar/Julian.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Julian/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Julian
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Calendar-Mayan/pkg-plist b/devel/p5-DateTime-Calendar-Mayan/pkg-plist
index 495e07916776..a00bb3ecbebb 100644
--- a/devel/p5-DateTime-Calendar-Mayan/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Mayan/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/DateTime/Calendar/Mayan.pm
%%SITE_PERL%%/DateTime/Calendar/Mayan.pod
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist b/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist
index 4e1e43233513..9bd4d485dbbd 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist
+++ b/devel/p5-DateTime-Calendar-Pataphysical/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Calendar/Pataphysical.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Pataphysical/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar/Pataphysical
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Calendar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Calendar
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-Cron/pkg-plist b/devel/p5-DateTime-Event-Cron/pkg-plist
index 6480f32ca3b1..2ad7f6403e24 100644
--- a/devel/p5-DateTime-Event-Cron/pkg-plist
+++ b/devel/p5-DateTime-Event-Cron/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Event/Cron.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Cron/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Cron
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-Easter/pkg-plist b/devel/p5-DateTime-Event-Easter/pkg-plist
index 06e6abd16e61..6a58dec0d872 100644
--- a/devel/p5-DateTime-Event-Easter/pkg-plist
+++ b/devel/p5-DateTime-Event-Easter/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Event/Easter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Easter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Easter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-ICal/pkg-plist b/devel/p5-DateTime-Event-ICal/pkg-plist
index 2741c6f6c174..7bd53024df7a 100644
--- a/devel/p5-DateTime-Event-ICal/pkg-plist
+++ b/devel/p5-DateTime-Event-ICal/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/DateTime/Event/ICal.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/ICal/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/ICal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-NameDay/pkg-plist b/devel/p5-DateTime-Event-NameDay/pkg-plist
index b7c8893a2cc7..54f99a714f9d 100644
--- a/devel/p5-DateTime-Event-NameDay/pkg-plist
+++ b/devel/p5-DateTime-Event-NameDay/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/DateTime/Event/NameDay/france.pm
%%SITE_PERL%%/DateTime/Event/NameDay/greece.pm
@dirrm %%SITE_PERL%%/DateTime/Event/NameDay
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-Random/pkg-plist b/devel/p5-DateTime-Event-Random/pkg-plist
index 39c343fe3682..115b42832738 100644
--- a/devel/p5-DateTime-Event-Random/pkg-plist
+++ b/devel/p5-DateTime-Event-Random/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Event/Random.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Random/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-Recurrence/pkg-plist b/devel/p5-DateTime-Event-Recurrence/pkg-plist
index 7d55015291bf..a014a16040a2 100644
--- a/devel/p5-DateTime-Event-Recurrence/pkg-plist
+++ b/devel/p5-DateTime-Event-Recurrence/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/DateTime/Event/Recurrence.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Recurrence/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Recurrence
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Event-Sunrise/pkg-plist b/devel/p5-DateTime-Event-Sunrise/pkg-plist
index 72161ae2d2ee..83cbeadb56cd 100644
--- a/devel/p5-DateTime-Event-Sunrise/pkg-plist
+++ b/devel/p5-DateTime-Event-Sunrise/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Event/Sunrise.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Sunrise/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event/Sunrise
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Event
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Fiscal-Year/pkg-plist b/devel/p5-DateTime-Fiscal-Year/pkg-plist
index 3f7f2d6b0a71..c7265845f5f0 100644
--- a/devel/p5-DateTime-Fiscal-Year/pkg-plist
+++ b/devel/p5-DateTime-Fiscal-Year/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/Fiscal/Year.pm
@dirrm %%SITE_PERL%%/DateTime/Fiscal
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Baby/pkg-plist b/devel/p5-DateTime-Format-Baby/pkg-plist
index 521f61e4f67b..ed86c6de83c3 100644
--- a/devel/p5-DateTime-Format-Baby/pkg-plist
+++ b/devel/p5-DateTime-Format-Baby/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/Baby.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Baby/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Baby
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Bork/pkg-plist b/devel/p5-DateTime-Format-Bork/pkg-plist
index 7fd5ad9f669b..5b32089feef6 100644
--- a/devel/p5-DateTime-Format-Bork/pkg-plist
+++ b/devel/p5-DateTime-Format-Bork/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/DateTime/Format/Bork.pm
%%SITE_PERL%%/DateTime/Format/Bork.pod
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Builder/pkg-plist b/devel/p5-DateTime-Format-Builder/pkg-plist
index f79cd0a630ea..5b33b27bf96d 100644
--- a/devel/p5-DateTime-Format-Builder/pkg-plist
+++ b/devel/p5-DateTime-Format-Builder/pkg-plist
@@ -17,5 +17,5 @@
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/DateTime/Format/Builder/Parser
@dirrm %%SITE_PERL%%/DateTime/Format/Builder
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-DBI/pkg-plist b/devel/p5-DateTime-Format-DBI/pkg-plist
index cbbaabeea31c..485bebc18d8c 100644
--- a/devel/p5-DateTime-Format-DBI/pkg-plist
+++ b/devel/p5-DateTime-Format-DBI/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/DBI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/DBI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/DBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-DateManip/pkg-plist b/devel/p5-DateTime-Format-DateManip/pkg-plist
index f2543c923d9a..43e9a8f86159 100644
--- a/devel/p5-DateTime-Format-DateManip/pkg-plist
+++ b/devel/p5-DateTime-Format-DateManip/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/Format/DateManip.pm
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Duration/pkg-plist b/devel/p5-DateTime-Format-Duration/pkg-plist
index 2ea6f3a459ae..bdcb619b2a9a 100644
--- a/devel/p5-DateTime-Format-Duration/pkg-plist
+++ b/devel/p5-DateTime-Format-Duration/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/Duration.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Duration/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Duration
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Epoch/pkg-plist b/devel/p5-DateTime-Format-Epoch/pkg-plist
index ef84eb0f9750..fb2d819ece7c 100644
--- a/devel/p5-DateTime-Format-Epoch/pkg-plist
+++ b/devel/p5-DateTime-Format-Epoch/pkg-plist
@@ -12,8 +12,8 @@
%%SITE_PERL%%/DateTime/Format/Epoch/Unix.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Epoch/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Epoch
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
@dirrm %%SITE_PERL%%/DateTime/Format/Epoch
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Excel/pkg-plist b/devel/p5-DateTime-Format-Excel/pkg-plist
index b9f4fbf1ee7e..3bcece54a5c3 100644
--- a/devel/p5-DateTime-Format-Excel/pkg-plist
+++ b/devel/p5-DateTime-Format-Excel/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/Format/Excel.pm
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-HTTP/pkg-plist b/devel/p5-DateTime-Format-HTTP/pkg-plist
index cbfffba72be2..f1af26381a6a 100644
--- a/devel/p5-DateTime-Format-HTTP/pkg-plist
+++ b/devel/p5-DateTime-Format-HTTP/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/Format/HTTP.pm
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-IBeat/pkg-plist b/devel/p5-DateTime-Format-IBeat/pkg-plist
index f26f500f99d5..f832f39fdcc6 100644
--- a/devel/p5-DateTime-Format-IBeat/pkg-plist
+++ b/devel/p5-DateTime-Format-IBeat/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/IBeat.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/IBeat/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/IBeat
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-ICal/pkg-plist b/devel/p5-DateTime-Format-ICal/pkg-plist
index 5097724c1cf0..b41db094d4b9 100644
--- a/devel/p5-DateTime-Format-ICal/pkg-plist
+++ b/devel/p5-DateTime-Format-ICal/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/Format/ICal.pm
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-ISO8601/pkg-plist b/devel/p5-DateTime-Format-ISO8601/pkg-plist
index 1f679b9cc41f..5b9b344da5a1 100644
--- a/devel/p5-DateTime-Format-ISO8601/pkg-plist
+++ b/devel/p5-DateTime-Format-ISO8601/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/DateTime/Format/ISO8601.pm
%%SITE_PERL%%/DateTime/Format/ISO8601.pod
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Mail/pkg-plist b/devel/p5-DateTime-Format-Mail/pkg-plist
index eec580acf6a0..9fa5a9e90e35 100644
--- a/devel/p5-DateTime-Format-Mail/pkg-plist
+++ b/devel/p5-DateTime-Format-Mail/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/Format/Mail.pm
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-MySQL/pkg-plist b/devel/p5-DateTime-Format-MySQL/pkg-plist
index 4eca75b5b883..60820043f071 100644
--- a/devel/p5-DateTime-Format-MySQL/pkg-plist
+++ b/devel/p5-DateTime-Format-MySQL/pkg-plist
@@ -1,4 +1,4 @@
@comment $FreeBSD$
%%SITE_PERL%%/DateTime/Format/MySQL.pm
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Pg/pkg-plist b/devel/p5-DateTime-Format-Pg/pkg-plist
index 9a334e3550cc..ec3851caeb24 100644
--- a/devel/p5-DateTime-Format-Pg/pkg-plist
+++ b/devel/p5-DateTime-Format-Pg/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/Pg.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Pg/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Pg
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Roman/pkg-plist b/devel/p5-DateTime-Format-Roman/pkg-plist
index 7705a20e2b0c..838c77dd3945 100644
--- a/devel/p5-DateTime-Format-Roman/pkg-plist
+++ b/devel/p5-DateTime-Format-Roman/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/Roman.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Roman/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Roman
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-Strptime/pkg-plist b/devel/p5-DateTime-Format-Strptime/pkg-plist
index f9b3053e275b..e6c388052ad6 100644
--- a/devel/p5-DateTime-Format-Strptime/pkg-plist
+++ b/devel/p5-DateTime-Format-Strptime/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/DateTime/Format/Strptime.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Strptime/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/Strptime
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Format-W3CDTF/pkg-plist b/devel/p5-DateTime-Format-W3CDTF/pkg-plist
index de39a5335680..65e5d5ceed69 100644
--- a/devel/p5-DateTime-Format-W3CDTF/pkg-plist
+++ b/devel/p5-DateTime-Format-W3CDTF/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/Format/W3CDTF.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/W3CDTF/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format/W3CDTF
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Format
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/Format
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Functions/pkg-plist b/devel/p5-DateTime-Functions/pkg-plist
index 98cb045acd73..70647a3ce915 100644
--- a/devel/p5-DateTime-Functions/pkg-plist
+++ b/devel/p5-DateTime-Functions/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DateTime/Functions.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Functions/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Functions
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-HiRes/pkg-plist b/devel/p5-DateTime-HiRes/pkg-plist
index 8a271a363ec1..1b445a988224 100644
--- a/devel/p5-DateTime-HiRes/pkg-plist
+++ b/devel/p5-DateTime-HiRes/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/DateTime/HiRes.pm
%%SITE_PERL%%/DateTime/HiRes.pod
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Incomplete/pkg-plist b/devel/p5-DateTime-Incomplete/pkg-plist
index 8956387dc87e..f4ce55f3089a 100644
--- a/devel/p5-DateTime-Incomplete/pkg-plist
+++ b/devel/p5-DateTime-Incomplete/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DateTime/Incomplete.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Incomplete/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Incomplete
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Locale/pkg-plist b/devel/p5-DateTime-Locale/pkg-plist
index 159b4df5a772..f170222964a9 100644
--- a/devel/p5-DateTime-Locale/pkg-plist
+++ b/devel/p5-DateTime-Locale/pkg-plist
@@ -304,4 +304,4 @@
%%SITE_PERL%%/DateTime/LocaleCatalog.pm
@dirrm %%SITE_PERL%%/DateTime/Locale/Alias
@dirrm %%SITE_PERL%%/DateTime/Locale
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Precise/pkg-plist b/devel/p5-DateTime-Precise/pkg-plist
index b67bc6334477..7fd11279faee 100644
--- a/devel/p5-DateTime-Precise/pkg-plist
+++ b/devel/p5-DateTime-Precise/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/DateTime/Math/bigint.pl
%%SITE_PERL%%/DateTime/Math/bigfloat.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/Precise
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/Math 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/Math
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-Set/pkg-plist b/devel/p5-DateTime-Set/pkg-plist
index f41424563f15..c3f1d2722db2 100644
--- a/devel/p5-DateTime-Set/pkg-plist
+++ b/devel/p5-DateTime-Set/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/DateTime/Span.pm
%%SITE_PERL%%/DateTime/SpanSet.pm
%%SITE_PERL%%/Set/Infinite/_recurrence.pm
-@unexec rmdir %D/%%SITE_PERL%%/Set/Infinite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Set/Infinite
+@dirrmtry %%SITE_PERL%%/Set
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-TimeZone-Alias/pkg-plist b/devel/p5-DateTime-TimeZone-Alias/pkg-plist
index 76e34f99638a..7b428c89da54 100644
--- a/devel/p5-DateTime-TimeZone-Alias/pkg-plist
+++ b/devel/p5-DateTime-TimeZone-Alias/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/DateTime/TimeZone/Alias.pm
%%SITE_PERL%%/DateTime/TimeZone/Alias.pod
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/TimeZone 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime/TimeZone
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-TimeZone-LMT/pkg-plist b/devel/p5-DateTime-TimeZone-LMT/pkg-plist
index 13a4a2fdc0b0..f32cf1c0cd02 100644
--- a/devel/p5-DateTime-TimeZone-LMT/pkg-plist
+++ b/devel/p5-DateTime-TimeZone-LMT/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/DateTime/TimeZone/LMT.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/TimeZone/LMT/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/TimeZone/LMT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/TimeZone 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime/TimeZone 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/TimeZone
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/DateTime/TimeZone
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime-TimeZone/pkg-plist b/devel/p5-DateTime-TimeZone/pkg-plist
index a0735a2bdfeb..03252830fe35 100644
--- a/devel/p5-DateTime-TimeZone/pkg-plist
+++ b/devel/p5-DateTime-TimeZone/pkg-plist
@@ -398,4 +398,4 @@
@dirrm %%SITE_PERL%%/DateTime/TimeZone/America
@dirrm %%SITE_PERL%%/DateTime/TimeZone/Africa
@dirrm %%SITE_PERL%%/DateTime/TimeZone
-@unexec rmdir %D/%%SITE_PERL%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DateTime
diff --git a/devel/p5-DateTime/pkg-plist b/devel/p5-DateTime/pkg-plist
index 322cff49df1e..d41c4cdd2911 100644
--- a/devel/p5-DateTime/pkg-plist
+++ b/devel/p5-DateTime/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/DateTime.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime/DateTime.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DateTime 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DateTime
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DateTime
diff --git a/devel/p5-Decision-ACL/pkg-plist b/devel/p5-Decision-ACL/pkg-plist
index 4c3737185068..85621fab7ecd 100644
--- a/devel/p5-Decision-ACL/pkg-plist
+++ b/devel/p5-Decision-ACL/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/Decision/ACL/Rule.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Decision/ACL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Decision/ACL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Decision 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Decision
@dirrm %%SITE_PERL%%/Decision/ACL
-@unexec rmdir %D/%%SITE_PERL%%/Decision 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Decision
diff --git a/devel/p5-Devel-Arena/pkg-plist b/devel/p5-Devel-Arena/pkg-plist
index 5bf36f244b0c..639e91c06993 100644
--- a/devel/p5-Devel-Arena/pkg-plist
+++ b/devel/p5-Devel-Arena/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Arena/Arena.so
%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Arena.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Arena
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-Constants/pkg-plist b/devel/p5-Devel-Constants/pkg-plist
index 78c912f4949f..668af1c4f33f 100644
--- a/devel/p5-Devel-Constants/pkg-plist
+++ b/devel/p5-Devel-Constants/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Constants/.packlist
%%SITE_PERL%%/Devel/Constants.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Constants
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-Cover/pkg-plist b/devel/p5-Devel-Cover/pkg-plist
index ad9b405f95ae..2d338bac6c46 100644
--- a/devel/p5-Devel-Cover/pkg-plist
+++ b/devel/p5-Devel-Cover/pkg-plist
@@ -35,9 +35,9 @@ bin/gcov2perl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cover/Cover.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cover/Cover.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cover
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Report
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/DB
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover/Annotation
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Devel/Cover
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
diff --git a/devel/p5-Devel-Cycle/pkg-plist b/devel/p5-Devel-Cycle/pkg-plist
index 3ef5321a933b..615f3ce1e2af 100644
--- a/devel/p5-Devel-Cycle/pkg-plist
+++ b/devel/p5-Devel-Cycle/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cycle/.packlist
%%SITE_PERL%%/Devel/Cycle.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Cycle
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-DProf/pkg-plist b/devel/p5-Devel-DProf/pkg-plist
index e7d7a38bcbaf..aec2fcd91ff6 100644
--- a/devel/p5-Devel-DProf/pkg-plist
+++ b/devel/p5-Devel-DProf/pkg-plist
@@ -4,5 +4,5 @@ bin/dprofpp
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf/DProf.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-DProfPP/pkg-plist b/devel/p5-Devel-DProfPP/pkg-plist
index 01c11ded20f2..d961b154f8cc 100644
--- a/devel/p5-Devel-DProfPP/pkg-plist
+++ b/devel/p5-Devel-DProfPP/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProfPP/.packlist
%%SITE_PERL%%/Devel/DProfPP.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/DProfPP
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-Diagram/pkg-plist b/devel/p5-Devel-Diagram/pkg-plist
index ae7dbcc5faa0..e6d94bbd80e1 100644
--- a/devel/p5-Devel-Diagram/pkg-plist
+++ b/devel/p5-Devel-Diagram/pkg-plist
@@ -6,8 +6,8 @@
@dirrm %%SITE_PERL%%/Devel/Diagram/xsl
@dirrm %%SITE_PERL%%/Devel/Diagram
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Diagram
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
%%PORTDOCS%%%%EXAMPLESDIR%%/ClassDiagram.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/cd-CGI.html
%%PORTDOCS%%%%EXAMPLESDIR%%/cd-CPAN.html
diff --git a/devel/p5-Devel-Leak/pkg-plist b/devel/p5-Devel-Leak/pkg-plist
index bb472d3a6a75..e40b87131204 100644
--- a/devel/p5-Devel-Leak/pkg-plist
+++ b/devel/p5-Devel-Leak/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Leak.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-LeakTrace/pkg-plist b/devel/p5-Devel-LeakTrace/pkg-plist
index d451e93f0459..2b49403c51b9 100644
--- a/devel/p5-Devel-LeakTrace/pkg-plist
+++ b/devel/p5-Devel-LeakTrace/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/LeakTrace/LeakTrace.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/LeakTrace/LeakTrace.so
%%SITE_PERL%%/%%PERL_ARCH%%/Devel/LeakTrace.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/LeakTrace
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-Modlist/pkg-plist b/devel/p5-Devel-Modlist/pkg-plist
index a5d409be0d2e..8f33b281d25f 100644
--- a/devel/p5-Devel-Modlist/pkg-plist
+++ b/devel/p5-Devel-Modlist/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Modlist/.packlist
%%SITE_PERL%%/Devel/Modlist.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Modlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-ObjectTracker/pkg-plist b/devel/p5-Devel-ObjectTracker/pkg-plist
index 8bf0a8229dc9..74f67da58ca5 100644
--- a/devel/p5-Devel-ObjectTracker/pkg-plist
+++ b/devel/p5-Devel-ObjectTracker/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ObjectTracker/.packlist
%%SITE_PERL%%/Devel/ObjectTracker.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ObjectTracker
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-PPPort/pkg-plist b/devel/p5-Devel-PPPort/pkg-plist
index 42e3d83928c3..38148429c6fa 100644
--- a/devel/p5-Devel-PPPort/pkg-plist
+++ b/devel/p5-Devel-PPPort/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PPPort/PPPort.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PPPort/PPPort.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/PPPort
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
diff --git a/devel/p5-Devel-Peek/pkg-plist b/devel/p5-Devel-Peek/pkg-plist
index da5c08330a6a..718eb1d232cd 100644
--- a/devel/p5-Devel-Peek/pkg-plist
+++ b/devel/p5-Devel-Peek/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek/Peek.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Peek
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
diff --git a/devel/p5-Devel-Pointer/pkg-plist b/devel/p5-Devel-Pointer/pkg-plist
index a45efb8dbb55..93b29c6b3f0a 100644
--- a/devel/p5-Devel-Pointer/pkg-plist
+++ b/devel/p5-Devel-Pointer/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Pointer/Pointer.so
%%SITE_PERL%%/%%PERL_ARCH%%/Devel/Pointer.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Pointer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-Profile/pkg-plist b/devel/p5-Devel-Profile/pkg-plist
index ec3504b7408f..06668ab9ef80 100644
--- a/devel/p5-Devel-Profile/pkg-plist
+++ b/devel/p5-Devel-Profile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Devel/Profile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Profile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Profile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-Profiler/pkg-plist b/devel/p5-Devel-Profiler/pkg-plist
index 7eb144f16086..5ac63f683c9f 100644
--- a/devel/p5-Devel-Profiler/pkg-plist
+++ b/devel/p5-Devel-Profiler/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/Devel/Profiler/Test.pm
@dirrm %%SITE_PERL%%/Devel/Profiler
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Profiler
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-SimpleTrace/pkg-plist b/devel/p5-Devel-SimpleTrace/pkg-plist
index 54ad2f259398..cd7f3615060f 100644
--- a/devel/p5-Devel-SimpleTrace/pkg-plist
+++ b/devel/p5-Devel-SimpleTrace/pkg-plist
@@ -3,5 +3,5 @@
@dirrm share/nls/en_US.US-ASCII
@dirrm share/nls/POSIX
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SimpleTrace
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-Size/pkg-plist b/devel/p5-Devel-Size/pkg-plist
index b4edef744a10..362596e8cbec 100644
--- a/devel/p5-Devel-Size/pkg-plist
+++ b/devel/p5-Devel-Size/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Size/Size.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Size/Size.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Size
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel
diff --git a/devel/p5-Devel-SmallProf/pkg-plist b/devel/p5-Devel-SmallProf/pkg-plist
index 0f0d851837ae..959b61056970 100644
--- a/devel/p5-Devel-SmallProf/pkg-plist
+++ b/devel/p5-Devel-SmallProf/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Devel/SmallProf.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SmallProf/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/SmallProf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-StackTrace/pkg-plist b/devel/p5-Devel-StackTrace/pkg-plist
index d05928be9b06..00f58adec5d2 100644
--- a/devel/p5-Devel-StackTrace/pkg-plist
+++ b/devel/p5-Devel-StackTrace/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Devel/StackTrace.pm
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-Symdump/pkg-plist b/devel/p5-Devel-Symdump/pkg-plist
index 5fc614b88659..fc5d4a70085e 100644
--- a/devel/p5-Devel-Symdump/pkg-plist
+++ b/devel/p5-Devel-Symdump/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Symdump/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Symdump
@dirrm %%SITE_PERL%%/Devel/Symdump
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
diff --git a/devel/p5-Devel-Trace/pkg-plist b/devel/p5-Devel-Trace/pkg-plist
index a64e71fa1b1e..b3e9b9e65721 100644
--- a/devel/p5-Devel-Trace/pkg-plist
+++ b/devel/p5-Devel-Trace/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Devel/Trace.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Trace/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Trace
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Devel-TraceCalls/pkg-plist b/devel/p5-Devel-TraceCalls/pkg-plist
index 21efb5c823aa..9359dc4658eb 100644
--- a/devel/p5-Devel-TraceCalls/pkg-plist
+++ b/devel/p5-Devel-TraceCalls/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceCalls/.packlist
%%SITE_PERL%%/Devel/TraceCalls.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceCalls
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/devel/p5-Encode-compat/pkg-plist b/devel/p5-Encode-compat/pkg-plist
index 56d2791f5569..4446e51ffef3 100644
--- a/devel/p5-Encode-compat/pkg-plist
+++ b/devel/p5-Encode-compat/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/Encode/compat/common.pm
%%SITE_PERL%%/Encode/compat/Alias.pm
@dirrm %%SITE_PERL%%/mach/auto/Encode/compat
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Encode
@dirrm %%SITE_PERL%%/Encode/compat
-@unexec rmdir %D/%%SITE_PERL%%/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Encode
diff --git a/devel/p5-Encode/pkg-plist b/devel/p5-Encode/pkg-plist
index bdb0f5a8fbc6..a8bdcf9f5a76 100644
--- a/devel/p5-Encode/pkg-plist
+++ b/devel/p5-Encode/pkg-plist
@@ -52,19 +52,19 @@ bin/enc2xs
%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header/ISO_2022_JP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN/HZ.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Byte
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/EBCDIC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/JP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/KR
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Symbol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/TW
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/Unicode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/CN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/JP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/KR
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME/Header
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/Unicode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
diff --git a/devel/p5-Env-PS1/pkg-plist b/devel/p5-Env-PS1/pkg-plist
index 2d688d99b907..d89c8d753278 100644
--- a/devel/p5-Env-PS1/pkg-plist
+++ b/devel/p5-Env-PS1/pkg-plist
@@ -11,5 +11,5 @@
%%SITE_PERL%%/auto/Env/PS1/autosplit.ix
%%SITE_PERL%%/auto/Env/PS1/dollar.al
@dirrm %%SITE_PERL%%/auto/Env/PS1
-@unexec rmdir %D/%%SITE_PERL%%/Env 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Env 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Env
+@dirrmtry %%SITE_PERL%%/auto/Env
diff --git a/devel/p5-Event/pkg-plist b/devel/p5-Event/pkg-plist
index 78e4ed36b27c..5935ad13a980 100644
--- a/devel/p5-Event/pkg-plist
+++ b/devel/p5-Event/pkg-plist
@@ -18,5 +18,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event/Event.so
%%PORTDOCS%%%%DOCSDIR%%/Tutorial.pdf
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Event 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Event 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Event
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Event
diff --git a/devel/p5-Exporter-Lite/pkg-plist b/devel/p5-Exporter-Lite/pkg-plist
index 5abc90c11145..cc6db95e358f 100644
--- a/devel/p5-Exporter-Lite/pkg-plist
+++ b/devel/p5-Exporter-Lite/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Exporter/Lite.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Lite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Exporter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter
+@dirrmtry %%SITE_PERL%%/Exporter
diff --git a/devel/p5-Exporter-Tidy/pkg-plist b/devel/p5-Exporter-Tidy/pkg-plist
index 440b9f9db00a..66ff3e160a08 100644
--- a/devel/p5-Exporter-Tidy/pkg-plist
+++ b/devel/p5-Exporter-Tidy/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Exporter/Tidy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Tidy/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter/Tidy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Exporter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Exporter
+@dirrmtry %%SITE_PERL%%/Exporter
diff --git a/devel/p5-ExtUtils-AutoInstall/pkg-plist b/devel/p5-ExtUtils-AutoInstall/pkg-plist
index 8f2f51037f00..d307a158685e 100644
--- a/devel/p5-ExtUtils-AutoInstall/pkg-plist
+++ b/devel/p5-ExtUtils-AutoInstall/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/AutoInstall/.packlist
%%SITE_PERL%%/ExtUtils/AutoInstall.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/AutoInstall
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ExtUtils
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
diff --git a/devel/p5-ExtUtils-CBuilder/pkg-plist b/devel/p5-ExtUtils-CBuilder/pkg-plist
index 375ac0207193..90192eb363ea 100644
--- a/devel/p5-ExtUtils-CBuilder/pkg-plist
+++ b/devel/p5-ExtUtils-CBuilder/pkg-plist
@@ -10,7 +10,7 @@
%%SITE_PERL%%/ExtUtils/CBuilder/Platform/os2.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/CBuilder/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/CBuilder
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
@dirrm %%SITE_PERL%%/ExtUtils/CBuilder/Platform
@dirrm %%SITE_PERL%%/ExtUtils/CBuilder
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ExtUtils
diff --git a/devel/p5-ExtUtils-Constant/pkg-plist b/devel/p5-ExtUtils-Constant/pkg-plist
index cc89c37e695c..49540e75e398 100644
--- a/devel/p5-ExtUtils-Constant/pkg-plist
+++ b/devel/p5-ExtUtils-Constant/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/ExtUtils/Constant/Utils.pm
%%SITE_PERL%%/ExtUtils/Constant/XS.pm
@dirrm %%SITE_PERL%%/ExtUtils/Constant
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ExtUtils
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Constant
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
diff --git a/devel/p5-ExtUtils-Depends/pkg-plist b/devel/p5-ExtUtils-Depends/pkg-plist
index 5d81f0c16e7f..0ecf5eb35a4d 100644
--- a/devel/p5-ExtUtils-Depends/pkg-plist
+++ b/devel/p5-ExtUtils-Depends/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Depends/.packlist
%%SITE_PERL%%/ExtUtils/Depends.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/Depends
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ExtUtils
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist b/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist
index 0010977df239..cebbbd384fef 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/pkg-plist
@@ -1,8 +1,8 @@
bin/testcover
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker/Coverage/.packlist
%%SITE_PERL%%/ExtUtils/MakeMaker/Coverage.pm
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ExtUtils/MakeMaker
+@dirrmtry %%SITE_PERL%%/ExtUtils
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker/Coverage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
diff --git a/devel/p5-ExtUtils-MakeMaker/pkg-plist b/devel/p5-ExtUtils-MakeMaker/pkg-plist
index 554d74f2631e..f0eb40d4ff31 100644
--- a/devel/p5-ExtUtils-MakeMaker/pkg-plist
+++ b/devel/p5-ExtUtils-MakeMaker/pkg-plist
@@ -36,8 +36,8 @@
%%SITE_PERL%%/ExtUtils/testlib.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto//ExtUtils/MakeMaker/.packlist
@dirrm %%SITE_PERL%%/ExtUtils/MakeMaker
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils/Command 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils/Liblist 2>/dev/null || true
-@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/MakeMaker
+@dirrmtry %%SITE_PERL%%/ExtUtils/Command
+@dirrmtry %%SITE_PERL%%/ExtUtils/Liblist
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
+@dirrmtry %%SITE_PERL%%/ExtUtils
diff --git a/devel/p5-ExtUtils-ParseXS/pkg-plist b/devel/p5-ExtUtils-ParseXS/pkg-plist
index a016306ec042..9b8de0a12da6 100644
--- a/devel/p5-ExtUtils-ParseXS/pkg-plist
+++ b/devel/p5-ExtUtils-ParseXS/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/ExtUtils/ParseXS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/ParseXS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/ParseXS
-@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/devel/p5-ExtUtils-PkgConfig/pkg-plist b/devel/p5-ExtUtils-PkgConfig/pkg-plist
index 9fbe0ae1f9ad..b339c285a706 100644
--- a/devel/p5-ExtUtils-PkgConfig/pkg-plist
+++ b/devel/p5-ExtUtils-PkgConfig/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/PkgConfig/.packlist
%%SITE_PERL%%/ExtUtils/PkgConfig.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/PkgConfig
-@unexec rmdir %D/%%SITE_PERL%%/ExtUtils 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/ExtUtils
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
diff --git a/devel/p5-ExtUtils-XSBuilder/pkg-plist b/devel/p5-ExtUtils-XSBuilder/pkg-plist
index a5a204d328ef..e56bdb819c40 100644
--- a/devel/p5-ExtUtils-XSBuilder/pkg-plist
+++ b/devel/p5-ExtUtils-XSBuilder/pkg-plist
@@ -14,5 +14,5 @@
@dirrm %%SITE_PERL%%/ExtUtils/XSBuilder/C
@dirrm %%SITE_PERL%%/ExtUtils/XSBuilder
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/XSBuilder
-@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/devel/p5-File-BaseDir/pkg-plist b/devel/p5-File-BaseDir/pkg-plist
index 5ad86709737c..06241f65fd2a 100644
--- a/devel/p5-File-BaseDir/pkg-plist
+++ b/devel/p5-File-BaseDir/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/BaseDir.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BaseDir/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BaseDir 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BaseDir
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Copy-Recursive/pkg-plist b/devel/p5-File-Copy-Recursive/pkg-plist
index 73ea521cdc4d..045c5064c539 100644
--- a/devel/p5-File-Copy-Recursive/pkg-plist
+++ b/devel/p5-File-Copy-Recursive/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/File/Copy/Recursive.pm
-@unexec rmdir %D/%%SITE_PERL%%/File/Copy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File/Copy
+@dirrmtry %%SITE_PERL%%/File
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Copy/Recursive/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Copy/Recursive
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Copy 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Copy
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Find-Rule/pkg-plist b/devel/p5-File-Find-Rule/pkg-plist
index a82d751f1f8a..d08fc9713ed7 100644
--- a/devel/p5-File-Find-Rule/pkg-plist
+++ b/devel/p5-File-Find-Rule/pkg-plist
@@ -2,6 +2,6 @@ bin/findrule
%%SITE_PERL%%/File/Find/Rule.pm
%%SITE_PERL%%/File/Find/Rule/Extending.pod
%%SITE_PERL%%/File/Find/Rule/Procedural.pod
-@unexec rmdir %D/%%SITE_PERL%%/File/Find/Rule 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File/Find 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File/Find/Rule
+@dirrmtry %%SITE_PERL%%/File/Find
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Flat/pkg-plist b/devel/p5-File-Flat/pkg-plist
index 70a2f731a472..2f9513ca376c 100644
--- a/devel/p5-File-Flat/pkg-plist
+++ b/devel/p5-File-Flat/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flat/.packlist
%%SITE_PERL%%/File/Flat.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flat
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Flock/pkg-plist b/devel/p5-File-Flock/pkg-plist
index 94ceb789ca8e..e674d059fa53 100644
--- a/devel/p5-File-Flock/pkg-plist
+++ b/devel/p5-File-Flock/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Flock.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flock/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Flock
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Grep/pkg-plist b/devel/p5-File-Grep/pkg-plist
index 4c165cb89e6d..7e9e85b3d810 100644
--- a/devel/p5-File-Grep/pkg-plist
+++ b/devel/p5-File-Grep/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Grep.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Grep/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Grep
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-HomeDir/pkg-plist b/devel/p5-File-HomeDir/pkg-plist
index 737518a211a3..d28b198a87a7 100644
--- a/devel/p5-File-HomeDir/pkg-plist
+++ b/devel/p5-File-HomeDir/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/File/HomeDir/Windows.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/HomeDir/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/HomeDir
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
@dirrm %%SITE_PERL%%/File/HomeDir
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Lock/pkg-plist b/devel/p5-File-Lock/pkg-plist
index bb1426211cda..24b9c6550dc6 100644
--- a/devel/p5-File-Lock/pkg-plist
+++ b/devel/p5-File-Lock/pkg-plist
@@ -9,4 +9,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Lock
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-MMagic/pkg-plist b/devel/p5-File-MMagic/pkg-plist
index 9eb5e5f2ec2f..f267e3130893 100644
--- a/devel/p5-File-MMagic/pkg-plist
+++ b/devel/p5-File-MMagic/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/MMagic.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-MimeInfo/pkg-plist b/devel/p5-File-MimeInfo/pkg-plist
index 3b9c409cd551..3e69d028df38 100644
--- a/devel/p5-File-MimeInfo/pkg-plist
+++ b/devel/p5-File-MimeInfo/pkg-plist
@@ -6,7 +6,7 @@ bin/mimetype
%%SITE_PERL%%/File/MimeInfo/Magic.pm
%%SITE_PERL%%/File/MimeInfo/Rox.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MimeInfo/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/File/MimeInfo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MimeInfo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File/MimeInfo
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MimeInfo
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Modified/pkg-plist b/devel/p5-File-Modified/pkg-plist
index 8844a3fb33a9..75a298ad8df6 100644
--- a/devel/p5-File-Modified/pkg-plist
+++ b/devel/p5-File-Modified/pkg-plist
@@ -5,5 +5,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/Import.cfg
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Modified
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-NCopy/pkg-plist b/devel/p5-File-NCopy/pkg-plist
index db310a65bb04..c2942402b8c3 100644
--- a/devel/p5-File-NCopy/pkg-plist
+++ b/devel/p5-File-NCopy/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NCopy/.packlist
%%SITE_PERL%%/File/NCopy.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NCopy
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-NFSLock/pkg-plist b/devel/p5-File-NFSLock/pkg-plist
index 5ed412b087b2..1b08076f9cbf 100644
--- a/devel/p5-File-NFSLock/pkg-plist
+++ b/devel/p5-File-NFSLock/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NFSLock/.packlist
%%SITE_PERL%%/File/NFSLock.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/NFSLock
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Path-Expand/pkg-plist b/devel/p5-File-Path-Expand/pkg-plist
index c963b342aa5c..81b5d5a6694f 100644
--- a/devel/p5-File-Path-Expand/pkg-plist
+++ b/devel/p5-File-Path-Expand/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Path/Expand.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File-Path-Expand/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File-Path-Expand
-@unexec rmdir %D/%%SITE_PERL%%/File/Path 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File/Path
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-PathConvert/pkg-plist b/devel/p5-File-PathConvert/pkg-plist
index 5e70cba60456..00c48404d637 100644
--- a/devel/p5-File-PathConvert/pkg-plist
+++ b/devel/p5-File-PathConvert/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/PathConvert.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/PathConvert/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/PathConvert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/PathConvert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Random/pkg-plist b/devel/p5-File-Random/pkg-plist
index 51e969bf35b7..cdf7212e809f 100644
--- a/devel/p5-File-Random/pkg-plist
+++ b/devel/p5-File-Random/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Random.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Random/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Random
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-ReadBackwards/pkg-plist b/devel/p5-File-ReadBackwards/pkg-plist
index 604e94014bcd..7eecd9ea2039 100644
--- a/devel/p5-File-ReadBackwards/pkg-plist
+++ b/devel/p5-File-ReadBackwards/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ReadBackwards/.packlist
%%SITE_PERL%%/File/ReadBackwards.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ReadBackwards
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Remove/pkg-plist b/devel/p5-File-Remove/pkg-plist
index cc5537e97018..d728ddd8875b 100644
--- a/devel/p5-File-Remove/pkg-plist
+++ b/devel/p5-File-Remove/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Remove.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Remove/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Remove
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-ShareDir/pkg-plist b/devel/p5-File-ShareDir/pkg-plist
index 8aad79be470a..325d1447e567 100644
--- a/devel/p5-File-ShareDir/pkg-plist
+++ b/devel/p5-File-ShareDir/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir/sample.txt
%%SITE_PERL%%/%%PERL_ARCH%%/File/ShareDir.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/ShareDir
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Slurp/pkg-plist b/devel/p5-File-Slurp/pkg-plist
index ab975b993c4d..2a6e76477e34 100644
--- a/devel/p5-File-Slurp/pkg-plist
+++ b/devel/p5-File-Slurp/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/File/Slurp.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Slurp/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Slurp
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Sync/pkg-plist b/devel/p5-File-Sync/pkg-plist
index 6ae0059be524..5520221e51c7 100644
--- a/devel/p5-File-Sync/pkg-plist
+++ b/devel/p5-File-Sync/pkg-plist
@@ -5,4 +5,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Sync
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-Tail/pkg-plist b/devel/p5-File-Tail/pkg-plist
index ea0728ce7115..1370e35e9be8 100644
--- a/devel/p5-File-Tail/pkg-plist
+++ b/devel/p5-File-Tail/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Tail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Tail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Temp/pkg-plist b/devel/p5-File-Temp/pkg-plist
index 2b420e44f9e5..330e1ffdce12 100644
--- a/devel/p5-File-Temp/pkg-plist
+++ b/devel/p5-File-Temp/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/Temp.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Temp/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Temp
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-Type/pkg-plist b/devel/p5-File-Type/pkg-plist
index e95fcec6511a..f2ad9dc32212 100644
--- a/devel/p5-File-Type/pkg-plist
+++ b/devel/p5-File-Type/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Type/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Type
@dirrm %%SITE_PERL%%/File/Type
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-File-chdir/pkg-plist b/devel/p5-File-chdir/pkg-plist
index ca971eb7651e..04b734cc9ede 100644
--- a/devel/p5-File-chdir/pkg-plist
+++ b/devel/p5-File-chdir/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/chdir/.packlist
%%SITE_PERL%%/File/chdir.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/chdir
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
diff --git a/devel/p5-File-pushd/pkg-plist b/devel/p5-File-pushd/pkg-plist
index 740425c86951..7b835dd8c3a5 100644
--- a/devel/p5-File-pushd/pkg-plist
+++ b/devel/p5-File-pushd/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/File/pushd.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/pushd/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/pushd 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/pushd
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/File
diff --git a/devel/p5-FileHandle-Unget/pkg-plist b/devel/p5-FileHandle-Unget/pkg-plist
index 0ae605a761fa..942b82153040 100644
--- a/devel/p5-FileHandle-Unget/pkg-plist
+++ b/devel/p5-FileHandle-Unget/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle/Unget/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle/Unget
@dirrm %%SITE_PERL%%/FileHandle
-@unexec rmdir %D/%%SITE_PERL%%/FileHandle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/FileHandle
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FileHandle
diff --git a/devel/p5-Filesys-Statvfs_Df/pkg-plist b/devel/p5-Filesys-Statvfs_Df/pkg-plist
index a1cbc6b5d3a0..d67816cfd381 100644
--- a/devel/p5-Filesys-Statvfs_Df/pkg-plist
+++ b/devel/p5-Filesys-Statvfs_Df/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs/Statvfs.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs/Statvfs.bs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Filesys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Filesys 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Statvfs
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys
+@dirrmtry %%SITE_PERL%%/Filesys
diff --git a/devel/p5-Filesys-Virtual-Plain/pkg-plist b/devel/p5-Filesys-Virtual-Plain/pkg-plist
index f3a226fd10f7..6a9a70a6a715 100644
--- a/devel/p5-Filesys-Virtual-Plain/pkg-plist
+++ b/devel/p5-Filesys-Virtual-Plain/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Filesys/Virtual/Plain.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual/Plain/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual/Plain
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
@dirrm %%SITE_PERL%%/Filesys/Virtual
-@unexec rmdir %D/%%SITE_PERL%%/Filesys 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Filesys
diff --git a/devel/p5-Filesys-Virtual/pkg-plist b/devel/p5-Filesys-Virtual/pkg-plist
index 4bec0baf3e24..f906650444e3 100644
--- a/devel/p5-Filesys-Virtual/pkg-plist
+++ b/devel/p5-Filesys-Virtual/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Filesys/Virtual.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Filesys 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/Virtual
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys
+@dirrmtry %%SITE_PERL%%/Filesys
diff --git a/devel/p5-Geo-ShapeFile/pkg-plist b/devel/p5-Geo-ShapeFile/pkg-plist
index 4d0dc28eda72..820743315b0d 100644
--- a/devel/p5-Geo-ShapeFile/pkg-plist
+++ b/devel/p5-Geo-ShapeFile/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Geo/ShapeFile/Shape.pm
%%SITE_PERL%%/mach/auto/Geo/ShapeFile/.packlist
@dirrm %%SITE_PERL%%/mach/auto/Geo/ShapeFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geo/ShapeFile 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/Geo/ShapeFile
+@dirrmtry %%SITE_PERL%%/Geo
diff --git a/devel/p5-Getopt-ArgvFile/pkg-plist b/devel/p5-Getopt-ArgvFile/pkg-plist
index 4ced285fddf2..9094fa3c9d09 100644
--- a/devel/p5-Getopt-ArgvFile/pkg-plist
+++ b/devel/p5-Getopt-ArgvFile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Getopt/ArgvFile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/ArgvFile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/ArgvFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt
+@dirrmtry %%SITE_PERL%%/Getopt
diff --git a/devel/p5-Getopt-Declare/pkg-plist b/devel/p5-Getopt-Declare/pkg-plist
index 53a66fec6a15..3fb72f57300d 100644
--- a/devel/p5-Getopt-Declare/pkg-plist
+++ b/devel/p5-Getopt-Declare/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Declare/.packlist
%%SITE_PERL%%/Getopt/Declare.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Declare
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt
+@dirrmtry %%SITE_PERL%%/Getopt
diff --git a/devel/p5-Getopt-Long/pkg-plist b/devel/p5-Getopt-Long/pkg-plist
index 35535de40756..e5ad9f8706bd 100644
--- a/devel/p5-Getopt-Long/pkg-plist
+++ b/devel/p5-Getopt-Long/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/newgetopt.pl
%%SITE_PERL%%/Getopt/Long.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Long
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt
+@dirrmtry %%SITE_PERL%%/Getopt
diff --git a/devel/p5-Getopt-Popt/pkg-plist b/devel/p5-Getopt-Popt/pkg-plist
index 306f31361d6c..0ecc07bba9ba 100644
--- a/devel/p5-Getopt-Popt/pkg-plist
+++ b/devel/p5-Getopt-Popt/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Popt/Popt.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Popt/Popt.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Popt
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Getopt 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Getopt
diff --git a/devel/p5-Glib2/pkg-plist b/devel/p5-Glib2/pkg-plist
index 8c6ed15a206d..3bfa32b33c49 100644
--- a/devel/p5-Glib2/pkg-plist
+++ b/devel/p5-Glib2/pkg-plist
@@ -40,4 +40,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Glib/Install
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Glib/Object
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Glib/Param
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Glib 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Glib
diff --git a/devel/p5-Gnome2-GConf/pkg-plist b/devel/p5-Gnome2-GConf/pkg-plist
index eddb85e8586a..4c9402f5bb00 100644
--- a/devel/p5-Gnome2-GConf/pkg-plist
+++ b/devel/p5-Gnome2-GConf/pkg-plist
@@ -18,5 +18,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf/Install
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/GConf
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/GConf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2
diff --git a/devel/p5-Heap-Simple-Perl/pkg-plist b/devel/p5-Heap-Simple-Perl/pkg-plist
index 91349924ce17..976068101d02 100644
--- a/devel/p5-Heap-Simple-Perl/pkg-plist
+++ b/devel/p5-Heap-Simple-Perl/pkg-plist
@@ -35,10 +35,10 @@
%%SITE_PERL%%/auto/Heap/Simple/Perl/values.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/Perl/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/Perl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap
@dirrm %%SITE_PERL%%/auto/Heap/Simple/Perl
-@unexec rmdir %D/%%SITE_PERL%%/auto/Heap/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Heap 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Heap/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Heap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Heap/Simple
+@dirrmtry %%SITE_PERL%%/auto/Heap
+@dirrmtry %%SITE_PERL%%/Heap/Simple
+@dirrmtry %%SITE_PERL%%/Heap
diff --git a/devel/p5-Heap-Simple-XS/pkg-plist b/devel/p5-Heap-Simple-XS/pkg-plist
index f21a63488854..f1e23568cf5b 100644
--- a/devel/p5-Heap-Simple-XS/pkg-plist
+++ b/devel/p5-Heap-Simple-XS/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/XS/XS.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/XS/XS.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/XS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Heap/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Heap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Heap/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Heap
diff --git a/devel/p5-Heap-Simple/pkg-plist b/devel/p5-Heap-Simple/pkg-plist
index 8f6735b0cb5f..d53bc36cb5b6 100644
--- a/devel/p5-Heap-Simple/pkg-plist
+++ b/devel/p5-Heap-Simple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Heap/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Heap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap
+@dirrmtry %%SITE_PERL%%/Heap
diff --git a/devel/p5-Heap/pkg-plist b/devel/p5-Heap/pkg-plist
index 95e19806b0ce..666e2f7703bf 100644
--- a/devel/p5-Heap/pkg-plist
+++ b/devel/p5-Heap/pkg-plist
@@ -22,7 +22,7 @@
%%SITE_PERL%%/auto/Heap/Fibonacci/autosplit.ix
%%SITE_PERL%%/auto/Heap/autosplit.ix
@dirrm %%SITE_PERL%%/Heap/Elem
-@unexec rmdir %D/%%SITE_PERL%%/Heap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Heap
@dirrm %%SITE_PERL%%/auto/Heap/Binary
@dirrm %%SITE_PERL%%/auto/Heap/Binomial
@dirrm %%SITE_PERL%%/auto/Heap/Fibonacci
@@ -32,6 +32,6 @@
@dirrm %%SITE_PERL%%/auto/Heap/Elem/RefRev
@dirrm %%SITE_PERL%%/auto/Heap/Elem/Str
@dirrm %%SITE_PERL%%/auto/Heap/Elem/StrRev
-@unexec rmdir %D/%%SITE_PERL%%/auto/Heap/Elem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Heap 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Heap/Elem
+@dirrmtry %%SITE_PERL%%/auto/Heap
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Heap
diff --git a/devel/p5-Hook-LexWrap/pkg-plist b/devel/p5-Hook-LexWrap/pkg-plist
index ad3e9269aa8e..b1a058556041 100644
--- a/devel/p5-Hook-LexWrap/pkg-plist
+++ b/devel/p5-Hook-LexWrap/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hook/LexWrap/.packlist
%%SITE_PERL%%/Hook/LexWrap.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hook/LexWrap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hook 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Hook 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hook
+@dirrmtry %%SITE_PERL%%/Hook
diff --git a/devel/p5-IO-All/pkg-plist b/devel/p5-IO-All/pkg-plist
index e918c4ee0f65..5bd774891148 100644
--- a/devel/p5-IO-All/pkg-plist
+++ b/devel/p5-IO-All/pkg-plist
@@ -13,6 +13,6 @@
%%SITE_PERL%%/IO/All/Temp.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/All/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/All
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
@dirrm %%SITE_PERL%%/IO/All
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Capture/pkg-plist b/devel/p5-IO-Capture/pkg-plist
index 15c98e80cff4..f7c50315b3e6 100644
--- a/devel/p5-IO-Capture/pkg-plist
+++ b/devel/p5-IO-Capture/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/IO/Capture/Stdout.pm
%%SITE_PERL%%/IO/Capture/Tie_STDx.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Capture/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Capture 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO/Capture 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Capture
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO/Capture
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-CaptureOutput/pkg-plist b/devel/p5-IO-CaptureOutput/pkg-plist
index ac96295247da..b9427f81d7de 100644
--- a/devel/p5-IO-CaptureOutput/pkg-plist
+++ b/devel/p5-IO-CaptureOutput/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IO/CaptureOutput.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CaptureOutput/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CaptureOutput
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Digest/pkg-plist b/devel/p5-IO-Digest/pkg-plist
index dc6ff047b7e9..43ed4d7ef442 100644
--- a/devel/p5-IO-Digest/pkg-plist
+++ b/devel/p5-IO-Digest/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IO/Digest.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Digest/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Digest
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-KQueue/pkg-plist b/devel/p5-IO-KQueue/pkg-plist
index 4a996e118a2f..f469f397ab68 100644
--- a/devel/p5-IO-KQueue/pkg-plist
+++ b/devel/p5-IO-KQueue/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/IO/KQueue.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/KQueue/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/KQueue/KQueue.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/KQueue/KQueue.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/KQueue
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/devel/p5-IO-LockedFile/pkg-plist b/devel/p5-IO-LockedFile/pkg-plist
index f280fb6b072e..05cc8934e960 100644
--- a/devel/p5-IO-LockedFile/pkg-plist
+++ b/devel/p5-IO-LockedFile/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/IO/LockedFile.pm
%%SITE_PERL%%/IO/LockedFile/Flock.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/LockedFile/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/LockedFile 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO/LockedFile 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/LockedFile
+@dirrmtry %%SITE_PERL%%/IO/LockedFile
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Multiplex/pkg-plist b/devel/p5-IO-Multiplex/pkg-plist
index 98bf10d62f42..b9dbb5529aa5 100644
--- a/devel/p5-IO-Multiplex/pkg-plist
+++ b/devel/p5-IO-Multiplex/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Multiplex/.packlist
%%SITE_PERL%%/IO/Multiplex.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Multiplex
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-NestedCapture/pkg-plist b/devel/p5-IO-NestedCapture/pkg-plist
index 7773cd78201b..f48e6257f357 100644
--- a/devel/p5-IO-NestedCapture/pkg-plist
+++ b/devel/p5-IO-NestedCapture/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/IO/NestedCapture.pm
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Pager/pkg-plist b/devel/p5-IO-Pager/pkg-plist
index 44941763c479..91dae91f0c54 100644
--- a/devel/p5-IO-Pager/pkg-plist
+++ b/devel/p5-IO-Pager/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/IO/Pager/Unbuffered.pm
%%SITE_PERL%%/IO/Pager/Page.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Pager/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO/Pager 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO/Pager
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Prompt/pkg-plist b/devel/p5-IO-Prompt/pkg-plist
index a296e30ba5dd..06ae6014493b 100644
--- a/devel/p5-IO-Prompt/pkg-plist
+++ b/devel/p5-IO-Prompt/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IO/Prompt.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Prompt/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Prompt
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-String/pkg-plist b/devel/p5-IO-String/pkg-plist
index 92952e7df397..d0a0a9d891bd 100644
--- a/devel/p5-IO-String/pkg-plist
+++ b/devel/p5-IO-String/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IO/String.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/String/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/String
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Tee/pkg-plist b/devel/p5-IO-Tee/pkg-plist
index d6ed8fa25d50..e621b952ccca 100644
--- a/devel/p5-IO-Tee/pkg-plist
+++ b/devel/p5-IO-Tee/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IO/Tee.pm
@unexec rm %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee/.packlist 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tee
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-Tty/pkg-plist b/devel/p5-IO-Tty/pkg-plist
index c8704f849661..5f5747ef9ca9 100644
--- a/devel/p5-IO-Tty/pkg-plist
+++ b/devel/p5-IO-Tty/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty.pm
%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty/Constant.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Tty
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Tty
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/devel/p5-IO-Util/pkg-plist b/devel/p5-IO-Util/pkg-plist
index f1783865a387..95a7bac4c34c 100644
--- a/devel/p5-IO-Util/pkg-plist
+++ b/devel/p5-IO-Util/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util/.packlist
%%SITE_PERL%%/IO/Util.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Util/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/devel/p5-IO-stringy/pkg-plist b/devel/p5-IO-stringy/pkg-plist
index 97237c2f54ee..26266fea7781 100644
--- a/devel/p5-IO-stringy/pkg-plist
+++ b/devel/p5-IO-stringy/pkg-plist
@@ -7,6 +7,6 @@
%%SITE_PERL%%/IO/Wrap.pm
%%SITE_PERL%%/IO/WrapTie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stringy/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IO
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stringy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
diff --git a/devel/p5-IPC-Cmd/pkg-plist b/devel/p5-IPC-Cmd/pkg-plist
index 0caf2047d8f0..350ecc1fe358 100644
--- a/devel/p5-IPC-Cmd/pkg-plist
+++ b/devel/p5-IPC-Cmd/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IPC/Cmd.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cmd/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cmd 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cmd
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-DirQueue/pkg-plist b/devel/p5-IPC-DirQueue/pkg-plist
index f0025a766e25..7111194a53cb 100644
--- a/devel/p5-IPC-DirQueue/pkg-plist
+++ b/devel/p5-IPC-DirQueue/pkg-plist
@@ -8,7 +8,7 @@ bin/dq-submit
%%SITE_PERL%%/IPC/DirQueue/IndexServer.pm
%%SITE_PERL%%/IPC/DirQueue/Job.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/DirQueue/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/DirQueue 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IPC/DirQueue 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/DirQueue
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/IPC/DirQueue
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-Locker/pkg-plist b/devel/p5-IPC-Locker/pkg-plist
index d2cc1d153455..f9c8fa1668bc 100644
--- a/devel/p5-IPC-Locker/pkg-plist
+++ b/devel/p5-IPC-Locker/pkg-plist
@@ -7,7 +7,7 @@ bin/pidstatd
%%SITE_PERL%%/IPC/PidStat.pm
%%SITE_PERL%%/IPC/PidStat/PidServer.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Locker
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
@dirrm %%SITE_PERL%%/IPC/Locker
@dirrm %%SITE_PERL%%/IPC/PidStat
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-MM/pkg-plist b/devel/p5-IPC-MM/pkg-plist
index 653482d0c1b4..d4168c43975c 100644
--- a/devel/p5-IPC-MM/pkg-plist
+++ b/devel/p5-IPC-MM/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/MM.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/MM
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
diff --git a/devel/p5-IPC-Run/pkg-plist b/devel/p5-IPC-Run/pkg-plist
index e465af277b74..e2d23c8c1ba1 100644
--- a/devel/p5-IPC-Run/pkg-plist
+++ b/devel/p5-IPC-Run/pkg-plist
@@ -7,6 +7,6 @@
%%SITE_PERL%%/IPC/Run/Win32Pump.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
@dirrm %%SITE_PERL%%/IPC/Run
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-IPC-Run3/pkg-plist b/devel/p5-IPC-Run3/pkg-plist
index 365fcbf53e5d..88fc3dbf3d30 100644
--- a/devel/p5-IPC-Run3/pkg-plist
+++ b/devel/p5-IPC-Run3/pkg-plist
@@ -7,6 +7,6 @@
%%SITE_PERL%%/IPC/Run3/ProfReporter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run3/.packlist
@dirrm %%SITE_PERL%%/IPC/Run3
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/IPC
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Run3
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
diff --git a/devel/p5-IPC-ShareLite/pkg-plist b/devel/p5-IPC-ShareLite/pkg-plist
index b051b22b9ad6..66745c599572 100644
--- a/devel/p5-IPC-ShareLite/pkg-plist
+++ b/devel/p5-IPC-ShareLite/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/ShareLite.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/ShareLite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IPC
diff --git a/devel/p5-IPC-SharedCache/pkg-plist b/devel/p5-IPC-SharedCache/pkg-plist
index 9cbfcf5e82b6..3c953d378765 100644
--- a/devel/p5-IPC-SharedCache/pkg-plist
+++ b/devel/p5-IPC-SharedCache/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IPC/SharedCache.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/SharedCache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC
+@dirrmtry %%SITE_PERL%%/IPC
diff --git a/devel/p5-Inline-ASM/pkg-plist b/devel/p5-Inline-ASM/pkg-plist
index 324673a9938f..65c7906f167a 100644
--- a/devel/p5-Inline-ASM/pkg-plist
+++ b/devel/p5-Inline-ASM/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Inline/ASM.pm
%%SITE_PERL%%/Inline/ASM.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/ASM
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Inline
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
diff --git a/devel/p5-Inline-CPP/pkg-plist b/devel/p5-Inline-CPP/pkg-plist
index fb0a878b95ee..94645c58578e 100644
--- a/devel/p5-Inline-CPP/pkg-plist
+++ b/devel/p5-Inline-CPP/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/CPP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/CPP
@dirrm %%SITE_PERL%%/Inline/CPP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
+@dirrmtry %%SITE_PERL%%/Inline
diff --git a/devel/p5-Inline-Filters/pkg-plist b/devel/p5-Inline-Filters/pkg-plist
index 91460b47b50b..106bf144e75c 100644
--- a/devel/p5-Inline-Filters/pkg-plist
+++ b/devel/p5-Inline-Filters/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Inline/Filters.pm
%%SITE_PERL%%/Inline/Filters.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Filters
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Inline
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
diff --git a/devel/p5-Inline-Tcl/pkg-plist b/devel/p5-Inline-Tcl/pkg-plist
index 74e41c6de495..b24daa401e3a 100644
--- a/devel/p5-Inline-Tcl/pkg-plist
+++ b/devel/p5-Inline-Tcl/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/Tcl.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl/Tcl.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Tcl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Inline
diff --git a/devel/p5-Inline/pkg-plist b/devel/p5-Inline/pkg-plist
index 3f43a11216d8..cf9355d8e799 100644
--- a/devel/p5-Inline/pkg-plist
+++ b/devel/p5-Inline/pkg-plist
@@ -117,6 +117,6 @@
@dirrm %%SITE_PERL%%/auto/Inline/denter
@dirrm %%SITE_PERL%%/Inline/MakeMaker
@dirrm %%SITE_PERL%%/Inline/C
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Inline 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline
+@dirrmtry %%SITE_PERL%%/auto/Inline
+@dirrmtry %%SITE_PERL%%/Inline
diff --git a/devel/p5-List-Cycle/pkg-plist b/devel/p5-List-Cycle/pkg-plist
index 7e49d64928c7..f13f1344e210 100644
--- a/devel/p5-List-Cycle/pkg-plist
+++ b/devel/p5-List-Cycle/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/List/Cycle.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Cycle
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
+@dirrmtry %%SITE_PERL%%/List
diff --git a/devel/p5-List-Group/pkg-plist b/devel/p5-List-Group/pkg-plist
index 04f73a464c37..c054727b5c6d 100644
--- a/devel/p5-List-Group/pkg-plist
+++ b/devel/p5-List-Group/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/List/Group.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Group/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/List/Group
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/List 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/List
@dirrm %%SITE_PERL%%/List
diff --git a/devel/p5-Locale-Maketext-Fuzzy/pkg-plist b/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
index e49785bcb1fa..8900fdb01738 100644
--- a/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
+++ b/devel/p5-Locale-Maketext-Fuzzy/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Fuzzy/.packlist
%%SITE_PERL%%/Locale/Maketext/Fuzzy.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Fuzzy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale/Maketext 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
+@dirrmtry %%SITE_PERL%%/Locale/Maketext
diff --git a/devel/p5-Locale-Maketext-Gettext/pkg-plist b/devel/p5-Locale-Maketext-Gettext/pkg-plist
index a69217516d50..eb5c3d4a69c3 100644
--- a/devel/p5-Locale-Maketext-Gettext/pkg-plist
+++ b/devel/p5-Locale-Maketext-Gettext/pkg-plist
@@ -5,5 +5,5 @@ bin/maketext
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext-Gettext/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext-Gettext
@dirrm %%SITE_PERL%%/Locale/Maketext/Gettext
-@unexec rmdir %D/%%SITE_PERL%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Locale/Maketext
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Locale-Maketext-Lexicon/pkg-plist b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
index f6e636e46d54..a1809a933cb7 100644
--- a/devel/p5-Locale-Maketext-Lexicon/pkg-plist
+++ b/devel/p5-Locale-Maketext-Lexicon/pkg-plist
@@ -9,9 +9,9 @@ bin/xgettext.pl
%%SITE_PERL%%/Locale/Maketext/Lexicon/Tie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Lexicon
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
@dirrm %%SITE_PERL%%/Locale/Maketext/Lexicon
-@unexec rmdir %D/%%SITE_PERL%%/Locale/Maketext/Extract 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Locale/Maketext/Extract
+@dirrmtry %%SITE_PERL%%/Locale/Maketext
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Locale-Maketext-Simple/pkg-plist b/devel/p5-Locale-Maketext-Simple/pkg-plist
index fe20a0716ec9..109f59358f81 100644
--- a/devel/p5-Locale-Maketext-Simple/pkg-plist
+++ b/devel/p5-Locale-Maketext-Simple/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Locale/Maketext/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale/Maketext 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/Maketext
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
+@dirrmtry %%SITE_PERL%%/Locale/Maketext
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Locale-Maketext/pkg-plist b/devel/p5-Locale-Maketext/pkg-plist
index afe22ce1dc05..e35891602ae6 100644
--- a/devel/p5-Locale-Maketext/pkg-plist
+++ b/devel/p5-Locale-Maketext/pkg-plist
@@ -6,4 +6,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale-Maketext
@dirrm %%SITE_PERL%%/Locale/Maketext
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Locale-gettext/pkg-plist b/devel/p5-Locale-gettext/pkg-plist
index bad07b4fc1b8..199f9bd4a136 100644
--- a/devel/p5-Locale-gettext/pkg-plist
+++ b/devel/p5-Locale-gettext/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext/gettext.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Locale/gettext.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/gettext
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Locale 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Locale
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale
diff --git a/devel/p5-Locale-libintl/pkg-plist b/devel/p5-Locale-libintl/pkg-plist
index 417b9ec13509..16819819417a 100644
--- a/devel/p5-Locale-libintl/pkg-plist
+++ b/devel/p5-Locale-libintl/pkg-plist
@@ -153,4 +153,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libintl-perl
@dirrm %%SITE_PERL%%/Locale/RecodeData
@dirrm %%SITE_PERL%%/Locale/Recode
-@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Locale
diff --git a/devel/p5-Log-Accounting-SVK/pkg-plist b/devel/p5-Log-Accounting-SVK/pkg-plist
index 56f18b581947..ec751489c244 100644
--- a/devel/p5-Log-Accounting-SVK/pkg-plist
+++ b/devel/p5-Log-Accounting-SVK/pkg-plist
@@ -2,7 +2,7 @@ bin/svk-accounting.pl
%%SITE_PERL%%/Log/Accounting/SVK.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting/SVK/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting/SVK
-@unexec rmdir %D/%%SITE_PERL%%/Log/Accounting 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Log/Accounting
+@dirrmtry %%SITE_PERL%%/Log
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting 2>/dev/null ||true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null ||true
diff --git a/devel/p5-Log-Agent/pkg-plist b/devel/p5-Log-Agent/pkg-plist
index 538420361a4b..0005029e4aa2 100644
--- a/devel/p5-Log-Agent/pkg-plist
+++ b/devel/p5-Log-Agent/pkg-plist
@@ -54,9 +54,9 @@
@dirrm %%SITE_PERL%%/Log/Agent/File
@dirrm %%SITE_PERL%%/Log/Agent/Driver
@dirrm %%SITE_PERL%%/Log/Agent/Channel
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Log/Agent 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log/Agent 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/auto/Log/Agent
+@dirrmtry %%SITE_PERL%%/auto/Log
+@dirrmtry %%SITE_PERL%%/Log/Agent
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Dispatch-FileRotate/pkg-plist b/devel/p5-Log-Dispatch-FileRotate/pkg-plist
index 4c5e2f469841..8e1920799e1c 100644
--- a/devel/p5-Log-Dispatch-FileRotate/pkg-plist
+++ b/devel/p5-Log-Dispatch-FileRotate/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Log/Dispatch/FileRotate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/FileRotate/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/FileRotate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log
diff --git a/devel/p5-Log-Dispatch-Perl/pkg-plist b/devel/p5-Log-Dispatch-Perl/pkg-plist
index 01cfa23bcaf0..864ef3f08a97 100644
--- a/devel/p5-Log-Dispatch-Perl/pkg-plist
+++ b/devel/p5-Log-Dispatch-Perl/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Log/Dispatch/Perl.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Perl/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Perl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Log/Dispatch 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log/Dispatch
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Log
diff --git a/devel/p5-Log-Dispatch/pkg-plist b/devel/p5-Log-Dispatch/pkg-plist
index 8f695beb32b8..1c58d3bea191 100644
--- a/devel/p5-Log-Dispatch/pkg-plist
+++ b/devel/p5-Log-Dispatch/pkg-plist
@@ -15,4 +15,4 @@
@dirrm %%SITE_PERL%%/Log/Dispatch/File
@dirrm %%SITE_PERL%%/Log/Dispatch/Email
@dirrm %%SITE_PERL%%/Log/Dispatch
-@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-Log4perl/pkg-plist b/devel/p5-Log-Log4perl/pkg-plist
index 9ce6d544ed6a..5e26ceceab36 100644
--- a/devel/p5-Log-Log4perl/pkg-plist
+++ b/devel/p5-Log-Log4perl/pkg-plist
@@ -43,11 +43,11 @@
%%SITE_PERL%%/Log/Log4perl/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Log4perl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log
@dirrm %%SITE_PERL%%/Log/Log4perl/Layout
@dirrm %%SITE_PERL%%/Log/Log4perl/JavaMap
@dirrm %%SITE_PERL%%/Log/Log4perl/Filter
@dirrm %%SITE_PERL%%/Log/Log4perl/Config
@dirrm %%SITE_PERL%%/Log/Log4perl/Appender
@dirrm %%SITE_PERL%%/Log/Log4perl
-@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Log
diff --git a/devel/p5-Log-TraceMessages/pkg-plist b/devel/p5-Log-TraceMessages/pkg-plist
index bbb321fe0f34..47dc29952a50 100644
--- a/devel/p5-Log-TraceMessages/pkg-plist
+++ b/devel/p5-Log-TraceMessages/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages/.packlist
%%SITE_PERL%%/auto/Log/TraceMessages/autosplit.ix
@dirrm %%SITE_PERL%%/auto/Log/TraceMessages
-@unexec rmdir %D/%%SITE_PERL%%/auto/Log 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Log
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/TraceMessages
-@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/devel/p5-Mac-FileSpec-Unixish/pkg-plist b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
index c2b9c92d76ab..dd5e90fee309 100644
--- a/devel/p5-Mac-FileSpec-Unixish/pkg-plist
+++ b/devel/p5-Mac-FileSpec-Unixish/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Mac/FileSpec/Unixish.pm
%%SITE_PERL%%/Mac/FileSpec/unixish_guts_test.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec/Unixish
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mac/FileSpec 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Mac 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/FileSpec
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac
+@dirrmtry %%SITE_PERL%%/Mac/FileSpec
+@dirrmtry %%SITE_PERL%%/Mac
diff --git a/devel/p5-Memoize/pkg-plist b/devel/p5-Memoize/pkg-plist
index e8e987000b7b..22e2d265e19c 100644
--- a/devel/p5-Memoize/pkg-plist
+++ b/devel/p5-Memoize/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/Memoize/SDBM_File.pm
%%SITE_PERL%%/Memoize/ExpireFile.pm
%%SITE_PERL%%/Memoize/NDBM_File.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Memoize 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize
+@dirrmtry %%SITE_PERL%%/Memoize
diff --git a/devel/p5-Module-Build/pkg-plist b/devel/p5-Module-Build/pkg-plist
index 43f488fa408e..fe97a9bfdb9e 100644
--- a/devel/p5-Module-Build/pkg-plist
+++ b/devel/p5-Module-Build/pkg-plist
@@ -23,4 +23,4 @@ bin/config_data
%%SITE_PERL%%/Module/Build/PodParser.pm
@dirrm %%SITE_PERL%%/Module/Build/Platform
@dirrm %%SITE_PERL%%/Module/Build
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-CoreList/pkg-plist b/devel/p5-Module-CoreList/pkg-plist
index 3835382f0fe1..d73f6152508a 100644
--- a/devel/p5-Module-CoreList/pkg-plist
+++ b/devel/p5-Module-CoreList/pkg-plist
@@ -1,6 +1,6 @@
bin/corelist
%%SITE_PERL%%/Module/CoreList.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CoreList/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CoreList 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/CoreList
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Find/pkg-plist b/devel/p5-Module-Find/pkg-plist
index d0f4b712bc2a..c81adda17e36 100644
--- a/devel/p5-Module-Find/pkg-plist
+++ b/devel/p5-Module-Find/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Find/.packlist
%%SITE_PERL%%/Module/Find.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Find
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
diff --git a/devel/p5-Module-Info/pkg-plist b/devel/p5-Module-Info/pkg-plist
index cfd28515dff2..25d343d5a1ee 100644
--- a/devel/p5-Module-Info/pkg-plist
+++ b/devel/p5-Module-Info/pkg-plist
@@ -5,7 +5,7 @@ bin/pfunc
%%SITE_PERL%%/Module/Info.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module
@dirrm %%SITE_PERL%%/B/Module
-@unexec rmdir %D/%%SITE_PERL%%/B 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/B
diff --git a/devel/p5-Module-Install/pkg-plist b/devel/p5-Module-Install/pkg-plist
index da885b5cde2f..62877a31d11d 100644
--- a/devel/p5-Module-Install/pkg-plist
+++ b/devel/p5-Module-Install/pkg-plist
@@ -38,6 +38,6 @@
@dirrm %%SITE_PERL%%/Module/Install/Admin
@dirrm %%SITE_PERL%%/Module/Install
@dirrm %%SITE_PERL%%/inc/Module
-@unexec rmdir %D/%%SITE_PERL%%/inc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/inc
+@dirrmtry %%SITE_PERL%%/Module
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
diff --git a/devel/p5-Module-Load-Conditional/pkg-plist b/devel/p5-Module-Load-Conditional/pkg-plist
index 4d8b11c99e0d..c11a67d29a5e 100644
--- a/devel/p5-Module-Load-Conditional/pkg-plist
+++ b/devel/p5-Module-Load-Conditional/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Module/Load/Conditional.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load/Conditional/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load/Conditional
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module/Load 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module/Load
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Load/pkg-plist b/devel/p5-Module-Load/pkg-plist
index dfc19a8e517e..c86dd019a963 100644
--- a/devel/p5-Module-Load/pkg-plist
+++ b/devel/p5-Module-Load/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Module/Load.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Load
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Pluggable-Fast/pkg-plist b/devel/p5-Module-Pluggable-Fast/pkg-plist
index 1b0e5ae664c4..ac312f6068cf 100644
--- a/devel/p5-Module-Pluggable-Fast/pkg-plist
+++ b/devel/p5-Module-Pluggable-Fast/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Module/Pluggable/Fast.pm
-@unexec rmdir %D/%%SITE_PERL%%/Module/Pluggable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module/Pluggable
+@dirrmtry %%SITE_PERL%%/Module
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Fast/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Fast
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
diff --git a/devel/p5-Module-Pluggable-Ordered/pkg-plist b/devel/p5-Module-Pluggable-Ordered/pkg-plist
index ef09091ea739..9a9d2a89fc44 100644
--- a/devel/p5-Module-Pluggable-Ordered/pkg-plist
+++ b/devel/p5-Module-Pluggable-Ordered/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Module/Pluggable/Ordered.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Ordered/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Ordered 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module/Pluggable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable/Ordered
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Pluggable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module/Pluggable
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Pluggable/pkg-plist b/devel/p5-Module-Pluggable/pkg-plist
index 1754a5d67f86..7e61cea53c19 100644
--- a/devel/p5-Module-Pluggable/pkg-plist
+++ b/devel/p5-Module-Pluggable/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Module/Pluggable.pm
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Refresh/pkg-plist b/devel/p5-Module-Refresh/pkg-plist
index 4c9f01d07e3f..a2444b03ca0f 100644
--- a/devel/p5-Module-Refresh/pkg-plist
+++ b/devel/p5-Module-Refresh/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Module/Refresh.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Refresh/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Refresh
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Release/pkg-plist b/devel/p5-Module-Release/pkg-plist
index a946cd3968f3..eab14a411c59 100644
--- a/devel/p5-Module-Release/pkg-plist
+++ b/devel/p5-Module-Release/pkg-plist
@@ -2,4 +2,4 @@ bin/release
%%SITE_PERL%%/Module/Release.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/release/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/release
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Reload-Sel/pkg-plist b/devel/p5-Module-Reload-Sel/pkg-plist
index 64cb37c4943c..3c9fbe677fc4 100644
--- a/devel/p5-Module-Reload-Sel/pkg-plist
+++ b/devel/p5-Module-Reload-Sel/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Module/Reload/Selective.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload/Selective/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload/Selective
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module/Reload 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module/Reload
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Reload/pkg-plist b/devel/p5-Module-Reload/pkg-plist
index fb89618a353f..8568dc433e9a 100644
--- a/devel/p5-Module-Reload/pkg-plist
+++ b/devel/p5-Module-Reload/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Module/Reload.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Reload
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-ScanDeps/pkg-plist b/devel/p5-Module-ScanDeps/pkg-plist
index beb4c7ca26cf..23de032cbe1f 100644
--- a/devel/p5-Module-ScanDeps/pkg-plist
+++ b/devel/p5-Module-ScanDeps/pkg-plist
@@ -4,5 +4,5 @@ bin/scandeps.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/ScanDeps/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/ScanDeps
@dirrm %%SITE_PERL%%/Module/ScanDeps
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
diff --git a/devel/p5-Module-Starter-PBP/pkg-plist b/devel/p5-Module-Starter-PBP/pkg-plist
index 5c7472650556..a5a4f8309c94 100644
--- a/devel/p5-Module-Starter-PBP/pkg-plist
+++ b/devel/p5-Module-Starter-PBP/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Module/Starter/PBP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter/PBP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter/PBP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module/Starter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
+@dirrmtry %%SITE_PERL%%/Module/Starter
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/p5-Module-Starter/pkg-plist b/devel/p5-Module-Starter/pkg-plist
index 0a5081cc9809..d5933784ecf0 100644
--- a/devel/p5-Module-Starter/pkg-plist
+++ b/devel/p5-Module-Starter/pkg-plist
@@ -7,5 +7,5 @@ bin/module-starter
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Starter
@dirrm %%SITE_PERL%%/Module/Starter/Plugin
@dirrm %%SITE_PERL%%/Module/Starter
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module
diff --git a/devel/p5-Net-DBus/pkg-plist b/devel/p5-Net-DBus/pkg-plist
index 113137f9d02e..c42ae4ad71a9 100644
--- a/devel/p5-Net-DBus/pkg-plist
+++ b/devel/p5-Net-DBus/pkg-plist
@@ -34,5 +34,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus/Tutorial
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/DBus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/devel/p5-OLE-Storage_Lite/pkg-plist b/devel/p5-OLE-Storage_Lite/pkg-plist
index 5c53d35ef9f7..4676c8cc048a 100644
--- a/devel/p5-OLE-Storage_Lite/pkg-plist
+++ b/devel/p5-OLE-Storage_Lite/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/OLE/Storage_Lite.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE/Storage_Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/OLE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE
+@dirrmtry %%SITE_PERL%%/OLE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OLE
diff --git a/devel/p5-OOTools/pkg-plist b/devel/p5-OOTools/pkg-plist
index b35ae8f3131b..e20ed979fcc0 100644
--- a/devel/p5-OOTools/pkg-plist
+++ b/devel/p5-OOTools/pkg-plist
@@ -9,6 +9,6 @@
%%SITE_PERL%%/Package/props.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/OOTools/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OOTools
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Object 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Package 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/Object
+@dirrmtry %%SITE_PERL%%/Package
diff --git a/devel/p5-Object-Accessor/pkg-plist b/devel/p5-Object-Accessor/pkg-plist
index 0ad36cd9b0d6..6b237093dd6a 100644
--- a/devel/p5-Object-Accessor/pkg-plist
+++ b/devel/p5-Object-Accessor/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Accessor/.packlist
%%SITE_PERL%%/Object/Accessor.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Accessor
-@unexec rmdir %D/%%SITE_PERL%%/Object 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Object
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object
diff --git a/devel/p5-Object-InsideOut/pkg-plist b/devel/p5-Object-InsideOut/pkg-plist
index 27c312935acf..796c1f5c6636 100644
--- a/devel/p5-Object-InsideOut/pkg-plist
+++ b/devel/p5-Object-InsideOut/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Object/InsideOut.pm
%%SITE_PERL%%/Object/InsideOut/Results.pm
%%SITE_PERL%%/Object/InsideOut/Util.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/InsideOut 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Object/InsideOut 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Object 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/InsideOut
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object
+@dirrmtry %%SITE_PERL%%/Object/InsideOut
+@dirrmtry %%SITE_PERL%%/Object
diff --git a/devel/p5-Object-MultiType/pkg-plist b/devel/p5-Object-MultiType/pkg-plist
index 9d6a5dc9c306..58b2f80845b6 100644
--- a/devel/p5-Object-MultiType/pkg-plist
+++ b/devel/p5-Object-MultiType/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Object/MultiType.pm
@dirrm %%SITE_PERL%%/mach/auto/Object/MultiType
@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Object 2>/dev/null
-@unexec rmdir %D/%SITE_PERL%%/%%PERL_ARCH%%/Object 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Object 2>/dev/null || true
+@dirrmtry %SITE_PERL%%/%%PERL_ARCH%%/Object
+@dirrmtry %%SITE_PERL%%/Object
diff --git a/devel/p5-Object-Realize-Later/pkg-plist b/devel/p5-Object-Realize-Later/pkg-plist
index 049eecb7b7ca..d0b1a3aa62dc 100644
--- a/devel/p5-Object-Realize-Later/pkg-plist
+++ b/devel/p5-Object-Realize-Later/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Object/Realize/Later.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Realize/Later
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Realize
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object
@dirrm %%SITE_PERL%%/Object/Realize
-@unexec rmdir %D/%%SITE_PERL%%/Object 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Object
diff --git a/devel/p5-Object-Signature/pkg-plist b/devel/p5-Object-Signature/pkg-plist
index 1d782d3ae9cf..38757ba5eaae 100644
--- a/devel/p5-Object-Signature/pkg-plist
+++ b/devel/p5-Object-Signature/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Signature/.packlist
%%SITE_PERL%%/Object/Signature.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Signature 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Object 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Object 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/Signature
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object
+@dirrmtry %%SITE_PERL%%/Object
diff --git a/devel/p5-P4-Client/pkg-plist b/devel/p5-P4-Client/pkg-plist
index 71e7ec929212..e726c44499fc 100644
--- a/devel/p5-P4-Client/pkg-plist
+++ b/devel/p5-P4-Client/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/P4/Client/Client.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/P4/Client/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/P4/Client
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/P4 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/P4 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/P4
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/P4
diff --git a/devel/p5-P4/pkg-plist b/devel/p5-P4/pkg-plist
index 78a0221b55b8..f24fa5226706 100644
--- a/devel/p5-P4/pkg-plist
+++ b/devel/p5-P4/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/auto/P4/autosplit.ix
%%SITE_PERL%%/example.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/P4/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/P4 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/P4 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/P4
+@dirrmtry %%SITE_PERL%%/auto/P4
diff --git a/devel/p5-PAR/pkg-plist b/devel/p5-PAR/pkg-plist
index 7e68f1cba69f..36fa6e53bc0b 100644
--- a/devel/p5-PAR/pkg-plist
+++ b/devel/p5-PAR/pkg-plist
@@ -16,7 +16,7 @@ bin/tkpp
%%SITE_PERL%%/PAR/Packer.pm
%%SITE_PERL%%/PAR/Tutorial.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PAR/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/App/Packer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/App 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PAR/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PAR 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/App/Packer
+@dirrmtry %%SITE_PERL%%/App
+@dirrmtry %%SITE_PERL%%/PAR/Filter
+@dirrmtry %%SITE_PERL%%/PAR
diff --git a/devel/p5-POE-API-Hooks/pkg-plist b/devel/p5-POE-API-Hooks/pkg-plist
index 1afe4b66eb0d..9e74c1128768 100644
--- a/devel/p5-POE-API-Hooks/pkg-plist
+++ b/devel/p5-POE-API-Hooks/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Hooks/.packlist
%%SITE_PERL%%/POE/API/Hooks.pm
-@unexec rmdir %D/%%SITE_PERL%%/POE/API 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/API
+@dirrmtry %%SITE_PERL%%/POE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Hooks
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-API-Peek/pkg-plist b/devel/p5-POE-API-Peek/pkg-plist
index 549c83bb7d4f..e9e6ac14457d 100644
--- a/devel/p5-POE-API-Peek/pkg-plist
+++ b/devel/p5-POE-API-Peek/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Peek/.packlist
%%SITE_PERL%%/POE/API/Peek.pm
-@unexec rmdir %D/%%SITE_PERL%%/POE/API 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/API
+@dirrmtry %%SITE_PERL%%/POE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API/Peek
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/API
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Component-Child/pkg-plist b/devel/p5-POE-Component-Child/pkg-plist
index bd315f4ba863..63ce76bcadb4 100644
--- a/devel/p5-POE-Component-Child/pkg-plist
+++ b/devel/p5-POE-Component-Child/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/POE/Component/Child.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Child/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Child
-@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/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Component-DebugShell/pkg-plist b/devel/p5-POE-Component-DebugShell/pkg-plist
index e47b180a8ddb..2fa8aefee72d 100644
--- a/devel/p5-POE-Component-DebugShell/pkg-plist
+++ b/devel/p5-POE-Component-DebugShell/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/POE/Component/DebugShell.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/devel/p5-POE-Component-DirWatch/pkg-plist b/devel/p5-POE-Component-DirWatch/pkg-plist
index 22104bb9c279..49add150c145 100644
--- a/devel/p5-POE-Component-DirWatch/pkg-plist
+++ b/devel/p5-POE-Component-DirWatch/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch/.packlist
%%SITE_PERL%%/POE/Component/DirWatch.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DirWatch
-@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/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
%%PORTDOCS%%%%EXAMPLESDIR%%/dirwatch
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/p5-POE-Component-IKC/pkg-plist b/devel/p5-POE-Component-IKC/pkg-plist
index a42a198b4a0c..ab38e0d81b42 100644
--- a/devel/p5-POE-Component-IKC/pkg-plist
+++ b/devel/p5-POE-Component-IKC/pkg-plist
@@ -11,7 +11,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IKC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/IKC
@dirrm %%SITE_PERL%%/POE/Component/IKC
-@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/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-JobQueue/pkg-plist b/devel/p5-POE-Component-JobQueue/pkg-plist
index 7cf5e9f787c9..273f06a672c0 100644
--- a/devel/p5-POE-Component-JobQueue/pkg-plist
+++ b/devel/p5-POE-Component-JobQueue/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/POE/Component/JobQueue.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/JobQueue/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/JobQueue
-@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/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-Logger/pkg-plist b/devel/p5-POE-Component-Logger/pkg-plist
index ef2acbbff5c9..8a9c2e092cb1 100644
--- a/devel/p5-POE-Component-Logger/pkg-plist
+++ b/devel/p5-POE-Component-Logger/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger/.packlist
%%SITE_PERL%%/POE/Component/Logger.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger
-@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/Component/Logger 2>/dev/null || true
-@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%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Logger
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Component-RSS/pkg-plist b/devel/p5-POE-Component-RSS/pkg-plist
index 512e37061e79..8f00185ed75e 100644
--- a/devel/p5-POE-Component-RSS/pkg-plist
+++ b/devel/p5-POE-Component-RSS/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/POE/Component/RSS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RSS
-@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/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Component-Server-XMLRPC/pkg-plist b/devel/p5-POE-Component-Server-XMLRPC/pkg-plist
index 1e7392e9965f..7dbea9470be6 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/pkg-plist
+++ b/devel/p5-POE-Component-Server-XMLRPC/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/POE/Component/Server/XMLRPC.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/XMLRPC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/XMLRPC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server 2>/dev/null || true
-@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/Component/Server 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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-POE-Devel-Profiler/pkg-plist b/devel/p5-POE-Devel-Profiler/pkg-plist
index def69d4a664f..f6d2ec60b07e 100644
--- a/devel/p5-POE-Devel-Profiler/pkg-plist
+++ b/devel/p5-POE-Devel-Profiler/pkg-plist
@@ -6,8 +6,8 @@ bin/poepp
%%SITE_PERL%%/POE/Devel/Profiler/Visualizer/BasicSummary.pm
@dirrm %%SITE_PERL%%/POE/Devel/Profiler/Visualizer
@dirrm %%SITE_PERL%%/POE/Devel/Profiler
-@unexec rmdir %D/%%SITE_PERL%%/POE/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Devel
+@dirrmtry %%SITE_PERL%%/POE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel/Profiler
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Devel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Exceptions/pkg-plist b/devel/p5-POE-Exceptions/pkg-plist
index 866664e26e8a..99acc023c713 100644
--- a/devel/p5-POE-Exceptions/pkg-plist
+++ b/devel/p5-POE-Exceptions/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/POE/Kernel/Exception.pm
%%SITE_PERL%%/POE/Session/Exception.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Exceptions
-@unexec rmdir %D/%%SITE_PERL%%/POE/Kernel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Session 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/Kernel
+@dirrmtry %%SITE_PERL%%/POE/Session
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE-Session-MultiDispatch/pkg-plist b/devel/p5-POE-Session-MultiDispatch/pkg-plist
index 917e86cf3183..6f4a1b2a285c 100644
--- a/devel/p5-POE-Session-MultiDispatch/pkg-plist
+++ b/devel/p5-POE-Session-MultiDispatch/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/MultiDispatch/.packlist
%%SITE_PERL%%/POE/Session/MultiDispatch.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session/MultiDispatch
-@unexec rmdir %D/%%SITE_PERL%%/POE/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Session
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Session
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/devel/p5-POE/pkg-plist b/devel/p5-POE/pkg-plist
index 80f0172c9b09..03857ca564e3 100644
--- a/devel/p5-POE/pkg-plist
+++ b/devel/p5-POE/pkg-plist
@@ -55,20 +55,20 @@
%%SITE_PERL%%/POE/Wheel/ReadWrite.pm
%%SITE_PERL%%/POE/Wheel/Run.pm
%%SITE_PERL%%/POE/Wheel/SocketFactory.pm
-@unexec rmdir %D/%%SITE_PERL%%/POE/API 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/API
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/POE/Component
@dirrm %%SITE_PERL%%/POE/Driver
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Loop 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Filter
+@dirrmtry %%SITE_PERL%%/POE/Loop
@dirrm %%SITE_PERL%%/POE/Macro
@dirrm %%SITE_PERL%%/POE/Pipe
@dirrm %%SITE_PERL%%/POE/Queue
@dirrm %%SITE_PERL%%/POE/Resource
@dirrm %%SITE_PERL%%/POE/Wheel
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
%%PORTDOCS%%%%EXAMPLESDIR%%/README.samples
%%PORTDOCS%%%%EXAMPLESDIR%%/create.perl
%%PORTDOCS%%%%EXAMPLESDIR%%/fakelogin.perl
diff --git a/devel/p5-PadWalker/pkg-plist b/devel/p5-PadWalker/pkg-plist
index 717a6df3598e..9138c5c660f9 100644
--- a/devel/p5-PadWalker/pkg-plist
+++ b/devel/p5-PadWalker/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker/PadWalker.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker/PadWalker.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PadWalker
diff --git a/devel/p5-Parallel-ForkManager/pkg-plist b/devel/p5-Parallel-ForkManager/pkg-plist
index ba9656b5e652..e433baea3a1f 100644
--- a/devel/p5-Parallel-ForkManager/pkg-plist
+++ b/devel/p5-Parallel-ForkManager/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Parallel/ForkManager.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/ForkManager/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/ForkManager
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parallel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel
+@dirrmtry %%SITE_PERL%%/Parallel
%%PORTDOCS%%%%EXAMPLESDIR%%/callback.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/parallel_get.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/p5-Params-CallbackRequest/pkg-plist b/devel/p5-Params-CallbackRequest/pkg-plist
index ebbe21a6fb89..05b59e224075 100644
--- a/devel/p5-Params-CallbackRequest/pkg-plist
+++ b/devel/p5-Params-CallbackRequest/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Params/Callback.pm
%%SITE_PERL%%/Params/CallbackRequest/Exceptions.pm
@dirrm %%SITE_PERL%%/Params/CallbackRequest
-@unexec rmdir %D/%%SITE_PERL%%/Params 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Params
diff --git a/devel/p5-Params-Check/pkg-plist b/devel/p5-Params-Check/pkg-plist
index fc216650d03e..873d0102e47b 100644
--- a/devel/p5-Params-Check/pkg-plist
+++ b/devel/p5-Params-Check/pkg-plist
@@ -1,6 +1,6 @@
@comment $FreeBSD$
%%SITE_PERL%%/Params/Check.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Check/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Check 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Params 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Check
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params
+@dirrmtry %%SITE_PERL%%/Params
diff --git a/devel/p5-Params-Util/pkg-plist b/devel/p5-Params-Util/pkg-plist
index 05b34cd1e156..d7fb552486ca 100644
--- a/devel/p5-Params-Util/pkg-plist
+++ b/devel/p5-Params-Util/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Params/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Util/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Util
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Params 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params
+@dirrmtry %%SITE_PERL%%/Params
diff --git a/devel/p5-Params-Validate/pkg-plist b/devel/p5-Params-Validate/pkg-plist
index 09f1a17c6cf6..d5b53db69341 100644
--- a/devel/p5-Params-Validate/pkg-plist
+++ b/devel/p5-Params-Validate/pkg-plist
@@ -7,6 +7,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Attribute/Params/Validate.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Attribute/Params
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Attribute
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Params 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Params
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params/Validate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Params 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Params
diff --git a/devel/p5-Parse-CPAN-Packages/pkg-plist b/devel/p5-Parse-CPAN-Packages/pkg-plist
index c36ff4271d94..900d8887a025 100644
--- a/devel/p5-Parse-CPAN-Packages/pkg-plist
+++ b/devel/p5-Parse-CPAN-Packages/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Parse/CPAN/Packages/Distribution.pm
%%SITE_PERL%%/Parse/CPAN/Packages/Package.pm
@dirrm %%SITE_PERL%%/Parse/CPAN/Packages
-@unexec rmdir %D/%%SITE_PERL%%/Parse/CPAN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Parse/CPAN
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/devel/p5-Parse-PerlConfig/pkg-plist b/devel/p5-Parse-PerlConfig/pkg-plist
index 9678b0f28ec9..56d7abd410a4 100644
--- a/devel/p5-Parse-PerlConfig/pkg-plist
+++ b/devel/p5-Parse-PerlConfig/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Parse/PerlConfig.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/PerlConfig/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/PerlConfig
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/devel/p5-Parse-RecDescent/pkg-plist b/devel/p5-Parse-RecDescent/pkg-plist
index 3161df55bb43..4b3f1fa89b52 100644
--- a/devel/p5-Parse-RecDescent/pkg-plist
+++ b/devel/p5-Parse-RecDescent/pkg-plist
@@ -9,5 +9,5 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/RecDescent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/devel/p5-Parse-Yapp/pkg-plist b/devel/p5-Parse-Yapp/pkg-plist
index 19f3fafef637..7c912f60cfaa 100644
--- a/devel/p5-Parse-Yapp/pkg-plist
+++ b/devel/p5-Parse-Yapp/pkg-plist
@@ -8,6 +8,6 @@ bin/yapp
%%SITE_PERL%%/Parse/Yapp.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Yapp/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Yapp
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse/Yapp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrmtry %%SITE_PERL%%/Parse/Yapp
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/devel/p5-ParseLex/pkg-plist b/devel/p5-ParseLex/pkg-plist
index de2402fd546a..22158f84a012 100644
--- a/devel/p5-ParseLex/pkg-plist
+++ b/devel/p5-ParseLex/pkg-plist
@@ -8,6 +8,6 @@
%%SITE_PERL%%/Parse/Token.pm
%%SITE_PERL%%/Parse/Token-t.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Lex/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Lex 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Lex
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/devel/p5-PatchReader/pkg-plist b/devel/p5-PatchReader/pkg-plist
index 521f7e991e32..c3e9c846f3fb 100644
--- a/devel/p5-PatchReader/pkg-plist
+++ b/devel/p5-PatchReader/pkg-plist
@@ -10,6 +10,6 @@
%%SITE_PERL%%/PatchReader/DiffPrinter/template.pm
%%SITE_PERL%%/PatchReader/DiffPrinter/raw.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PatchReader/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PatchReader 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PatchReader
@dirrm %%SITE_PERL%%/PatchReader/DiffPrinter
-@unexec rmdir %D/%%SITE_PERL%%/PatchReader 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PatchReader
diff --git a/devel/p5-Path-Class/pkg-plist b/devel/p5-Path-Class/pkg-plist
index 2b6a9dd66a46..c50cb3482725 100644
--- a/devel/p5-Path-Class/pkg-plist
+++ b/devel/p5-Path-Class/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/Path/Class/Dir.pm
%%SITE_PERL%%/Path/Class/File.pm
@dirrm %%SITE_PERL%%/Path/Class
-@unexec rmdir %D/%%SITE_PERL%%/Path 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Path
diff --git a/devel/p5-PathTools/pkg-plist b/devel/p5-PathTools/pkg-plist
index 45e8d55a91be..117857e4f2e1 100644
--- a/devel/p5-PathTools/pkg-plist
+++ b/devel/p5-PathTools/pkg-plist
@@ -14,4 +14,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd/Cwd.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/Spec
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cwd
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File
diff --git a/devel/p5-Perl6-Export/pkg-plist b/devel/p5-Perl6-Export/pkg-plist
index 72e00c731260..c88ffc47a53a 100644
--- a/devel/p5-Perl6-Export/pkg-plist
+++ b/devel/p5-Perl6-Export/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Perl6/Export.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Export
-@unexec rmdir %D/%%SITE_PERL%%/Perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Perl6
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
diff --git a/devel/p5-Perl6-Form/pkg-plist b/devel/p5-Perl6-Form/pkg-plist
index e712a067326c..d91aa074e727 100644
--- a/devel/p5-Perl6-Form/pkg-plist
+++ b/devel/p5-Perl6-Form/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Perl6/Form.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Form/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6/Form
-@unexec rmdir %D/%%SITE_PERL%%/Perl6 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Perl6
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl6
diff --git a/devel/p5-PerlIO-eol/pkg-plist b/devel/p5-PerlIO-eol/pkg-plist
index 0f7e5a1ed7ba..909eae34a7fb 100644
--- a/devel/p5-PerlIO-eol/pkg-plist
+++ b/devel/p5-PerlIO-eol/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/eol/eol.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/eol/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO/eol.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/eol 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/eol
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PerlIO
diff --git a/devel/p5-PerlIO-via-MD5/pkg-plist b/devel/p5-PerlIO-via-MD5/pkg-plist
index ae6d95d4c93c..6df9e4c8e019 100644
--- a/devel/p5-PerlIO-via-MD5/pkg-plist
+++ b/devel/p5-PerlIO-via-MD5/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/PerlIO/via/MD5.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/MD5/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/MD5
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlIO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry %%SITE_PERL%%/PerlIO/via
+@dirrmtry %%SITE_PERL%%/PerlIO
diff --git a/devel/p5-PerlIO-via-dynamic/pkg-plist b/devel/p5-PerlIO-via-dynamic/pkg-plist
index d0b956fc8afa..9e520a3e69f2 100644
--- a/devel/p5-PerlIO-via-dynamic/pkg-plist
+++ b/devel/p5-PerlIO-via-dynamic/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/PerlIO/via/dynamic.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/dynamic/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/dynamic
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlIO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO
+@dirrmtry %%SITE_PERL%%/PerlIO/via
+@dirrmtry %%SITE_PERL%%/PerlIO
diff --git a/devel/p5-PerlIO-via-symlink/pkg-plist b/devel/p5-PerlIO-via-symlink/pkg-plist
index aaf25653643e..4bfdce543b57 100644
--- a/devel/p5-PerlIO-via-symlink/pkg-plist
+++ b/devel/p5-PerlIO-via-symlink/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/PerlIO/via/symlink.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/symlink/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlIO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/symlink 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PerlIO/via
+@dirrmtry %%SITE_PERL%%/PerlIO
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via/symlink
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/via
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO
diff --git a/devel/p5-Pod-Coverage/pkg-plist b/devel/p5-Pod-Coverage/pkg-plist
index c5f72e40493d..ef0f6f4214c5 100644
--- a/devel/p5-Pod-Coverage/pkg-plist
+++ b/devel/p5-Pod-Coverage/pkg-plist
@@ -9,6 +9,6 @@ bin/pod_cover
%%PORTDOCS%%%%EXAMPLESDIR%%/README
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Coverage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Pod/Coverage
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Pod
diff --git a/devel/p5-Proc-Background/pkg-plist b/devel/p5-Proc-Background/pkg-plist
index d99f07fbc3ef..53400ca8212d 100644
--- a/devel/p5-Proc-Background/pkg-plist
+++ b/devel/p5-Proc-Background/pkg-plist
@@ -4,6 +4,6 @@ bin/timed-process
%%SITE_PERL%%/Proc/Background/Win32.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Background/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Background
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
@dirrm %%SITE_PERL%%/Proc/Background
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-Daemon/pkg-plist b/devel/p5-Proc-Daemon/pkg-plist
index b3bdbb5c65de..d6950424e99c 100644
--- a/devel/p5-Proc-Daemon/pkg-plist
+++ b/devel/p5-Proc-Daemon/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Proc/Daemon.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Daemon
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-Fork/pkg-plist b/devel/p5-Proc-Fork/pkg-plist
index 73d8240d43da..d3975683ba35 100644
--- a/devel/p5-Proc-Fork/pkg-plist
+++ b/devel/p5-Proc-Fork/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Proc/Fork.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Fork
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-PID-File/pkg-plist b/devel/p5-Proc-PID-File/pkg-plist
index 28b9e847d88c..1b2790cefce9 100644
--- a/devel/p5-Proc-PID-File/pkg-plist
+++ b/devel/p5-Proc-PID-File/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Proc/PID/File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID/File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc/PID 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/Proc/PID
+@dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-PIDFile/pkg-plist b/devel/p5-Proc-PIDFile/pkg-plist
index 631a7aa4cdc6..41e5f36f2789 100644
--- a/devel/p5-Proc-PIDFile/pkg-plist
+++ b/devel/p5-Proc-PIDFile/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Proc/test-T.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID_File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/PID_File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-Queue/pkg-plist b/devel/p5-Proc-Queue/pkg-plist
index b666a4292b8f..0bdbd022475a 100644
--- a/devel/p5-Proc-Queue/pkg-plist
+++ b/devel/p5-Proc-Queue/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Proc/Queue.pm
%%SITE_PERL%%/Proc/example.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Queue/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Queue 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Queue
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/Proc
diff --git a/devel/p5-Proc-Reliable/pkg-plist b/devel/p5-Proc-Reliable/pkg-plist
index 80239ac28640..d5bc7ef66148 100644
--- a/devel/p5-Proc-Reliable/pkg-plist
+++ b/devel/p5-Proc-Reliable/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/auto/Proc/Reliable/autosplit.ix
%%SITE_PERL%%/Proc/Reliable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/auto/Proc/Reliable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Proc 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Proc/Reliable
+@dirrmtry %%SITE_PERL%%/auto/Proc
+@dirrmtry %%SITE_PERL%%/Proc
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/Reliable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc
diff --git a/devel/p5-Project-Gantt/pkg-plist b/devel/p5-Project-Gantt/pkg-plist
index 34722e1bb0f4..8f6f7449ce1c 100644
--- a/devel/p5-Project-Gantt/pkg-plist
+++ b/devel/p5-Project-Gantt/pkg-plist
@@ -13,5 +13,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Project/Gantt/.packlist
@dirrm %%SITE_PERL%%/Project/Gantt
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Project/Gantt
-@unexec rmdir %D/%%SITE_PERL%%/Project 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Project 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Project
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Project
diff --git a/devel/p5-Rcs-Agent/pkg-plist b/devel/p5-Rcs-Agent/pkg-plist
index 18d6134d61c6..86cb7a43b7c8 100644
--- a/devel/p5-Rcs-Agent/pkg-plist
+++ b/devel/p5-Rcs-Agent/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Rcs/Agent.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs/Agent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs/Agent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Rcs 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs
+@dirrmtry %%SITE_PERL%%/Rcs
diff --git a/devel/p5-Rcs/pkg-plist b/devel/p5-Rcs/pkg-plist
index a09ac065b05f..61f426e04c34 100644
--- a/devel/p5-Rcs/pkg-plist
+++ b/devel/p5-Rcs/pkg-plist
@@ -23,7 +23,7 @@ share/examples/p5-Rcs/test1.pl
share/examples/p5-Rcs/test2.pl
share/examples/p5-Rcs/test3.pl
share/examples/p5-Rcs/unlock.pl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Rcs
@dirrm share/examples/p5-Rcs/project/RCS
@dirrm share/examples/p5-Rcs/project/src
@dirrm share/examples/p5-Rcs/project
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index d4b914a68cb5..fb2235805f39 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -8,7 +8,7 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu/XS
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/Gnu
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine/Gnu
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Term/ReadLine
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Term
diff --git a/devel/p5-ReadLine-Perl/pkg-plist b/devel/p5-ReadLine-Perl/pkg-plist
index 084055cb1227..3c03e6bc2d95 100644
--- a/devel/p5-ReadLine-Perl/pkg-plist
+++ b/devel/p5-ReadLine-Perl/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Term/ReadLine/readline.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadLine
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term/ReadLine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term/ReadLine
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Regexp-Assemble/pkg-plist b/devel/p5-Regexp-Assemble/pkg-plist
index 5e5c0c0705f2..59d206a8bdfc 100644
--- a/devel/p5-Regexp-Assemble/pkg-plist
+++ b/devel/p5-Regexp-Assemble/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Regexp/Assemble.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Assemble/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Assemble
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
+@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/devel/p5-Regexp-Shellish/pkg-plist b/devel/p5-Regexp-Shellish/pkg-plist
index 8caf196404e5..b71e46062505 100644
--- a/devel/p5-Regexp-Shellish/pkg-plist
+++ b/devel/p5-Regexp-Shellish/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Regexp/Shellish.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Shellish/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Shellish
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
+@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/devel/p5-Return-Value/pkg-plist b/devel/p5-Return-Value/pkg-plist
index b375d97b57d6..59d0e776fd7d 100644
--- a/devel/p5-Return-Value/pkg-plist
+++ b/devel/p5-Return-Value/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Return/Value.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Return/Value/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Return/Value 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Return 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Return 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Return/Value
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Return
+@dirrmtry %%SITE_PERL%%/Return
diff --git a/devel/p5-SSN-Validate/pkg-plist b/devel/p5-SSN-Validate/pkg-plist
index 6a0405482b6a..f21b552f82ed 100644
--- a/devel/p5-SSN-Validate/pkg-plist
+++ b/devel/p5-SSN-Validate/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/SSN/Validate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SSN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN/Validate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SSN
+@dirrmtry %%SITE_PERL%%/SSN
diff --git a/devel/p5-SVN-ACL/pkg-plist b/devel/p5-SVN-ACL/pkg-plist
index f6e98ea2a541..ef0d97840980 100644
--- a/devel/p5-SVN-ACL/pkg-plist
+++ b/devel/p5-SVN-ACL/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/SVN/ACL.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/ACL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/ACL
-@unexec rmdir %D/%%SITE_PERL%%/SVN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
diff --git a/devel/p5-SVN-Mirror/pkg-plist b/devel/p5-SVN-Mirror/pkg-plist
index 5d28fab7cab9..f52f343af37f 100644
--- a/devel/p5-SVN-Mirror/pkg-plist
+++ b/devel/p5-SVN-Mirror/pkg-plist
@@ -4,7 +4,7 @@ bin/svm
%%SITE_PERL%%/SVN/Mirror/Git.pm
%%SITE_PERL%%/SVN/Mirror/VCP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Mirror/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/SVN/Mirror 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SVN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Mirror 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVN/Mirror
+@dirrmtry %%SITE_PERL%%/SVN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Mirror
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
diff --git a/devel/p5-SVN-Notify/pkg-plist b/devel/p5-SVN-Notify/pkg-plist
index 2e60804ecdd7..d1bf19b15138 100644
--- a/devel/p5-SVN-Notify/pkg-plist
+++ b/devel/p5-SVN-Notify/pkg-plist
@@ -2,6 +2,6 @@ bin/svnnotify
%%SITE_PERL%%/SVN/Notify.pm
%%SITE_PERL%%/SVN/Notify/HTML.pm
%%SITE_PERL%%/SVN/Notify/HTML/ColorDiff.pm
-@unexec rmdir %D/%%SITE_PERL%%/SVN/Notify/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SVN/Notify 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SVN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVN/Notify/HTML
+@dirrmtry %%SITE_PERL%%/SVN/Notify
+@dirrmtry %%SITE_PERL%%/SVN
diff --git a/devel/p5-SVN-Simple/pkg-plist b/devel/p5-SVN-Simple/pkg-plist
index 819777c0898b..9f1150940b20 100644
--- a/devel/p5-SVN-Simple/pkg-plist
+++ b/devel/p5-SVN-Simple/pkg-plist
@@ -4,5 +4,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Simple/Edit
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN/Simple
@dirrm %%SITE_PERL%%/SVN/Simple
-@unexec rmdir %D/%%SITE_PERL%%/SVN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
diff --git a/devel/p5-SVN-Web/pkg-plist b/devel/p5-SVN-Web/pkg-plist
index 028fc59107b8..21e334a2657f 100644
--- a/devel/p5-SVN-Web/pkg-plist
+++ b/devel/p5-SVN-Web/pkg-plist
@@ -27,5 +27,5 @@ bin/svnweb-install
@dirrm %%SITE_PERL%%/SVN/Web/Style
@dirrm %%SITE_PERL%%/SVN/Web/Template
@dirrm %%SITE_PERL%%/SVN/Web
-@unexec rmdir %D/%%SITE_PERL%%/SVN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
diff --git a/devel/p5-Search-Binary/pkg-plist b/devel/p5-Search-Binary/pkg-plist
index 0b425962a3dc..bc247ef97240 100644
--- a/devel/p5-Search-Binary/pkg-plist
+++ b/devel/p5-Search-Binary/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Binary/.packlist
%%SITE_PERL%%/Search/Binary.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Binary
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Search 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
+@dirrmtry %%SITE_PERL%%/Search
diff --git a/devel/p5-Set-Crontab/pkg-plist b/devel/p5-Set-Crontab/pkg-plist
index a9e05b641377..873c43d611c2 100644
--- a/devel/p5-Set-Crontab/pkg-plist
+++ b/devel/p5-Set-Crontab/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Set/Crontab.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Crontab/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Crontab
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/devel/p5-Set-Infinite/pkg-plist b/devel/p5-Set-Infinite/pkg-plist
index 4f6188e0c37d..68b8d9509ee5 100644
--- a/devel/p5-Set-Infinite/pkg-plist
+++ b/devel/p5-Set-Infinite/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Set/Infinite/Basic.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Infinite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Infinite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
@dirrm %%SITE_PERL%%/Set/Infinite
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/devel/p5-Set-NestedGroups/pkg-plist b/devel/p5-Set-NestedGroups/pkg-plist
index 23e5b215fd50..b7ecbd6859e0 100644
--- a/devel/p5-Set-NestedGroups/pkg-plist
+++ b/devel/p5-Set-NestedGroups/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/Set/NestedGroups/Member.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/NestedGroups
@dirrm %%SITE_PERL%%/Set/NestedGroups
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/devel/p5-Set-Object/pkg-plist b/devel/p5-Set-Object/pkg-plist
index 129799ab3e0a..86d6532f6a58 100644
--- a/devel/p5-Set-Object/pkg-plist
+++ b/devel/p5-Set-Object/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/Set/Object.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Object
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Set
diff --git a/devel/p5-Set-Scalar/pkg-plist b/devel/p5-Set-Scalar/pkg-plist
index c26313ae6c7b..956b8c4d36e9 100644
--- a/devel/p5-Set-Scalar/pkg-plist
+++ b/devel/p5-Set-Scalar/pkg-plist
@@ -9,5 +9,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Scalar/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set/Scalar
@dirrm %%SITE_PERL%%/Set/Scalar
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Set 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Set
+@dirrmtry %%SITE_PERL%%/Set
diff --git a/devel/p5-Shape/pkg-plist b/devel/p5-Shape/pkg-plist
index 45647d3dfae5..3f89d04879bd 100644
--- a/devel/p5-Shape/pkg-plist
+++ b/devel/p5-Shape/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shape
diff --git a/devel/p5-Shell-Parser/pkg-plist b/devel/p5-Shell-Parser/pkg-plist
index ea6be3dd42b7..98bb78ff9bd6 100644
--- a/devel/p5-Shell-Parser/pkg-plist
+++ b/devel/p5-Shell-Parser/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Parser/.packlist
%%SITE_PERL%%/Shell/Parser.pm
-@unexec rmdir %D/%%SITE_PERL%%/Shell 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Shell
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell/Parser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shell
diff --git a/devel/p5-Smart-Comments/pkg-plist b/devel/p5-Smart-Comments/pkg-plist
index 91d6fb10534e..0c5ceee6ffe4 100644
--- a/devel/p5-Smart-Comments/pkg-plist
+++ b/devel/p5-Smart-Comments/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Smart/Comments.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Smart/Comments/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Smart/Comments
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Smart 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Smart 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Smart
+@dirrmtry %%SITE_PERL%%/Smart
diff --git a/devel/p5-Sort-Array/pkg-plist b/devel/p5-Sort-Array/pkg-plist
index 12878f3307aa..ea817930b95a 100644
--- a/devel/p5-Sort-Array/pkg-plist
+++ b/devel/p5-Sort-Array/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sort/Array.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Array/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Array
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/devel/p5-Sort-Key-DateTime/pkg-plist b/devel/p5-Sort-Key-DateTime/pkg-plist
index 500d1e7e1a72..9b9f7e00a097 100644
--- a/devel/p5-Sort-Key-DateTime/pkg-plist
+++ b/devel/p5-Sort-Key-DateTime/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Sort/Key/DateTime.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort/Key 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/DateTime
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort/Key
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/devel/p5-Sort-Key/pkg-plist b/devel/p5-Sort-Key/pkg-plist
index b476a632e56a..39dc9602438a 100644
--- a/devel/p5-Sort-Key/pkg-plist
+++ b/devel/p5-Sort-Key/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Key.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key/Key.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Key
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort/Key
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sort
diff --git a/devel/p5-Sort-Tree/pkg-plist b/devel/p5-Sort-Tree/pkg-plist
index 35aaa7d3bf8c..1ca8d8c860b3 100644
--- a/devel/p5-Sort-Tree/pkg-plist
+++ b/devel/p5-Sort-Tree/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sort/Tree.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Tree/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Tree
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Sort
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
diff --git a/devel/p5-Sort-Versions/pkg-plist b/devel/p5-Sort-Versions/pkg-plist
index 4f90aba0dc33..fed9b86e9c0f 100644
--- a/devel/p5-Sort-Versions/pkg-plist
+++ b/devel/p5-Sort-Versions/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sort/Versions.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Versions/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Versions
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Sort
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
diff --git a/devel/p5-String-Similarity/pkg-plist b/devel/p5-String-Similarity/pkg-plist
index e502fbff6a5a..1ecc5d0fbeee 100644
--- a/devel/p5-String-Similarity/pkg-plist
+++ b/devel/p5-String-Similarity/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity/Similarity.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Similarity
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/devel/p5-Sub-Installer/pkg-plist b/devel/p5-Sub-Installer/pkg-plist
index b137bef9cf6d..128a43b87f74 100644
--- a/devel/p5-Sub-Installer/pkg-plist
+++ b/devel/p5-Sub-Installer/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sub/Installer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sub 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Installer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
+@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sub-Name/pkg-plist b/devel/p5-Sub-Name/pkg-plist
index b60cc85f587d..3d03f0db8853 100644
--- a/devel/p5-Sub-Name/pkg-plist
+++ b/devel/p5-Sub-Name/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/Name.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name/Name.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sub 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Name
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sub
diff --git a/devel/p5-Sub-Override/pkg-plist b/devel/p5-Sub-Override/pkg-plist
index a67a15e81b01..87e18a5b732f 100644
--- a/devel/p5-Sub-Override/pkg-plist
+++ b/devel/p5-Sub-Override/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sub/Override.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sub/Override
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Sub 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sub 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Sub
+@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sub-Uplevel/pkg-plist b/devel/p5-Sub-Uplevel/pkg-plist
index 053cbf853f3a..dee80398f318 100644
--- a/devel/p5-Sub-Uplevel/pkg-plist
+++ b/devel/p5-Sub-Uplevel/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/mach/auto/Sub/Uplevel/.packlist
%%SITE_PERL%%/Sub/Uplevel.pm
@dirrm %%SITE_PERL%%/mach/auto/Sub/Uplevel
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Sub 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sub 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Sub
+@dirrmtry %%SITE_PERL%%/Sub
diff --git a/devel/p5-Sys-Mmap/pkg-plist b/devel/p5-Sys-Mmap/pkg-plist
index 27a19a3f9425..95597fcc120d 100644
--- a/devel/p5-Sys-Mmap/pkg-plist
+++ b/devel/p5-Sys-Mmap/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap/Mmap.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Mmap
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys
diff --git a/devel/p5-Term-ANSIColor/pkg-plist b/devel/p5-Term-ANSIColor/pkg-plist
index 77b856869b68..a54746e07a0f 100644
--- a/devel/p5-Term-ANSIColor/pkg-plist
+++ b/devel/p5-Term-ANSIColor/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Term/ANSIColor.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIColor/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIColor
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-Animation/pkg-plist b/devel/p5-Term-Animation/pkg-plist
index 8bcd443d824b..d5017174e468 100644
--- a/devel/p5-Term-Animation/pkg-plist
+++ b/devel/p5-Term-Animation/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Term/Animation/Entity.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Animation/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Animation
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
@dirrm %%SITE_PERL%%/Term/Animation
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-ProgressBar/pkg-plist b/devel/p5-Term-ProgressBar/pkg-plist
index a0cb0fc0a1a4..be7b6a664cca 100644
--- a/devel/p5-Term-ProgressBar/pkg-plist
+++ b/devel/p5-Term-ProgressBar/pkg-plist
@@ -6,5 +6,5 @@
%%PORTDOCS%%share/examples/Term-ProgressBar/powers4
%%PORTDOCS%%share/examples/Term-ProgressBar/powers5
%%PORTDOCS%%@dirrm share/examples/Term-ProgressBar
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term-ProgressBar 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term-ProgressBar
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-Prompt/pkg-plist b/devel/p5-Term-Prompt/pkg-plist
index 8d10b1e34b3f..5cdab3ff84e5 100644
--- a/devel/p5-Term-Prompt/pkg-plist
+++ b/devel/p5-Term-Prompt/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Prompt/.packlist
%%SITE_PERL%%/Term/Prompt.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Prompt
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-ReadKey/pkg-plist b/devel/p5-Term-ReadKey/pkg-plist
index 01c07e2ec9bb..752b4dc7e99f 100644
--- a/devel/p5-Term-ReadKey/pkg-plist
+++ b/devel/p5-Term-ReadKey/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/ReadKey.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Term
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadKey
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
diff --git a/devel/p5-Term-ReadLine-Zoid/pkg-plist b/devel/p5-Term-ReadLine-Zoid/pkg-plist
index bba3f08c5d50..4921690e88a8 100644
--- a/devel/p5-Term-ReadLine-Zoid/pkg-plist
+++ b/devel/p5-Term-ReadLine-Zoid/pkg-plist
@@ -50,7 +50,7 @@
@dirrm %%SITE_PERL%%/Term/ReadLine/Zoid
@dirrm %%SITE_PERL%%/auto/Term/ReadLine/Zoid/ViCommand
@dirrm %%SITE_PERL%%/auto/Term/ReadLine/Zoid
-@unexec rmdir %D/%%SITE_PERL%%/Term/ReadLine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Term/ReadLine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Term/ReadLine
+@dirrmtry %%SITE_PERL%%/Term
+@dirrmtry %%SITE_PERL%%/auto/Term/ReadLine
+@dirrmtry %%SITE_PERL%%/auto/Term
diff --git a/devel/p5-Term-ReadPassword/pkg-plist b/devel/p5-Term-ReadPassword/pkg-plist
index 9a466565897c..39da920ba093 100644
--- a/devel/p5-Term-ReadPassword/pkg-plist
+++ b/devel/p5-Term-ReadPassword/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Term/ReadPassword.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadPassword/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ReadPassword
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-Screen/pkg-plist b/devel/p5-Term-Screen/pkg-plist
index dddf0570cc94..c8d823adb02c 100644
--- a/devel/p5-Term-Screen/pkg-plist
+++ b/devel/p5-Term-Screen/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Term/Screen.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Screen/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Screen
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-Shell/pkg-plist b/devel/p5-Term-Shell/pkg-plist
index f84d8ff26299..fc7c209f51bf 100644
--- a/devel/p5-Term-Shell/pkg-plist
+++ b/devel/p5-Term-Shell/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Term/Shell.pm
%%SITE_PERL%%/Term/Shell.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Shell
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Term-Size/pkg-plist b/devel/p5-Term-Size/pkg-plist
index 11973abe9de5..73b85bbf330f 100644
--- a/devel/p5-Term-Size/pkg-plist
+++ b/devel/p5-Term-Size/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/Size.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Size
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Term 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Term
+@dirrmtry %%SITE_PERL%%/Term
diff --git a/devel/p5-Test-Base/pkg-plist b/devel/p5-Test-Base/pkg-plist
index b15ae72ddb26..cb6881c23539 100644
--- a/devel/p5-Test-Base/pkg-plist
+++ b/devel/p5-Test-Base/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Base/.packlist
%%SITE_PERL%%/Test/Base.pm
%%SITE_PERL%%/Test/Base/Filter.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Base 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/Base 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Base
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/Base
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Class/pkg-plist b/devel/p5-Test-Class/pkg-plist
index 1a51cf54ab2b..40b3072bf6fb 100644
--- a/devel/p5-Test-Class/pkg-plist
+++ b/devel/p5-Test-Class/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/Test/Class/MethodInfo.pm
@dirrm %%SITE_PERL%%/Test/Class
@dirrm %%SITE_PERL%%/mach/auto/Test/Class
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-ClassAPI/pkg-plist b/devel/p5-Test-ClassAPI/pkg-plist
index dfd5d979037c..a1b39be9a67e 100644
--- a/devel/p5-Test-ClassAPI/pkg-plist
+++ b/devel/p5-Test-ClassAPI/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/ClassAPI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/ClassAPI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/ClassAPI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Cmd/pkg-plist b/devel/p5-Test-Cmd/pkg-plist
index a38c62684ea6..05da0a4c24d0 100644
--- a/devel/p5-Test-Cmd/pkg-plist
+++ b/devel/p5-Test-Cmd/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Test/Cmd/Common.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Cmd/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Cmd
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrm %%SITE_PERL%%/Test/Cmd
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Deep/pkg-plist b/devel/p5-Test-Deep/pkg-plist
index 87fb83409952..1b698b62810b 100644
--- a/devel/p5-Test-Deep/pkg-plist
+++ b/devel/p5-Test-Deep/pkg-plist
@@ -41,7 +41,7 @@
%%SITE_PERL%%/Test/Deep/Stack.pm
%%SITE_PERL%%/Test/Deep/String.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Deep
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrm %%SITE_PERL%%/Test/Deep/Cache
@dirrm %%SITE_PERL%%/Test/Deep
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Differences/pkg-plist b/devel/p5-Test-Differences/pkg-plist
index f35193a1e778..bdeb733b8d4b 100644
--- a/devel/p5-Test-Differences/pkg-plist
+++ b/devel/p5-Test-Differences/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Differences/.packlist
%%SITE_PERL%%/Test/Differences.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Differences
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Exception/pkg-plist b/devel/p5-Test-Exception/pkg-plist
index 4d1a7a930645..72f8937e9e2a 100644
--- a/devel/p5-Test-Exception/pkg-plist
+++ b/devel/p5-Test-Exception/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/mach/auto/Test/Exception/.packlist
%%SITE_PERL%%/Test/Exception.pm
@dirrm %%SITE_PERL%%/mach/auto/Test/Exception
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-File/pkg-plist b/devel/p5-Test-File/pkg-plist
index 1ac012bb3025..acd7fd396e37 100644
--- a/devel/p5-Test-File/pkg-plist
+++ b/devel/p5-Test-File/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Harness/pkg-plist b/devel/p5-Test-Harness/pkg-plist
index 0b0e27d85a7c..ae414cb5bd4f 100644
--- a/devel/p5-Test-Harness/pkg-plist
+++ b/devel/p5-Test-Harness/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Harness/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Harness
@dirrm %%SITE_PERL%%/Test/Harness
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Inline/pkg-plist b/devel/p5-Test-Inline/pkg-plist
index cfb0d027af88..58abe0e85010 100644
--- a/devel/p5-Test-Inline/pkg-plist
+++ b/devel/p5-Test-Inline/pkg-plist
@@ -5,8 +5,8 @@ bin/pod2test
%%SITE_PERL%%/Pod/Tests/Tutorial.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Inline/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Inline
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrm %%SITE_PERL%%/Test/Inline
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
@dirrm %%SITE_PERL%%/Pod/Tests
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
diff --git a/devel/p5-Test-LectroTest/pkg-plist b/devel/p5-Test-LectroTest/pkg-plist
index 3455d87f45bb..63711585553f 100644
--- a/devel/p5-Test-LectroTest/pkg-plist
+++ b/devel/p5-Test-LectroTest/pkg-plist
@@ -5,4 +5,4 @@
%%SITE_PERL%%/Test/LectroTest/TestRunner.pm
%%SITE_PERL%%/Test/LectroTest/Tutorial.pod
@dirrm %%SITE_PERL%%/Test/LectroTest
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-LongString/pkg-plist b/devel/p5-Test-LongString/pkg-plist
index 322ba307a980..cd405c007ac3 100644
--- a/devel/p5-Test-LongString/pkg-plist
+++ b/devel/p5-Test-LongString/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/LongString.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/LongString/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/LongString
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Manifest/pkg-plist b/devel/p5-Test-Manifest/pkg-plist
index a1515d80f03a..fc764477065b 100644
--- a/devel/p5-Test-Manifest/pkg-plist
+++ b/devel/p5-Test-Manifest/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/Manifest.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Manifest/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Manifest
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-MockModule/pkg-plist b/devel/p5-Test-MockModule/pkg-plist
index 8d2d4aea63fa..6cbb66d1592a 100644
--- a/devel/p5-Test-MockModule/pkg-plist
+++ b/devel/p5-Test-MockModule/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/MockModule.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockModule/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockModule
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-MockObject/pkg-plist b/devel/p5-Test-MockObject/pkg-plist
index f0bdb5640d42..bee3de726213 100644
--- a/devel/p5-Test-MockObject/pkg-plist
+++ b/devel/p5-Test-MockObject/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Test/MockObject/Extends.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockObject/.packlist
@dirrm %%SITE_PERL%%/Test/MockObject
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/MockObject
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
diff --git a/devel/p5-Test-NoWarnings/pkg-plist b/devel/p5-Test-NoWarnings/pkg-plist
index aa0c2c4ad596..8ff72ac8f150 100644
--- a/devel/p5-Test-NoWarnings/pkg-plist
+++ b/devel/p5-Test-NoWarnings/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Test/NoWarnings.pm
%%SITE_PERL%%/Test/NoWarnings/Warning.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/NoWarnings
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrm %%SITE_PERL%%/Test/NoWarnings
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Pod/pkg-plist b/devel/p5-Test-Pod/pkg-plist
index b64a05db7a67..bec707bacbbc 100644
--- a/devel/p5-Test-Pod/pkg-plist
+++ b/devel/p5-Test-Pod/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/Pod.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Reporter/pkg-plist b/devel/p5-Test-Reporter/pkg-plist
index da861a9e587d..2f3b7229ed56 100644
--- a/devel/p5-Test-Reporter/pkg-plist
+++ b/devel/p5-Test-Reporter/pkg-plist
@@ -5,9 +5,9 @@ bin/cpantest
%%SITE_PERL%%/Test/Reporter/Time/Zone.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Reporter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Reporter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrm %%SITE_PERL%%/Test/Reporter/Time
@dirrm %%SITE_PERL%%/Test/Reporter/Mail
@dirrm %%SITE_PERL%%/Test/Reporter/Date
@dirrm %%SITE_PERL%%/Test/Reporter
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Simple/pkg-plist b/devel/p5-Test-Simple/pkg-plist
index 0177cc43d403..b9c6f152893f 100644
--- a/devel/p5-Test-Simple/pkg-plist
+++ b/devel/p5-Test-Simple/pkg-plist
@@ -7,7 +7,7 @@
%%SITE_PERL%%/Test/Tutorial.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/Builder/Tester 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/Builder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/Builder/Tester
+@dirrmtry %%SITE_PERL%%/Test/Builder
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Strict/pkg-plist b/devel/p5-Test-Strict/pkg-plist
index dcdcd4265d17..6cf800ea1cbd 100644
--- a/devel/p5-Test-Strict/pkg-plist
+++ b/devel/p5-Test-Strict/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/Strict.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Strict/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Strict
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-SubCalls/pkg-plist b/devel/p5-Test-SubCalls/pkg-plist
index 85da2167bf25..5c7f5a698503 100644
--- a/devel/p5-Test-SubCalls/pkg-plist
+++ b/devel/p5-Test-SubCalls/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Test/SubCalls.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/SubCalls/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/SubCalls
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Tester/pkg-plist b/devel/p5-Test-Tester/pkg-plist
index 6c4a772ac308..c57950f53661 100644
--- a/devel/p5-Test-Tester/pkg-plist
+++ b/devel/p5-Test-Tester/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/Test/Tester/CaptureRunner.pm
%%SITE_PERL%%/Test/Tester/Delegate.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Tester
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
@dirrm %%SITE_PERL%%/Test/Tester
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Unit/pkg-plist b/devel/p5-Test-Unit/pkg-plist
index e7e3508943c4..781698556e13 100644
--- a/devel/p5-Test-Unit/pkg-plist
+++ b/devel/p5-Test-Unit/pkg-plist
@@ -34,5 +34,5 @@
@dirrm %%SITE_PERL%%/Test/Unit/Runner
@dirrm %%SITE_PERL%%/Test/Unit
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Unit
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist b/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist
index 6d43d6e7c0c5..11ec2928fdf7 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Test/WWW/Mechanize/Catalyst.pm
-@unexec rmdir %D/%%SITE_PERL%%/Test/WWW/Mechanize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test/WWW/Mechanize
+@dirrmtry %%SITE_PERL%%/Test/WWW
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-WWW-Mechanize/pkg-plist b/devel/p5-Test-WWW-Mechanize/pkg-plist
index 840da9b7293c..18b3dd5c87a6 100644
--- a/devel/p5-Test-WWW-Mechanize/pkg-plist
+++ b/devel/p5-Test-WWW-Mechanize/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Test/WWW/Mechanize.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW/Mechanize
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/WWW
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/WWW
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Test-Warn/pkg-plist b/devel/p5-Test-Warn/pkg-plist
index d25e43d599a5..358e28e58d4e 100644
--- a/devel/p5-Test-Warn/pkg-plist
+++ b/devel/p5-Test-Warn/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Warn/.packlist
%%SITE_PERL%%/Test/Warn.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Warn
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Warn 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/Warn 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Warn
+@dirrmtry %%SITE_PERL%%/Test/Warn
diff --git a/devel/p5-Test-XML/pkg-plist b/devel/p5-Test-XML/pkg-plist
index f4eb02f04f99..343d85526f49 100644
--- a/devel/p5-Test-XML/pkg-plist
+++ b/devel/p5-Test-XML/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/Test/XML/Twig.pm
%%SITE_PERL%%/Test/XML/XPath.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/XML/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/XML
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/devel/p5-Text-LevenshteinXS/pkg-plist b/devel/p5-Text-LevenshteinXS/pkg-plist
index ea6b63292971..37ab447d311c 100644
--- a/devel/p5-Text-LevenshteinXS/pkg-plist
+++ b/devel/p5-Text-LevenshteinXS/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/mach/auto/Text/LevenshteinXS/.packlist
%%SITE_PERL%%/mach/Text/LevenshteinXS.pm
@dirrm %%SITE_PERL%%/mach/auto/Text/LevenshteinXS
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Text
+@dirrmtry %%SITE_PERL%%/mach/Text
diff --git a/devel/p5-Text-vFile-asData/pkg-plist b/devel/p5-Text-vFile-asData/pkg-plist
index eb300854a617..985a31fae763 100644
--- a/devel/p5-Text-vFile-asData/pkg-plist
+++ b/devel/p5-Text-vFile-asData/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Text/vFile/asData.pm
-@unexec rmdir %D/%%SITE_PERL%%/Text/vFile 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text/vFile
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/devel/p5-Tie-Array-Sorted/pkg-plist b/devel/p5-Tie-Array-Sorted/pkg-plist
index 5ce59edf4f35..b889d89f7589 100644
--- a/devel/p5-Tie-Array-Sorted/pkg-plist
+++ b/devel/p5-Tie-Array-Sorted/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/Tie/Array/Sorted/Lazy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Array/Sorted/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Array/Sorted
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Array
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
@dirrm %%SITE_PERL%%/Tie/Array/Sorted
-@unexec rmdir %D/%%SITE_PERL%%/Tie/Array 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tie/Array
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-Cache/pkg-plist b/devel/p5-Tie-Cache/pkg-plist
index f00171a6db76..538eaf75f2ee 100644
--- a/devel/p5-Tie-Cache/pkg-plist
+++ b/devel/p5-Tie-Cache/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Tie/bench.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Cache/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Cache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-DB_File-SplitHash/pkg-plist b/devel/p5-Tie-DB_File-SplitHash/pkg-plist
index ead9cc8e54d0..a9b7a44db28a 100644
--- a/devel/p5-Tie-DB_File-SplitHash/pkg-plist
+++ b/devel/p5-Tie-DB_File-SplitHash/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Tie/DB_File/SplitHash.pm
%%SITE_PERL%%/Tie/DB_File/SplitHash.pod
-@unexec rmdir %D/%%SITE_PERL%%/Tie/DB_File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tie/DB_File
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-File/pkg-plist b/devel/p5-Tie-File/pkg-plist
index 1bbf6bc24377..91ba4618230e 100644
--- a/devel/p5-Tie-File/pkg-plist
+++ b/devel/p5-Tie-File/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Tie/File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-FileLRUCache/pkg-plist b/devel/p5-Tie-FileLRUCache/pkg-plist
index d9dbd8ee76ab..97983ead5869 100644
--- a/devel/p5-Tie-FileLRUCache/pkg-plist
+++ b/devel/p5-Tie-FileLRUCache/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Tie/FileLRUCache.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/FileLRUCache/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/FileLRUCache
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tie
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
diff --git a/devel/p5-Tie-Hash-Sorted/pkg-plist b/devel/p5-Tie-Hash-Sorted/pkg-plist
index 0459dfeebc18..248a1e5f1cee 100644
--- a/devel/p5-Tie-Hash-Sorted/pkg-plist
+++ b/devel/p5-Tie-Hash-Sorted/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Tie/Hash/Sorted.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Sorted/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Sorted 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie/Hash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/Sorted
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie/Hash
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-Hash-TwoWay/pkg-plist b/devel/p5-Tie-Hash-TwoWay/pkg-plist
index 1fd154af97e6..b1b6dd7a63c6 100644
--- a/devel/p5-Tie-Hash-TwoWay/pkg-plist
+++ b/devel/p5-Tie-Hash-TwoWay/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Tie/Hash/TwoWay.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/TwoWay/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/TwoWay 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie/Hash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash/TwoWay
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Hash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie/Hash
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-ShareLite/pkg-plist b/devel/p5-Tie-ShareLite/pkg-plist
index 6238ba824738..da3f8cf4b231 100644
--- a/devel/p5-Tie-ShareLite/pkg-plist
+++ b/devel/p5-Tie-ShareLite/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Tie/ShareLite.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/ShareLite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/ShareLite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Tie-iCal/pkg-plist b/devel/p5-Tie-iCal/pkg-plist
index df8343b48257..ec1d74a920fb 100644
--- a/devel/p5-Tie-iCal/pkg-plist
+++ b/devel/p5-Tie-iCal/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Tie/iCal.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/iCal/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/iCal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie
+@dirrmtry %%SITE_PERL%%/Tie
diff --git a/devel/p5-Time-Duration/pkg-plist b/devel/p5-Time-Duration/pkg-plist
index 7b25d146ff45..ec8c0453d9bc 100644
--- a/devel/p5-Time-Duration/pkg-plist
+++ b/devel/p5-Time-Duration/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Duration/.packlist
%%SITE_PERL%%/Time/Duration.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Duration
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Time
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
diff --git a/devel/p5-Time-HiRes/pkg-plist b/devel/p5-Time-HiRes/pkg-plist
index e4ce1fe6d43c..c1208b1abac6 100644
--- a/devel/p5-Time-HiRes/pkg-plist
+++ b/devel/p5-Time-HiRes/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/HiRes/HiRes.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/HiRes/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/HiRes
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Time
diff --git a/devel/p5-Time-Local/pkg-plist b/devel/p5-Time-Local/pkg-plist
index 0f68465e5934..a8ff120af166 100644
--- a/devel/p5-Time-Local/pkg-plist
+++ b/devel/p5-Time-Local/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Time/Local.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Local/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Local
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry %%SITE_PERL%%/Time
diff --git a/devel/p5-Time-Object/pkg-plist b/devel/p5-Time-Object/pkg-plist
index f09bd61bae95..6e54f472fb39 100644
--- a/devel/p5-Time-Object/pkg-plist
+++ b/devel/p5-Time-Object/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Time/Object.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Time/Seconds.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Object
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Time
diff --git a/devel/p5-Time-Period/pkg-plist b/devel/p5-Time-Period/pkg-plist
index 3f3b27b11c1c..f31c81886356 100644
--- a/devel/p5-Time-Period/pkg-plist
+++ b/devel/p5-Time-Period/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Time/Period.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Period/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Period
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry %%SITE_PERL%%/Time
diff --git a/devel/p5-Time-Piece/pkg-plist b/devel/p5-Time-Piece/pkg-plist
index c87e64e31c44..fd4956711cd0 100644
--- a/devel/p5-Time-Piece/pkg-plist
+++ b/devel/p5-Time-Piece/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Time/Piece.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Time/Seconds.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Time
diff --git a/devel/p5-Time-modules/pkg-plist b/devel/p5-Time-modules/pkg-plist
index 5f540ba19d2d..9fcccc4de706 100644
--- a/devel/p5-Time-modules/pkg-plist
+++ b/devel/p5-Time-modules/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/Time/ParseDate.pm
%%SITE_PERL%%/Time/Timezone.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time-modules
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Time
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
diff --git a/devel/p5-TimeDate/pkg-plist b/devel/p5-TimeDate/pkg-plist
index dab6aeb3610f..e415386b6edf 100644
--- a/devel/p5-TimeDate/pkg-plist
+++ b/devel/p5-TimeDate/pkg-plist
@@ -28,5 +28,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/TimeDate/.packlist
@dirrm %%SITE_PERL%%/Date/Language
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TimeDate
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Time
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/devel/p5-Tree-Binary/pkg-plist b/devel/p5-Tree-Binary/pkg-plist
index bb058f3c4461..deeb43086cd2 100644
--- a/devel/p5-Tree-Binary/pkg-plist
+++ b/devel/p5-Tree-Binary/pkg-plist
@@ -9,8 +9,8 @@
%%SITE_PERL%%/Tree/Binary/VisitorFactory.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Binary/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Binary
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
@dirrm %%SITE_PERL%%/Tree/Binary/Visitor
@dirrm %%SITE_PERL%%/Tree/Binary/Search
@dirrm %%SITE_PERL%%/Tree/Binary
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tree
diff --git a/devel/p5-Tree-Node/pkg-plist b/devel/p5-Tree-Node/pkg-plist
index efe24a9cc55c..759772f55e76 100644
--- a/devel/p5-Tree-Node/pkg-plist
+++ b/devel/p5-Tree-Node/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Node/Node.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Node/Node.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Node
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tree
diff --git a/devel/p5-Tree-Parser/pkg-plist b/devel/p5-Tree-Parser/pkg-plist
index dc4e98385318..4a3012ccf312 100644
--- a/devel/p5-Tree-Parser/pkg-plist
+++ b/devel/p5-Tree-Parser/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Tree/Parser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Parser/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Parser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
+@dirrmtry %%SITE_PERL%%/Tree
diff --git a/devel/p5-Tree-Simple-View/pkg-plist b/devel/p5-Tree-Simple-View/pkg-plist
index 6e8624c2d4d8..541fe82357b6 100644
--- a/devel/p5-Tree-Simple-View/pkg-plist
+++ b/devel/p5-Tree-Simple-View/pkg-plist
@@ -4,8 +4,8 @@
%%SITE_PERL%%/Tree/Simple/View/HTML.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/View/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/View
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
@dirrm %%SITE_PERL%%/Tree/Simple/View
-@unexec rmdir %D/%%SITE_PERL%%/Tree/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tree/Simple
+@dirrmtry %%SITE_PERL%%/Tree
diff --git a/devel/p5-Tree-Simple-VisitorFactory/pkg-plist b/devel/p5-Tree-Simple-VisitorFactory/pkg-plist
index 6bc413c72ffb..58826bf267de 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/pkg-plist
+++ b/devel/p5-Tree-Simple-VisitorFactory/pkg-plist
@@ -18,8 +18,8 @@
%%SITE_PERL%%/Tree/Simple/VisitorFactory.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/VisitorFactory/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/VisitorFactory
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
@dirrm %%SITE_PERL%%/Tree/Simple/Visitor
-@unexec rmdir %D/%%SITE_PERL%%/Tree/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tree/Simple
+@dirrmtry %%SITE_PERL%%/Tree
diff --git a/devel/p5-Tree-Simple/pkg-plist b/devel/p5-Tree-Simple/pkg-plist
index c6f7c36d0f30..ab83beaf7001 100644
--- a/devel/p5-Tree-Simple/pkg-plist
+++ b/devel/p5-Tree-Simple/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple/.packlist
@dirrm %%SITE_PERL%%/Tree/Simple
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Simple
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Tree
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
diff --git a/devel/p5-UNIVERSAL-can/pkg-plist b/devel/p5-UNIVERSAL-can/pkg-plist
index 7f2ab55af4d9..e6e84d479edd 100644
--- a/devel/p5-UNIVERSAL-can/pkg-plist
+++ b/devel/p5-UNIVERSAL-can/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/UNIVERSAL/can.pm
-@unexec rmdir %D/%%SITE_PERL%%/UNIVERSAL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/UNIVERSAL
diff --git a/devel/p5-UNIVERSAL-exports/pkg-plist b/devel/p5-UNIVERSAL-exports/pkg-plist
index 58ba070f0a7f..b12225e92b17 100644
--- a/devel/p5-UNIVERSAL-exports/pkg-plist
+++ b/devel/p5-UNIVERSAL-exports/pkg-plist
@@ -3,4 +3,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/exports/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/exports
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL
-@unexec rmdir %D/%%SITE_PERL%%/UNIVERSAL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/UNIVERSAL
diff --git a/devel/p5-UNIVERSAL-isa/pkg-plist b/devel/p5-UNIVERSAL-isa/pkg-plist
index d2f8f1b425b2..4b1b6d9cb402 100644
--- a/devel/p5-UNIVERSAL-isa/pkg-plist
+++ b/devel/p5-UNIVERSAL-isa/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/UNIVERSAL/isa.pm
-@unexec rmdir %D/%%SITE_PERL%%/UNIVERSAL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/UNIVERSAL
diff --git a/devel/p5-UNIVERSAL-moniker/pkg-plist b/devel/p5-UNIVERSAL-moniker/pkg-plist
index f678c3d4a840..d28b4fd5f5b1 100644
--- a/devel/p5-UNIVERSAL-moniker/pkg-plist
+++ b/devel/p5-UNIVERSAL-moniker/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/moniker/.packlist
%%SITE_PERL%%/UNIVERSAL/moniker.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/moniker
-@unexec rmdir %D/%%SITE_PERL%%/UNIVERSAL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/UNIVERSAL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL
diff --git a/devel/p5-UNIVERSAL-require/pkg-plist b/devel/p5-UNIVERSAL-require/pkg-plist
index 4627016683c5..0a351d6dde36 100644
--- a/devel/p5-UNIVERSAL-require/pkg-plist
+++ b/devel/p5-UNIVERSAL-require/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/UNIVERSAL/require.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/require/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL/require
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/UNIVERSAL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UNIVERSAL
+@dirrmtry %%SITE_PERL%%/UNIVERSAL
diff --git a/devel/p5-Unix-Statgrab/pkg-plist b/devel/p5-Unix-Statgrab/pkg-plist
index 9c48d2083268..c5d016c4bb73 100644
--- a/devel/p5-Unix-Statgrab/pkg-plist
+++ b/devel/p5-Unix-Statgrab/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Statgrab/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/Unix/Statgrab.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Statgrab
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix
diff --git a/devel/p5-User-Identity/pkg-plist b/devel/p5-User-Identity/pkg-plist
index 1ee66026b4fe..36c3c3d7384b 100644
--- a/devel/p5-User-Identity/pkg-plist
+++ b/devel/p5-User-Identity/pkg-plist
@@ -27,6 +27,6 @@
@dirrm %%SITE_PERL%%/User/Identity/Collection
@dirrm %%SITE_PERL%%/User/Identity
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/User/Identity
-@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/User 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/User 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Mail
+@dirrmtry %%SITE_PERL%%/User
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/User
diff --git a/devel/p5-VCP-Dest-svk/pkg-plist b/devel/p5-VCP-Dest-svk/pkg-plist
index b9a3712b734a..5c83e879c748 100644
--- a/devel/p5-VCP-Dest-svk/pkg-plist
+++ b/devel/p5-VCP-Dest-svk/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/VCP/Dest/svk.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Dest/svk/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/VCP/Dest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/VCP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Dest/svk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Dest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/VCP/Dest
+@dirrmtry %%SITE_PERL%%/VCP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Dest/svk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Dest
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP
diff --git a/devel/p5-VCP-Source-cvsbk/pkg-plist b/devel/p5-VCP-Source-cvsbk/pkg-plist
index c9b2e67a1cda..d0c774ce0bf5 100644
--- a/devel/p5-VCP-Source-cvsbk/pkg-plist
+++ b/devel/p5-VCP-Source-cvsbk/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/VCP/Source/cvsbk.pm
%%SITE_PERL%%/VCP/Filter/cvsbkchangeset.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Source/cvsbk/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/VCP/Source 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/VCP/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/VCP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/VCP/Source
+@dirrmtry %%SITE_PERL%%/VCP/Filter
+@dirrmtry %%SITE_PERL%%/VCP
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Source/cvsbk
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Source 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/Source
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP
diff --git a/devel/p5-VCP/pkg-plist b/devel/p5-VCP/pkg-plist
index ebc4cff19ea2..82051927beba 100644
--- a/devel/p5-VCP/pkg-plist
+++ b/devel/p5-VCP/pkg-plist
@@ -81,4 +81,4 @@ bin/vcp
@dirrm %%SITE_PERL%%/VCP/Utils
@dirrm %%SITE_PERL%%/VCP
%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP
diff --git a/devel/p5-VCS/pkg-plist b/devel/p5-VCS/pkg-plist
index 9c42cd1074d3..d0e17bd9e96b 100644
--- a/devel/p5-VCS/pkg-plist
+++ b/devel/p5-VCS/pkg-plist
@@ -15,5 +15,5 @@ bin/diff-hist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS/.packlist
@dirrm %%SITE_PERL%%/VCS/Rcs
@dirrm %%SITE_PERL%%/VCS/Cvs
-@unexec rmdir %D/%%SITE_PERL%%/VCS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/VCS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCS
diff --git a/devel/p5-iCal-Parser/pkg-plist b/devel/p5-iCal-Parser/pkg-plist
index 40d2f3b1366a..1896aaa00e2e 100644
--- a/devel/p5-iCal-Parser/pkg-plist
+++ b/devel/p5-iCal-Parser/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/iCal/Parser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/iCal/Parser/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/iCal 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/iCal
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/iCal/Parser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/iCal 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/iCal
diff --git a/devel/p5-prefork/pkg-plist b/devel/p5-prefork/pkg-plist
index 395515dfe637..ee3e54175189 100644
--- a/devel/p5-prefork/pkg-plist
+++ b/devel/p5-prefork/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/prefork/.packlist
%%SITE_PERL%%/prefork.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/prefork
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/prefork 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/prefork
diff --git a/devel/p5-release/pkg-plist b/devel/p5-release/pkg-plist
index a946cd3968f3..eab14a411c59 100644
--- a/devel/p5-release/pkg-plist
+++ b/devel/p5-release/pkg-plist
@@ -2,4 +2,4 @@ bin/release
%%SITE_PERL%%/Module/Release.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/release/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/release
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/devel/pear/pkg-plist b/devel/pear/pkg-plist
index d93ec06a6900..9784f3a54e89 100644
--- a/devel/pear/pkg-plist
+++ b/devel/pear/pkg-plist
@@ -123,7 +123,7 @@ etc/pear.conf
%%DATADIR%%/tests/XML_RPC/tests/types.php
@dirrm %%DOCSDIR%%/Archive_Tar/docs
@dirrm %%DOCSDIR%%/Archive_Tar
-@unexec rmdir %D/share/doc/pear 2> /dev/null || true
+@dirrmtry share/doc/pear
@unexec rm %D/share/pear/.channels/.alias/pear.txt 2> /dev/null || true
@unexec rm %D/share/pear/.channels/.alias/pecl.txt 2> /dev/null || true
@unexec rm %D/share/pear/.channels/__uri.reg 2> /dev/null || true
@@ -133,11 +133,11 @@ etc/pear.conf
@unexec rm %D/share/pear/.depdblock 2> /dev/null || true
@unexec rm %D/share/pear/.filemap 2> /dev/null || true
@unexec rm %D/share/pear/.lock 2> /dev/null || true
-@unexec rmdir %D/share/pear/.channels/.alias 2> /dev/null || true
-@unexec rmdir %D/share/pear/.channels 2> /dev/null || true
-@unexec rmdir %D/share/pear/.registry/.channel.__uri 2> /dev/null || true
-@unexec rmdir %D/share/pear/.registry/.channel.pecl.php.net 2> /dev/null || true
-@unexec rmdir %D/share/pear/.registry 2> /dev/null || true
+@dirrmtry share/pear/.channels/.alias
+@dirrmtry share/pear/.channels
+@dirrmtry share/pear/.registry/.channel.__uri
+@dirrmtry share/pear/.registry/.channel.pecl.php.net
+@dirrmtry share/pear/.registry
@dirrm %%DATADIR%%/Archive
@dirrm %%DATADIR%%/Console
@dirrm %%DATADIR%%/OS
@@ -160,10 +160,10 @@ etc/pear.conf
@dirrm %%DATADIR%%/PEAR/Validator
@dirrm %%DATADIR%%/PEAR
@dirrm %%DATADIR%%/XML/RPC
-@unexec rmdir %D/share/pear/XML 2> /dev/null || true
+@dirrmtry share/pear/XML
@dirrm %%DATADIR%%/data/PEAR
-@unexec rmdir %D/share/pear/data 2> /dev/null || true
+@dirrmtry share/pear/data
@dirrm %%DATADIR%%/tests/XML_RPC/tests
@dirrm %%DATADIR%%/tests/XML_RPC
-@unexec rmdir %D/share/pear/tests 2> /dev/null || true
-@unexec rmdir %D/share/pear 2> /dev/null || true
+@dirrmtry share/pear/tests
+@dirrmtry share/pear
diff --git a/devel/perltidy/pkg-plist b/devel/perltidy/pkg-plist
index 057d5e07b726..e6781352a5cd 100644
--- a/devel/perltidy/pkg-plist
+++ b/devel/perltidy/pkg-plist
@@ -2,5 +2,5 @@ bin/perltidy
%%SITE_PERL%%/Perl/Tidy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Tidy/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/Tidy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Perl 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl
+@dirrmtry %%SITE_PERL%%/Perl
diff --git a/devel/php-dbg/pkg-plist b/devel/php-dbg/pkg-plist
index b49ec0b6ccab..ab9d144b978b 100644
--- a/devel/php-dbg/pkg-plist
+++ b/devel/php-dbg/pkg-plist
@@ -1,2 +1,2 @@
lib/php/%%PHP_EXT_DIR%%/dbg.so
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
diff --git a/devel/php-dbg2/pkg-plist b/devel/php-dbg2/pkg-plist
index b49ec0b6ccab..ab9d144b978b 100644
--- a/devel/php-dbg2/pkg-plist
+++ b/devel/php-dbg2/pkg-plist
@@ -1,2 +1,2 @@
lib/php/%%PHP_EXT_DIR%%/dbg.so
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
diff --git a/devel/php-xdebug/pkg-plist b/devel/php-xdebug/pkg-plist
index 1ef13dc30b94..3e706e29f1a1 100644
--- a/devel/php-xdebug/pkg-plist
+++ b/devel/php-xdebug/pkg-plist
@@ -1,2 +1,2 @@
lib/php/%%PHP_EXT_DIR%%/xdebug.so
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
diff --git a/devel/prepstools/pkg-plist b/devel/prepstools/pkg-plist
index cba8777cb13d..6dc6e96fe37c 100644
--- a/devel/prepstools/pkg-plist
+++ b/devel/prepstools/pkg-plist
@@ -8,4 +8,4 @@ lib/libpreps.so.2
%%DATADIR%%/new_pr.msg
%%DATADIR%%/update.msg
@dirrm include/preps
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/devel/py-dateutil/pkg-plist b/devel/py-dateutil/pkg-plist
index a4f55742d849..9663fd3f9f11 100644
--- a/devel/py-dateutil/pkg-plist
+++ b/devel/py-dateutil/pkg-plist
@@ -25,5 +25,5 @@
%%PYTHON_SITELIBDIR%%/dateutil/zoneinfo/zoneinfo-2005k.tar.gz
@dirrm %%PYTHON_SITELIBDIR%%/dateutil/zoneinfo
@dirrm %%PYTHON_SITELIBDIR%%/dateutil
-@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/devel/py-kid/pkg-plist b/devel/py-kid/pkg-plist
index 1ed4555a695f..f121e4ce4a0a 100644
--- a/devel/py-kid/pkg-plist
+++ b/devel/py-kid/pkg-plist
@@ -81,5 +81,5 @@ bin/kid
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/cgi 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/basic 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/kid/test 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/kid 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%/kid/test
+@dirrmtry %%PYTHON_SITELIBDIR%%/kid
diff --git a/devel/qsa/pkg-plist b/devel/qsa/pkg-plist
index cd9e8b028c85..e828ac215018 100644
--- a/devel/qsa/pkg-plist
+++ b/devel/qsa/pkg-plist
@@ -218,8 +218,8 @@ share/doc/qsa/html/windowmenu1.png
share/doc/qsa/html/windowmenu2.png
share/doc/qsa/html/wrappers.html
share/qt/mkspecs/features/qsa.prf
-@unexec rmdir %D/share/qt/mkspecs/features 2>/dev/null || true
-@unexec rmdir %D/share/qt/mkspecs 2>/dev/null || true
-@unexec rmdir %D/share/qt 2>/dev/null || true
+@dirrmtry share/qt/mkspecs/features
+@dirrmtry share/qt/mkspecs
+@dirrmtry share/qt
@dirrm share/doc/qsa/html
@dirrm share/doc/qsa
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index 58c393d7c5ee..17a497ab2164 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -81,4 +81,4 @@ share/aclocal/sdl11.m4
%%EXAMPLESDIR%%/threadwin.c
%%EXAMPLESDIR%%/torturethread.c
@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/include/SDL11 2>/dev/null || true
+@dirrmtry include/SDL11
diff --git a/devel/sfslite/pkg-plist b/devel/sfslite/pkg-plist
index 9db52460a1fb..d911c021a730 100644
--- a/devel/sfslite/pkg-plist
+++ b/devel/sfslite/pkg-plist
@@ -122,6 +122,6 @@ lib/sfslite-%%VERSION%%/%%TAG%%/libsfsmisc.so.0
lib/sfslite-%%VERSION%%/%%TAG%%/mallock.o
lib/sfslite-%%VERSION%%/%%TAG%%/mmcd
@dirrm lib/sfslite-%%VERSION%%/%%TAG%%
-@unexec rmdir %D/lib/sfslite-%%VERSION%% 2>/dev/null || true
+@dirrmtry lib/sfslite-%%VERSION%%
@dirrm include/sfslite-%%VERSION%%/%%TAG%%
-@unexec rmdir %D/include/sfslite-%%VERSION%% 2>/dev/null || true
+@dirrmtry include/sfslite-%%VERSION%%
diff --git a/devel/silc-toolkit/pkg-plist b/devel/silc-toolkit/pkg-plist
index b165fc1184ff..6d824e963139 100644
--- a/devel/silc-toolkit/pkg-plist
+++ b/devel/silc-toolkit/pkg-plist
@@ -1128,8 +1128,8 @@ lib/silcsim/twofish.sim.so
%%EXAMPLESDIR%%/Makefile.in
%%EXAMPLESDIR%%/Makefile
%%PORTDOCS%%@dirrm %%DOCSDIR%%/toolkit
-@unexec rmdir %D/%%PORTDOCS%%%%DOCSDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/silcsim 2>/dev/null || true
-@unexec rmdir %D/include/silc 2>/dev/null || true
-@unexec rmdir %D/share/examples/silc/mybot 2>/dev/null || true
-@unexec rmdir %D/share/examples/silc 2>/dev/null || true
+@dirrmtry %%PORTDOCS%%%%DOCSDIR%%
+@dirrmtry lib/silcsim
+@dirrmtry include/silc
+@dirrmtry share/examples/silc/mybot
+@dirrmtry share/examples/silc
diff --git a/devel/simpletest/pkg-plist b/devel/simpletest/pkg-plist
index 0421bff5c7d9..f1b0b006bb1f 100644
--- a/devel/simpletest/pkg-plist
+++ b/devel/simpletest/pkg-plist
@@ -72,4 +72,4 @@
@dirrm %%DATADIR%%
@dirrm %%PEARDIR%%/simpletest/extensions
@dirrm %%PEARDIR%%/simpletest
-@unexec rmdir %D/%%PEARDIR%% 2>/dev/null || true
+@dirrmtry %%PEARDIR%%
diff --git a/devel/svk/pkg-plist b/devel/svk/pkg-plist
index f7884fb39d19..f84b86d2cd91 100644
--- a/devel/svk/pkg-plist
+++ b/devel/svk/pkg-plist
@@ -90,4 +90,4 @@ bin/svk
@dirrm %%SITE_PERL%%/SVK/Command
@dirrm %%SITE_PERL%%/SVK/Target
@dirrm %%SITE_PERL%%/SVK
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVK 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVK
diff --git a/devel/xfc/pkg-plist b/devel/xfc/pkg-plist
index b7bd6fa6f2c5..87485c7d0f1b 100644
--- a/devel/xfc/pkg-plist
+++ b/devel/xfc/pkg-plist
@@ -2749,6 +2749,6 @@ share/xfce4/xfc/demos/ui_manager.cc
@dirrm include/xfce4/xfc/atk/inline
@dirrm include/xfce4/xfc/atk
@dirrm include/xfce4/xfc
-@unexec rmdir %D/include/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry include/xfce4
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4