aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/MT/pkg-plist4
-rw-r--r--www/abcache/pkg-plist2
-rw-r--r--www/amaya/pkg-plist4
-rw-r--r--www/amphetadesk/pkg-plist6
-rw-r--r--www/amyc/pkg-plist6
-rw-r--r--www/analog/pkg-plist2
-rw-r--r--www/apache13-modperl/pkg-plist8
-rw-r--r--www/apache13-modssl/pkg-plist4
-rw-r--r--www/apache13-ssl/pkg-plist2
-rw-r--r--www/apache20/pkg-plist6
-rw-r--r--www/apache21/pkg-plist8
-rw-r--r--www/apache22/pkg-plist10
-rw-r--r--www/bannerfilter/pkg-plist2
-rw-r--r--www/bins/pkg-plist28
-rw-r--r--www/caudium10/pkg-plist12
-rw-r--r--www/caudium12/pkg-plist14
-rw-r--r--www/caudium14/pkg-plist14
-rw-r--r--www/cgiwrap/pkg-plist2
-rw-r--r--www/cherokee-devel/pkg-plist4
-rw-r--r--www/cherokee/pkg-plist4
-rw-r--r--www/coppermine/pkg-plist2
-rw-r--r--www/dalbum/pkg-plist6
-rw-r--r--www/dummyflash/pkg-plist2
-rw-r--r--www/eaccelerator/pkg-plist2
-rw-r--r--www/emacs-w3m-xemacs21-mule/pkg-plist2
-rw-r--r--www/epiphany-extensions/pkg-plist10
-rw-r--r--www/evolution-webcal/pkg-plist4
-rw-r--r--www/feedonfeeds/pkg-plist2
-rw-r--r--www/flashplugin-mozilla/pkg-plist2
-rw-r--r--www/flashplugin/pkg-plist4
-rw-r--r--www/frontpage/pkg-plist4
-rw-r--r--www/fxhtml/pkg-plist4
-rw-r--r--www/galeon/pkg-plist4
-rw-r--r--www/gallery/pkg-plist2
-rw-r--r--www/gallery2/pkg-plist4
-rw-r--r--www/gallery3/pkg-plist4
-rw-r--r--www/gforge/pkg-plist26
-rw-r--r--www/guile-www/pkg-plist2
-rw-r--r--www/horde-base/pkg-plist6
-rw-r--r--www/horde-passwd/pkg-plist4
-rw-r--r--www/horde/pkg-plist6
-rw-r--r--www/horde4-base/pkg-plist6
-rw-r--r--www/httrack/pkg-plist4
-rw-r--r--www/instiki/pkg-plist6
-rw-r--r--www/interchange/pkg-plist6
-rw-r--r--www/jakarta-tomcat3/pkg-plist12
-rw-r--r--www/jakarta-tomcat4/pkg-plist4
-rw-r--r--www/kdedict/pkg-plist2
-rw-r--r--www/middleman/pkg-plist2
-rw-r--r--www/mnogosearch/pkg-plist2
-rw-r--r--www/mod_perl/pkg-plist8
-rw-r--r--www/mod_perl2/pkg-plist6
-rw-r--r--www/mozplugger/pkg-plist2
-rw-r--r--www/mplayer-plugin/pkg-plist4
-rw-r--r--www/nginx-devel/pkg-plist2
-rw-r--r--www/nginx/pkg-plist2
-rw-r--r--www/oops/pkg-plist10
-rw-r--r--www/openvrml/pkg-plist6
-rw-r--r--www/p5-AMF-Perl/pkg-plist4
-rw-r--r--www/p5-Acme-Monta/pkg-plist4
-rw-r--r--www/p5-Apache-ASP/pkg-plist6
-rw-r--r--www/p5-Apache-AddHostPath/pkg-plist4
-rw-r--r--www/p5-Apache-Admin-Config/pkg-plist8
-rw-r--r--www/p5-Apache-AntiSpam/pkg-plist4
-rw-r--r--www/p5-Apache-Archive/pkg-plist6
-rw-r--r--www/p5-Apache-AuthCookie/pkg-plist4
-rw-r--r--www/p5-Apache-AuthTicket/pkg-plist4
-rw-r--r--www/p5-Apache-AuthenCache/pkg-plist4
-rw-r--r--www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist16
-rw-r--r--www/p5-Apache-Clean/pkg-plist4
-rw-r--r--www/p5-Apache-Clean2/pkg-plist4
-rw-r--r--www/p5-Apache-Compress/pkg-plist4
-rw-r--r--www/p5-Apache-CompressClientFixup/pkg-plist4
-rw-r--r--www/p5-Apache-ConfigFile/pkg-plist4
-rw-r--r--www/p5-Apache-DB/pkg-plist4
-rw-r--r--www/p5-Apache-DBI/pkg-plist2
-rw-r--r--www/p5-Apache-DebugInfo/pkg-plist4
-rw-r--r--www/p5-Apache-DumpHeaders/pkg-plist6
-rw-r--r--www/p5-Apache-Filter/pkg-plist4
-rw-r--r--www/p5-Apache-Gallery/pkg-plist2
-rw-r--r--www/p5-Apache-GopherHandler/pkg-plist2
-rw-r--r--www/p5-Apache-MP3/pkg-plist4
-rw-r--r--www/p5-Apache-NNTPGateway/pkg-plist4
-rw-r--r--www/p5-Apache-PageKit/pkg-plist8
-rw-r--r--www/p5-Apache-ParseFormData/pkg-plist4
-rw-r--r--www/p5-Apache-Peek/pkg-plist4
-rw-r--r--www/p5-Apache-Profiler/pkg-plist4
-rw-r--r--www/p5-Apache-Radius/pkg-plist4
-rw-r--r--www/p5-Apache-Reload/pkg-plist4
-rw-r--r--www/p5-Apache-SSI/pkg-plist4
-rw-r--r--www/p5-Apache-Scoreboard/pkg-plist4
-rw-r--r--www/p5-Apache-Session-PHP/pkg-plist12
-rw-r--r--www/p5-Apache-Session-SQLite3/pkg-plist10
-rw-r--r--www/p5-Apache-Session-Wrapper/pkg-plist4
-rw-r--r--www/p5-Apache-Session/pkg-plist4
-rw-r--r--www/p5-Apache-Singleton/pkg-plist4
-rw-r--r--www/p5-Apache-SubProcess/pkg-plist6
-rw-r--r--www/p5-Apache-Template/pkg-plist10
-rw-r--r--www/p5-Apache-Test/pkg-plist6
-rw-r--r--www/p5-Apache2-Scoreboard/pkg-plist4
-rw-r--r--www/p5-ApacheBench/pkg-plist8
-rw-r--r--www/p5-AxKit-XSP-Cookie/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-ESQL/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-Exception/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-IfParam/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-Param/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-PerForm/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-Sendmail/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-Util/pkg-plist6
-rw-r--r--www/p5-AxKit-XSP-WebUtils/pkg-plist6
-rw-r--r--www/p5-B-LexInfo/pkg-plist6
-rw-r--r--www/p5-Bundle-Catalyst/pkg-plist6
-rw-r--r--www/p5-Bundle-Slash/pkg-plist6
-rw-r--r--www/p5-Bundle-Sledge/pkg-plist6
-rw-r--r--www/p5-CGI-Ajax/pkg-plist6
-rw-r--r--www/p5-CGI-Application-Plugin-DBH/pkg-plist2
-rw-r--r--www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist6
-rw-r--r--www/p5-CGI-Application-ValidateRM/pkg-plist4
-rw-r--r--www/p5-CGI-Application/pkg-plist4
-rw-r--r--www/p5-CGI-ArgChecker/pkg-plist4
-rw-r--r--www/p5-CGI-Builder/pkg-plist8
-rw-r--r--www/p5-CGI-Cache/pkg-plist4
-rw-r--r--www/p5-CGI-FastTemplate/pkg-plist4
-rw-r--r--www/p5-CGI-Framework/pkg-plist4
-rw-r--r--www/p5-CGI-Kwiki/pkg-plist2
-rw-r--r--www/p5-CGI-Minimal/pkg-plist4
-rw-r--r--www/p5-CGI-Response/pkg-plist4
-rw-r--r--www/p5-CGI-SSI/pkg-plist6
-rw-r--r--www/p5-CGI-Session/pkg-plist10
-rw-r--r--www/p5-CGI-Simple/pkg-plist4
-rw-r--r--www/p5-CGI-SpeedyCGI/pkg-plist4
-rw-r--r--www/p5-CGI-Untaint/pkg-plist4
-rw-r--r--www/p5-CGI-Upload/pkg-plist4
-rw-r--r--www/p5-CGI-XMLApplication/pkg-plist4
-rw-r--r--www/p5-CGI.pm/pkg-plist4
-rw-r--r--www/p5-CGI_Lite/pkg-plist4
-rw-r--r--www/p5-Catalyst-Engine-Apache/pkg-plist6
-rw-r--r--www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist14
-rw-r--r--www/p5-Catalyst-Log-Log4perl/pkg-plist10
-rw-r--r--www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist4
-rw-r--r--www/p5-Catalyst-Model-CDBI/pkg-plist10
-rw-r--r--www/p5-Catalyst-Model-DBIC-Plain/pkg-plist18
-rw-r--r--www/p5-Catalyst-Model-DBIC/pkg-plist12
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist14
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-Authentication/pkg-plist14
-rw-r--r--www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist6
-rw-r--r--www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist6
-rw-r--r--www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist6
-rw-r--r--www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist6
-rw-r--r--www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist4
-rw-r--r--www/p5-Catalyst-Plugin-FillInForm/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist12
-rw-r--r--www/p5-Catalyst-Plugin-FormValidator/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist14
-rw-r--r--www/p5-Catalyst-Plugin-I18N/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-PageCache/pkg-plist4
-rw-r--r--www/p5-Catalyst-Plugin-Pluggable/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-Prototype/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist16
-rw-r--r--www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Session/pkg-plist10
-rw-r--r--www/p5-Catalyst-Plugin-Singleton/pkg-plist4
-rw-r--r--www/p5-Catalyst-Plugin-StackTrace/pkg-plist4
-rw-r--r--www/p5-Catalyst-Plugin-Static/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-SubRequest/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-Textile/pkg-plist8
-rw-r--r--www/p5-Catalyst-Plugin-XMLRPC/pkg-plist10
-rw-r--r--www/p5-Catalyst-View-HTML-Template/pkg-plist10
-rw-r--r--www/p5-Catalyst-View-Mason/pkg-plist8
-rw-r--r--www/p5-Catalyst-View-TT/pkg-plist12
-rw-r--r--www/p5-Catalyst/pkg-plist24
-rw-r--r--www/p5-Class-DBI-FromForm/pkg-plist10
-rw-r--r--www/p5-Compress-LeadingBlankSpaces/pkg-plist4
-rw-r--r--www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist8
-rw-r--r--www/p5-FAQ-OMatic/pkg-plist8
-rw-r--r--www/p5-FastCGI-ProcManager/pkg-plist4
-rw-r--r--www/p5-Feed-Find/pkg-plist2
-rw-r--r--www/p5-Flickr-API/pkg-plist4
-rw-r--r--www/p5-Flickr-Upload/pkg-plist6
-rw-r--r--www/p5-HTML-Breadcrumbs/pkg-plist4
-rw-r--r--www/p5-HTML-CalendarMonthSimple/pkg-plist6
-rw-r--r--www/p5-HTML-Chunks/pkg-plist4
-rw-r--r--www/p5-HTML-Clean/pkg-plist8
-rw-r--r--www/p5-HTML-Diff/pkg-plist4
-rw-r--r--www/p5-HTML-Element-Extended/pkg-plist2
-rw-r--r--www/p5-HTML-Embperl/pkg-plist4
-rw-r--r--www/p5-HTML-FillInForm/pkg-plist2
-rw-r--r--www/p5-HTML-FromText/pkg-plist4
-rw-r--r--www/p5-HTML-LinkExtractor/pkg-plist4
-rw-r--r--www/p5-HTML-Lint/pkg-plist12
-rw-r--r--www/p5-HTML-Mason/pkg-plist10
-rw-r--r--www/p5-HTML-Parser/pkg-plist4
-rw-r--r--www/p5-HTML-Prototype/pkg-plist6
-rw-r--r--www/p5-HTML-QuickCheck/pkg-plist4
-rw-r--r--www/p5-HTML-Scrubber/pkg-plist4
-rw-r--r--www/p5-HTML-SimpleLinkExtor/pkg-plist6
-rw-r--r--www/p5-HTML-SimpleParse/pkg-plist4
-rw-r--r--www/p5-HTML-StickyQuery/pkg-plist6
-rw-r--r--www/p5-HTML-Stream/pkg-plist4
-rw-r--r--www/p5-HTML-Strip/pkg-plist4
-rw-r--r--www/p5-HTML-Summary/pkg-plist6
-rw-r--r--www/p5-HTML-Table/pkg-plist4
-rw-r--r--www/p5-HTML-TableLayout/pkg-plist4
-rw-r--r--www/p5-HTML-TableTiler/pkg-plist2
-rw-r--r--www/p5-HTML-TagCloud-Extended/pkg-plist10
-rw-r--r--www/p5-HTML-TagCloud/pkg-plist6
-rw-r--r--www/p5-HTML-Tagset/pkg-plist4
-rw-r--r--www/p5-HTML-Template-Associate/pkg-plist2
-rw-r--r--www/p5-HTML-Template-Compiled/pkg-plist8
-rw-r--r--www/p5-HTML-Template-Expr/pkg-plist10
-rw-r--r--www/p5-HTML-Template-HashWrapper/pkg-plist8
-rw-r--r--www/p5-HTML-Template-JIT/pkg-plist8
-rw-r--r--www/p5-HTML-Template/pkg-plist4
-rw-r--r--www/p5-HTML-TokeParser-Simple/pkg-plist4
-rw-r--r--www/p5-HTML-Tree/pkg-plist2
-rw-r--r--www/p5-HTML-Webmake/pkg-plist4
-rw-r--r--www/p5-HTML-Widget/pkg-plist14
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/pkg-plist8
-rw-r--r--www/p5-HTML-WikiConverter/pkg-plist4
-rw-r--r--www/p5-HTML/pkg-plist2
-rw-r--r--www/p5-HTTP-Body/pkg-plist8
-rw-r--r--www/p5-HTTP-BrowserDetect/pkg-plist4
-rw-r--r--www/p5-HTTP-Cache-Transparent/pkg-plist8
-rw-r--r--www/p5-HTTP-DAV/pkg-plist4
-rw-r--r--www/p5-HTTP-GHTTP/pkg-plist4
-rw-r--r--www/p5-HTTP-Lite/pkg-plist4
-rw-r--r--www/p5-HTTP-MHTTP/pkg-plist4
-rw-r--r--www/p5-HTTP-MobileAgent/pkg-plist2
-rw-r--r--www/p5-HTTP-Proxy/pkg-plist2
-rw-r--r--www/p5-HTTP-Recorder/pkg-plist4
-rw-r--r--www/p5-HTTP-Request-AsCGI/pkg-plist10
-rw-r--r--www/p5-HTTP-Request-Params/pkg-plist8
-rw-r--r--www/p5-HTTP-Server-Simple-Mason/pkg-plist6
-rw-r--r--www/p5-HTTP-Server-Simple-Recorder/pkg-plist14
-rw-r--r--www/p5-HTTP-Server-Simple-Static/pkg-plist6
-rw-r--r--www/p5-HTTP-Server-Simple/pkg-plist14
-rw-r--r--www/p5-HTTP-WebTest/pkg-plist14
-rw-r--r--www/p5-HTTPD-Log-Filter/pkg-plist8
-rw-r--r--www/p5-HTTPD-User-Manage/pkg-plist2
-rw-r--r--www/p5-Handel/pkg-plist18
-rw-r--r--www/p5-IMDB-Movie/pkg-plist4
-rw-r--r--www/p5-Jifty/pkg-plist68
-rw-r--r--www/p5-Kwiki-Archive-Rcs/pkg-plist6
-rw-r--r--www/p5-Kwiki-Archive-SVK/pkg-plist6
-rw-r--r--www/p5-Kwiki-Atom/pkg-plist2
-rw-r--r--www/p5-Kwiki-Diff/pkg-plist2
-rw-r--r--www/p5-Kwiki-Edit-RequireUserName/pkg-plist6
-rw-r--r--www/p5-Kwiki-GDGraphGenerator/pkg-plist2
-rw-r--r--www/p5-Kwiki-Icons-Gnome/pkg-plist4
-rw-r--r--www/p5-Kwiki-Infobox/pkg-plist2
-rw-r--r--www/p5-Kwiki-NavigationToolbar/pkg-plist2
-rw-r--r--www/p5-Kwiki-NewPage/pkg-plist2
-rw-r--r--www/p5-Kwiki-Notify-Mail/pkg-plist6
-rw-r--r--www/p5-Kwiki-PagePrivacy/pkg-plist2
-rw-r--r--www/p5-Kwiki-RecentChanges/pkg-plist2
-rw-r--r--www/p5-Kwiki-RecentChangesRSS/pkg-plist4
-rw-r--r--www/p5-Kwiki-Revisions/pkg-plist2
-rw-r--r--www/p5-Kwiki-Search/pkg-plist2
-rw-r--r--www/p5-Kwiki-Theme-ColumnLayout/pkg-plist6
-rw-r--r--www/p5-Kwiki-UserName/pkg-plist2
-rw-r--r--www/p5-Kwiki-UserPreferences/pkg-plist2
-rw-r--r--www/p5-Kwiki-VimMode/pkg-plist2
-rw-r--r--www/p5-LWP-Authen-Wsse/pkg-plist10
-rw-r--r--www/p5-MasonX-Interp-WithCallbacks/pkg-plist2
-rw-r--r--www/p5-MasonX-Profiler/pkg-plist4
-rw-r--r--www/p5-MasonX-Request-WithApacheSession/pkg-plist4
-rw-r--r--www/p5-MasonX-WebApp/pkg-plist2
-rw-r--r--www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist8
-rw-r--r--www/p5-Maypole-Component/pkg-plist2
-rw-r--r--www/p5-Maypole/pkg-plist14
-rw-r--r--www/p5-PHP-Session/pkg-plist4
-rw-r--r--www/p5-POE-Component-Client-HTTP/pkg-plist14
-rw-r--r--www/p5-POE-Component-Client-UserAgent/pkg-plist12
-rw-r--r--www/p5-POE-Component-Server-HTTP/pkg-plist12
-rw-r--r--www/p5-POE-Component-Server-HTTPServer/pkg-plist12
-rw-r--r--www/p5-POE-Component-Server-SOAP/pkg-plist14
-rw-r--r--www/p5-POE-Component-Server-SimpleHTTP/pkg-plist12
-rw-r--r--www/p5-ParallelUA/pkg-plist4
-rw-r--r--www/p5-PodToHTML/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-CacheContent/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-Download/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-Dumper/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-HTML2HDML/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-Log/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-NoCache/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-SaveUpload/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-ScratchPad/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist4
-rw-r--r--www/p5-Sledge-Plugin-XSLT/pkg-plist4
-rw-r--r--www/p5-Sledge-SessionManager-CookieStore/pkg-plist4
-rw-r--r--www/p5-Sledge-Template-Expr/pkg-plist4
-rw-r--r--www/p5-Syntax-Highlight-HTML/pkg-plist8
-rw-r--r--www/p5-Syntax-Highlight-Shell/pkg-plist8
-rw-r--r--www/p5-Task-Catalyst/pkg-plist6
-rw-r--r--www/p5-Template-Multilingual/pkg-plist2
-rw-r--r--www/p5-Template-Plugin-Class/pkg-plist4
-rw-r--r--www/p5-Template-Plugin-Comma/pkg-plist6
-rw-r--r--www/p5-Template-Plugin-MP3/pkg-plist6
-rw-r--r--www/p5-Template-Plugin-Monta/pkg-plist6
-rw-r--r--www/p5-Template-Timer/pkg-plist4
-rw-r--r--www/p5-Test-HTTP-Server-Simple/pkg-plist14
-rw-r--r--www/p5-URI-Fetch/pkg-plist2
-rw-r--r--www/p5-URI-Sequin/pkg-plist4
-rw-r--r--www/p5-W3C-LinkChecker/pkg-plist2
-rw-r--r--www/p5-W3C-LogValidator/pkg-plist4
-rw-r--r--www/p5-WWW-Babelfish/pkg-plist6
-rw-r--r--www/p5-WWW-Curl/pkg-plist4
-rw-r--r--www/p5-WWW-Dilbert/pkg-plist4
-rw-r--r--www/p5-WWW-Link/pkg-plist2
-rw-r--r--www/p5-WWW-Mechanize-FormFiller/pkg-plist8
-rw-r--r--www/p5-WWW-Mechanize-Shell/pkg-plist16
-rw-r--r--www/p5-WWW-Mechanize/pkg-plist4
-rw-r--r--www/p5-WWW-Mixi/pkg-plist4
-rw-r--r--www/p5-WWW-Robot/pkg-plist4
-rw-r--r--www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist12
-rw-r--r--www/p5-WWW-Scraper-ISBN-Driver/pkg-plist14
-rw-r--r--www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist12
-rw-r--r--www/p5-WWW-Scraper-ISBN-Record/pkg-plist12
-rw-r--r--www/p5-WWW-Scraper-ISBN/pkg-plist10
-rw-r--r--www/p5-WWW-Search-AltaVista/pkg-plist8
-rw-r--r--www/p5-WWW-Search-Google/pkg-plist8
-rw-r--r--www/p5-WWW-Search/pkg-plist8
-rw-r--r--www/p5-WWW-Shorten/pkg-plist4
-rw-r--r--www/p5-WWW-SourceForge/pkg-plist4
-rw-r--r--www/p5-WebService-Bloglines/pkg-plist4
-rw-r--r--www/p5-WebService-NoPaste/pkg-plist4
-rw-r--r--www/p5-WebService-Technorati/pkg-plist6
-rw-r--r--www/p5-libwww/pkg-plist14
-rw-r--r--www/p5-webservice-validator-css-w3c/pkg-plist8
-rw-r--r--www/p5-webservice-validator-html-w3c/pkg-plist8
-rw-r--r--www/php-dyn/pkg-plist2
-rw-r--r--www/php-screw/pkg-plist2
-rw-r--r--www/php-templates/pkg-plist2
-rw-r--r--www/phpbb/pkg-plist18
-rw-r--r--www/plugger/pkg-plist2
-rw-r--r--www/polipo/pkg-plist4
-rw-r--r--www/privoxy+ipv6/pkg-plist2
-rw-r--r--www/py-formencode/pkg-plist10
-rw-r--r--www/py-webware/pkg-plist300
-rw-r--r--www/roundup/pkg-plist4
-rw-r--r--www/rt2/pkg-plist2
-rw-r--r--www/sidplug/pkg-plist2
-rw-r--r--www/simplog/pkg-plist2
-rw-r--r--www/slash/pkg-plist2
-rw-r--r--www/snownews/pkg-plist20
-rw-r--r--www/squid_radius_auth/pkg-plist4
-rw-r--r--www/ssserver/pkg-plist2
-rw-r--r--www/syndigator/pkg-plist6
-rw-r--r--www/thttpd/pkg-plist4
-rw-r--r--www/ump/pkg-plist2
-rw-r--r--www/urchin5/pkg-plist34
-rw-r--r--www/wiliki/pkg-plist4
-rw-r--r--www/winhelpcgi/pkg-plist2
-rw-r--r--www/xitami/pkg-plist6
-rw-r--r--www/xshttpd-devel/pkg-plist6
-rw-r--r--www/xshttpd/pkg-plist6
-rw-r--r--www/yabb/pkg-plist52
365 files changed, 1313 insertions, 1313 deletions
diff --git a/www/MT/pkg-plist b/www/MT/pkg-plist
index 9b3c4744c532..e8b11abb9c57 100644
--- a/www/MT/pkg-plist
+++ b/www/MT/pkg-plist
@@ -989,5 +989,5 @@
@dirrm %%DATADIR%%/mt-static/images/nav_icons
@dirrm %%DATADIR%%/mt-static/images
@dirrm %%DATADIR%%/mt-static
-@unexec rmdir %D/%%CGIDIR%%/db 2>/dev/null || true
-@unexec rmdir %D/%%CGIDIR%% 2>/dev/null || true
+@dirrmtry %%CGIDIR%%/db
+@dirrmtry %%CGIDIR%%
diff --git a/www/abcache/pkg-plist b/www/abcache/pkg-plist
index eb9cb91fd308..385a13ebc401 100644
--- a/www/abcache/pkg-plist
+++ b/www/abcache/pkg-plist
@@ -1,2 +1,2 @@
lib/php/%%PHP_EXT_DIR%%/bware_cache.so
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist
index ccc9eff6525d..ccf4551476aa 100644
--- a/www/amaya/pkg-plist
+++ b/www/amaya/pkg-plist
@@ -1425,8 +1425,8 @@ bin/amaya-%%GUI%%
%%DATADIR%%/resources/xrc/WinPrintDlgWX.xrc
share/applications/amaya-8.8.1.desktop
share/pixmaps/amaya-8.8.1.png
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry share/pixmaps
@dirrm %%DATADIR%%/resources/xrc
@dirrm %%DATADIR%%/resources/icons/misc
@dirrm %%DATADIR%%/resources/icons/22x22
diff --git a/www/amphetadesk/pkg-plist b/www/amphetadesk/pkg-plist
index 4ecbcbe46dce..a81e2fd97292 100644
--- a/www/amphetadesk/pkg-plist
+++ b/www/amphetadesk/pkg-plist
@@ -52,6 +52,6 @@ etc/rc.d/amphetadesk.sh
@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS
@dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk
@dirrm %%SITE_PERL%%/AmphetaDesk
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/www/amyc/pkg-plist b/www/amyc/pkg-plist
index 115e943325a5..5dfea208e53b 100644
--- a/www/amyc/pkg-plist
+++ b/www/amyc/pkg-plist
@@ -1,6 +1,6 @@
bin/amyc
%%WITH_GTK%%bin/amycg
share/locale/fr/LC_MESSAGES/amyc.mo
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index b76e2a8fbd0a..f2d12ff74daf 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -393,4 +393,4 @@ share/analog/lang/yudom.tab
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/css
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/%%IMGDIR%% 2>/dev/null || true
+@dirrmtry %%IMGDIR%%
diff --git a/www/apache13-modperl/pkg-plist b/www/apache13-modperl/pkg-plist
index d2f6f6e34182..a5e39f8b3a58 100644
--- a/www/apache13-modperl/pkg-plist
+++ b/www/apache13-modperl/pkg-plist
@@ -662,8 +662,8 @@ www/icons/world2.png
@dirrm share/doc/apache/howto
@dirrm share/doc/apache/programs
@dirrm share/doc/apache
-@unexec rmdir %D/www/data-dist 2>/dev/null || true
-@unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true
+@dirrmtry www/data-dist
+@dirrmtry www/cgi-bin-dist
@unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true
@dirrm www/icons/small
@dirrm www/icons
@@ -837,5 +837,5 @@ www/icons/world2.png
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2> /dev/null || true
-@unexec rmdir %D/etc/apache 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrmtry etc/apache
diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist
index 8eedf17e23ba..1838cc3248bf 100644
--- a/www/apache13-modssl/pkg-plist
+++ b/www/apache13-modssl/pkg-plist
@@ -753,8 +753,8 @@ www/icons/world2.png
@dirrm %%DOCSDIR%%/howto
@dirrm %%DOCSDIR%%/programs
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/www/data-dist 2>/dev/null || true
-@unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true
+@dirrmtry www/data-dist
+@dirrmtry www/cgi-bin-dist
@dirrm www/icons/small
@dirrm www/icons
@dirrm www/proxy
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 5e916c354830..2ca0c04f648f 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -656,7 +656,7 @@ www/icons/world2.gif
www/icons/world2.png
@exec mkdir -p %D/www/proxy
@unexec rm -f %D/etc/apache/httpsd.conf.bak 2> /dev/null || true
-@unexec rmdir %D/etc/apache 2> /dev/null || true
+@dirrmtry etc/apache
@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 90d2c03b0574..3ad2a7266a9c 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -518,12 +518,12 @@ share/apache2/build/special.mk
@dirrm %%EXAMPLESDIR%%
@dirrm share/apache2/build
@dirrm share/apache2
-@unexec rmdir %D/libexec/apache2 2> /dev/null || true
+@dirrmtry libexec/apache2
@dirrm lib/apache2
@dirrm include/apache2
@exec mkdir -p %D/etc/apache2/Includes 2> /dev/null || true
@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache2/Includes 2> /dev/null || true
-@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true
+@dirrmtry etc/apache2/Includes
+@dirrmtry etc/apache2/envvars.d
@unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true
@unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2."
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index e8e253e3edce..9c09d2bda7ff 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -536,12 +536,12 @@ share/apache21/build/special.mk
@dirrm share/apache21
%%APR_PORTS%%@dirrm include/apr-1
%%APR_PORTS%%@dirrm build-1
-@unexec rmdir %D/libexec/apache21 2> /dev/null || true
+@dirrmtry libexec/apache21
@dirrm include/apache21
@exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true
@exec mkdir -p %D/etc/apache21/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true
+@dirrmtry etc/apache21/Includes
@unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true
-@unexec rmdir %D/etc/apache21/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache21/extra 2> /dev/null || true
+@dirrmtry etc/apache21/envvars.d
+@dirrmtry etc/apache21/extra
@unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21."
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index c2f27f3b92a3..f6e4d0787cac 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -532,11 +532,11 @@ www/apache22/icons/world2.png
@dirrm share/apache22
%%APR_PORTS%%@dirrm include/apr-1
%%APR_PORTS%%@dirrm build-1
-@unexec rmdir %D/libexec/apache22 2> /dev/null || true
+@dirrmtry libexec/apache22
@dirrm include/apache22
-@unexec rmdir %D/www/apache22 2> /dev/null || true
-@unexec rmdir %D/etc/apache22/Includes 2> /dev/null || true
+@dirrmtry www/apache22
+@dirrmtry etc/apache22/Includes
@unexec rm -f %D/etc/apache22/httpd.conf.bak 2> /dev/null || true
-@unexec rmdir %D/etc/apache22/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache22/extra 2> /dev/null || true
+@dirrmtry etc/apache22/envvars.d
+@dirrmtry etc/apache22/extra
@unexec rmdir %D/etc/apache22 2> /dev/null || echo "===> If you plan to do not reinstall apache22, you can safely remove %D/etc/apache22."
diff --git a/www/bannerfilter/pkg-plist b/www/bannerfilter/pkg-plist
index ffe5c35949e8..77724efcc89c 100644
--- a/www/bannerfilter/pkg-plist
+++ b/www/bannerfilter/pkg-plist
@@ -42,6 +42,6 @@ libexec/bannerfilter/redirector.pl
%%WWW_ROOT%%/bannerfilter/xbbackground.gif
%%WWW_ROOT%%/bannerfilter/xoom.html
%%WWW_ROOT%%/bannerfilter/yahoo.html
-@unexec rmdir %D/etc/bannerfilter 2> /dev/null || true
+@dirrmtry etc/bannerfilter
@dirrm libexec/bannerfilter
@dirrm %%WWW_ROOT%%/bannerfilter
diff --git a/www/bins/pkg-plist b/www/bins/pkg-plist
index 70178e2ad8e6..18af6dc36aae 100644
--- a/www/bins/pkg-plist
+++ b/www/bins/pkg-plist
@@ -122,20 +122,20 @@ share/locale/it/LC_MESSAGES/bins.mo
share/locale/pl/LC_MESSAGES/bins.mo
share/locale/ru/LC_MESSAGES/bins.mo
share/locale/zh/LC_MESSAGES/bins.mo
-@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@dirrmtry share/locale/zh/LC_MESSAGES
+@dirrmtry share/locale/zh
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
%%PORTDOCS%%@dirrm share/doc/bins
@dirrm share/bins/templates.joi/static
@dirrm share/bins/templates.joi
diff --git a/www/caudium10/pkg-plist b/www/caudium10/pkg-plist
index b93033ab0de2..e69cb8f2afe4 100644
--- a/www/caudium10/pkg-plist
+++ b/www/caudium10/pkg-plist
@@ -558,12 +558,12 @@ caudium/server/install
caudium/server/configvar
caudium/server/.cvsignore
@unexec rm %D/caudium/server/lib/7.0.361/PiXSL.so 2>/dev/null || true
-@unexec rmdir %D/caudium/configurations 2>/dev/null || true
-@unexec rmdir %D/caudium/local/modules 2>/dev/null || true
-@unexec rmdir %D/caudium/local/nfonts 2>/dev/null || true
-@unexec rmdir %D/caudium/local 2>/dev/null || true
-@unexec rmdir %D/caudium/logs 2>/dev/null || true
-@unexec rmdir %D/caudium/server/include 2>/dev/null || true
+@dirrmtry caudium/configurations
+@dirrmtry caudium/local/modules
+@dirrmtry caudium/local/nfonts
+@dirrmtry caudium/local
+@dirrmtry caudium/logs
+@dirrmtry caudium/server/include
@dirrm caudium/readme
@dirrm caudium/server/more_modules
@dirrm caudium/server/base_server/config
diff --git a/www/caudium12/pkg-plist b/www/caudium12/pkg-plist
index 1b3981f66983..925ef994b78c 100644
--- a/www/caudium12/pkg-plist
+++ b/www/caudium12/pkg-plist
@@ -723,13 +723,13 @@ caudium/server/testca.pem
caudium/server/install
caudium/server/configvar
caudium/server/.cvsignore
-@unexec rmdir %D/caudium/configurations 2>/dev/null || true
-@unexec rmdir %D/caudium/local/modules 2>/dev/null || true
-@unexec rmdir %D/caudium/local/nfonts 2>/dev/null || true
-@unexec rmdir %D/caudium/local 2>/dev/null || true
-@unexec rmdir %D/caudium/logs 2>/dev/null || true
-@unexec rmdir %D/caudium/var 2>/dev/null || true
-@unexec rmdir %D/caudium/server/include 2>/dev/null || true
+@dirrmtry caudium/configurations
+@dirrmtry caudium/local/modules
+@dirrmtry caudium/local/nfonts
+@dirrmtry caudium/local
+@dirrmtry caudium/logs
+@dirrmtry caudium/var
+@dirrmtry caudium/server/include
@dirrm caudium/readme
@dirrm caudium/server/more_modules
@dirrm caudium/server/base_server/config
diff --git a/www/caudium14/pkg-plist b/www/caudium14/pkg-plist
index 1b3981f66983..925ef994b78c 100644
--- a/www/caudium14/pkg-plist
+++ b/www/caudium14/pkg-plist
@@ -723,13 +723,13 @@ caudium/server/testca.pem
caudium/server/install
caudium/server/configvar
caudium/server/.cvsignore
-@unexec rmdir %D/caudium/configurations 2>/dev/null || true
-@unexec rmdir %D/caudium/local/modules 2>/dev/null || true
-@unexec rmdir %D/caudium/local/nfonts 2>/dev/null || true
-@unexec rmdir %D/caudium/local 2>/dev/null || true
-@unexec rmdir %D/caudium/logs 2>/dev/null || true
-@unexec rmdir %D/caudium/var 2>/dev/null || true
-@unexec rmdir %D/caudium/server/include 2>/dev/null || true
+@dirrmtry caudium/configurations
+@dirrmtry caudium/local/modules
+@dirrmtry caudium/local/nfonts
+@dirrmtry caudium/local
+@dirrmtry caudium/logs
+@dirrmtry caudium/var
+@dirrmtry caudium/server/include
@dirrm caudium/readme
@dirrm caudium/server/more_modules
@dirrm caudium/server/base_server/config
diff --git a/www/cgiwrap/pkg-plist b/www/cgiwrap/pkg-plist
index 12b7a58134e2..c5b90fde8c84 100644
--- a/www/cgiwrap/pkg-plist
+++ b/www/cgiwrap/pkg-plist
@@ -2,4 +2,4 @@ www/cgi-bin/cgiwrap
%%DEBUGFLAG%%www/cgi-bin/cgiwrapd
%%NPHFLAG%%www/cgi-bin/nph-cgiwrap
%%NPHFLAG%%%%DEBUGFLAG%%www/cgi-bin/nph-cgiwrapd
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index d9933fc61797..b92829348b5b 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -146,5 +146,5 @@ www/index.html
@dirrm etc/cherokee/mods-enabled
@dirrm etc/cherokee/mods-available
@dirrm etc/cherokee
-@unexec rmdir %D/www/images 2>/dev/null || true
-@unexec rmdir %D/www/data 2>/dev/null || true
+@dirrmtry www/images
+@dirrmtry www/data
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index d9933fc61797..b92829348b5b 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -146,5 +146,5 @@ www/index.html
@dirrm etc/cherokee/mods-enabled
@dirrm etc/cherokee/mods-available
@dirrm etc/cherokee
-@unexec rmdir %D/www/images 2>/dev/null || true
-@unexec rmdir %D/www/data 2>/dev/null || true
+@dirrmtry www/images
+@dirrmtry www/data
diff --git a/www/coppermine/pkg-plist b/www/coppermine/pkg-plist
index b6a526e656b3..d54f527753b2 100644
--- a/www/coppermine/pkg-plist
+++ b/www/coppermine/pkg-plist
@@ -699,4 +699,4 @@
@dirrm %%CPGDIR%%/albums/edit
@dirrm %%CPGDIR%%/albums
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/%%CPGDIR%% 2>/dev/null || true
+@dirrmtry %%CPGDIR%%
diff --git a/www/dalbum/pkg-plist b/www/dalbum/pkg-plist
index 3cb95c4644a4..9d872c59529c 100644
--- a/www/dalbum/pkg-plist
+++ b/www/dalbum/pkg-plist
@@ -81,12 +81,12 @@
%%DALBUM_DIR%%/reindex.php
%%DALBUM_DIR%%/showimg.php
%%DALBUM_DIR%%/version.txt
-@unexec rmdir %D/%%DALBUM_DIR%%/pictures/Sample\ album 2>/dev/null || true
-@unexec rmdir %D/%%DALBUM_DIR%%/pictures 2>/dev/null || true
+@dirrmtry %%DALBUM_DIR%%/pictures/Sample\ album
+@dirrmtry %%DALBUM_DIR%%/pictures
@dirrm %%DALBUM_DIR%%/include/lang
@dirrm %%DALBUM_DIR%%/include
@dirrm %%DALBUM_DIR%%/images/folder
@dirrm %%DALBUM_DIR%%/images
@dirrm %%DALBUM_DIR%%/config
-@unexec rmdir %D/%%DALBUM_DIR%%/.private 2>/dev/null || true
+@dirrmtry %%DALBUM_DIR%%/.private
@dirrm %%DALBUM_DIR%%
diff --git a/www/dummyflash/pkg-plist b/www/dummyflash/pkg-plist
index 29513d7aa154..1d5c408d69d0 100644
--- a/www/dummyflash/pkg-plist
+++ b/www/dummyflash/pkg-plist
@@ -1,2 +1,2 @@
lib/browser_plugins/dummyflash.so
-@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true
+@dirrmtry lib/browser_plugins
diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist
index 661dca538810..d94827ec5535 100644
--- a/www/eaccelerator/pkg-plist
+++ b/www/eaccelerator/pkg-plist
@@ -1,6 +1,6 @@
bin/encoder
lib/php/%%PHP_EXT_DIR%%/eaccelerator.so
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
%%EXAMPLESDIR%%/eaccelerator.ini
%%EXAMPLESDIR%%/eaccelerator.php
%%EXAMPLESDIR%%/eaccelerator_password.php
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
index 47ae8959604c..701e6ff393f7 100644
--- a/www/emacs-w3m-xemacs21-mule/pkg-plist
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -324,5 +324,5 @@
%%PORTDOCS%%@dirrm share/doc/ja/emacs-w3m
%%PORTDOCS%%@dirrm share/doc/emacs-w3m
@dirrm %%ICONDIR%%
-@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/etc/images 2>/dev/null || true
+@dirrmtry %%EMACS_PACKAGESDIR%%/etc/images
@dirrm %%LISPDIR%%
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 345aa634f2dd..6b952958030b 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -75,11 +75,11 @@ share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/epiphany-extensions/xml
@dirrm share/gnome/epiphany-extensions/glade
@dirrm share/gnome/epiphany-extensions
-@unexec rmdir %D/lib/epiphany/%%VERSION%%/extensions 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany/%%VERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/epiphany 2>/dev/null || true
+@dirrmtry lib/epiphany/%%VERSION%%/extensions
+@dirrmtry lib/epiphany/%%VERSION%%
+@dirrmtry lib/epiphany
diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist
index a37f1e0548df..78669fe92aee 100644
--- a/www/evolution-webcal/pkg-plist
+++ b/www/evolution-webcal/pkg-plist
@@ -55,5 +55,5 @@ share/locale/vi/LC_MESSAGES/evolution-webcal.mo
share/locale/xh/LC_MESSAGES/evolution-webcal.mo
share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo
share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
diff --git a/www/feedonfeeds/pkg-plist b/www/feedonfeeds/pkg-plist
index c6017d870d31..2317cf7ea220 100644
--- a/www/feedonfeeds/pkg-plist
+++ b/www/feedonfeeds/pkg-plist
@@ -38,4 +38,4 @@
@dirrm %%DATADIR%%/frames
@dirrm %%DATADIR%%/magpierss/extlib
@dirrm %%DATADIR%%/magpierss
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/www/flashplugin-mozilla/pkg-plist b/www/flashplugin-mozilla/pkg-plist
index c8ebfc6508dd..58310e6b2b4d 100644
--- a/www/flashplugin-mozilla/pkg-plist
+++ b/www/flashplugin-mozilla/pkg-plist
@@ -1,2 +1,2 @@
%%PLUGIN_DIR%%/libnpflash.so
-@unexec rmdir %D/%%PLUGIN_DIR%% 2>/dev/null || true
+@dirrmtry %%PLUGIN_DIR%%
diff --git a/www/flashplugin/pkg-plist b/www/flashplugin/pkg-plist
index a96d3a0c8bfb..31369d02a103 100644
--- a/www/flashplugin/pkg-plist
+++ b/www/flashplugin/pkg-plist
@@ -1,3 +1,3 @@
lib/netscape/plugins/libswf.so
-@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/netscape 2>/dev/null || true
+@dirrmtry lib/netscape/plugins
+@dirrmtry lib/netscape
diff --git a/www/frontpage/pkg-plist b/www/frontpage/pkg-plist
index c26c15d136ff..7714232a8bc5 100644
--- a/www/frontpage/pkg-plist
+++ b/www/frontpage/pkg-plist
@@ -264,8 +264,8 @@ frontpage/version%%FP_VER%%/set_default_perms.sh
@dirrm frontpage/version%%FP_VER%%/apache2
@dirrm frontpage/version%%FP_VER%%/admin/1033
@dirrm frontpage/version%%FP_VER%%/admin
-@unexec rmdir %D/frontpage/version%%FP_VER%% 2> /dev/null || true
-@unexec rmdir %D/frontpage 2> /dev/null || true
+@dirrmtry frontpage/version%%FP_VER%%
+@dirrmtry frontpage
%%PORTDOCS%%%%DOCSDIR%%/readme.htm
%%PORTDOCS%%%%DOCSDIR%%/readme_apache_dso.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT
diff --git a/www/fxhtml/pkg-plist b/www/fxhtml/pkg-plist
index dfa17a5282c6..b63fd70c9a6a 100644
--- a/www/fxhtml/pkg-plist
+++ b/www/fxhtml/pkg-plist
@@ -1,4 +1,4 @@
www/data/demo.fx
www/cgi-bin/fxhtml
-@unexec rmdir %D/www/data 2> /dev/null || true
-@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
+@dirrmtry www/data
+@dirrmtry www/cgi-bin
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 1d66d0cd4add..97f0a8cfdccc 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -213,8 +213,8 @@ share/locale/vi/LC_MESSAGES/galeon-2.0.mo
share/locale/wa/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/sounds/galeon
@dirrm share/gnome/omf/galeon
@dirrm share/gnome/help/galeon/es/figures
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index 8bc77c96ccb6..2cd08c4d7a11 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -1175,4 +1175,4 @@
@dirrm %%GALLERYDIR%%/classes/Mail
@dirrm %%GALLERYDIR%%/classes/HTML
@dirrm %%GALLERYDIR%%/classes
-@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
+@dirrmtry %%GALLERYDIR%%
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index 59e03a116574..ee97b0465670 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -5624,7 +5624,7 @@
@dirrm %%GALLERY2DIR%%/install/locale/bg_BG
@dirrm %%GALLERY2DIR%%/install/locale
@dirrm %%GALLERY2DIR%%/install/images
-@unexec rmdir %D/%%GALLERYDIR%%/install 2>/dev/null || true
+@dirrmtry %%GALLERYDIR%%/install
@dirrm %%GALLERY2DIR%%/images
@dirrm %%GALLERY2DIR%%/docs
-@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
+@dirrmtry %%GALLERYDIR%%
diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist
index 59e03a116574..ee97b0465670 100644
--- a/www/gallery3/pkg-plist
+++ b/www/gallery3/pkg-plist
@@ -5624,7 +5624,7 @@
@dirrm %%GALLERY2DIR%%/install/locale/bg_BG
@dirrm %%GALLERY2DIR%%/install/locale
@dirrm %%GALLERY2DIR%%/install/images
-@unexec rmdir %D/%%GALLERYDIR%%/install 2>/dev/null || true
+@dirrmtry %%GALLERYDIR%%/install
@dirrm %%GALLERY2DIR%%/images
@dirrm %%GALLERY2DIR%%/docs
-@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true
+@dirrmtry %%GALLERYDIR%%
diff --git a/www/gforge/pkg-plist b/www/gforge/pkg-plist
index 21ed4cfab687..b26d5bd7719a 100644
--- a/www/gforge/pkg-plist
+++ b/www/gforge/pkg-plist
@@ -1370,19 +1370,19 @@
%%WWW_ROOT%%/gforge/www/tarballs.php
%%WWW_ROOT%%/gforge/www/\
%%WWW_ROOT%%/gforge/www/index.php
-@unexec rmdir %D/%%ETC_DIR%% 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/backend/zones 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/backend/shell 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/backend 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/mail 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/tarballs 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/dav-svn/mail 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/dav-svn/www 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/dav-svn 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/cvs-cron/mail 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/cvs-cron/www 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/cvs-cron 2>/dev/null || true
-@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs 2>/dev/null || true
+@dirrmtry %%ETC_DIR%%
+@dirrmtry %%BACKEND_DIR%%/backend/zones
+@dirrmtry %%BACKEND_DIR%%/backend/shell
+@dirrmtry %%BACKEND_DIR%%/backend
+@dirrmtry %%BACKEND_DIR%%/cronjobs/mail
+@dirrmtry %%BACKEND_DIR%%/cronjobs/tarballs
+@dirrmtry %%BACKEND_DIR%%/cronjobs/dav-svn/mail
+@dirrmtry %%BACKEND_DIR%%/cronjobs/dav-svn/www
+@dirrmtry %%BACKEND_DIR%%/cronjobs/dav-svn
+@dirrmtry %%BACKEND_DIR%%/cronjobs/cvs-cron/mail
+@dirrmtry %%BACKEND_DIR%%/cronjobs/cvs-cron/www
+@dirrmtry %%BACKEND_DIR%%/cronjobs/cvs-cron
+@dirrmtry %%BACKEND_DIR%%/cronjobs
@dirrm %%BACKEND_DIR%%/monitor
@dirrm %%BACKEND_DIR%%/utils/underworld-dummy
@dirrm %%BACKEND_DIR%%/utils/cvs1
diff --git a/www/guile-www/pkg-plist b/www/guile-www/pkg-plist
index b219c5463648..0bcedbc3979c 100644
--- a/www/guile-www/pkg-plist
+++ b/www/guile-www/pkg-plist
@@ -3,4 +3,4 @@ share/guile/www/http.scm
share/guile/www/main.scm
share/guile/www/url.scm
@dirrm share/guile/www
-@unexec rmdir %D/share/guile 2>/dev/null || true
+@dirrmtry share/guile
diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist
index ee9c61e2095a..e3902824891b 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde-base/pkg-plist
@@ -1578,16 +1578,16 @@
@dirrm %%HORDEDIR%%/lib/File/PDF
@dirrm %%HORDEDIR%%/lib/File
@dirrm %%HORDEDIR%%/lib/Block
-@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%/lib/data
@dirrm %%HORDEDIR%%/lib
@dirrm %%HORDEDIR%%/js
-@unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%/config
@dirrm %%HORDEDIR%%/admin/setup
@dirrm %%HORDEDIR%%/admin/perms
@dirrm %%HORDEDIR%%/admin/locale/fi_FI
@dirrm %%HORDEDIR%%/admin/locale/en_US
@dirrm %%HORDEDIR%%/admin/locale
@dirrm %%HORDEDIR%%/admin
-@unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true
diff --git a/www/horde-passwd/pkg-plist b/www/horde-passwd/pkg-plist
index f774ee530482..6ec9e254af94 100644
--- a/www/horde-passwd/pkg-plist
+++ b/www/horde-passwd/pkg-plist
@@ -166,5 +166,5 @@
@dirrm %%LPWDDIR%%/locale
@dirrm %%LPWDDIR%%/lib/Driver
@dirrm %%LPWDDIR%%/lib
-@unexec rmdir %D/%%LPWDDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%LPWDDIR%% 2>/dev/null || true
+@dirrmtry %%LPWDDIR%%/config
+@dirrmtry %%LPWDDIR%%
diff --git a/www/horde/pkg-plist b/www/horde/pkg-plist
index ee9c61e2095a..e3902824891b 100644
--- a/www/horde/pkg-plist
+++ b/www/horde/pkg-plist
@@ -1578,16 +1578,16 @@
@dirrm %%HORDEDIR%%/lib/File/PDF
@dirrm %%HORDEDIR%%/lib/File
@dirrm %%HORDEDIR%%/lib/Block
-@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%/lib/data
@dirrm %%HORDEDIR%%/lib
@dirrm %%HORDEDIR%%/js
-@unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%/config
@dirrm %%HORDEDIR%%/admin/setup
@dirrm %%HORDEDIR%%/admin/perms
@dirrm %%HORDEDIR%%/admin/locale/fi_FI
@dirrm %%HORDEDIR%%/admin/locale/en_US
@dirrm %%HORDEDIR%%/admin/locale
@dirrm %%HORDEDIR%%/admin
-@unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index ee9c61e2095a..e3902824891b 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -1578,16 +1578,16 @@
@dirrm %%HORDEDIR%%/lib/File/PDF
@dirrm %%HORDEDIR%%/lib/File
@dirrm %%HORDEDIR%%/lib/Block
-@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%/lib/data
@dirrm %%HORDEDIR%%/lib
@dirrm %%HORDEDIR%%/js
-@unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%/config
@dirrm %%HORDEDIR%%/admin/setup
@dirrm %%HORDEDIR%%/admin/perms
@dirrm %%HORDEDIR%%/admin/locale/fi_FI
@dirrm %%HORDEDIR%%/admin/locale/en_US
@dirrm %%HORDEDIR%%/admin/locale
@dirrm %%HORDEDIR%%/admin
-@unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true
+@dirrmtry %%HORDEDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 8c007b3b4d8d..100c2b572443 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -215,5 +215,5 @@ share/pixmaps/httrack.xpm
@dirrm %%DOCSDIR%%
@dirrm lib/httrack
@dirrm include/httrack
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/pixmaps
+@dirrmtry share/applications
diff --git a/www/instiki/pkg-plist b/www/instiki/pkg-plist
index fd060dc9760d..84857aa1092c 100644
--- a/www/instiki/pkg-plist
+++ b/www/instiki/pkg-plist
@@ -1025,6 +1025,6 @@ etc/rc.d/instiki.sh
@dirrm %%INSTIKIDIR%%app/views
@dirrm %%INSTIKIDIR%%app
@dirrm %%INSTIKIDIR%%lib
-@unexec rmdir %D/%%INSTIKIDIR%%storage/2500 2>/dev/null || true
-@unexec rmdir %D/%%INSTIKIDIR%%storage 2>/dev/null || true
-@unexec rmdir %D/%%INSTIKIDIR%% 2>/dev/null || true
+@dirrmtry %%INSTIKIDIR%%storage/2500
+@dirrmtry %%INSTIKIDIR%%storage
+@dirrmtry %%INSTIKIDIR%%
diff --git a/www/interchange/pkg-plist b/www/interchange/pkg-plist
index 24f5b6d3ecac..7b75b1bb1071 100644
--- a/www/interchange/pkg-plist
+++ b/www/interchange/pkg-plist
@@ -1754,6 +1754,6 @@ interchange/standard/variables/THEME_CSS
@dirrm interchange/code/Filter
@dirrm interchange/code/ActionMap
@dirrm interchange/code
-@unexec rmdir %D/interchange/src 2>/dev/null || true
-@unexec rmdir %D/interchange/etc 2>/dev/null || true
-@unexec rmdir %D/interchange 2>/dev/null || true
+@dirrmtry interchange/src
+@dirrmtry interchange/etc
+@dirrmtry interchange
diff --git a/www/jakarta-tomcat3/pkg-plist b/www/jakarta-tomcat3/pkg-plist
index 139e4fd7199c..dc79a97ae169 100644
--- a/www/jakarta-tomcat3/pkg-plist
+++ b/www/jakarta-tomcat3/pkg-plist
@@ -146,11 +146,11 @@ etc/rc.d/020.jakarta-tomcat3.sh
@exec mkdir -p %D/%%T%%/conf/auto || true
@exec mkdir -p %D/%%T%%/modules || true
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
-@unexec rmdir %D/%%T%%/conf/users 2>/dev/null || true
-@unexec rmdir %D/%%T%%/conf/auto 2>/dev/null || true
-@unexec rmdir %D/%%T%%/conf/jserv 2>/dev/null || true
-@unexec rmdir %D/%%T%%/conf/jk 2>/dev/null || true
-@unexec rmdir %D/%%T%%/conf 2>/dev/null || true
+@dirrmtry %%T%%/conf/users
+@dirrmtry %%T%%/conf/auto
+@dirrmtry %%T%%/conf/jserv
+@dirrmtry %%T%%/conf/jk
+@dirrmtry %%T%%/conf
@dirrm %%T%%/logs
@dirrm %%T%%/doc/images
@dirrm %%T%%/doc/appdev/sample/etc
@@ -172,4 +172,4 @@ etc/rc.d/020.jakarta-tomcat3.sh
@dirrm %%T%%/webapps
@dirrm %%T%%/bin
@dirrm %%T%%/ant
-@unexec rmdir %D/%%T%% 2>/dev/null || true
+@dirrmtry %%T%%
diff --git a/www/jakarta-tomcat4/pkg-plist b/www/jakarta-tomcat4/pkg-plist
index 45855e0e3f87..95e5b3ae4ed9 100644
--- a/www/jakarta-tomcat4/pkg-plist
+++ b/www/jakarta-tomcat4/pkg-plist
@@ -971,7 +971,7 @@ etc/rc.d/020.jakarta-tomcat4.sh
@exec mkdir %D/%%T%%/server/classes || true
@exec mkdir %D/%%T%%/work || true
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/
-@unexec rmdir %D/%%T%%/conf 2>/dev/null || true
+@dirrmtry %%T%%/conf
@dirrm %%T%%/logs
@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage
@dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src
@@ -1095,4 +1095,4 @@ etc/rc.d/020.jakarta-tomcat4.sh
@dirrm %%T%%/server/classes
@dirrm %%T%%/server
@dirrm %%T%%/work
-@unexec rmdir %D/%%T%% 2>/dev/null || true
+@dirrmtry %%T%%
diff --git a/www/kdedict/pkg-plist b/www/kdedict/pkg-plist
index 0809046a8346..53302d31d29e 100644
--- a/www/kdedict/pkg-plist
+++ b/www/kdedict/pkg-plist
@@ -17,4 +17,4 @@ www/cgi-bin/kdedictionary/sessiondb
www/cgi-bin/kdedictionary/userdb
www/cgi-bin/kdedictionary/users
@dirrm www/cgi-bin/kdedictionary
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/www/middleman/pkg-plist b/www/middleman/pkg-plist
index b161031690a6..6f4a6dca7488 100644
--- a/www/middleman/pkg-plist
+++ b/www/middleman/pkg-plist
@@ -6,5 +6,5 @@ etc/mman.xml.dist
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@cwd /
@exec mkdir -p %%MMAN_CACHE%%
-@unexec rmdir %D/%%MMAN_CACHE%% 2>/dev/null || true
+@dirrmtry %%MMAN_CACHE%%
@dirrm /var/cache
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index 334717109018..bc1e333ea336 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -439,5 +439,5 @@ sbin/indexer
@dirrm etc/mnogosearch/synonym
@dirrm etc/mnogosearch/stopwords
@dirrm etc/mnogosearch/langmap
-@unexec rmdir %D/etc/mnogosearch 2>/dev/null || true
+@dirrmtry etc/mnogosearch
@dirrm %%DOCSDIR%%
diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist
index dcf31a2abd45..c38fcda33a25 100644
--- a/www/mod_perl/pkg-plist
+++ b/www/mod_perl/pkg-plist
@@ -71,9 +71,9 @@ libexec/apache/libperl.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
-@unexec rmdir %D/etc/apache 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrmtry etc/apache
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 2c9634b1dac9..0a8a5e9bd032 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -324,11 +324,11 @@ bin/mp2bug
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
@dirrm include/apache2/modules/perl
-@unexec rmdir %D/include/apache2/modules 2>/dev/null || true
-@unexec rmdir %D/include/apache2 2>/dev/null || true
+@dirrmtry include/apache2/modules
+@dirrmtry include/apache2
diff --git a/www/mozplugger/pkg-plist b/www/mozplugger/pkg-plist
index a78302e1df15..b7970ed4319b 100644
--- a/www/mozplugger/pkg-plist
+++ b/www/mozplugger/pkg-plist
@@ -2,4 +2,4 @@ bin/mozplugger-helper
bin/mozplugger-controller
etc/mozpluggerrc
lib/browser_plugins/mozplugger.so
-@unexec rmdir %D/lib/browser_plugins 2> /dev/null || true
+@dirrmtry lib/browser_plugins
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index 39c9f1b0f11e..92dba19e7082 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -24,6 +24,6 @@ share/locale/nl/LC_MESSAGES/mplayerplug-in.mo
share/locale/pl/LC_MESSAGES/mplayerplug-in.mo
share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo
share/locale/ru/LC_MESSAGES/mplayerplug-in.mo
-@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US 2> /dev/null || true
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
@unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index ace48038cb95..460817a8abeb 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -6,7 +6,7 @@ etc/nginx/mime.types-dist
@unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi
etc/nginx/nginx.conf-dist
@exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf
-@unexec rmdir %D/etc/nginx 2>/dev/null || true
+@dirrmtry etc/nginx
%%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
@comment @unexec chmod u+w www/nginx-dist
%%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index ace48038cb95..460817a8abeb 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -6,7 +6,7 @@ etc/nginx/mime.types-dist
@unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi
etc/nginx/nginx.conf-dist
@exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf
-@unexec rmdir %D/etc/nginx 2>/dev/null || true
+@dirrmtry etc/nginx
%%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
@comment @unexec chmod u+w www/nginx-dist
%%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist
index 392066cca2fb..b63dd14e05e2 100644
--- a/www/oops/pkg-plist
+++ b/www/oops/pkg-plist
@@ -53,11 +53,11 @@ sbin/oops
sbin/oopsctl
@dirrm libexec/oops
@dirrm etc/oops/tables
-@unexec rmdir %D/etc/oops 2>/dev/null || true
-@unexec rmdir %D/oops/DB 2>/dev/null || true
-@unexec rmdir %D/oops/logs 2>/dev/null || true
-@unexec rmdir %D/oops/storages 2>/dev/null || true
-@unexec rmdir %D/oops 2>/dev/null || true
+@dirrmtry etc/oops
+@dirrmtry oops/DB
+@dirrmtry oops/logs
+@dirrmtry oops/storages
+@dirrmtry oops
@unexec rmdir /var/log/oops 2>/dev/null || true
@unexec rm -f /var/run/oops/oopsctl 2>/dev/null || true
@unexec rm -f /var/run/oops/oops_statfile 2>/dev/null || true
diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist
index 3e4153beca3a..fccde3a4391d 100644
--- a/www/openvrml/pkg-plist
+++ b/www/openvrml/pkg-plist
@@ -54,6 +54,6 @@ lib/mozilla/plugins/openvrml.xpt
@dirrm include/openvrml
@dirrm share/idl/openvrml-%%VER%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/share/gtk-doc/html/gtkglext 2>/dev/null || true
-@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/gtkglext
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
diff --git a/www/p5-AMF-Perl/pkg-plist b/www/p5-AMF-Perl/pkg-plist
index b8ba63095b36..f06626f9606e 100644
--- a/www/p5-AMF-Perl/pkg-plist
+++ b/www/p5-AMF-Perl/pkg-plist
@@ -14,5 +14,5 @@
@dirrm %%SITE_PERL%%/AMF/Perl/Util
@dirrm %%SITE_PERL%%/AMF/Perl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl
-@unexec rmdir %D/%%SITE_PERL%%/AMF 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/AMF
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF
diff --git a/www/p5-Acme-Monta/pkg-plist b/www/p5-Acme-Monta/pkg-plist
index 633f4bed0aa7..eadda4465a92 100644
--- a/www/p5-Acme-Monta/pkg-plist
+++ b/www/p5-Acme-Monta/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Acme/Monta.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Monta/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Monta
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Acme 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme
+@dirrmtry %%SITE_PERL%%/Acme
diff --git a/www/p5-Apache-ASP/pkg-plist b/www/p5-Apache-ASP/pkg-plist
index bd9ab42fdbf9..7c597c9f35c7 100644
--- a/www/p5-Apache-ASP/pkg-plist
+++ b/www/p5-Apache-ASP/pkg-plist
@@ -32,8 +32,8 @@ bin/asp-perl
@dirrm %%SITE_PERL%%/Apache/ASP/Share/CORE
@dirrm %%SITE_PERL%%/Apache/ASP/Share
@dirrm %%SITE_PERL%%/Apache/ASP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrm %%SITE_PERL%%/Bundle/Apache/ASP
@dirrm %%SITE_PERL%%/Bundle/Apache
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AddHostPath/pkg-plist b/www/p5-Apache-AddHostPath/pkg-plist
index 336c74ba47ff..0723bae3ed08 100644
--- a/www/p5-Apache-AddHostPath/pkg-plist
+++ b/www/p5-Apache-AddHostPath/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/AddHostPath.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Admin-Config/pkg-plist b/www/p5-Apache-Admin-Config/pkg-plist
index de408c3e1b13..62eb47afcabc 100644
--- a/www/p5-Apache-Admin-Config/pkg-plist
+++ b/www/p5-Apache-Admin-Config/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist
%%SITE_PERL%%/Apache/Admin/Config.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Admin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache/Admin
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AntiSpam/pkg-plist b/www/p5-Apache-AntiSpam/pkg-plist
index ab0f54471da8..b1ef8604476f 100644
--- a/www/p5-Apache-AntiSpam/pkg-plist
+++ b/www/p5-Apache-AntiSpam/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/Apache/AntiSpam/Heuristic.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrm %%SITE_PERL%%/Apache/AntiSpam
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Archive/pkg-plist b/www/p5-Apache-Archive/pkg-plist
index 5b50a615ac23..b76bf519092d 100644
--- a/www/p5-Apache-Archive/pkg-plist
+++ b/www/p5-Apache-Archive/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive
@dirrm %%SITE_PERL%%/auto/Apache/Archive
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist
index a09b80078cbb..b47cfdffb299 100644
--- a/www/p5-Apache-AuthCookie/pkg-plist
+++ b/www/p5-Apache-AuthCookie/pkg-plist
@@ -4,5 +4,5 @@
@dirrm %%SITE_PERL%%/Apache/AuthCookie
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache2 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/Apache2
diff --git a/www/p5-Apache-AuthTicket/pkg-plist b/www/p5-Apache-AuthTicket/pkg-plist
index 6abe3abb4a32..3a4d75c0483a 100644
--- a/www/p5-Apache-AuthTicket/pkg-plist
+++ b/www/p5-Apache-AuthTicket/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/AuthTicket.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AuthenCache/pkg-plist b/www/p5-Apache-AuthenCache/pkg-plist
index 5d53fbeff37f..eb9012894e5f 100644
--- a/www/p5-Apache-AuthenCache/pkg-plist
+++ b/www/p5-Apache-AuthenCache/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/AuthenCache.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist b/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist
index b80557d222b8..1abe75a763aa 100644
--- a/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist
+++ b/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist
@@ -1,11 +1,11 @@
%%SITE_PERL%%/Apache/AxKit/Plugin/AddXSLParams/Request.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams/Request/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams/Request
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/AxKit/Plugin/AddXSLParams 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/AxKit/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/AxKit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache/AxKit/Plugin/AddXSLParams
+@dirrmtry %%SITE_PERL%%/Apache/AxKit/Plugin
+@dirrmtry %%SITE_PERL%%/Apache/AxKit
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Clean/pkg-plist b/www/p5-Apache-Clean/pkg-plist
index 65a28fe6254c..2ef7e3b83235 100644
--- a/www/p5-Apache-Clean/pkg-plist
+++ b/www/p5-Apache-Clean/pkg-plist
@@ -3,5 +3,5 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Clean2/pkg-plist b/www/p5-Apache-Clean2/pkg-plist
index 65a28fe6254c..2ef7e3b83235 100644
--- a/www/p5-Apache-Clean2/pkg-plist
+++ b/www/p5-Apache-Clean2/pkg-plist
@@ -3,5 +3,5 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Compress/pkg-plist b/www/p5-Apache-Compress/pkg-plist
index f6acd4686cdb..355aacd3cee6 100644
--- a/www/p5-Apache-Compress/pkg-plist
+++ b/www/p5-Apache-Compress/pkg-plist
@@ -3,5 +3,5 @@
%%PORTDOCS%%%%DOCSDIR%%/Changes
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Compress
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-CompressClientFixup/pkg-plist b/www/p5-Apache-CompressClientFixup/pkg-plist
index a59692c136cd..9a4e1cac6184 100644
--- a/www/p5-Apache-CompressClientFixup/pkg-plist
+++ b/www/p5-Apache-CompressClientFixup/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/CompressClientFixup.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/CompressClientFixup/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/CompressClientFixup
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-ConfigFile/pkg-plist b/www/p5-Apache-ConfigFile/pkg-plist
index bdd04740a326..3150160c9942 100644
--- a/www/p5-Apache-ConfigFile/pkg-plist
+++ b/www/p5-Apache-ConfigFile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist
%%SITE_PERL%%/Apache/ConfigFile.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-DB/pkg-plist b/www/p5-Apache-DB/pkg-plist
index 8efb1e03b070..11f55c6bb0a3 100644
--- a/www/p5-Apache-DB/pkg-plist
+++ b/www/p5-Apache-DB/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-DBI/pkg-plist b/www/p5-Apache-DBI/pkg-plist
index e93f4e5a09b9..814e8dc2141f 100644
--- a/www/p5-Apache-DBI/pkg-plist
+++ b/www/p5-Apache-DBI/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Apache/AuthDBI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-DebugInfo/pkg-plist b/www/p5-Apache-DebugInfo/pkg-plist
index 2c2c346006b9..3e7b1c6c1ac8 100644
--- a/www/p5-Apache-DebugInfo/pkg-plist
+++ b/www/p5-Apache-DebugInfo/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DebugInfo/.packlist
%%SITE_PERL%%/Apache/DebugInfo.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DebugInfo
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-DumpHeaders/pkg-plist b/www/p5-Apache-DumpHeaders/pkg-plist
index 330bdeb2352d..02bb1945f327 100644
--- a/www/p5-Apache-DumpHeaders/pkg-plist
+++ b/www/p5-Apache-DumpHeaders/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Apache/DumpHeaders.pm
%%SITE_PERL%%/Apache/ProxyPassThru.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-Filter/pkg-plist b/www/p5-Apache-Filter/pkg-plist
index 0a8849bfe148..a7bd80158794 100644
--- a/www/p5-Apache-Filter/pkg-plist
+++ b/www/p5-Apache-Filter/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Apache/PerlRunFilter.pm
%%SITE_PERL%%/Apache/Filter.pm
%%SITE_PERL%%/Apache/RegistryFilter.pm
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Filter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Filter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-Gallery/pkg-plist b/www/p5-Apache-Gallery/pkg-plist
index e8d75002730f..63d7e7e5d7f6 100644
--- a/www/p5-Apache-Gallery/pkg-plist
+++ b/www/p5-Apache-Gallery/pkg-plist
@@ -59,7 +59,7 @@ www/icons/gallery/video-mpeg.png
www/icons/gallery/video-mpg.png
www/icons/gallery/video-wmv.png
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
@dirrm %%DATADIR%%/templates/default
@dirrm %%DATADIR%%/templates/new
@dirrm %%DATADIR%%/templates
diff --git a/www/p5-Apache-GopherHandler/pkg-plist b/www/p5-Apache-GopherHandler/pkg-plist
index ee1491ab97eb..94c6b9e72445 100644
--- a/www/p5-Apache-GopherHandler/pkg-plist
+++ b/www/p5-Apache-GopherHandler/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Apache/GopherHandler.pm
%%SITE_PERL%%/Apache/GopherHandler/TiedSocket.pm
@dirrm %%SITE_PERL%%/Apache/GopherHandler
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-MP3/pkg-plist b/www/p5-Apache-MP3/pkg-plist
index 522977529696..a8fbdc3a2033 100644
--- a/www/p5-Apache-MP3/pkg-plist
+++ b/www/p5-Apache-MP3/pkg-plist
@@ -55,8 +55,8 @@ share/Apache-MP3/playlist.gif
share/Apache-MP3/right_arrow.gif
share/Apache-MP3/sound.gif
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrm %%SITE_PERL%%/Apache/MP3/L10N
@dirrm %%SITE_PERL%%/Apache/MP3
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
@dirrm share/Apache-MP3
diff --git a/www/p5-Apache-NNTPGateway/pkg-plist b/www/p5-Apache-NNTPGateway/pkg-plist
index 5fd095ccb30d..2bbed3adf5f8 100644
--- a/www/p5-Apache-NNTPGateway/pkg-plist
+++ b/www/p5-Apache-NNTPGateway/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway/.packlist
%%SITE_PERL%%/Apache/NNTPGateway.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-PageKit/pkg-plist b/www/p5-Apache-PageKit/pkg-plist
index 25a600cd17df..a1cd5f375cba 100644
--- a/www/p5-Apache-PageKit/pkg-plist
+++ b/www/p5-Apache-PageKit/pkg-plist
@@ -81,7 +81,7 @@
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Config
%%PORTDOCS%%@dirrm share/examples/Apache-PageKit
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/PageKit
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/PageKit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache/PageKit
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/www/p5-Apache-ParseFormData/pkg-plist b/www/p5-Apache-ParseFormData/pkg-plist
index 1876f09f6a6c..6dee2911ca1c 100644
--- a/www/p5-Apache-ParseFormData/pkg-plist
+++ b/www/p5-Apache-ParseFormData/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/ParseFormData.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Peek/pkg-plist b/www/p5-Apache-Peek/pkg-plist
index 5e9cdb7cfe36..c5415d947b62 100644
--- a/www/p5-Apache-Peek/pkg-plist
+++ b/www/p5-Apache-Peek/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-Apache-Profiler/pkg-plist b/www/p5-Apache-Profiler/pkg-plist
index 194c4d298eb3..8fcf805561b5 100644
--- a/www/p5-Apache-Profiler/pkg-plist
+++ b/www/p5-Apache-Profiler/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/Profiler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-Radius/pkg-plist b/www/p5-Apache-Radius/pkg-plist
index 993178b1ff56..32a2ba993368 100644
--- a/www/p5-Apache-Radius/pkg-plist
+++ b/www/p5-Apache-Radius/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/AuthenRadius.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Reload/pkg-plist b/www/p5-Apache-Reload/pkg-plist
index ed834e651972..bbf37c9b0fc0 100644
--- a/www/p5-Apache-Reload/pkg-plist
+++ b/www/p5-Apache-Reload/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload/.packlist
%%SITE_PERL%%/Apache/Reload.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache-SSI/pkg-plist b/www/p5-Apache-SSI/pkg-plist
index 0106cecb4d23..1e7f8f750b71 100644
--- a/www/p5-Apache-SSI/pkg-plist
+++ b/www/p5-Apache-SSI/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Apache/FakeSSI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SSI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SSI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Scoreboard/pkg-plist b/www/p5-Apache-Scoreboard/pkg-plist
index c1a0f41ea691..cdf7d9b1293e 100644
--- a/www/p5-Apache-Scoreboard/pkg-plist
+++ b/www/p5-Apache-Scoreboard/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard/Scoreboard.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DummyScoreboard
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-Apache-Session-PHP/pkg-plist b/www/p5-Apache-Session-PHP/pkg-plist
index 73f8eb3b8046..db58da2fea32 100644
--- a/www/p5-Apache-Session-PHP/pkg-plist
+++ b/www/p5-Apache-Session-PHP/pkg-plist
@@ -3,9 +3,9 @@
%%SITE_PERL%%/Apache/Session/Store/PHP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Session/Serialize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache/Session/Store
+@dirrmtry %%SITE_PERL%%/Apache/Session/Serialize
+@dirrmtry %%SITE_PERL%%/Apache/Session
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-SQLite3/pkg-plist b/www/p5-Apache-Session-SQLite3/pkg-plist
index 9eb0af14907b..0d221c282f17 100644
--- a/www/p5-Apache-Session-SQLite3/pkg-plist
+++ b/www/p5-Apache-Session-SQLite3/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/Apache/Session/Store/SQLite3.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache/Session/Store
+@dirrmtry %%SITE_PERL%%/Apache/Session
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session-Wrapper/pkg-plist b/www/p5-Apache-Session-Wrapper/pkg-plist
index 0beeaef6a73c..ebbfdb1ea5d7 100644
--- a/www/p5-Apache-Session-Wrapper/pkg-plist
+++ b/www/p5-Apache-Session-Wrapper/pkg-plist
@@ -1,4 +1,4 @@
@comment $FreeBSD$
%%SITE_PERL%%/Apache/Session/Wrapper.pm
-@unexec rmdir %D/%%SITE_PERL%%/Apache/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache/Session
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Session/pkg-plist b/www/p5-Apache-Session/pkg-plist
index 07cba1864a45..6253d7a185dc 100644
--- a/www/p5-Apache-Session/pkg-plist
+++ b/www/p5-Apache-Session/pkg-plist
@@ -29,10 +29,10 @@
%%SITE_PERL%%/Apache/Session/Sybase.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
@dirrm %%SITE_PERL%%/Apache/Session/Store
@dirrm %%SITE_PERL%%/Apache/Session/Serialize
@dirrm %%SITE_PERL%%/Apache/Session/Lock
@dirrm %%SITE_PERL%%/Apache/Session/Generate
@dirrm %%SITE_PERL%%/Apache/Session
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-Singleton/pkg-plist b/www/p5-Apache-Singleton/pkg-plist
index d553ab236f05..462418836c1b 100644
--- a/www/p5-Apache-Singleton/pkg-plist
+++ b/www/p5-Apache-Singleton/pkg-plist
@@ -1,9 +1,9 @@
@comment $FreeBSD$
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
%%SITE_PERL%%/Apache/Singleton.pm
%%SITE_PERL%%/Apache/Singleton/Process.pm
%%SITE_PERL%%/Apache/Singleton/Request.pm
@dirrm %%SITE_PERL%%/Apache/Singleton
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-Apache-SubProcess/pkg-plist b/www/p5-Apache-SubProcess/pkg-plist
index ae0a2a44fde0..1cba77d25b85 100644
--- a/www/p5-Apache-SubProcess/pkg-plist
+++ b/www/p5-Apache-SubProcess/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SubProcess.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-Apache-Template/pkg-plist b/www/p5-Apache-Template/pkg-plist
index 930b82762090..38001c61a5b8 100644
--- a/www/p5-Apache-Template/pkg-plist
+++ b/www/p5-Apache-Template/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template/Template.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template/Template.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Template/Service 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Service
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-Apache-Test/pkg-plist b/www/p5-Apache-Test/pkg-plist
index f5aa83733da8..dab7e3f9807a 100644
--- a/www/p5-Apache-Test/pkg-plist
+++ b/www/p5-Apache-Test/pkg-plist
@@ -34,6 +34,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestUtil.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Test
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
diff --git a/www/p5-Apache2-Scoreboard/pkg-plist b/www/p5-Apache2-Scoreboard/pkg-plist
index c1a0f41ea691..cdf7d9b1293e 100644
--- a/www/p5-Apache2-Scoreboard/pkg-plist
+++ b/www/p5-Apache2-Scoreboard/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard/Scoreboard.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DummyScoreboard
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-ApacheBench/pkg-plist b/www/p5-ApacheBench/pkg-plist
index 08cd40f033fc..9856a914d2ed 100644
--- a/www/p5-ApacheBench/pkg-plist
+++ b/www/p5-ApacheBench/pkg-plist
@@ -5,8 +5,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD
diff --git a/www/p5-AxKit-XSP-Cookie/pkg-plist b/www/p5-AxKit-XSP-Cookie/pkg-plist
index 0a56fc181685..ef680251e85b 100644
--- a/www/p5-AxKit-XSP-Cookie/pkg-plist
+++ b/www/p5-AxKit-XSP-Cookie/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/Cookie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-ESQL/pkg-plist b/www/p5-AxKit-XSP-ESQL/pkg-plist
index 1f406480c1f8..72b8a66576c0 100644
--- a/www/p5-AxKit-XSP-ESQL/pkg-plist
+++ b/www/p5-AxKit-XSP-ESQL/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/ESQL.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-Exception/pkg-plist b/www/p5-AxKit-XSP-Exception/pkg-plist
index c5719ed7fea0..99b424849e76 100644
--- a/www/p5-AxKit-XSP-Exception/pkg-plist
+++ b/www/p5-AxKit-XSP-Exception/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/Exception.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-IfParam/pkg-plist b/www/p5-AxKit-XSP-IfParam/pkg-plist
index 7a2a491b2e6a..b5a03be7f601 100644
--- a/www/p5-AxKit-XSP-IfParam/pkg-plist
+++ b/www/p5-AxKit-XSP-IfParam/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/IfParam.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-Param/pkg-plist b/www/p5-AxKit-XSP-Param/pkg-plist
index fb338161421e..efb6255e7f94 100644
--- a/www/p5-AxKit-XSP-Param/pkg-plist
+++ b/www/p5-AxKit-XSP-Param/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/Param.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-PerForm/pkg-plist b/www/p5-AxKit-XSP-PerForm/pkg-plist
index a7f9cdaa4b6c..d92677209180 100644
--- a/www/p5-AxKit-XSP-PerForm/pkg-plist
+++ b/www/p5-AxKit-XSP-PerForm/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/PerForm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-Sendmail/pkg-plist b/www/p5-AxKit-XSP-Sendmail/pkg-plist
index 9be0d56f8575..7cf4545462a1 100644
--- a/www/p5-AxKit-XSP-Sendmail/pkg-plist
+++ b/www/p5-AxKit-XSP-Sendmail/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/Sendmail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-Util/pkg-plist b/www/p5-AxKit-XSP-Util/pkg-plist
index f017e0569600..66f3934b1167 100644
--- a/www/p5-AxKit-XSP-Util/pkg-plist
+++ b/www/p5-AxKit-XSP-Util/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-AxKit-XSP-WebUtils/pkg-plist b/www/p5-AxKit-XSP-WebUtils/pkg-plist
index 66a6e3038074..53c9c095aadb 100644
--- a/www/p5-AxKit-XSP-WebUtils/pkg-plist
+++ b/www/p5-AxKit-XSP-WebUtils/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/AxKit/XSP/WebUtils.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
diff --git a/www/p5-B-LexInfo/pkg-plist b/www/p5-B-LexInfo/pkg-plist
index 983d1fcfef0f..2874a13b9c0c 100644
--- a/www/p5-B-LexInfo/pkg-plist
+++ b/www/p5-B-LexInfo/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/LexInfo/LexInfo.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/B/LexInfo/LexInfo.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/LexInfo
-@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
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
diff --git a/www/p5-Bundle-Catalyst/pkg-plist b/www/p5-Bundle-Catalyst/pkg-plist
index 88713c2582b2..dcbdf9afc985 100644
--- a/www/p5-Bundle-Catalyst/pkg-plist
+++ b/www/p5-Bundle-Catalyst/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Bundle/Catalyst.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Catalyst/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Catalyst
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/www/p5-Bundle-Slash/pkg-plist b/www/p5-Bundle-Slash/pkg-plist
index 82bda6482a5e..39b557982042 100644
--- a/www/p5-Bundle-Slash/pkg-plist
+++ b/www/p5-Bundle-Slash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Bundle/Slash.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/www/p5-Bundle-Sledge/pkg-plist b/www/p5-Bundle-Sledge/pkg-plist
index 820f5f823258..e8be11489410 100644
--- a/www/p5-Bundle-Sledge/pkg-plist
+++ b/www/p5-Bundle-Sledge/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Bundle/Sledge.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/www/p5-CGI-Ajax/pkg-plist b/www/p5-CGI-Ajax/pkg-plist
index 7eff39dfbb7a..6768d6805d13 100644
--- a/www/p5-CGI-Ajax/pkg-plist
+++ b/www/p5-CGI-Ajax/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CGI/Ajax.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-Plugin-DBH/pkg-plist b/www/p5-CGI-Application-Plugin-DBH/pkg-plist
index 64a77f3ab4f7..0733387f51f0 100644
--- a/www/p5-CGI-Application-Plugin-DBH/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-DBH/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/CGI/Application/Plugin/DBH.pm
-@unexec rmdir %D/%%SITE_PERL%%/CGI/Application/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist b/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist
index a7ab37051f18..3548c9b53e18 100644
--- a/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist
+++ b/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/CGI/Application/Plugin/ValidateRM.pm
-@unexec rmdir %D/%%SITE_PERL%%/CGI/Application/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI/Application 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin
+@dirrmtry %%SITE_PERL%%/CGI/Application
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application-ValidateRM/pkg-plist b/www/p5-CGI-Application-ValidateRM/pkg-plist
index 267514a6d6c3..9564c5463471 100644
--- a/www/p5-CGI-Application-ValidateRM/pkg-plist
+++ b/www/p5-CGI-Application-ValidateRM/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/CGI/Application/ValidateRM.pm
-@unexec rmdir %D/%%SITE_PERL%%/CGI/Application 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI/Application
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Application/pkg-plist b/www/p5-CGI-Application/pkg-plist
index 559dc1fac363..e25357986579 100644
--- a/www/p5-CGI-Application/pkg-plist
+++ b/www/p5-CGI-Application/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/CGI/Application/Mailform.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
@dirrm %%SITE_PERL%%/CGI/Application
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist
index 767facd633ca..b2821305f25e 100644
--- a/www/p5-CGI-ArgChecker/pkg-plist
+++ b/www/p5-CGI-ArgChecker/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CGI/ArgChecker.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Builder/pkg-plist b/www/p5-CGI-Builder/pkg-plist
index a0ac8c195c21..6429753d8fc5 100644
--- a/www/p5-CGI-Builder/pkg-plist
+++ b/www/p5-CGI-Builder/pkg-plist
@@ -4,9 +4,9 @@
%%SITE_PERL%%/CGI/Builder/Test.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
@dirrm %%SITE_PERL%%/CGI/Builder
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
@dirrm %%SITE_PERL%%/Bundle/CGI/Builder
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle/CGI
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/www/p5-CGI-Cache/pkg-plist b/www/p5-CGI-Cache/pkg-plist
index 395eaca1328f..f42269517279 100644
--- a/www/p5-CGI-Cache/pkg-plist
+++ b/www/p5-CGI-Cache/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CGI/Cache.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-FastTemplate/pkg-plist b/www/p5-CGI-FastTemplate/pkg-plist
index ea8c2e2f26fc..f23628bad891 100644
--- a/www/p5-CGI-FastTemplate/pkg-plist
+++ b/www/p5-CGI-FastTemplate/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CGI/FastTemplate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Framework/pkg-plist b/www/p5-CGI-Framework/pkg-plist
index c95885d0c764..7b357ddff7d2 100644
--- a/www/p5-CGI-Framework/pkg-plist
+++ b/www/p5-CGI-Framework/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/CGI/Framework.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Kwiki/pkg-plist b/www/p5-CGI-Kwiki/pkg-plist
index f0fb4322da70..ae2f308c1ffc 100644
--- a/www/p5-CGI-Kwiki/pkg-plist
+++ b/www/p5-CGI-Kwiki/pkg-plist
@@ -43,4 +43,4 @@ bin/kwiki-install
@dirrm %%SITE_PERL%%/CGI/Kwiki/I18N
@dirrm %%SITE_PERL%%/CGI/Kwiki/Backup
@dirrm %%SITE_PERL%%/CGI/Kwiki
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Minimal/pkg-plist b/www/p5-CGI-Minimal/pkg-plist
index a5f5fe7f99da..c1b3844353d1 100644
--- a/www/p5-CGI-Minimal/pkg-plist
+++ b/www/p5-CGI-Minimal/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/CGI/Minimal/Multipart.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
@dirrm %%SITE_PERL%%/CGI/Minimal
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Response/pkg-plist b/www/p5-CGI-Response/pkg-plist
index 2e05b26b10cb..ebf63603dc91 100644
--- a/www/p5-CGI-Response/pkg-plist
+++ b/www/p5-CGI-Response/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response/.packlist
%%SITE_PERL%%/CGI/Response.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-SSI/pkg-plist b/www/p5-CGI-SSI/pkg-plist
index 0558346c7e48..789c4ae6d78b 100644
--- a/www/p5-CGI-SSI/pkg-plist
+++ b/www/p5-CGI-SSI/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CGI/SSI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-Session/pkg-plist b/www/p5-CGI-Session/pkg-plist
index ab2478d76d05..4ac79c11f0aa 100644
--- a/www/p5-CGI-Session/pkg-plist
+++ b/www/p5-CGI-Session/pkg-plist
@@ -38,10 +38,10 @@
%%SITE_PERL%%/auto/CGI/Session/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
@dirrm %%SITE_PERL%%/CGI/Session
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
@dirrm %%SITE_PERL%%/auto/CGI/Session
-@unexec rmdir %D/%%SITE_PERL%%/auto/CGI/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/CGI/Session
+@dirrmtry %%SITE_PERL%%/auto/CGI
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/mach/auto/CGI
diff --git a/www/p5-CGI-Simple/pkg-plist b/www/p5-CGI-Simple/pkg-plist
index 847908071b89..758789d0d593 100644
--- a/www/p5-CGI-Simple/pkg-plist
+++ b/www/p5-CGI-Simple/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/CGI/Simple/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
@dirrm %%SITE_PERL%%/CGI/Simple
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist
index c436ddb2033b..a494840e85db 100644
--- a/www/p5-CGI-SpeedyCGI/pkg-plist
+++ b/www/p5-CGI-SpeedyCGI/pkg-plist
@@ -5,5 +5,5 @@ bin/speedy
bin/speedy_backend
bin/speedy_suidperl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Untaint/pkg-plist b/www/p5-CGI-Untaint/pkg-plist
index 1ac9927658f6..6a605a2adec4 100644
--- a/www/p5-CGI-Untaint/pkg-plist
+++ b/www/p5-CGI-Untaint/pkg-plist
@@ -6,6 +6,6 @@
%%SITE_PERL%%/CGI/Untaint/printable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
@dirrm %%SITE_PERL%%/CGI/Untaint
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI-Upload/pkg-plist b/www/p5-CGI-Upload/pkg-plist
index c803b8e5128d..87220b0260e2 100644
--- a/www/p5-CGI-Upload/pkg-plist
+++ b/www/p5-CGI-Upload/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist
%%SITE_PERL%%/CGI/Upload.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
diff --git a/www/p5-CGI-XMLApplication/pkg-plist b/www/p5-CGI-XMLApplication/pkg-plist
index f8d52ebe3eb7..402aadb2b8a6 100644
--- a/www/p5-CGI-XMLApplication/pkg-plist
+++ b/www/p5-CGI-XMLApplication/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication/.packlist
%%SITE_PERL%%/CGI/XMLApplication.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
%%PORTDOCS%%%%EXAMPLESDIR%%/ex2_finish.xsl
%%PORTDOCS%%%%EXAMPLESDIR%%/ex2_form.xsl
%%PORTDOCS%%%%EXAMPLESDIR%%/example1.pl
diff --git a/www/p5-CGI.pm/pkg-plist b/www/p5-CGI.pm/pkg-plist
index 00e8184d7093..e9e52beb5084 100644
--- a/www/p5-CGI.pm/pkg-plist
+++ b/www/p5-CGI.pm/pkg-plist
@@ -30,5 +30,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/tryit.cgi
%%PORTDOCS%%%%EXAMPLESDIR%%/wilogo.gif
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-CGI_Lite/pkg-plist b/www/p5-CGI_Lite/pkg-plist
index 6144a4aa7b9d..a59d82feceac 100644
--- a/www/p5-CGI_Lite/pkg-plist
+++ b/www/p5-CGI_Lite/pkg-plist
@@ -13,5 +13,5 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
+@dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-Catalyst-Engine-Apache/pkg-plist b/www/p5-Catalyst-Engine-Apache/pkg-plist
index 2b286bf6b5dd..de50e0499ac2 100644
--- a/www/p5-Catalyst-Engine-Apache/pkg-plist
+++ b/www/p5-Catalyst-Engine-Apache/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Catalyst/Engine/Apache/MP13.pm
%%SITE_PERL%%/Catalyst/Engine/Apache2/MP19.pm
%%SITE_PERL%%/Catalyst/Engine/Apache2/MP20.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/Apache2 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine/Apache
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine/Apache2
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine
diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist b/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist
index 5d7351c68a51..94e909e2c0c8 100644
--- a/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist
+++ b/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Catalyst/Helper/Controller/Scaffold.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Controller 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Log-Log4perl/pkg-plist b/www/p5-Catalyst-Log-Log4perl/pkg-plist
index 39662d24f44b..d96c5ea4ae13 100644
--- a/www/p5-Catalyst-Log-Log4perl/pkg-plist
+++ b/www/p5-Catalyst-Log-Log4perl/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Log/Log4perl.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log/Log4perl/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log/Log4perl 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log/Log4perl
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Log
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
index 015e15a0f915..66858beee67f 100644
--- a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Catalyst/Model/CDBI/Sweet.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model/CDBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Model/CDBI
+@dirrmtry %%SITE_PERL%%/Catalyst/Model
diff --git a/www/p5-Catalyst-Model-CDBI/pkg-plist b/www/p5-Catalyst-Model-CDBI/pkg-plist
index 8a495d5cdfd3..6d77b145ef21 100644
--- a/www/p5-Catalyst-Model-CDBI/pkg-plist
+++ b/www/p5-Catalyst-Model-CDBI/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Catalyst/Model/CDBI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
@dirrm %%SITE_PERL%%/Catalyst/Helper/Model
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
index 160d17aa15da..ce3552ecb930 100644
--- a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
+++ b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist
@@ -2,12 +2,12 @@
%%SITE_PERL%%/Catalyst/Model/DBIC/Plain.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model/DBIC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model/DBIC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/DBIC
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC
+@dirrmtry %%SITE_PERL%%/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Model-DBIC/pkg-plist b/www/p5-Catalyst-Model-DBIC/pkg-plist
index 0fd005761fe8..8c66818edf37 100644
--- a/www/p5-Catalyst-Model-DBIC/pkg-plist
+++ b/www/p5-Catalyst-Model-DBIC/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Catalyst/Model/DBIC.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/Model
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
index 3219aae718ba..c41b3f74d6d6 100644
--- a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Catalyst/Plugin/Authentication/CDBI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist
index 2eab9cc1de87..544a84d44719 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC/User.pm
%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC/Backend.pm
%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
index 482f2725a6f5..17f11853f711 100644
--- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm
%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/Backend.pm
%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authentication/pkg-plist b/www/p5-Catalyst-Plugin-Authentication/pkg-plist
index 5eb771db1d55..fee85b373bed 100644
--- a/www/p5-Catalyst-Plugin-Authentication/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authentication/pkg-plist
@@ -5,10 +5,10 @@
%%SITE_PERL%%/Catalyst/Plugin/Authentication/User/Hash.pm
%%SITE_PERL%%/Catalyst/Plugin/Authentication/User.pm
%%SITE_PERL%%/Catalyst/Plugin/Authentication.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Minimal 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/User 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Minimal
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/User
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist
index e0ca79f9a316..3bc16ab0a00a 100644
--- a/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL/Engine.pm
%%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authorization 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
index be8be82c71d3..fd3076922c8d 100644
--- a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Catalyst/Plugin/Authorization/Roles.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authorization 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
index c08631eee016..b1ece4fb4335 100644
--- a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Catalyst/Plugin/Cache/FastMmap.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist b/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist
index f4cf98e5ff6a..38af79968a84 100644
--- a/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Catalyst/Plugin/Cache/FileCache.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
index 480d48314878..b1a8463f85b2 100644
--- a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Catalyst/Plugin/Cache/Memcached.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
index b16ead1bfb2a..28c32042d23b 100644
--- a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
+++ b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Catalyst/Plugin/DefaultEnd.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
index b8d8f8601d39..a45e3142dca1 100644
--- a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/FillInForm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist b/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist
index d8d3cf601feb..b9cd33567793 100644
--- a/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Catalyst/Plugin/FormValidator/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/FormValidator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/FormValidator
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-FormValidator/pkg-plist b/www/p5-Catalyst-Plugin-FormValidator/pkg-plist
index a8bda003712f..7a539c2c4c61 100644
--- a/www/p5-Catalyst-Plugin-FormValidator/pkg-plist
+++ b/www/p5-Catalyst-Plugin-FormValidator/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/FormValidator.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist b/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist
index 596917815171..f17b79acab27 100644
--- a/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist
+++ b/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Catalyst/Plugin/HTML/Widget.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML/Widget/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML/Widget 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML/Widget
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/HTML
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-I18N/pkg-plist b/www/p5-Catalyst-Plugin-I18N/pkg-plist
index 73fc94da8b63..ab719990b91d 100644
--- a/www/p5-Catalyst-Plugin-I18N/pkg-plist
+++ b/www/p5-Catalyst-Plugin-I18N/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/I18N.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-PageCache/pkg-plist b/www/p5-Catalyst-Plugin-PageCache/pkg-plist
index 8f7f4e981ca0..0b8109a754b5 100644
--- a/www/p5-Catalyst-Plugin-PageCache/pkg-plist
+++ b/www/p5-Catalyst-Plugin-PageCache/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Catalyst/Plugin/PageCache.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Pluggable/pkg-plist b/www/p5-Catalyst-Plugin-Pluggable/pkg-plist
index 813e636bffee..2756b97e3b52 100644
--- a/www/p5-Catalyst-Plugin-Pluggable/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Pluggable/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/Pluggable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Prototype/pkg-plist b/www/p5-Catalyst-Plugin-Prototype/pkg-plist
index 5b191b8d036f..c0f2211278a2 100644
--- a/www/p5-Catalyst-Plugin-Prototype/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Prototype/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/Catalyst/Plugin/Prototype.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist
index 263572e5c269..bf8690c97a5c 100644
--- a/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/FastMmap/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/FastMmap
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
@dirrm %%SITE_PERL%%/Catalyst/Plugin/Session
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist
index 6d4f211a584d..f8360bfd96f5 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/State 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
index 7187e1492176..9787436a0447 100644
--- a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/State/URI.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/State 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
index 40b382f40163..36a57a5fc44f 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBI.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist
index 653d37669533..ff4c15886690 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/Store/FastMmap.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist
index 03c28c093350..9ae435e8fc22 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist
@@ -1,11 +1,11 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/Store/File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/File/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/File
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist
index 0e98ee2ccbc1..b38fcb574e72 100644
--- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/Store/Memcached.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Session/pkg-plist b/www/p5-Catalyst-Plugin-Session/pkg-plist
index 1e7673b82bc8..ed1acfc068e6 100644
--- a/www/p5-Catalyst-Plugin-Session/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Session/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/Catalyst/Plugin/Session/Store.pm
%%SITE_PERL%%/Catalyst/Plugin/Session/Store/Dummy.pm
%%SITE_PERL%%/Catalyst/Plugin/Session/Test/Store.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Test
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Singleton/pkg-plist b/www/p5-Catalyst-Plugin-Singleton/pkg-plist
index d61685c8ffe2..d606fb7e74b6 100644
--- a/www/p5-Catalyst-Plugin-Singleton/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Singleton/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Catalyst/Plugin/Singleton.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-StackTrace/pkg-plist b/www/p5-Catalyst-Plugin-StackTrace/pkg-plist
index 569d2b1d8c3d..bf794bb05812 100644
--- a/www/p5-Catalyst-Plugin-StackTrace/pkg-plist
+++ b/www/p5-Catalyst-Plugin-StackTrace/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Catalyst/Plugin/StackTrace.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Static/pkg-plist b/www/p5-Catalyst-Plugin-Static/pkg-plist
index 657017f9969d..31c7243a0c7f 100644
--- a/www/p5-Catalyst-Plugin-Static/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Static/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/Static.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
index 28d3b578d111..0fc4ee69b8ab 100644
--- a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
+++ b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/SubRequest.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-Textile/pkg-plist b/www/p5-Catalyst-Plugin-Textile/pkg-plist
index e089cb908cd3..cafe5d8ef4fb 100644
--- a/www/p5-Catalyst-Plugin-Textile/pkg-plist
+++ b/www/p5-Catalyst-Plugin-Textile/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/Textile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist b/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist
index d0850b6a9105..e7a32c066f8b 100644
--- a/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist
+++ b/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Plugin/XMLRPC.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-HTML-Template/pkg-plist b/www/p5-Catalyst-View-HTML-Template/pkg-plist
index 70521afda63b..7acd471967b1 100644
--- a/www/p5-Catalyst-View-HTML-Template/pkg-plist
+++ b/www/p5-Catalyst-View-HTML-Template/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Catalyst/Helper/View/HTML/Template.pm
%%SITE_PERL%%/Catalyst/View/HTML/Template.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML
+@dirrmtry %%SITE_PERL%%/Catalyst/View
diff --git a/www/p5-Catalyst-View-Mason/pkg-plist b/www/p5-Catalyst-View-Mason/pkg-plist
index a538eda6b900..e2586a8dad1c 100644
--- a/www/p5-Catalyst-View-Mason/pkg-plist
+++ b/www/p5-Catalyst-View-Mason/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Catalyst/Helper/View/Mason.pm
%%SITE_PERL%%/Catalyst/View/Mason.pm
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/View
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst-View-TT/pkg-plist b/www/p5-Catalyst-View-TT/pkg-plist
index f7c598236a06..b43431f895ea 100644
--- a/www/p5-Catalyst-View-TT/pkg-plist
+++ b/www/p5-Catalyst-View-TT/pkg-plist
@@ -3,9 +3,9 @@
%%SITE_PERL%%/Catalyst/View/TT.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst/View
+@dirrmtry %%SITE_PERL%%/Catalyst
diff --git a/www/p5-Catalyst/pkg-plist b/www/p5-Catalyst/pkg-plist
index a550363119bd..b0fae6142b9e 100644
--- a/www/p5-Catalyst/pkg-plist
+++ b/www/p5-Catalyst/pkg-plist
@@ -40,15 +40,15 @@ bin/catalyst.pl
%%SITE_PERL%%/Catalyst/View.pm
%%SITE_PERL%%/Module/Install/Catalyst.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/DispatchType 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/HTTP/Restarter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Manual 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Static 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module/Install 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst
+@dirrmtry %%SITE_PERL%%/Catalyst/DispatchType
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP/Restarter
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP
+@dirrmtry %%SITE_PERL%%/Catalyst/Engine
+@dirrmtry %%SITE_PERL%%/Catalyst/Manual
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Static
+@dirrmtry %%SITE_PERL%%/Catalyst/Plugin
+@dirrmtry %%SITE_PERL%%/Catalyst/Request
+@dirrmtry %%SITE_PERL%%/Catalyst
+@dirrmtry %%SITE_PERL%%/Module/Install
+@dirrmtry %%SITE_PERL%%/Module
diff --git a/www/p5-Class-DBI-FromForm/pkg-plist b/www/p5-Class-DBI-FromForm/pkg-plist
index 1be30d48491a..8bb5d2d6c57a 100644
--- a/www/p5-Class-DBI-FromForm/pkg-plist
+++ b/www/p5-Class-DBI-FromForm/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/FromForm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/www/p5-Compress-LeadingBlankSpaces/pkg-plist b/www/p5-Compress-LeadingBlankSpaces/pkg-plist
index 3538799b6553..c7ec216728be 100644
--- a/www/p5-Compress-LeadingBlankSpaces/pkg-plist
+++ b/www/p5-Compress-LeadingBlankSpaces/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Compress/LeadingBlankSpaces.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Compress 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress
+@dirrmtry %%SITE_PERL%%/Compress
diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist b/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist
index e7993e5f2dd3..751568eb0172 100644
--- a/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist
+++ b/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/DHTML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/DHTML
@dirrm %%SITE_PERL%%/auto/Data/TreeDumper/Renderer/DHTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Data/TreeDumper/Renderer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/TreeDumper/Renderer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/TreeDumper 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer
+@dirrmtry %%SITE_PERL%%/auto/Data/TreeDumper/Renderer
+@dirrmtry %%SITE_PERL%%/Data/TreeDumper/Renderer
+@dirrmtry %%SITE_PERL%%/Data/TreeDumper
diff --git a/www/p5-FAQ-OMatic/pkg-plist b/www/p5-FAQ-OMatic/pkg-plist
index c112f722672e..96270c500f8b 100644
--- a/www/p5-FAQ-OMatic/pkg-plist
+++ b/www/p5-FAQ-OMatic/pkg-plist
@@ -63,7 +63,7 @@
%%SITE_PERL%%/FAQ/OMatic/API.pm
%%SITE_PERL%%/FAQ/OMatic.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/FAQ/OMatic 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/FAQ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/FAQ/OMatic
+@dirrmtry %%SITE_PERL%%/FAQ
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ
diff --git a/www/p5-FastCGI-ProcManager/pkg-plist b/www/p5-FastCGI-ProcManager/pkg-plist
index a2403f921a7a..b3088cff72f7 100644
--- a/www/p5-FastCGI-ProcManager/pkg-plist
+++ b/www/p5-FastCGI-ProcManager/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/FCGI/ProcManager.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/ProcManager/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/ProcManager
-@unexec rmdir %D/%%SITE_PERL%%/FCGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/FCGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI
diff --git a/www/p5-Feed-Find/pkg-plist b/www/p5-Feed-Find/pkg-plist
index 77cdebeb053d..4f4634bba1ca 100644
--- a/www/p5-Feed-Find/pkg-plist
+++ b/www/p5-Feed-Find/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Feed/Find.pm
-@unexec rmdir %D/%%SITE_PERL%%/Feed 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Feed
diff --git a/www/p5-Flickr-API/pkg-plist b/www/p5-Flickr-API/pkg-plist
index 8efb5b0cd1e8..272f7dc29e42 100644
--- a/www/p5-Flickr-API/pkg-plist
+++ b/www/p5-Flickr-API/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Flickr/API/Request.pm
%%SITE_PERL%%/Flickr/API/Response.pm
@dirrm %%SITE_PERL%%/Flickr/API
-@unexec rmdir %D/%%SITE_PERL%%/Flickr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Flickr
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/API/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/API
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr
diff --git a/www/p5-Flickr-Upload/pkg-plist b/www/p5-Flickr-Upload/pkg-plist
index 5e876bc6fa72..de925edaf358 100644
--- a/www/p5-Flickr-Upload/pkg-plist
+++ b/www/p5-Flickr-Upload/pkg-plist
@@ -1,9 +1,9 @@
bin/flickr_upload
%%SITE_PERL%%/Flickr/Upload.pm
-@unexec rmdir %D/%%SITE_PERL%%/Flickr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Flickr
%%SITE_PERL%%/auto/Flickr/Upload/autosplit.ix
@dirrm %%SITE_PERL%%/auto/Flickr/Upload
-@unexec rmdir %D/%%SITE_PERL%%/auto/Flickr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Flickr
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/Upload/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/Upload
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr
diff --git a/www/p5-HTML-Breadcrumbs/pkg-plist b/www/p5-HTML-Breadcrumbs/pkg-plist
index d39528c22171..58034c50aa4c 100644
--- a/www/p5-HTML-Breadcrumbs/pkg-plist
+++ b/www/p5-HTML-Breadcrumbs/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Breadcrumbs/.packlist
%%SITE_PERL%%/HTML/Breadcrumbs.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Breadcrumbs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-plist b/www/p5-HTML-CalendarMonthSimple/pkg-plist
index e2e10efe7ca1..158db18f9747 100644
--- a/www/p5-HTML-CalendarMonthSimple/pkg-plist
+++ b/www/p5-HTML-CalendarMonthSimple/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/HTML/CalendarMonthSimple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Chunks/pkg-plist b/www/p5-HTML-Chunks/pkg-plist
index 3652b5ea1f91..15d524f22265 100644
--- a/www/p5-HTML-Chunks/pkg-plist
+++ b/www/p5-HTML-Chunks/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/HTML/ChunksLocal.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Chunks/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Chunks
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
@dirrm %%SITE_PERL%%/HTML/Chunks
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist
index e31ee7128e86..fabade1c8be6 100644
--- a/www/p5-HTML-Clean/pkg-plist
+++ b/www/p5-HTML-Clean/pkg-plist
@@ -1,10 +1,10 @@
bin/htmlclean
%%SITE_PERL%%/HTML/Clean.pm
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
%%SITE_PERL%%/auto/HTML/Clean/autosplit.ix
@dirrm %%SITE_PERL%%/auto/HTML/Clean
-@unexec rmdir %D/%%SITE_PERL%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/HTML
+@dirrmtry lib/perl5/%%PERL_VERSION%%/man/man1
diff --git a/www/p5-HTML-Diff/pkg-plist b/www/p5-HTML-Diff/pkg-plist
index 1a4850ff270c..ce2b4b723ec2 100644
--- a/www/p5-HTML-Diff/pkg-plist
+++ b/www/p5-HTML-Diff/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Diff.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Diff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Diff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Element-Extended/pkg-plist b/www/p5-HTML-Element-Extended/pkg-plist
index b0e1579763cf..1b709e4435d2 100644
--- a/www/p5-HTML-Element-Extended/pkg-plist
+++ b/www/p5-HTML-Element-Extended/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/HTML/ElementTable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Embperl/pkg-plist b/www/p5-HTML-Embperl/pkg-plist
index cc5823ed56a7..8a7d0a356947 100644
--- a/www/p5-HTML-Embperl/pkg-plist
+++ b/www/p5-HTML-Embperl/pkg-plist
@@ -22,5 +22,5 @@ bin/embpexec.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-FillInForm/pkg-plist b/www/p5-HTML-FillInForm/pkg-plist
index 83242ad2d25a..d6b35483fe33 100644
--- a/www/p5-HTML-FillInForm/pkg-plist
+++ b/www/p5-HTML-FillInForm/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/FillInForm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null|| true
diff --git a/www/p5-HTML-FromText/pkg-plist b/www/p5-HTML-FromText/pkg-plist
index 280cd860dc70..b5365d780b2e 100644
--- a/www/p5-HTML-FromText/pkg-plist
+++ b/www/p5-HTML-FromText/pkg-plist
@@ -3,5 +3,5 @@ bin/text2html
%%SITE_PERL%%/HTML/FromText.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-LinkExtractor/pkg-plist b/www/p5-HTML-LinkExtractor/pkg-plist
index fffa0b88631a..7a471f350a00 100644
--- a/www/p5-HTML-LinkExtractor/pkg-plist
+++ b/www/p5-HTML-LinkExtractor/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/LinkExtractor.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/LinkExtractor/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/LinkExtractor
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Lint/pkg-plist b/www/p5-HTML-Lint/pkg-plist
index 88cfa1d8a011..9b3d044cd185 100644
--- a/www/p5-HTML-Lint/pkg-plist
+++ b/www/p5-HTML-Lint/pkg-plist
@@ -4,9 +4,9 @@ bin/weblint
%%SITE_PERL%%/HTML/Lint/HTML4.pm
%%SITE_PERL%%/Test/HTML/Lint.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Lint 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/Test/HTML
+@dirrmtry %%SITE_PERL%%/HTML/Lint
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/www/p5-HTML-Mason/pkg-plist b/www/p5-HTML-Mason/pkg-plist
index 7664ac9edcf1..cffd0acd51d0 100644
--- a/www/p5-HTML-Mason/pkg-plist
+++ b/www/p5-HTML-Mason/pkg-plist
@@ -39,8 +39,8 @@
@dirrm %%SITE_PERL%%/HTML/Mason/Resolver
@dirrm %%SITE_PERL%%/HTML/Mason
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/Bundle/HTML
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-HTML-Parser/pkg-plist b/www/p5-HTML-Parser/pkg-plist
index 0a06b8174372..d311ced7a258 100644
--- a/www/p5-HTML-Parser/pkg-plist
+++ b/www/p5-HTML-Parser/pkg-plist
@@ -9,5 +9,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
diff --git a/www/p5-HTML-Prototype/pkg-plist b/www/p5-HTML-Prototype/pkg-plist
index b99b1de674a2..dbc449f05fe5 100644
--- a/www/p5-HTML-Prototype/pkg-plist
+++ b/www/p5-HTML-Prototype/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/HTML/Prototype/Helper.pm
%%SITE_PERL%%/HTML/Prototype/Helper/Tag.pm
%%SITE_PERL%%/HTML/Prototype/Js.pm
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Prototype/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Prototype 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML/Prototype/Helper
+@dirrmtry %%SITE_PERL%%/HTML/Prototype
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-QuickCheck/pkg-plist b/www/p5-HTML-QuickCheck/pkg-plist
index abef439bded9..d3056cabd002 100644
--- a/www/p5-HTML-QuickCheck/pkg-plist
+++ b/www/p5-HTML-QuickCheck/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/QuickCheck.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Scrubber/pkg-plist b/www/p5-HTML-Scrubber/pkg-plist
index cc79ec0ca3a4..05e05cb305f7 100644
--- a/www/p5-HTML-Scrubber/pkg-plist
+++ b/www/p5-HTML-Scrubber/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Scrubber/.packlist
%%SITE_PERL%%/HTML/Scrubber.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Scrubber
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
diff --git a/www/p5-HTML-SimpleLinkExtor/pkg-plist b/www/p5-HTML-SimpleLinkExtor/pkg-plist
index 26d202ae6a98..175fddf7819e 100644
--- a/www/p5-HTML-SimpleLinkExtor/pkg-plist
+++ b/www/p5-HTML-SimpleLinkExtor/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleLinkExtor/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleLinkExtor
@dirrm %%SITE_PERL%%/auto/HTML/SimpleLinkExtor
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/auto/HTML
diff --git a/www/p5-HTML-SimpleParse/pkg-plist b/www/p5-HTML-SimpleParse/pkg-plist
index 0e7690828e13..65bd8e47f4ea 100644
--- a/www/p5-HTML-SimpleParse/pkg-plist
+++ b/www/p5-HTML-SimpleParse/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/SimpleParse.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleParse/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleParse
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-StickyQuery/pkg-plist b/www/p5-HTML-StickyQuery/pkg-plist
index 88aaf69b9bf6..00ecef4f7eb2 100644
--- a/www/p5-HTML-StickyQuery/pkg-plist
+++ b/www/p5-HTML-StickyQuery/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/StickyQuery.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Stream/pkg-plist b/www/p5-HTML-Stream/pkg-plist
index aaffda928919..6256a43eede9 100644
--- a/www/p5-HTML-Stream/pkg-plist
+++ b/www/p5-HTML-Stream/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Stream.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Strip/pkg-plist b/www/p5-HTML-Strip/pkg-plist
index f5e664a5166e..6c9eb157f017 100644
--- a/www/p5-HTML-Strip/pkg-plist
+++ b/www/p5-HTML-Strip/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip/Strip.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip/Strip.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
diff --git a/www/p5-HTML-Summary/pkg-plist b/www/p5-HTML-Summary/pkg-plist
index 43a4c01c56d8..fa939084daa1 100644
--- a/www/p5-HTML-Summary/pkg-plist
+++ b/www/p5-HTML-Summary/pkg-plist
@@ -6,6 +6,6 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary
@dirrm %%SITE_PERL%%/Lingua/JA
@dirrm %%SITE_PERL%%/Lingua
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Table/pkg-plist b/www/p5-HTML-Table/pkg-plist
index c9313f4af599..88b489b3fd80 100644
--- a/www/p5-HTML-Table/pkg-plist
+++ b/www/p5-HTML-Table/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Table.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TableLayout/pkg-plist b/www/p5-HTML-TableLayout/pkg-plist
index cb24d8d16e06..94c934097147 100644
--- a/www/p5-HTML-TableLayout/pkg-plist
+++ b/www/p5-HTML-TableLayout/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist
@dirrm %%SITE_PERL%%/HTML/TableLayout
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TableTiler/pkg-plist b/www/p5-HTML-TableTiler/pkg-plist
index 484070249435..5aed8a116fb6 100644
--- a/www/p5-HTML-TableTiler/pkg-plist
+++ b/www/p5-HTML-TableTiler/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/HTML/TableTiler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableTiler/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableTiler
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TagCloud-Extended/pkg-plist b/www/p5-HTML-TagCloud-Extended/pkg-plist
index b6695d83175f..b76c7b6ba411 100644
--- a/www/p5-HTML-TagCloud-Extended/pkg-plist
+++ b/www/p5-HTML-TagCloud-Extended/pkg-plist
@@ -5,9 +5,9 @@
%%SITE_PERL%%/HTML/TagCloud/Extended/TagColors.pm
%%SITE_PERL%%/HTML/TagCloud/Extended/TagList.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud
@dirrm %%SITE_PERL%%/HTML/TagCloud/Extended
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/TagCloud 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML/TagCloud
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-TagCloud/pkg-plist b/www/p5-HTML-TagCloud/pkg-plist
index 643af5e39476..062af50fe8a4 100644
--- a/www/p5-HTML-TagCloud/pkg-plist
+++ b/www/p5-HTML-TagCloud/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/TagCloud.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Tagset/pkg-plist b/www/p5-HTML-Tagset/pkg-plist
index 1da36d193566..f85adb777edb 100644
--- a/www/p5-HTML-Tagset/pkg-plist
+++ b/www/p5-HTML-Tagset/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Tagset.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Template-Associate/pkg-plist b/www/p5-HTML-Template-Associate/pkg-plist
index 78bc19a697f8..c56ab038c256 100644
--- a/www/p5-HTML-Template-Associate/pkg-plist
+++ b/www/p5-HTML-Template-Associate/pkg-plist
@@ -3,4 +3,4 @@
@dirrm %%SITE_PERL%%/HTML/Template/Associate
%%SITE_PERL%%/mach/auto/HTML/Template/Associate/.packlist
@dirrm %%SITE_PERL%%/mach/auto/HTML/Template/Associate
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML/Template
diff --git a/www/p5-HTML-Template-Compiled/pkg-plist b/www/p5-HTML-Template-Compiled/pkg-plist
index 91a6b90a1b86..fc959d46a167 100644
--- a/www/p5-HTML-Template-Compiled/pkg-plist
+++ b/www/p5-HTML-Template-Compiled/pkg-plist
@@ -5,9 +5,9 @@
%%SITE_PERL%%/HTML/Template/Compiled/Filter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Compiled/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Compiled
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
@dirrm %%SITE_PERL%%/HTML/Template/Compiled/Plugin
@dirrm %%SITE_PERL%%/HTML/Template/Compiled
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML/Template
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-Expr/pkg-plist b/www/p5-HTML-Template-Expr/pkg-plist
index e95da97a3f45..fa9dd519860e 100644
--- a/www/p5-HTML-Template-Expr/pkg-plist
+++ b/www/p5-HTML-Template-Expr/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/HTML/Template/Expr.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML/Template
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-HashWrapper/pkg-plist b/www/p5-HTML-Template-HashWrapper/pkg-plist
index 7e2bbdf5b566..37276bc067bf 100644
--- a/www/p5-HTML-Template-HashWrapper/pkg-plist
+++ b/www/p5-HTML-Template-HashWrapper/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/HTML/Template/HashWrapper.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/HashWrapper/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/HashWrapper
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML/Template
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template-JIT/pkg-plist b/www/p5-HTML-Template-JIT/pkg-plist
index f86bf94b1544..a8e05d5f48f2 100644
--- a/www/p5-HTML-Template-JIT/pkg-plist
+++ b/www/p5-HTML-Template-JIT/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/HTML/Template/JIT/Compiler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
@dirrm %%SITE_PERL%%/HTML/Template/JIT
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML/Template
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Template/pkg-plist b/www/p5-HTML-Template/pkg-plist
index 0d7c0878a683..ca0a9d5e5bcc 100644
--- a/www/p5-HTML-Template/pkg-plist
+++ b/www/p5-HTML-Template/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Template.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-TokeParser-Simple/pkg-plist b/www/p5-HTML-TokeParser-Simple/pkg-plist
index 5231bc5a195e..8a207a8dd47c 100644
--- a/www/p5-HTML-TokeParser-Simple/pkg-plist
+++ b/www/p5-HTML-TokeParser-Simple/pkg-plist
@@ -10,9 +10,9 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser/Simple
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
@dirrm %%SITE_PERL%%/HTML/TokeParser/Simple/Token/Tag
@dirrm %%SITE_PERL%%/HTML/TokeParser/Simple/Token
@dirrm %%SITE_PERL%%/HTML/TokeParser/Simple
@dirrm %%SITE_PERL%%/HTML/TokeParser
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Tree/pkg-plist b/www/p5-HTML-Tree/pkg-plist
index bd7ab6577d15..83c44800b9eb 100644
--- a/www/p5-HTML-Tree/pkg-plist
+++ b/www/p5-HTML-Tree/pkg-plist
@@ -11,4 +11,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Tree
@dirrm %%SITE_PERL%%/HTML/Element
@dirrm %%SITE_PERL%%/HTML/Tree
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Webmake/pkg-plist b/www/p5-HTML-Webmake/pkg-plist
index a7f977acc5a5..f762e20c79a4 100644
--- a/www/p5-HTML-Webmake/pkg-plist
+++ b/www/p5-HTML-Webmake/pkg-plist
@@ -62,5 +62,5 @@ bin/webmake
@dirrm %%SITE_PERL%%/HTML/WebMake/PerlLib
@dirrm %%SITE_PERL%%/HTML/WebMake
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WebMake
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
diff --git a/www/p5-HTML-Widget/pkg-plist b/www/p5-HTML-Widget/pkg-plist
index b50381b83c45..492773f69c5e 100644
--- a/www/p5-HTML-Widget/pkg-plist
+++ b/www/p5-HTML-Widget/pkg-plist
@@ -41,10 +41,10 @@
%%SITE_PERL%%/HTML/Widget/Filter/Whitespace.pm
%%SITE_PERL%%/HTML/Widget/Result.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget/Constraint 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget/Element 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML/Widget/Constraint
+@dirrmtry %%SITE_PERL%%/HTML/Widget/Element
+@dirrmtry %%SITE_PERL%%/HTML/Widget/Filter
+@dirrmtry %%SITE_PERL%%/HTML/Widget
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-Widgets-SelectLayers/pkg-plist b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
index c5294704d0f8..2b8631f4641e 100644
--- a/www/p5-HTML-Widgets-SelectLayers/pkg-plist
+++ b/www/p5-HTML-Widgets-SelectLayers/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/HTML/Widgets/homepage.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Widgets 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML/Widgets
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML-WikiConverter/pkg-plist b/www/p5-HTML-WikiConverter/pkg-plist
index 810499fbaba2..217463aa6a1b 100644
--- a/www/p5-HTML-WikiConverter/pkg-plist
+++ b/www/p5-HTML-WikiConverter/pkg-plist
@@ -13,5 +13,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/.packlist
@dirrm %%SITE_PERL%%/HTML/WikiConverter
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTML/pkg-plist b/www/p5-HTML/pkg-plist
index 390a88d58588..3aec0929dc33 100644
--- a/www/p5-HTML/pkg-plist
+++ b/www/p5-HTML/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/HTML/Base.pm
%%SITE_PERL%%/html_base.pod
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-HTTP-Body/pkg-plist b/www/p5-HTTP-Body/pkg-plist
index b928e67b7534..123ea839bde1 100644
--- a/www/p5-HTTP-Body/pkg-plist
+++ b/www/p5-HTTP-Body/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/HTTP/Body/OctetStream.pm
%%SITE_PERL%%/HTTP/Body/UrlEncoded.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Body 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP/Body
+@dirrmtry %%SITE_PERL%%/HTTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-BrowserDetect/pkg-plist b/www/p5-HTTP-BrowserDetect/pkg-plist
index 38cb7cc4e558..69b0c6f5c753 100644
--- a/www/p5-HTTP-BrowserDetect/pkg-plist
+++ b/www/p5-HTTP-BrowserDetect/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist
%%SITE_PERL%%/HTTP/BrowserDetect.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Cache-Transparent/pkg-plist b/www/p5-HTTP-Cache-Transparent/pkg-plist
index fc2c59401e12..7b32368d01e0 100644
--- a/www/p5-HTTP-Cache-Transparent/pkg-plist
+++ b/www/p5-HTTP-Cache-Transparent/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/HTTP/Cache/Transparent.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache/Transparent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache/Transparent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
+@dirrmtry %%SITE_PERL%%/HTTP/Cache
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-DAV/pkg-plist b/www/p5-HTTP-DAV/pkg-plist
index 342914b2abc9..a27292037c67 100644
--- a/www/p5-HTTP-DAV/pkg-plist
+++ b/www/p5-HTTP-DAV/pkg-plist
@@ -9,5 +9,5 @@ bin/dave
%%SITE_PERL%%/HTTP/DAV/Utils.pm
@dirrm %%SITE_PERL%%/HTTP/DAV
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-GHTTP/pkg-plist b/www/p5-HTTP-GHTTP/pkg-plist
index 1631ac674433..fcee72ace330 100644
--- a/www/p5-HTTP-GHTTP/pkg-plist
+++ b/www/p5-HTTP-GHTTP/pkg-plist
@@ -4,5 +4,5 @@ bin/g-request
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Lite/pkg-plist b/www/p5-HTTP-Lite/pkg-plist
index 3ee74e46cab4..fe747324d981 100644
--- a/www/p5-HTTP-Lite/pkg-plist
+++ b/www/p5-HTTP-Lite/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTTP/Lite.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Lite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Lite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-MHTTP/pkg-plist b/www/p5-HTTP-MHTTP/pkg-plist
index adeb772b59ac..a599001f1646 100644
--- a/www/p5-HTTP-MHTTP/pkg-plist
+++ b/www/p5-HTTP-MHTTP/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP/MHTTP.so
%%SITE_PERL%%/%%PERL_ARCH%%/HTTP/MHTTP.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-MobileAgent/pkg-plist b/www/p5-HTTP-MobileAgent/pkg-plist
index 9acc07e374cf..745365f0d0b4 100644
--- a/www/p5-HTTP-MobileAgent/pkg-plist
+++ b/www/p5-HTTP-MobileAgent/pkg-plist
@@ -11,4 +11,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent
@dirrm %%SITE_PERL%%/HTTP/MobileAgent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Proxy/pkg-plist b/www/p5-HTTP-Proxy/pkg-plist
index 973b415f6c91..5ecc75f1307a 100644
--- a/www/p5-HTTP-Proxy/pkg-plist
+++ b/www/p5-HTTP-Proxy/pkg-plist
@@ -19,4 +19,4 @@
@dirrm %%SITE_PERL%%/HTTP/Proxy/Engine
@dirrm %%SITE_PERL%%/HTTP/Proxy/BodyFilter
@dirrm %%SITE_PERL%%/HTTP/Proxy
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Recorder/pkg-plist b/www/p5-HTTP-Recorder/pkg-plist
index a5fc8dbe3bfe..e5727351ea4d 100644
--- a/www/p5-HTTP-Recorder/pkg-plist
+++ b/www/p5-HTTP-Recorder/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/HTTP/Recorder/Logger.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Recorder/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Recorder
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
@dirrm %%SITE_PERL%%/HTTP/Recorder
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Request-AsCGI/pkg-plist b/www/p5-HTTP-Request-AsCGI/pkg-plist
index 59af892a5742..38e832875daf 100644
--- a/www/p5-HTTP-Request-AsCGI/pkg-plist
+++ b/www/p5-HTTP-Request-AsCGI/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/HTTP/Request/AsCGI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP/Request
+@dirrmtry %%SITE_PERL%%/HTTP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTP-Request-Params/pkg-plist b/www/p5-HTTP-Request-Params/pkg-plist
index 3533d30f9973..4db5998d274c 100644
--- a/www/p5-HTTP-Request-Params/pkg-plist
+++ b/www/p5-HTTP-Request-Params/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/HTTP/Request/Params.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/Params/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/Params
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
+@dirrmtry %%SITE_PERL%%/HTTP/Request
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple-Mason/pkg-plist b/www/p5-HTTP-Server-Simple-Mason/pkg-plist
index 02f43a65eca8..a331a51d0cea 100644
--- a/www/p5-HTTP-Server-Simple-Mason/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Mason/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/HTTP/Server/Simple/Mason.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Mason/.packlist
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Mason
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/HTTP/Server
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple-Recorder/pkg-plist b/www/p5-HTTP-Server-Simple-Recorder/pkg-plist
index 31650c3f76b5..521195cd8cbe 100644
--- a/www/p5-HTTP-Server-Simple-Recorder/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Recorder/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/HTTP/Server/Simple/Recorder.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server
+@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
+@dirrmtry %%SITE_PERL%%/HTTP/Server
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple-Static/pkg-plist b/www/p5-HTTP-Server-Simple-Static/pkg-plist
index 2de22f14920d..7ae46c3a83bb 100644
--- a/www/p5-HTTP-Server-Simple-Static/pkg-plist
+++ b/www/p5-HTTP-Server-Simple-Static/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/HTTP/Server/Simple/Static.pm
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/HTTP/Server
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-Server-Simple/pkg-plist b/www/p5-HTTP-Server-Simple/pkg-plist
index 5ffa8ef4cc6b..25e2ed9ac09d 100644
--- a/www/p5-HTTP-Server-Simple/pkg-plist
+++ b/www/p5-HTTP-Server-Simple/pkg-plist
@@ -2,10 +2,10 @@
%%SITE_PERL%%/HTTP/Server/Simple/CGI.pm
%%SITE_PERL%%/HTTP/Server/Simple/CGI/Environment.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP
+@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple/CGI
+@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/HTTP/Server
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-HTTP-WebTest/pkg-plist b/www/p5-HTTP-WebTest/pkg-plist
index 5a0013667c94..3bf812e99980 100644
--- a/www/p5-HTTP-WebTest/pkg-plist
+++ b/www/p5-HTTP-WebTest/pkg-plist
@@ -27,10 +27,10 @@ bin/wt
%%SITE_PERL%%/HTTP/WebTest/TestResult.pm
%%SITE_PERL%%/HTTP/WebTest/Utils.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/WebTest/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/WebTest/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP/WebTest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP/WebTest 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle/HTTP
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/HTTP/WebTest/Plugin
+@dirrmtry %%SITE_PERL%%/HTTP/WebTest
+@dirrmtry %%SITE_PERL%%/HTTP
+@dirrmtry %%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP/WebTest
+@dirrmtry %%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP
diff --git a/www/p5-HTTPD-Log-Filter/pkg-plist b/www/p5-HTTPD-Log-Filter/pkg-plist
index 22421ec66487..5be0be562b11 100644
--- a/www/p5-HTTPD-Log-Filter/pkg-plist
+++ b/www/p5-HTTPD-Log-Filter/pkg-plist
@@ -2,7 +2,7 @@ bin/exclude_robots
%%SITE_PERL%%/HTTPD/Log/Filter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter
-@unexec rmdir %D/%%SITE_PERL%%/HTTPD/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTPD/Log
+@dirrmtry %%SITE_PERL%%/HTTPD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD
diff --git a/www/p5-HTTPD-User-Manage/pkg-plist b/www/p5-HTTPD-User-Manage/pkg-plist
index 578b124f2407..4add979b58ab 100644
--- a/www/p5-HTTPD-User-Manage/pkg-plist
+++ b/www/p5-HTTPD-User-Manage/pkg-plist
@@ -22,4 +22,4 @@
@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM
@dirrm %%SITE_PERL%%/HTTPD/GroupAdmin
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-User-Manage
-@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTTPD
diff --git a/www/p5-Handel/pkg-plist b/www/p5-Handel/pkg-plist
index 9f6eaa1e3716..0cdade859bbb 100644
--- a/www/p5-Handel/pkg-plist
+++ b/www/p5-Handel/pkg-plist
@@ -46,12 +46,12 @@
@dirrm %%SITE_PERL%%/Handel/Order
@dirrm %%SITE_PERL%%/Handel
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Handel
-@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Controller 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Handel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model
+@dirrmtry %%SITE_PERL%%/Catalyst/Helper
+@dirrmtry %%SITE_PERL%%/Catalyst
+@dirrmtry %%SITE_PERL%%/AxKit/XSP
+@dirrmtry %%SITE_PERL%%/AxKit
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Handel
diff --git a/www/p5-IMDB-Movie/pkg-plist b/www/p5-IMDB-Movie/pkg-plist
index c4362a242fe9..63330909460b 100644
--- a/www/p5-IMDB-Movie/pkg-plist
+++ b/www/p5-IMDB-Movie/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IMDB/Movie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB/Movie/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB/Movie
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IMDB 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB
+@dirrmtry %%SITE_PERL%%/IMDB
diff --git a/www/p5-Jifty/pkg-plist b/www/p5-Jifty/pkg-plist
index 86d0394a6046..7cefb8abdcf7 100644
--- a/www/p5-Jifty/pkg-plist
+++ b/www/p5-Jifty/pkg-plist
@@ -157,37 +157,37 @@ bin/jifty
%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Model/Schema.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test/WWW/Mechanize.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Email/Send/Jifty/Test.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/ie7 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/scriptaculous 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/css 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/images 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/online_docs 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/_elements 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments/list 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/error 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/_elements 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/let 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form/Field 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action/Record 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Manual 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/JSON 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Script 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Email/Send/Jifty 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Email/Send 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Email 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/ie7
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/scriptaculous
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/css
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/images
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/online_docs
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/_elements
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments/list
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/error
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/_elements
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/let
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form/Field
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action/Record
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Manual
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/JSON
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Script
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Request
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Model
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test/WWW
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email/Send/Jifty
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email/Send
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty
diff --git a/www/p5-Kwiki-Archive-Rcs/pkg-plist b/www/p5-Kwiki-Archive-Rcs/pkg-plist
index 01e966684365..665fd6154fd4 100644
--- a/www/p5-Kwiki-Archive-Rcs/pkg-plist
+++ b/www/p5-Kwiki-Archive-Rcs/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Kwiki/Archive/Rcs.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/Rcs/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/Rcs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Archive 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive
+@dirrmtry %%SITE_PERL%%/Kwiki/Archive
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Archive-SVK/pkg-plist b/www/p5-Kwiki-Archive-SVK/pkg-plist
index 23ce43fc38c0..a00fbc049a2e 100644
--- a/www/p5-Kwiki-Archive-SVK/pkg-plist
+++ b/www/p5-Kwiki-Archive-SVK/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Kwiki/Archive/SVK.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/SVK/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/SVK
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Archive 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive
+@dirrmtry %%SITE_PERL%%/Kwiki/Archive
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Atom/pkg-plist b/www/p5-Kwiki-Atom/pkg-plist
index 7e9ee0843ac4..13ed707d3e6d 100644
--- a/www/p5-Kwiki-Atom/pkg-plist
+++ b/www/p5-Kwiki-Atom/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Atom/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Atom
@dirrm %%SITE_PERL%%/Kwiki/Atom
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Diff/pkg-plist b/www/p5-Kwiki-Diff/pkg-plist
index e98233c5b4c9..2921fc240a80 100644
--- a/www/p5-Kwiki-Diff/pkg-plist
+++ b/www/p5-Kwiki-Diff/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/Diff.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Diff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Diff
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Edit-RequireUserName/pkg-plist b/www/p5-Kwiki-Edit-RequireUserName/pkg-plist
index 2007990b8455..6a064a17cda3 100644
--- a/www/p5-Kwiki-Edit-RequireUserName/pkg-plist
+++ b/www/p5-Kwiki-Edit-RequireUserName/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Kwiki/Edit/RequireUserName.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit/RequireUserName/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit/RequireUserName
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Edit 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit
+@dirrmtry %%SITE_PERL%%/Kwiki/Edit
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-GDGraphGenerator/pkg-plist b/www/p5-Kwiki-GDGraphGenerator/pkg-plist
index af5da18ddc86..c9456a650b20 100644
--- a/www/p5-Kwiki-GDGraphGenerator/pkg-plist
+++ b/www/p5-Kwiki-GDGraphGenerator/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Kwiki/GDGraphGenerator.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/GDGraphGenerator/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/GDGraphGenerator
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Icons-Gnome/pkg-plist b/www/p5-Kwiki-Icons-Gnome/pkg-plist
index 41f24eeb2ed8..db976134bf4f 100644
--- a/www/p5-Kwiki-Icons-Gnome/pkg-plist
+++ b/www/p5-Kwiki-Icons-Gnome/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Kwiki/Icons/Gnome.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons/Gnome/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons/Gnome
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Icons/ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons
+@dirrmtry %%SITE_PERL%%/Kwiki/Icons/
diff --git a/www/p5-Kwiki-Infobox/pkg-plist b/www/p5-Kwiki-Infobox/pkg-plist
index 447f06ea521b..84bdf717af20 100644
--- a/www/p5-Kwiki-Infobox/pkg-plist
+++ b/www/p5-Kwiki-Infobox/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/Infobox.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Infobox/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Infobox
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-NavigationToolbar/pkg-plist b/www/p5-Kwiki-NavigationToolbar/pkg-plist
index 6fb4ee195bff..5906f8ac5581 100644
--- a/www/p5-Kwiki-NavigationToolbar/pkg-plist
+++ b/www/p5-Kwiki-NavigationToolbar/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/NavigationToolbar.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NavigationToolbar/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NavigationToolbar
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-NewPage/pkg-plist b/www/p5-Kwiki-NewPage/pkg-plist
index 1c2ab0d81814..d82eb6c2fcd1 100644
--- a/www/p5-Kwiki-NewPage/pkg-plist
+++ b/www/p5-Kwiki-NewPage/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/Kwiki/NewPage.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NewPage/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NewPage
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Notify-Mail/pkg-plist b/www/p5-Kwiki-Notify-Mail/pkg-plist
index 61eea9760336..b0798141c683 100644
--- a/www/p5-Kwiki-Notify-Mail/pkg-plist
+++ b/www/p5-Kwiki-Notify-Mail/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Kwiki/Notify/Mail.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify/Mail/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify/Mail
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Notify 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify
+@dirrmtry %%SITE_PERL%%/Kwiki/Notify
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-PagePrivacy/pkg-plist b/www/p5-Kwiki-PagePrivacy/pkg-plist
index fede0efecff8..b397d2980391 100644
--- a/www/p5-Kwiki-PagePrivacy/pkg-plist
+++ b/www/p5-Kwiki-PagePrivacy/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/PagePrivacy.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/PagePrivacy/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/PagePrivacy
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-RecentChanges/pkg-plist b/www/p5-Kwiki-RecentChanges/pkg-plist
index 4fce6793326a..1543b5060b83 100644
--- a/www/p5-Kwiki-RecentChanges/pkg-plist
+++ b/www/p5-Kwiki-RecentChanges/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/RecentChanges.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChanges/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChanges
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-RecentChangesRSS/pkg-plist b/www/p5-Kwiki-RecentChangesRSS/pkg-plist
index 23789e38c606..a7cefc6b34a3 100644
--- a/www/p5-Kwiki-RecentChangesRSS/pkg-plist
+++ b/www/p5-Kwiki-RecentChangesRSS/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Kwiki/RecentChangesRSS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChangesRSS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChangesRSS
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki
diff --git a/www/p5-Kwiki-Revisions/pkg-plist b/www/p5-Kwiki-Revisions/pkg-plist
index 86e546554504..a886442f71fd 100644
--- a/www/p5-Kwiki-Revisions/pkg-plist
+++ b/www/p5-Kwiki-Revisions/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/Revisions.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Revisions/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Revisions
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Search/pkg-plist b/www/p5-Kwiki-Search/pkg-plist
index 24c807117177..47a787b58316 100644
--- a/www/p5-Kwiki-Search/pkg-plist
+++ b/www/p5-Kwiki-Search/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/Search.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Search/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Search
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist b/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist
index 9df510633db3..88d8bf8d3f01 100644
--- a/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist
+++ b/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Kwiki/Theme/ColumnLayout.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme/ColumnLayout/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme/ColumnLayout
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Theme 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme
+@dirrmtry %%SITE_PERL%%/Kwiki/Theme
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-UserName/pkg-plist b/www/p5-Kwiki-UserName/pkg-plist
index 58e1617c564b..9b21c48fb90a 100644
--- a/www/p5-Kwiki-UserName/pkg-plist
+++ b/www/p5-Kwiki-UserName/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/UserName.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserName/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserName
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-UserPreferences/pkg-plist b/www/p5-Kwiki-UserPreferences/pkg-plist
index 4c4467f6b34f..a8c63c50c0f9 100644
--- a/www/p5-Kwiki-UserPreferences/pkg-plist
+++ b/www/p5-Kwiki-UserPreferences/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/UserPreferences.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserPreferences/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserPreferences
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-Kwiki-VimMode/pkg-plist b/www/p5-Kwiki-VimMode/pkg-plist
index 5eb345d8fed5..bad66b6af3c3 100644
--- a/www/p5-Kwiki-VimMode/pkg-plist
+++ b/www/p5-Kwiki-VimMode/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/Kwiki/VimMode.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/VimMode/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/VimMode
-@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Kwiki
diff --git a/www/p5-LWP-Authen-Wsse/pkg-plist b/www/p5-LWP-Authen-Wsse/pkg-plist
index 73b43e71e7c5..afedf5306127 100644
--- a/www/p5-LWP-Authen-Wsse/pkg-plist
+++ b/www/p5-LWP-Authen-Wsse/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/LWP/Authen/Wsse.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LWP/Authen 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
+@dirrmtry %%SITE_PERL%%/LWP/Authen
+@dirrmtry %%SITE_PERL%%/LWP
diff --git a/www/p5-MasonX-Interp-WithCallbacks/pkg-plist b/www/p5-MasonX-Interp-WithCallbacks/pkg-plist
index 8e35721ff100..a3384a7fac6a 100644
--- a/www/p5-MasonX-Interp-WithCallbacks/pkg-plist
+++ b/www/p5-MasonX-Interp-WithCallbacks/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/MasonX/Interp/WithCallbacks.pm
@dirrm %%SITE_PERL%%/MasonX/Interp
-@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-MasonX-Profiler/pkg-plist b/www/p5-MasonX-Profiler/pkg-plist
index 8faa3d9086b4..0f3032ee923c 100644
--- a/www/p5-MasonX-Profiler/pkg-plist
+++ b/www/p5-MasonX-Profiler/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/MasonX/Profiler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Profiler/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Profiler
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX
+@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-MasonX-Request-WithApacheSession/pkg-plist b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
index 381e38804c06..06d85033ab3c 100644
--- a/www/p5-MasonX-Request-WithApacheSession/pkg-plist
+++ b/www/p5-MasonX-Request-WithApacheSession/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/MasonX/Request/WithApacheSession.pm
%%SITE_PERL%%/MasonX/Request/WithMultiSession.pm
-@unexec rmdir %D/%%SITE_PERL%%/MasonX/Request 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/MasonX/Request
+@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-MasonX-WebApp/pkg-plist b/www/p5-MasonX-WebApp/pkg-plist
index 87d650705136..f82b5c4668ca 100644
--- a/www/p5-MasonX-WebApp/pkg-plist
+++ b/www/p5-MasonX-WebApp/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/MasonX/WebApp.pm
-@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/MasonX
diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
index 400da9f43fb0..c74dc46c4209 100644
--- a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
+++ b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Maypole/Authentication/UserSessionCookie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Maypole/Authentication 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Maypole 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
+@dirrmtry %%SITE_PERL%%/Maypole/Authentication
+@dirrmtry %%SITE_PERL%%/Maypole
diff --git a/www/p5-Maypole-Component/pkg-plist b/www/p5-Maypole-Component/pkg-plist
index 2b42d0b3039e..429518b85b9a 100644
--- a/www/p5-Maypole-Component/pkg-plist
+++ b/www/p5-Maypole-Component/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Component/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Component
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
-@unexec rmdir %D/%%SITE_PERL%%/Maypole 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Maypole
diff --git a/www/p5-Maypole/pkg-plist b/www/p5-Maypole/pkg-plist
index 5e9bf9d24269..faed5891f2e9 100644
--- a/www/p5-Maypole/pkg-plist
+++ b/www/p5-Maypole/pkg-plist
@@ -57,10 +57,10 @@
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole
-@unexec rmdir %D/%%SITE_PERL%%/Maypole/Manual 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Maypole/Model/CDBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Maypole/Model 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Maypole/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Maypole 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Maypole/Manual
+@dirrmtry %%SITE_PERL%%/Maypole/Model/CDBI
+@dirrmtry %%SITE_PERL%%/Maypole/Model
+@dirrmtry %%SITE_PERL%%/Maypole/View
+@dirrmtry %%SITE_PERL%%/Maypole
+@dirrmtry %%SITE_PERL%%/CGI
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/www/p5-PHP-Session/pkg-plist b/www/p5-PHP-Session/pkg-plist
index 6e24a38f881f..1906a0afc26a 100644
--- a/www/p5-PHP-Session/pkg-plist
+++ b/www/p5-PHP-Session/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/PHP/Session/Serializer/PHP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Session/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Session
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP
@dirrm %%SITE_PERL%%/PHP/Session/Serializer
@dirrm %%SITE_PERL%%/PHP/Session
-@unexec rmdir %D/%%SITE_PERL%%/PHP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PHP
diff --git a/www/p5-POE-Component-Client-HTTP/pkg-plist b/www/p5-POE-Component-Client-HTTP/pkg-plist
index d6bab48f9a7f..17f5fc311fc7 100644
--- a/www/p5-POE-Component-Client-HTTP/pkg-plist
+++ b/www/p5-POE-Component-Client-HTTP/pkg-plist
@@ -6,10 +6,10 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP
@dirrm %%SITE_PERL%%/POE/Component/Client/HTTP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 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/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE/Filter
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Client-UserAgent/pkg-plist b/www/p5-POE-Component-Client-UserAgent/pkg-plist
index cc7a99bf5043..64a48df2d4fd 100644
--- a/www/p5-POE-Component-Client-UserAgent/pkg-plist
+++ b/www/p5-POE-Component-Client-UserAgent/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/POE/Component/Client/UserAgent.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 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/Client 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/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component/Client
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-HTTP/pkg-plist b/www/p5-POE-Component-Server-HTTP/pkg-plist
index c0f955ff0823..c07b67b63346 100644
--- a/www/p5-POE-Component-Server-HTTP/pkg-plist
+++ b/www/p5-POE-Component-Server-HTTP/pkg-plist
@@ -4,10 +4,10 @@
%%SITE_PERL%%/POE/Component/Server/HTTP/Response.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTP
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
@dirrm %%SITE_PERL%%/POE/Component/Server/HTTP
-@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%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-HTTPServer/pkg-plist b/www/p5-POE-Component-Server-HTTPServer/pkg-plist
index b8454721da28..0c9651956f94 100644
--- a/www/p5-POE-Component-Server-HTTPServer/pkg-plist
+++ b/www/p5-POE-Component-Server-HTTPServer/pkg-plist
@@ -8,10 +8,10 @@
%%SITE_PERL%%/POE/Component/Server/HTTPServer/TemplateHandler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTPServer/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTPServer
-@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
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
@dirrm %%SITE_PERL%%/POE/Component/Server/HTTPServer
-@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%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-SOAP/pkg-plist b/www/p5-POE-Component-Server-SOAP/pkg-plist
index c1fe327c9f01..b805c1bb9c73 100644
--- a/www/p5-POE-Component-Server-SOAP/pkg-plist
+++ b/www/p5-POE-Component-Server-SOAP/pkg-plist
@@ -2,10 +2,10 @@
%%SITE_PERL%%/POE/Component/Server/SOAP/Response.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SOAP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SOAP
-@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/SOAP 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/SOAP
+@dirrmtry %%SITE_PERL%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
index 904dcd9bce23..c82ca1d50391 100644
--- a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
+++ b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist
@@ -5,9 +5,9 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP
@dirrm %%SITE_PERL%%/POE/Component/Server/SimpleHTTP
-@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%%/POE/Component/Server 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/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/POE/Component/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/www/p5-ParallelUA/pkg-plist b/www/p5-ParallelUA/pkg-plist
index d122d0cc841f..5a88c4813c9e 100644
--- a/www/p5-ParallelUA/pkg-plist
+++ b/www/p5-ParallelUA/pkg-plist
@@ -12,7 +12,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist
@dirrm %%SITE_PERL%%/LWP/Parallel/Protocol
@dirrm %%SITE_PERL%%/LWP/Parallel
-@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/LWP
+@dirrmtry %%SITE_PERL%%/Bundle
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP
diff --git a/www/p5-PodToHTML/pkg-plist b/www/p5-PodToHTML/pkg-plist
index 7edff0cab4b4..0d20e8ea00ae 100644
--- a/www/p5-PodToHTML/pkg-plist
+++ b/www/p5-PodToHTML/pkg-plist
@@ -3,5 +3,5 @@ bin/podtohtml
%%SITE_PERL%%/Pod/HTML_Elements.pm
%%SITE_PERL%%/Pod/Links.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML
diff --git a/www/p5-Sledge-Plugin-CacheContent/pkg-plist b/www/p5-Sledge-Plugin-CacheContent/pkg-plist
index 922c52e92033..b9f3a7c7e0cc 100644
--- a/www/p5-Sledge-Plugin-CacheContent/pkg-plist
+++ b/www/p5-Sledge-Plugin-CacheContent/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/CacheContent.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-Download/pkg-plist b/www/p5-Sledge-Plugin-Download/pkg-plist
index 038c9a8203a2..390769afe350 100644
--- a/www/p5-Sledge-Plugin-Download/pkg-plist
+++ b/www/p5-Sledge-Plugin-Download/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/Download.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-Dumper/pkg-plist b/www/p5-Sledge-Plugin-Dumper/pkg-plist
index a6bb543299ca..eee0055e4ce1 100644
--- a/www/p5-Sledge-Plugin-Dumper/pkg-plist
+++ b/www/p5-Sledge-Plugin-Dumper/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/Dumper.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
index 84e0ccc50f31..13149f81ddfc 100644
--- a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
+++ b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/HTML2HDML.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-Log/pkg-plist b/www/p5-Sledge-Plugin-Log/pkg-plist
index dabfc3739f93..0936e8a6cf7f 100644
--- a/www/p5-Sledge-Plugin-Log/pkg-plist
+++ b/www/p5-Sledge-Plugin-Log/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/Log.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-NoCache/pkg-plist b/www/p5-Sledge-Plugin-NoCache/pkg-plist
index fa4a5d85fb8a..9a2c935bcd7c 100644
--- a/www/p5-Sledge-Plugin-NoCache/pkg-plist
+++ b/www/p5-Sledge-Plugin-NoCache/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/NoCache.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
index 7ebb314b2957..f846435ec0e6 100644
--- a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
+++ b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/SaveUpload.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
index dc0fd60a2002..ab05aaa69e93 100644
--- a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
+++ b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/ScratchPad.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
index a3e59ed4fd6e..70603e1fdf1d 100644
--- a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
+++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/SessionAutoCleanup.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-Plugin-XSLT/pkg-plist b/www/p5-Sledge-Plugin-XSLT/pkg-plist
index 9c72b38b119f..4a67008d881b 100644
--- a/www/p5-Sledge-Plugin-XSLT/pkg-plist
+++ b/www/p5-Sledge-Plugin-XSLT/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Plugin/XSLT.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin
+@dirrmtry %%SITE_PERL%%/Sledge/Plugin
diff --git a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
index 659fec08334b..1b661db4dfda 100644
--- a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
+++ b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/SessionManager/CookieStore.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/SessionManager 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager
+@dirrmtry %%SITE_PERL%%/Sledge/SessionManager
diff --git a/www/p5-Sledge-Template-Expr/pkg-plist b/www/p5-Sledge-Template-Expr/pkg-plist
index db87ea04f737..fe97341c31a2 100644
--- a/www/p5-Sledge-Template-Expr/pkg-plist
+++ b/www/p5-Sledge-Template-Expr/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sledge/Template/Expr.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sledge/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template
+@dirrmtry %%SITE_PERL%%/Sledge/Template
diff --git a/www/p5-Syntax-Highlight-HTML/pkg-plist b/www/p5-Syntax-Highlight-HTML/pkg-plist
index b1907b57d396..e79b2df98456 100644
--- a/www/p5-Syntax-Highlight-HTML/pkg-plist
+++ b/www/p5-Syntax-Highlight-HTML/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Syntax/Highlight/HTML.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/HTML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/HTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Syntax 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
+@dirrmtry %%SITE_PERL%%/Syntax/Highlight
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
+@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/www/p5-Syntax-Highlight-Shell/pkg-plist b/www/p5-Syntax-Highlight-Shell/pkg-plist
index 5ae424bb61a4..edcab421c89c 100644
--- a/www/p5-Syntax-Highlight-Shell/pkg-plist
+++ b/www/p5-Syntax-Highlight-Shell/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Syntax/Highlight/Shell.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Shell/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Shell
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Syntax 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
+@dirrmtry %%SITE_PERL%%/Syntax/Highlight
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
+@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/www/p5-Task-Catalyst/pkg-plist b/www/p5-Task-Catalyst/pkg-plist
index b7bd01720cf2..8df48249d091 100644
--- a/www/p5-Task-Catalyst/pkg-plist
+++ b/www/p5-Task-Catalyst/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Task/Catalyst.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Task 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task
+@dirrmtry %%SITE_PERL%%/Task
diff --git a/www/p5-Template-Multilingual/pkg-plist b/www/p5-Template-Multilingual/pkg-plist
index a916f9d76242..fbbadd79979c 100644
--- a/www/p5-Template-Multilingual/pkg-plist
+++ b/www/p5-Template-Multilingual/pkg-plist
@@ -3,4 +3,4 @@
%%SITE_PERL%%/Template/Multilingual.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Multilingual
@dirrm %%SITE_PERL%%/Template/Multilingual
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Class/pkg-plist b/www/p5-Template-Plugin-Class/pkg-plist
index bc53ab2142f4..418a5ff47809 100644
--- a/www/p5-Template-Plugin-Class/pkg-plist
+++ b/www/p5-Template-Plugin-Class/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Template/Plugin/Class.pm
-@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Comma/pkg-plist b/www/p5-Template-Plugin-Comma/pkg-plist
index 945251f50a1f..3c2cd9a5916d 100644
--- a/www/p5-Template-Plugin-Comma/pkg-plist
+++ b/www/p5-Template-Plugin-Comma/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Comma/.packlist
%%SITE_PERL%%/Template/Plugin/Comma.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Comma
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-MP3/pkg-plist b/www/p5-Template-Plugin-MP3/pkg-plist
index 1f9aa9d58b8e..6968f74b74b9 100644
--- a/www/p5-Template-Plugin-MP3/pkg-plist
+++ b/www/p5-Template-Plugin-MP3/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/MP3/.packlist
%%SITE_PERL%%/Template/Plugin/MP3.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/MP3
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Plugin-Monta/pkg-plist b/www/p5-Template-Plugin-Monta/pkg-plist
index 840c59aa1c4f..d2e12a80cf80 100644
--- a/www/p5-Template-Plugin-Monta/pkg-plist
+++ b/www/p5-Template-Plugin-Monta/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Monta/.packlist
%%SITE_PERL%%/Template/Plugin/Monta.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Monta
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template/Plugin
+@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Template-Timer/pkg-plist b/www/p5-Template-Timer/pkg-plist
index 5a3fd280b1cf..a0a5df2940c8 100644
--- a/www/p5-Template-Timer/pkg-plist
+++ b/www/p5-Template-Timer/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Template/Timer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Timer/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Timer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
+@dirrmtry %%SITE_PERL%%/Template
diff --git a/www/p5-Test-HTTP-Server-Simple/pkg-plist b/www/p5-Test-HTTP-Server-Simple/pkg-plist
index e6b786db84f6..d245078d0ef3 100644
--- a/www/p5-Test-HTTP-Server-Simple/pkg-plist
+++ b/www/p5-Test-HTTP-Server-Simple/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Test/HTTP/Server/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/HTTP/Server 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test/HTTP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP
+@dirrmtry %%SITE_PERL%%/Test/HTTP/Server
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test
+@dirrmtry %%SITE_PERL%%/Test/HTTP
+@dirrmtry %%SITE_PERL%%/Test
diff --git a/www/p5-URI-Fetch/pkg-plist b/www/p5-URI-Fetch/pkg-plist
index 42f801222858..b75be7d96f3f 100644
--- a/www/p5-URI-Fetch/pkg-plist
+++ b/www/p5-URI-Fetch/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/URI/Fetch.pm
%%SITE_PERL%%/URI/Fetch/Response.pm
@dirrm %%SITE_PERL%%/URI/Fetch
-@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-URI-Sequin/pkg-plist b/www/p5-URI-Sequin/pkg-plist
index dbfc90a04ba0..02844d18e112 100644
--- a/www/p5-URI-Sequin/pkg-plist
+++ b/www/p5-URI-Sequin/pkg-plist
@@ -6,5 +6,5 @@
%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin/examples
%%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
+@dirrmtry %%SITE_PERL%%/URI
diff --git a/www/p5-W3C-LinkChecker/pkg-plist b/www/p5-W3C-LinkChecker/pkg-plist
index 25fae7260113..b2c8fa5033d5 100644
--- a/www/p5-W3C-LinkChecker/pkg-plist
+++ b/www/p5-W3C-LinkChecker/pkg-plist
@@ -1,4 +1,4 @@
bin/checklink
%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LinkChecker/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LinkChecker
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C
diff --git a/www/p5-W3C-LogValidator/pkg-plist b/www/p5-W3C-LogValidator/pkg-plist
index 168854deef1b..9cc543a61141 100644
--- a/www/p5-W3C-LogValidator/pkg-plist
+++ b/www/p5-W3C-LogValidator/pkg-plist
@@ -15,7 +15,7 @@ bin/logprocess.pl
%%EXAMPLESDIR%%/logprocess.conf
@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LogValidator
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C
@dirrm %%SITE_PERL%%/W3C/LogValidator/Output
@dirrm %%SITE_PERL%%/W3C/LogValidator
-@unexec rmdir %D/%%SITE_PERL%%/W3C 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/W3C
diff --git a/www/p5-WWW-Babelfish/pkg-plist b/www/p5-WWW-Babelfish/pkg-plist
index 5c8ab6ee2eff..53c1d7ab9bcf 100644
--- a/www/p5-WWW-Babelfish/pkg-plist
+++ b/www/p5-WWW-Babelfish/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Babelfish/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Babelfish
@dirrm %%SITE_PERL%%/auto/WWW/Babelfish
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Curl/pkg-plist b/www/p5-WWW-Curl/pkg-plist
index 6b725296d180..8d0e60f133d1 100644
--- a/www/p5-WWW-Curl/pkg-plist
+++ b/www/p5-WWW-Curl/pkg-plist
@@ -8,7 +8,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/easy/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/easy
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/WWW
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Curl
diff --git a/www/p5-WWW-Dilbert/pkg-plist b/www/p5-WWW-Dilbert/pkg-plist
index fe10555a54e9..7830cbcbea1e 100644
--- a/www/p5-WWW-Dilbert/pkg-plist
+++ b/www/p5-WWW-Dilbert/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/WWW/Dilbert.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Dilbert/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Dilbert
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Link/pkg-plist b/www/p5-WWW-Link/pkg-plist
index f41f7305cfa2..ca964af46633 100644
--- a/www/p5-WWW-Link/pkg-plist
+++ b/www/p5-WWW-Link/pkg-plist
@@ -29,4 +29,4 @@
@dirrm %%SITE_PERL%%/WWW/Link/Reporter
@dirrm %%SITE_PERL%%/WWW/Link/Repair
@dirrm %%SITE_PERL%%/WWW/Link
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-FormFiller/pkg-plist b/www/p5-WWW-Mechanize-FormFiller/pkg-plist
index c1a81f1c098f..41f0d78869a5 100644
--- a/www/p5-WWW-Mechanize-FormFiller/pkg-plist
+++ b/www/p5-WWW-Mechanize-FormFiller/pkg-plist
@@ -14,7 +14,7 @@
@dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value/Random
@dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value
@dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Mechanize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW/Mechanize
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mechanize-Shell/pkg-plist b/www/p5-WWW-Mechanize-Shell/pkg-plist
index c9600774a880..aefde63b5534 100644
--- a/www/p5-WWW-Mechanize-Shell/pkg-plist
+++ b/www/p5-WWW-Mechanize-Shell/pkg-plist
@@ -20,11 +20,11 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/wwwshell.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Shell
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Mechanize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Display/Win32 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Display/OSX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Display 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW/Mechanize
+@dirrmtry %%SITE_PERL%%/WWW
+@dirrmtry %%SITE_PERL%%/HTML/Display/Win32
+@dirrmtry %%SITE_PERL%%/HTML/Display/OSX
+@dirrmtry %%SITE_PERL%%/HTML/Display
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/www/p5-WWW-Mechanize/pkg-plist b/www/p5-WWW-Mechanize/pkg-plist
index 79e6a10e889a..a36feb749a9d 100644
--- a/www/p5-WWW-Mechanize/pkg-plist
+++ b/www/p5-WWW-Mechanize/pkg-plist
@@ -8,6 +8,6 @@ bin/mech-dump
%%SITE_PERL%%/WWW/Mechanize/Link.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/WWW/Mechanize
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Mixi/pkg-plist b/www/p5-WWW-Mixi/pkg-plist
index 830855717f4d..2e95565f3de1 100644
--- a/www/p5-WWW-Mixi/pkg-plist
+++ b/www/p5-WWW-Mixi/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/WWW/Mixi/Cookbook.pod
%%SITE_PERL%%/WWW/Mixi/Mixi.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/WWW/Mixi
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Robot/pkg-plist b/www/p5-WWW-Robot/pkg-plist
index 8830191ca0ed..874078566a84 100644
--- a/www/p5-WWW-Robot/pkg-plist
+++ b/www/p5-WWW-Robot/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/WWW/Robot.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist
index f843f1ab11df..f74a8627094c 100644
--- a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist
@@ -1,10 +1,10 @@
%%SITE_PERL%%/WWW/Scraper/ISBN/AmazonUK_Driver.pm
%%SITE_PERL%%/WWW/Scraper/ISBN/AmazonUS_Driver.pm
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/WWW
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Amazon_Driver/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Amazon_Driver
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist
index 966650c8350c..294abc7c9dea 100644
--- a/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/WWW/Scraper/ISBN/Driver.pm
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/WWW
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Driver/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Driver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Driver
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist
index 2a0ba4d249e7..785b1933a6ca 100644
--- a/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/WWW/Scraper/ISBN/ORA_Driver.pm
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/WWW
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/ORA_Driver/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/ORA_Driver
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WWW-Scraper-ISBN-Record/pkg-plist b/www/p5-WWW-Scraper-ISBN-Record/pkg-plist
index 9269eaa70b8d..a38e9f7f934e 100644
--- a/www/p5-WWW-Scraper-ISBN-Record/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN-Record/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/WWW/Scraper/ISBN/Record.pm
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/WWW
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Record/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Record
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WWW-Scraper-ISBN/pkg-plist b/www/p5-WWW-Scraper-ISBN/pkg-plist
index 58ee4b827beb..e59fdf656faf 100644
--- a/www/p5-WWW-Scraper-ISBN/pkg-plist
+++ b/www/p5-WWW-Scraper-ISBN/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/WWW/Scraper/ISBN.pm
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/WWW
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WWW-Search-AltaVista/pkg-plist b/www/p5-WWW-Search-AltaVista/pkg-plist
index dc34034a0a79..f7bd2292a14d 100644
--- a/www/p5-WWW-Search-AltaVista/pkg-plist
+++ b/www/p5-WWW-Search-AltaVista/pkg-plist
@@ -10,8 +10,8 @@
%%SITE_PERL%%/WWW/Search/AltaVista/Web.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/AltaVista/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/AltaVista
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/WWW/Search/AltaVista
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Search
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Search-Google/pkg-plist b/www/p5-WWW-Search-Google/pkg-plist
index 9204ac8ccaff..2c731151d1f1 100644
--- a/www/p5-WWW-Search-Google/pkg-plist
+++ b/www/p5-WWW-Search-Google/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/WWW/Search/Google.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
+@dirrmtry %%SITE_PERL%%/WWW/Search
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist
index 4ab3eb179118..82deb182e62f 100644
--- a/www/p5-WWW-Search/pkg-plist
+++ b/www/p5-WWW-Search/pkg-plist
@@ -11,8 +11,8 @@ bin/WebSearch
%%SITE_PERL%%/WWW/Search/Test.pm
%%SITE_PERL%%/WWW/SearchResult.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/WWW/Search/Null
-@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW/Search
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-Shorten/pkg-plist b/www/p5-WWW-Shorten/pkg-plist
index 433c466e375e..d329beabd9a5 100644
--- a/www/p5-WWW-Shorten/pkg-plist
+++ b/www/p5-WWW-Shorten/pkg-plist
@@ -37,6 +37,6 @@
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
@dirrm %%SITE_PERL%%/WWW/Shorten
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW
diff --git a/www/p5-WWW-SourceForge/pkg-plist b/www/p5-WWW-SourceForge/pkg-plist
index 3b93a9d6b341..1374d299c816 100644
--- a/www/p5-WWW-SourceForge/pkg-plist
+++ b/www/p5-WWW-SourceForge/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/WWW/SourceForge/Project.pm
%%SITE_PERL%%/WWW/SourceForge/User.pm
@dirrm %%SITE_PERL%%/WWW/SourceForge
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/SourceForge/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/SourceForge
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
diff --git a/www/p5-WebService-Bloglines/pkg-plist b/www/p5-WebService-Bloglines/pkg-plist
index d66a4bda0686..d56ac168a9f6 100644
--- a/www/p5-WebService-Bloglines/pkg-plist
+++ b/www/p5-WebService-Bloglines/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/WebService/Bloglines/Subscriptions.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Bloglines/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Bloglines
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
@dirrm %%SITE_PERL%%/WebService/Bloglines
-@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-WebService-NoPaste/pkg-plist b/www/p5-WebService-NoPaste/pkg-plist
index 0ec404555065..b9355c93fc9a 100644
--- a/www/p5-WebService-NoPaste/pkg-plist
+++ b/www/p5-WebService-NoPaste/pkg-plist
@@ -1,6 +1,6 @@
bin/nopaste
%%SITE_PERL%%/WebService/NoPaste.pm
-@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WebService
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
diff --git a/www/p5-WebService-Technorati/pkg-plist b/www/p5-WebService-Technorati/pkg-plist
index 3a48aeeafbc4..067ee7f57b55 100644
--- a/www/p5-WebService-Technorati/pkg-plist
+++ b/www/p5-WebService-Technorati/pkg-plist
@@ -15,11 +15,11 @@
%%SITE_PERL%%/WebService/Technorati/SearchTerm.pm
@dirrm %%SITE_PERL%%/WebService/Technorati
%%SITE_PERL%%/WebService/pod2html.pl
-@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WebService
%%SITE_PERL%%/auto/WebService/Technorati/BaseTechnoratiObject/autosplit.ix
@dirrm %%SITE_PERL%%/auto/WebService/Technorati/BaseTechnoratiObject
@dirrm %%SITE_PERL%%/auto/WebService/Technorati
-@unexec rmdir %D/%%SITE_PERL%%/auto/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/WebService
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Technorati/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Technorati
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist
index c4f6f5c1912c..4bcdcccd4e62 100644
--- a/www/p5-libwww/pkg-plist
+++ b/www/p5-libwww/pkg-plist
@@ -61,17 +61,17 @@ bin/lwp-rget
%%SITE_PERL%%/lwptut.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/libwww-perl/.packlist
@dirrm %%SITE_PERL%%/WWW/RobotRules
-@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WWW
@dirrm %%SITE_PERL%%/Net/HTTP
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Net
@dirrm %%SITE_PERL%%/LWP/Authen
@dirrm %%SITE_PERL%%/LWP/Protocol
-@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/LWP
@dirrm %%SITE_PERL%%/HTTP/Cookies
@dirrm %%SITE_PERL%%/HTTP/Headers
@dirrm %%SITE_PERL%%/HTTP/Request
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libwww-perl
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/File
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/HTTP
diff --git a/www/p5-webservice-validator-css-w3c/pkg-plist b/www/p5-webservice-validator-css-w3c/pkg-plist
index 145d4b6714e4..cb17030e06d0 100644
--- a/www/p5-webservice-validator-css-w3c/pkg-plist
+++ b/www/p5-webservice-validator-css-w3c/pkg-plist
@@ -4,7 +4,7 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/CSS
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/CSS/W3C 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/CSS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WebService/Validator/CSS/W3C
+@dirrmtry %%SITE_PERL%%/WebService/Validator/CSS
+@dirrmtry %%SITE_PERL%%/WebService/Validator
+@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/p5-webservice-validator-html-w3c/pkg-plist b/www/p5-webservice-validator-html-w3c/pkg-plist
index 61440d0a33c8..c28bdf6383cc 100644
--- a/www/p5-webservice-validator-html-w3c/pkg-plist
+++ b/www/p5-webservice-validator-html-w3c/pkg-plist
@@ -5,7 +5,7 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/HTML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService
-@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/HTML/W3C 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WebService/Validator/HTML/W3C
+@dirrmtry %%SITE_PERL%%/WebService/Validator/HTML
+@dirrmtry %%SITE_PERL%%/WebService/Validator
+@dirrmtry %%SITE_PERL%%/WebService
diff --git a/www/php-dyn/pkg-plist b/www/php-dyn/pkg-plist
index e91d40926b0b..8b4c4a576dea 100644
--- a/www/php-dyn/pkg-plist
+++ b/www/php-dyn/pkg-plist
@@ -1,4 +1,4 @@
lib/php/%%PHP_EXT_DIR%%/php_dyn.so
%%PORTDOCS%%share/doc/php-dyn/README
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
%%PORTDOCS%%@dirrm share/doc/php-dyn
diff --git a/www/php-screw/pkg-plist b/www/php-screw/pkg-plist
index ce6f88ba39f2..3470bccaa8c1 100644
--- a/www/php-screw/pkg-plist
+++ b/www/php-screw/pkg-plist
@@ -1,3 +1,3 @@
bin/screw
lib/php/%%PHP_EXT_DIR%%/php_screw.so
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
diff --git a/www/php-templates/pkg-plist b/www/php-templates/pkg-plist
index 8fedeead348c..3bb91bbfa8c0 100644
--- a/www/php-templates/pkg-plist
+++ b/www/php-templates/pkg-plist
@@ -2,5 +2,5 @@ lib/php/%%PHP_EXT_DIR%%/templates.so
%%PORTDOCS%%share/doc/php-templates/CHANGELOG
%%PORTDOCS%%share/doc/php-templates/php_templates-eng.html
%%PORTDOCS%%share/doc/php-templates/php_templates.css
-@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
+@dirrmtry lib/php/%%PHP_EXT_DIR%%
%%PORTDOCS%%@dirrm share/doc/php-templates
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index f8e4aa1bbc01..5aa36aa36f1d 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -304,26 +304,26 @@
@exec touch %B/config.php
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/doc 2>/dev/null || true
+@dirrmtry share/doc
@dirrm %%DATADIR%%/contrib
@dirrm %%DATADIR%%
@dirrm %%PHPBBDIR%%/admin
@dirrm %%PHPBBDIR%%/cache
@dirrm %%PHPBBDIR%%/db
@dirrm %%PHPBBDIR%%/images/smiles
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/gallery 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/upload 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
+@dirrmtry %%PHPBBDIR%%/images/avatars/upload
+@dirrmtry %%PHPBBDIR%%/images/avatars
+@dirrmtry %%PHPBBDIR%%/images
@dirrm %%PHPBBDIR%%/includes
@dirrm %%PHPBBDIR%%/install/schemas
@dirrm %%PHPBBDIR%%/install
@dirrm %%PHPBBDIR%%/language/lang_english/email
@dirrm %%PHPBBDIR%%/language/lang_english
-@unexec rmdir %D/%%PHPBBDIR%%/language 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/language
@dirrm %%PHPBBDIR%%/templates/subSilver/admin
@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
-@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver/images 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/templates 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/templates/subSilver/images
+@dirrmtry %%PHPBBDIR%%/templates/subSilver
+@dirrmtry %%PHPBBDIR%%/templates
@unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist
index 50d5d4e89a99..2974fb3c4e8c 100644
--- a/www/plugger/pkg-plist
+++ b/www/plugger/pkg-plist
@@ -4,4 +4,4 @@ bin/plugger-oohelper
@unexec if cmp %D/etc/pluggerrc-5.1.3.sample %D/etc/pluggerrc-5.1.3 2>/dev/null; then rm -f %D/etc/pluggerrc-5.1.3; fi
etc/pluggerrc-5.1.3.sample
lib/browser_plugins/npplugger.so
-@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true
+@dirrmtry lib/browser_plugins
diff --git a/www/polipo/pkg-plist b/www/polipo/pkg-plist
index 9a446ee0b531..035298d82c98 100644
--- a/www/polipo/pkg-plist
+++ b/www/polipo/pkg-plist
@@ -3,5 +3,5 @@ etc/polipo/config.sample
etc/polipo/forbidden.sample
etc/periodic/daily/400.polipo
%%PORTDOCS%%%%DATADIR%%/www/index.html
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
diff --git a/www/privoxy+ipv6/pkg-plist b/www/privoxy+ipv6/pkg-plist
index 29f851b0332d..97c8485fbfa2 100644
--- a/www/privoxy+ipv6/pkg-plist
+++ b/www/privoxy+ipv6/pkg-plist
@@ -87,7 +87,7 @@ sbin/privoxy
%%DOCSDIR%%/user-manual/templates.html
%%DOCSDIR%%/user-manual/upgradersnote.html
@dirrm etc/privoxy/templates
-@unexec rmdir %D/etc/privoxy 2>/dev/null || true
+@dirrmtry etc/privoxy
@dirrm %%DOCSDIR%%/developer-manual
@dirrm %%DOCSDIR%%/faq
@dirrm %%DOCSDIR%%/images
diff --git a/www/py-formencode/pkg-plist b/www/py-formencode/pkg-plist
index aa4a03e60572..443436abbf2b 100644
--- a/www/py-formencode/pkg-plist
+++ b/www/py-formencode/pkg-plist
@@ -72,8 +72,8 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples/__init__.py
%%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples/index.py
%%PORTDOCS%%%%EXAMPLESDIR%%/webware_example.ini
-@unexec rmdir %D/%%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples 2>/dev/null || true
-@unexec rmdir %D/%%PORTDOCS%%%%EXAMPLESDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/formencode/util 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/formencode/javascript 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/formencode 2>/dev/null || true
+@dirrmtry %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples
+@dirrmtry %%PORTDOCS%%%%EXAMPLESDIR%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/formencode/util
+@dirrmtry %%PYTHON_SITELIBDIR%%/formencode/javascript
+@dirrmtry %%PYTHON_SITELIBDIR%%/formencode
diff --git a/www/py-webware/pkg-plist b/www/py-webware/pkg-plist
index 562193a1bd12..6b3814ddcf69 100644
--- a/www/py-webware/pkg-plist
+++ b/www/py-webware/pkg-plist
@@ -1577,153 +1577,153 @@ www/webkit/Launch.py
www/webkit/WebKit.cgi
www/webkit/MyContext/Main.py
www/webkit/MyContext/__init__.py
-@unexec rmdir %D/share/webware/bin 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils/Tests 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebUtils 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Tests/Basic/TestContext 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Tests/Basic/Configs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Tests/Basic/Cache 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Tests/Basic 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Tests 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/vhosts 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test5join2 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test5join1 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test5 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test4 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test3 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test2 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL/test1 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/URL 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing/Dir 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Testing 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Tasks 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/StartScripts 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Sessions 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Research 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Logs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Experimental 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Examples 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/ErrorMsgs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Configs 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Cache 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Admin 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Adapters/wkcgi 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Adapters/wkISAPI 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Adapters/mod_webkit2 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Adapters/mod_webkit 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Adapters/common 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit/Adapters 2>/dev/null || true
-@unexec rmdir %D/share/webware/WebKit 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Tests/UserManagerTest.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Tests 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/UserKit 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit/Tests 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/TaskKit 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Tests 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Examples 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/PSP 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils/Testing 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiscUtils 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/WebBrowser/Help 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/WebBrowser 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKTypeValueChecking.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKString.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKRefresh.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKObjRefReuse.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKObjRef.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKNone.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKMultipleThreads.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKMultipleStores.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKModelInh3.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKModelInh2.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKModelInh1.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKList.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKInheritanceAbstract.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKInheritance.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKExcel.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKEnums.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDump.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDeleteMark.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDelete.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDefaultMinMax.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDateTime.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKClone.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKBasic.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests/MKBackRef.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Tests 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Run 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Resources/Template.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Resources 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos/Middle/Videos.mkmodel 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos/Middle 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos/Command 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Design 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit/Core 2>/dev/null || true
-@unexec rmdir %D/share/webware/MiddleKit 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit/Examples 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/KidKit 2>/dev/null || true
-@unexec rmdir %D/share/webware/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/DocSupport 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit/Examples 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/COMKit 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper/Examples 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source/Summaries 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source/Files 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper/Docs 2>/dev/null || true
-@unexec rmdir %D/share/webware/CGIWrapper 2>/dev/null || true
-@unexec rmdir %D/share/webware 2>/dev/null || true
-@unexec rmdir %D/www/webkit/Sessions 2>/dev/null || true
-@unexec rmdir %D/www/webkit/MyContext 2>/dev/null || true
-@unexec rmdir %D/www/webkit/Logs 2>/dev/null || true
-@unexec rmdir %D/www/webkit/ErrorMsgs 2>/dev/null || true
-@unexec rmdir %D/www/webkit/Configs 2>/dev/null || true
-@unexec rmdir %D/www/webkit/Cache 2>/dev/null || true
-@unexec rmdir %D/www/webkit 2>/dev/null || true
+@dirrmtry share/webware/bin
+@dirrmtry share/webware/WebUtils/Tests
+@dirrmtry share/webware/WebUtils/Docs/Source/Summaries
+@dirrmtry share/webware/WebUtils/Docs/Source/Files
+@dirrmtry share/webware/WebUtils/Docs/Source/Docs
+@dirrmtry share/webware/WebUtils/Docs/Source
+@dirrmtry share/webware/WebUtils/Docs
+@dirrmtry share/webware/WebUtils
+@dirrmtry share/webware/WebKit/Tests/Basic/TestContext
+@dirrmtry share/webware/WebKit/Tests/Basic/Configs
+@dirrmtry share/webware/WebKit/Tests/Basic/Cache
+@dirrmtry share/webware/WebKit/Tests/Basic
+@dirrmtry share/webware/WebKit/Tests
+@dirrmtry share/webware/WebKit/Testing/URL/vhosts
+@dirrmtry share/webware/WebKit/Testing/URL/test5join2
+@dirrmtry share/webware/WebKit/Testing/URL/test5join1
+@dirrmtry share/webware/WebKit/Testing/URL/test5
+@dirrmtry share/webware/WebKit/Testing/URL/test4
+@dirrmtry share/webware/WebKit/Testing/URL/test3
+@dirrmtry share/webware/WebKit/Testing/URL/test2
+@dirrmtry share/webware/WebKit/Testing/URL/test1
+@dirrmtry share/webware/WebKit/Testing/URL
+@dirrmtry share/webware/WebKit/Testing/Dir
+@dirrmtry share/webware/WebKit/Testing
+@dirrmtry share/webware/WebKit/Tasks
+@dirrmtry share/webware/WebKit/StartScripts
+@dirrmtry share/webware/WebKit/Sessions
+@dirrmtry share/webware/WebKit/Research
+@dirrmtry share/webware/WebKit/Logs
+@dirrmtry share/webware/WebKit/Experimental
+@dirrmtry share/webware/WebKit/Examples
+@dirrmtry share/webware/WebKit/ErrorMsgs
+@dirrmtry share/webware/WebKit/Docs/Source/Summaries
+@dirrmtry share/webware/WebKit/Docs/Source/Files
+@dirrmtry share/webware/WebKit/Docs/Source/Docs
+@dirrmtry share/webware/WebKit/Docs/Source
+@dirrmtry share/webware/WebKit/Docs
+@dirrmtry share/webware/WebKit/Configs
+@dirrmtry share/webware/WebKit/Cache
+@dirrmtry share/webware/WebKit/Admin
+@dirrmtry share/webware/WebKit/Adapters/wkcgi
+@dirrmtry share/webware/WebKit/Adapters/wkISAPI
+@dirrmtry share/webware/WebKit/Adapters/mod_webkit2
+@dirrmtry share/webware/WebKit/Adapters/mod_webkit
+@dirrmtry share/webware/WebKit/Adapters/common
+@dirrmtry share/webware/WebKit/Adapters
+@dirrmtry share/webware/WebKit
+@dirrmtry share/webware/UserKit/Tests/UserManagerTest.mkmodel
+@dirrmtry share/webware/UserKit/Tests
+@dirrmtry share/webware/UserKit/Docs/Source/Summaries
+@dirrmtry share/webware/UserKit/Docs/Source/Files
+@dirrmtry share/webware/UserKit/Docs/Source/Docs
+@dirrmtry share/webware/UserKit/Docs/Source
+@dirrmtry share/webware/UserKit/Docs
+@dirrmtry share/webware/UserKit
+@dirrmtry share/webware/TaskKit/Tests
+@dirrmtry share/webware/TaskKit/Docs/Source/Summaries
+@dirrmtry share/webware/TaskKit/Docs/Source/Files
+@dirrmtry share/webware/TaskKit/Docs/Source/Docs
+@dirrmtry share/webware/TaskKit/Docs/Source
+@dirrmtry share/webware/TaskKit/Docs
+@dirrmtry share/webware/TaskKit
+@dirrmtry share/webware/PSP/Tests
+@dirrmtry share/webware/PSP/Examples
+@dirrmtry share/webware/PSP/Docs/Source/Summaries
+@dirrmtry share/webware/PSP/Docs/Source/Files
+@dirrmtry share/webware/PSP/Docs/Source/Docs
+@dirrmtry share/webware/PSP/Docs/Source
+@dirrmtry share/webware/PSP/Docs
+@dirrmtry share/webware/PSP
+@dirrmtry share/webware/MiscUtils/Testing
+@dirrmtry share/webware/MiscUtils/Docs/Source/Summaries
+@dirrmtry share/webware/MiscUtils/Docs/Source/Files
+@dirrmtry share/webware/MiscUtils/Docs/Source/Docs
+@dirrmtry share/webware/MiscUtils/Docs/Source
+@dirrmtry share/webware/MiscUtils/Docs
+@dirrmtry share/webware/MiscUtils
+@dirrmtry share/webware/MiddleKit/WebBrowser/Help
+@dirrmtry share/webware/MiddleKit/WebBrowser
+@dirrmtry share/webware/MiddleKit/Tests/MKTypeValueChecking.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKString.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKRefresh.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKObjRefReuse.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKObjRef.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKNone.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKMultipleThreads.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKMultipleStores.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKModelInh3.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKModelInh2.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKModelInh1.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKList.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKInheritanceAbstract.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKInheritance.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKExcel.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKEnums.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKDump.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKDeleteMark.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKDelete.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKDefaultMinMax.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKDateTime.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKClone.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKBasic.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests/MKBackRef.mkmodel
+@dirrmtry share/webware/MiddleKit/Tests
+@dirrmtry share/webware/MiddleKit/Run
+@dirrmtry share/webware/MiddleKit/Resources/Template.mkmodel
+@dirrmtry share/webware/MiddleKit/Resources
+@dirrmtry share/webware/MiddleKit/Docs/Videos/Middle/Videos.mkmodel
+@dirrmtry share/webware/MiddleKit/Docs/Videos/Middle
+@dirrmtry share/webware/MiddleKit/Docs/Videos/Command
+@dirrmtry share/webware/MiddleKit/Docs/Videos
+@dirrmtry share/webware/MiddleKit/Docs/Source/Summaries
+@dirrmtry share/webware/MiddleKit/Docs/Source/Files
+@dirrmtry share/webware/MiddleKit/Docs/Source/Docs
+@dirrmtry share/webware/MiddleKit/Docs/Source
+@dirrmtry share/webware/MiddleKit/Docs
+@dirrmtry share/webware/MiddleKit/Design
+@dirrmtry share/webware/MiddleKit/Core
+@dirrmtry share/webware/MiddleKit
+@dirrmtry share/webware/KidKit/Examples
+@dirrmtry share/webware/KidKit/Docs/Source/Summaries
+@dirrmtry share/webware/KidKit/Docs/Source/Files
+@dirrmtry share/webware/KidKit/Docs/Source/Docs
+@dirrmtry share/webware/KidKit/Docs/Source
+@dirrmtry share/webware/KidKit/Docs
+@dirrmtry share/webware/KidKit
+@dirrmtry share/webware/Docs
+@dirrmtry share/webware/DocSupport
+@dirrmtry share/webware/COMKit/Examples
+@dirrmtry share/webware/COMKit/Docs/Source/Summaries
+@dirrmtry share/webware/COMKit/Docs/Source/Files
+@dirrmtry share/webware/COMKit/Docs/Source/Docs
+@dirrmtry share/webware/COMKit/Docs/Source
+@dirrmtry share/webware/COMKit/Docs
+@dirrmtry share/webware/COMKit
+@dirrmtry share/webware/CGIWrapper/Examples
+@dirrmtry share/webware/CGIWrapper/Docs/Source/Summaries
+@dirrmtry share/webware/CGIWrapper/Docs/Source/Files
+@dirrmtry share/webware/CGIWrapper/Docs/Source/Docs
+@dirrmtry share/webware/CGIWrapper/Docs/Source
+@dirrmtry share/webware/CGIWrapper/Docs
+@dirrmtry share/webware/CGIWrapper
+@dirrmtry share/webware
+@dirrmtry www/webkit/Sessions
+@dirrmtry www/webkit/MyContext
+@dirrmtry www/webkit/Logs
+@dirrmtry www/webkit/ErrorMsgs
+@dirrmtry www/webkit/Configs
+@dirrmtry www/webkit/Cache
+@dirrmtry www/webkit
diff --git a/www/roundup/pkg-plist b/www/roundup/pkg-plist
index 2833fc6380f0..00d7dbe78848 100644
--- a/www/roundup/pkg-plist
+++ b/www/roundup/pkg-plist
@@ -303,5 +303,5 @@ share/locale/zh_TW/LC_MESSAGES/roundup.mo
@dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi
@dirrm %%PYTHON_SITELIBDIR%%/roundup/backends
@dirrm %%PYTHON_SITELIBDIR%%/roundup
-@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es_AR 2>/dev/null || true
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
diff --git a/www/rt2/pkg-plist b/www/rt2/pkg-plist
index 2447c26c7025..d996c905e573 100644
--- a/www/rt2/pkg-plist
+++ b/www/rt2/pkg-plist
@@ -362,4 +362,4 @@ rt2/README
@dirrm rt2/WebRT/html
@dirrm rt2/WebRT/data
@dirrm rt2/WebRT
-@unexec rmdir %D/rt2 2>/dev/null || true
+@dirrmtry rt2
diff --git a/www/sidplug/pkg-plist b/www/sidplug/pkg-plist
index e916a6e48c54..099e3f49c611 100644
--- a/www/sidplug/pkg-plist
+++ b/www/sidplug/pkg-plist
@@ -4,4 +4,4 @@ lib/browser_plugins/npsidplug.so
%%PORTDOCS%%share/examples/sidplug/README.html
%%PORTDOCS%%share/examples/sidplug/sidplug.png
%%PORTDOCS%%@dirrm share/examples/sidplug
-@unexec rmdir %D/lib/browser_plugins/ 2> /dev/null || true
+@dirrmtry lib/browser_plugins/
diff --git a/www/simplog/pkg-plist b/www/simplog/pkg-plist
index 305218482a75..88d60d85a51c 100644
--- a/www/simplog/pkg-plist
+++ b/www/simplog/pkg-plist
@@ -351,4 +351,4 @@ www/simplog/xmlrpcs.inc
@dirrm www/simplog/adodb/contrib
@dirrm www/simplog/adodb/xsl
@dirrm www/simplog/adodb
-@unexec rmdir %D/www/simplog 2>/dev/null || true
+@dirrmtry www/simplog
diff --git a/www/slash/pkg-plist b/www/slash/pkg-plist
index 433220bdbe88..3eed6f8e7ede 100644
--- a/www/slash/pkg-plist
+++ b/www/slash/pkg-plist
@@ -460,4 +460,4 @@ slash/slash.sites
@dirrm slash/plugins
@dirrm slash/httpd
@dirrm slash/bin
-@unexec rmdir %D/slash 2>/dev/null || true
+@dirrmtry slash
diff --git a/www/snownews/pkg-plist b/www/snownews/pkg-plist
index e8dcfdb58a73..5f55bcbcd923 100644
--- a/www/snownews/pkg-plist
+++ b/www/snownews/pkg-plist
@@ -14,13 +14,13 @@ bin/snowsync
%%NLS%%share/locale/sl/LC_MESSAGES/snownews.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/snownews.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/snownews.mo
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de 2>/dev/null || true
-@unexec rmdir %D/man/nl/man1 2>/dev/null || true
-@unexec rmdir %D/man/nl 2>/dev/null || true
-@unexec rmdir %D/man/it/man1 2>/dev/null || true
-@unexec rmdir %D/man/it 2>/dev/null || true
-@unexec rmdir %D/man/ru_RU.KOI8-R/man1 2>/dev/null || true
-@unexec rmdir %D/man/ru_RU.KOI8-R 2>/dev/null || true
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@dirrmtry man/nl/man1
+@dirrmtry man/nl
+@dirrmtry man/it/man1
+@dirrmtry man/it
+@dirrmtry man/ru_RU.KOI8-R/man1
+@dirrmtry man/ru_RU.KOI8-R
diff --git a/www/squid_radius_auth/pkg-plist b/www/squid_radius_auth/pkg-plist
index 5ee41599bd37..3b5295773ba2 100644
--- a/www/squid_radius_auth/pkg-plist
+++ b/www/squid_radius_auth/pkg-plist
@@ -1,5 +1,5 @@
etc/squid/squid_radius_auth.conf
etc/squid/squid_radius_auth.conf.default
libexec/squid/squid_radius_auth
-@unexec rmdir %D/libexec/squid/ 2>/dev/null || true
-@unexec rmdir %D/etc/squid/ 2>/dev/null || true
+@dirrmtry libexec/squid/
+@dirrmtry etc/squid/
diff --git a/www/ssserver/pkg-plist b/www/ssserver/pkg-plist
index f5d258dd359e..341605036a96 100644
--- a/www/ssserver/pkg-plist
+++ b/www/ssserver/pkg-plist
@@ -62,4 +62,4 @@ www/cgi-bin/ssserverdata/template7.txt
www/cgi-bin/ssserverdata/template8.txt
@mode
@unexec rm -fR %B>/dev/null || true
-@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
+@dirrmtry www/cgi-bin
diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist
index 1fc4d7f70dd8..447333940db7 100644
--- a/www/syndigator/pkg-plist
+++ b/www/syndigator/pkg-plist
@@ -85,6 +85,6 @@ share/gnome/pixmaps/syndigator/trayicon.gif
@dirrm %%SITE_PERL%%/syndigator/RSSReader/Exporter
@dirrm %%SITE_PERL%%/syndigator/RSSReader
@dirrm %%SITE_PERL%%/syndigator
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true
-@unexec rmdir %D/lib/perl5 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5
diff --git a/www/thttpd/pkg-plist b/www/thttpd/pkg-plist
index 983dc3a173f8..60661d0b4c83 100644
--- a/www/thttpd/pkg-plist
+++ b/www/thttpd/pkg-plist
@@ -6,5 +6,5 @@ sbin/thttpd
www/cgi-bin/phf
www/cgi-bin/redirect
www/cgi-bin/ssi
-@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
-@unexec rmdir %D/www/data 2> /dev/null || true
+@dirrmtry www/cgi-bin
+@dirrmtry www/data
diff --git a/www/ump/pkg-plist b/www/ump/pkg-plist
index 6f9891af5f7b..fd50f1c0a322 100644
--- a/www/ump/pkg-plist
+++ b/www/ump/pkg-plist
@@ -1,2 +1,2 @@
lib/browser_plugins/ump.so
-@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true
+@dirrmtry lib/browser_plugins
diff --git a/www/urchin5/pkg-plist b/www/urchin5/pkg-plist
index 08d1daa3d068..a2b3a6cdb856 100644
--- a/www/urchin5/pkg-plist
+++ b/www/urchin5/pkg-plist
@@ -627,12 +627,12 @@ urchin/var/server.key.sample
urchin/var/urchinwebd.conf
@unexec rm -rf %D/urchin/var/urchinwebd.conf.template.dist 2>/dev/null || true
@dirrm urchin/bin
-@unexec rmdir %D/urchin/data/admin 2>/dev/null || true
+@dirrmtry urchin/data/admin
@unexec rm -rf %D/urchin/data/cache 2>/dev/null
-@unexec rmdir %D/urchin/data/history 2>/dev/null || true
-@unexec rmdir %D/urchin/data/logs 2>/dev/null || true
-@unexec rmdir %D/urchin/data/reports 2>/dev/null || true
-@unexec rmdir %D/urchin/data/session 2>/dev/null || true
+@dirrmtry urchin/data/history
+@dirrmtry urchin/data/logs
+@dirrmtry urchin/data/reports
+@dirrmtry urchin/data/session
@dirrm urchin/doc
@dirrm urchin/htdocs/ucss
@dirrm urchin/htdocs/uicons/default/ee/images
@@ -647,16 +647,16 @@ urchin/var/urchinwebd.conf
@dirrm urchin/lib/admin/templates
@dirrm urchin/lib/admin/views
@dirrm urchin/lib/admin
-@unexec rmdir %D/urchin/lib/custom/cobrands 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/languages 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/logformats 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/lookuptables 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/profiletypes/Campaign_Website 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/profiletypes/Campaign_with_E-Commerce_Website 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/profiletypes/E-Commerce_Website 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/profiletypes/Standard_Website 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom/profiletypes 2>/dev/null || true
-@unexec rmdir %D/urchin/lib/custom 2>/dev/null || true
+@dirrmtry urchin/lib/custom/cobrands
+@dirrmtry urchin/lib/custom/languages
+@dirrmtry urchin/lib/custom/logformats
+@dirrmtry urchin/lib/custom/lookuptables
+@dirrmtry urchin/lib/custom/profiletypes/Campaign_Website
+@dirrmtry urchin/lib/custom/profiletypes/Campaign_with_E-Commerce_Website
+@dirrmtry urchin/lib/custom/profiletypes/E-Commerce_Website
+@dirrmtry urchin/lib/custom/profiletypes/Standard_Website
+@dirrmtry urchin/lib/custom/profiletypes
+@dirrmtry urchin/lib/custom
@dirrm urchin/lib/reporting/languages
@dirrm urchin/lib/reporting/logformats
@dirrm urchin/lib/reporting/lookuptables
@@ -670,6 +670,6 @@ urchin/var/urchinwebd.conf
@dirrm urchin/lib/session/languages
@dirrm urchin/lib/session/templates
@dirrm urchin/lib/session
-@unexec rmdir %D/urchin/lib 2>/dev/null || true
+@dirrmtry urchin/lib
@dirrm urchin/util/utm
-@unexec rmdir %D/urchin/util 2>/dev/null || true
+@dirrmtry urchin/util
diff --git a/www/wiliki/pkg-plist b/www/wiliki/pkg-plist
index 135b51e015ba..ab458510feef 100644
--- a/www/wiliki/pkg-plist
+++ b/www/wiliki/pkg-plist
@@ -1,9 +1,9 @@
www/cgi-bin/wiliki.cgi.dist
www/cgi-bin/wiliki2.cgi.dist
-@unexec rmdir %D/www/cgi-bin 2>/dev/null || true
+@dirrmtry www/cgi-bin
www/data/wiliki.css
www/data/wiliki2.css
-@unexec rmdir %D/www/data 2>/dev/null || true
+@dirrmtry www/data
share/gauche/site/lib/.packages/WiLiKi.gpd
share/gauche/site/lib/wiliki.scm
share/gauche/site/lib/wiliki/db.scm
diff --git a/www/winhelpcgi/pkg-plist b/www/winhelpcgi/pkg-plist
index 055c8979bb81..330c792f4d17 100644
--- a/www/winhelpcgi/pkg-plist
+++ b/www/winhelpcgi/pkg-plist
@@ -1,2 +1,2 @@
www/winhelpcgi/winhelpcgi.cgi
-@unexec rmdir %D/www/winhelpcgi 2>/dev/null || true
+@dirrmtry www/winhelpcgi
diff --git a/www/xitami/pkg-plist b/www/xitami/pkg-plist
index 6a9bc78ad372..e7021f96ceae 100644
--- a/www/xitami/pkg-plist
+++ b/www/xitami/pkg-plist
@@ -25,6 +25,6 @@ xitami/xitami.aut
xitami/xitami.cfg
@dirrm share/doc/xitami/html
@dirrm share/doc/xitami
-@unexec rmdir %D/xitami/webpages 2>/dev/null || true
-@unexec rmdir %D/xitami/cgi-bin 2>/dev/null || true
-@unexec rmdir %D/xitami 2>/dev/null || true
+@dirrmtry xitami/webpages
+@dirrmtry xitami/cgi-bin
+@dirrmtry xitami
diff --git a/www/xshttpd-devel/pkg-plist b/www/xshttpd-devel/pkg-plist
index 587a3c2b6b75..3c719061d98f 100644
--- a/www/xshttpd-devel/pkg-plist
+++ b/www/xshttpd-devel/pkg-plist
@@ -66,6 +66,6 @@ bin/xspasswd
@dirrm %%DATADIR%%/gfxcount
@dirrm %%DATADIR%%/icons
@cwd %%WWWDIR%%
-@unexec rmdir %D/cgi-bin 2>/dev/null || true
-@unexec rmdir %D/htdocs 2>/dev/null || true
-@unexec rmdir %D/logs 2>/dev/null || true
+@dirrmtry cgi-bin
+@dirrmtry htdocs
+@dirrmtry logs
diff --git a/www/xshttpd/pkg-plist b/www/xshttpd/pkg-plist
index 587a3c2b6b75..3c719061d98f 100644
--- a/www/xshttpd/pkg-plist
+++ b/www/xshttpd/pkg-plist
@@ -66,6 +66,6 @@ bin/xspasswd
@dirrm %%DATADIR%%/gfxcount
@dirrm %%DATADIR%%/icons
@cwd %%WWWDIR%%
-@unexec rmdir %D/cgi-bin 2>/dev/null || true
-@unexec rmdir %D/htdocs 2>/dev/null || true
-@unexec rmdir %D/logs 2>/dev/null || true
+@dirrmtry cgi-bin
+@dirrmtry htdocs
+@dirrmtry logs
diff --git a/www/yabb/pkg-plist b/www/yabb/pkg-plist
index eaf3221d6357..aa76b3770788 100644
--- a/www/yabb/pkg-plist
+++ b/www/yabb/pkg-plist
@@ -144,32 +144,32 @@
%%YABBCGI%%/Variables/index.html
%%YABBCGI%%/YaBB.pl
%%YABBCGI%%/index.html
-@unexec rmdir %D/%%YABBCGI%%/Variables 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Templates/default 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Templates 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Sources 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Modules/Upload/CGI 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Modules/Upload 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Modules/Time 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Modules/Digest 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Modules 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Messages 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Members 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Languages/English 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Languages 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Help/English/User 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Help/English/Moderator 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Help/English/Gmod 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Help/English/Admin 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Help/English 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Help 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Convert/Variables 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Convert/Messages 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Convert/Members 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Convert/Boards 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Convert 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Boards 2>/dev/null || true
-@unexec rmdir %D/%%YABBCGI%%/Admin 2>/dev/null || true
+@dirrmtry %%YABBCGI%%/Variables
+@dirrmtry %%YABBCGI%%/Templates/default
+@dirrmtry %%YABBCGI%%/Templates
+@dirrmtry %%YABBCGI%%/Sources
+@dirrmtry %%YABBCGI%%/Modules/Upload/CGI
+@dirrmtry %%YABBCGI%%/Modules/Upload
+@dirrmtry %%YABBCGI%%/Modules/Time
+@dirrmtry %%YABBCGI%%/Modules/Digest
+@dirrmtry %%YABBCGI%%/Modules
+@dirrmtry %%YABBCGI%%/Messages
+@dirrmtry %%YABBCGI%%/Members
+@dirrmtry %%YABBCGI%%/Languages/English
+@dirrmtry %%YABBCGI%%/Languages
+@dirrmtry %%YABBCGI%%/Help/English/User
+@dirrmtry %%YABBCGI%%/Help/English/Moderator
+@dirrmtry %%YABBCGI%%/Help/English/Gmod
+@dirrmtry %%YABBCGI%%/Help/English/Admin
+@dirrmtry %%YABBCGI%%/Help/English
+@dirrmtry %%YABBCGI%%/Help
+@dirrmtry %%YABBCGI%%/Convert/Variables
+@dirrmtry %%YABBCGI%%/Convert/Messages
+@dirrmtry %%YABBCGI%%/Convert/Members
+@dirrmtry %%YABBCGI%%/Convert/Boards
+@dirrmtry %%YABBCGI%%/Convert
+@dirrmtry %%YABBCGI%%/Boards
+@dirrmtry %%YABBCGI%%/Admin
@unexec rmdir %D/%%YABBCGI%% 2>/dev/null || echo "Note: %D/%%YABBCGI%% not empty -- not deleted!"
%%YABBFILES%%/Buttons/English/addfav.png
%%YABBFILES%%/Buttons/English/admin.png