aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 03:01:03 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 03:01:03 +0000
commit508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
treef7810d4887e5297c7b7788225e906b99c81d709b /textproc
parent4008c7e23fe847e2c8ade0ecb5d86f943d84c917 (diff)
downloadports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.tar.gz
ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.zip
Notes
Diffstat (limited to 'textproc')
-rw-r--r--textproc/add-css-links/pkg-plist4
-rw-r--r--textproc/docbook-241/pkg-plist2
-rw-r--r--textproc/docbook-300/pkg-plist2
-rw-r--r--textproc/docbook-310/pkg-plist2
-rw-r--r--textproc/docbook-400/pkg-plist2
-rw-r--r--textproc/docbook-410/pkg-plist2
-rw-r--r--textproc/docbook-420/pkg-plist2
-rw-r--r--textproc/dsssl-docbook-cygnus/pkg-plist2
-rw-r--r--textproc/dtdinst/pkg-plist2
-rw-r--r--textproc/dtdparse/pkg-plist4
-rw-r--r--textproc/fldiff/pkg-plist2
-rw-r--r--textproc/fop/pkg-plist4
-rw-r--r--textproc/gtkspell/pkg-plist4
-rw-r--r--textproc/gtkspell2/pkg-plist4
-rw-r--r--textproc/htdig/pkg-plist8
-rw-r--r--textproc/liblrdf/pkg-plist4
-rw-r--r--textproc/manued.el/pkg-plist4
-rw-r--r--textproc/mifluz/pkg-plist2
-rw-r--r--textproc/p5-Apache-ParseLog/pkg-plist6
-rw-r--r--textproc/p5-Apache-XBEL/pkg-plist4
-rw-r--r--textproc/p5-Bloom-Filter/pkg-plist6
-rw-r--r--textproc/p5-CSS-SAC/pkg-plist4
-rw-r--r--textproc/p5-CSS-Tiny/pkg-plist4
-rw-r--r--textproc/p5-Chess-PGN-Parse/pkg-plist8
-rw-r--r--textproc/p5-Data-FormValidator/pkg-plist2
-rw-r--r--textproc/p5-DelimMatch/pkg-plist6
-rw-r--r--textproc/p5-Devel-TraceSAX/pkg-plist4
-rw-r--r--textproc/p5-Filter-Simple/pkg-plist4
-rw-r--r--textproc/p5-FormValidator-Simple/pkg-plist8
-rw-r--r--textproc/p5-HTML-Entities-Numbered/pkg-plist10
-rw-r--r--textproc/p5-HTML-Format/pkg-plist2
-rw-r--r--textproc/p5-HTML-Fraction/pkg-plist6
-rw-r--r--textproc/p5-HTML-TagFilter/pkg-plist6
-rw-r--r--textproc/p5-HTML-Tidy/pkg-plist4
-rw-r--r--textproc/p5-HTML-Truncate/pkg-plist6
-rw-r--r--textproc/p5-Hash-Merge/pkg-plist4
-rw-r--r--textproc/p5-IDNA-Punycode/pkg-plist4
-rw-r--r--textproc/p5-IO-CSVHeaderFile/pkg-plist4
-rw-r--r--textproc/p5-JSON-Syck/pkg-plist6
-rw-r--r--textproc/p5-LJ-SpellCheck/pkg-plist4
-rw-r--r--textproc/p5-Lingua-Conjunction/pkg-plist4
-rw-r--r--textproc/p5-Lingua-EN-AddressParse/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-Gender/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-Infinitive/pkg-plist10
-rw-r--r--textproc/p5-Lingua-EN-Inflect-Number/pkg-plist12
-rw-r--r--textproc/p5-Lingua-EN-Inflect/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-NameCase/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-NameParse/pkg-plist6
-rw-r--r--textproc/p5-Lingua-EN-Nickname/pkg-plist6
-rw-r--r--textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist12
-rw-r--r--textproc/p5-Lingua-EN-Numbers/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-Sentence/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-Squeeze/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-Summarize/pkg-plist12
-rw-r--r--textproc/p5-Lingua-EN-Syllable/pkg-plist8
-rw-r--r--textproc/p5-Lingua-EN-Tagger/pkg-plist8
-rw-r--r--textproc/p5-Lingua-Ident/pkg-plist6
-rw-r--r--textproc/p5-Lingua-Identify/pkg-plist8
-rw-r--r--textproc/p5-Lingua-Ispell/pkg-plist2
-rw-r--r--textproc/p5-Lingua-PT-Stemmer/pkg-plist6
-rw-r--r--textproc/p5-Lingua-Preferred/pkg-plist6
-rw-r--r--textproc/p5-Lingua-Stem-Fr/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Stem-It/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Stem-Ru/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist12
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-No/pkg-plist12
-rw-r--r--textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist12
-rw-r--r--textproc/p5-Lingua-Stem-Snowball/pkg-plist10
-rw-r--r--textproc/p5-Lingua-Stem/pkg-plist4
-rw-r--r--textproc/p5-Lingua-StopWords/pkg-plist8
-rw-r--r--textproc/p5-NetAddr-IP-Find/pkg-plist8
-rw-r--r--textproc/p5-Number-Format/pkg-plist4
-rw-r--r--textproc/p5-PDF-API2/pkg-plist4
-rw-r--r--textproc/p5-PDF-API3/pkg-plist4
-rw-r--r--textproc/p5-PDF-Create/pkg-plist4
-rw-r--r--textproc/p5-POE-Filter-XML/pkg-plist8
-rw-r--r--textproc/p5-PPI-HTML/pkg-plist4
-rw-r--r--textproc/p5-PPI/pkg-plist14
-rw-r--r--textproc/p5-Parse-FixedLength/pkg-plist6
-rw-r--r--textproc/p5-Parse-Syslog/pkg-plist4
-rw-r--r--textproc/p5-Perl-Critic/pkg-plist2
-rw-r--r--textproc/p5-Perl-MinimumVersion/pkg-plist4
-rw-r--r--textproc/p5-PerlPoint-Converters/pkg-plist6
-rw-r--r--textproc/p5-PerlPoint-Package/pkg-plist6
-rw-r--r--textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist14
-rw-r--r--textproc/p5-Plucene/pkg-plist16
-rw-r--r--textproc/p5-Pod-Constants/pkg-plist4
-rw-r--r--textproc/p5-Pod-DocBook/pkg-plist4
-rw-r--r--textproc/p5-Pod-Escapes/pkg-plist4
-rw-r--r--textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist16
-rw-r--r--textproc/p5-Pod-POM/pkg-plist4
-rw-r--r--textproc/p5-Pod-Parser/pkg-plist4
-rw-r--r--textproc/p5-Pod-ProjectDocs/pkg-plist4
-rw-r--r--textproc/p5-Pod-Simple/pkg-plist4
-rw-r--r--textproc/p5-Pod-Stripper/pkg-plist4
-rw-r--r--textproc/p5-Pod-Tree/pkg-plist4
-rw-r--r--textproc/p5-RADIUS-UserFile/pkg-plist4
-rw-r--r--textproc/p5-RDF-Core/pkg-plist4
-rw-r--r--textproc/p5-RDF-Notation3/pkg-plist4
-rw-r--r--textproc/p5-RDF-Simple/pkg-plist4
-rw-r--r--textproc/p5-RDFStore/pkg-plist2
-rw-r--r--textproc/p5-RTF-Parser/pkg-plist2
-rw-r--r--textproc/p5-RTF-Tokenizer/pkg-plist4
-rw-r--r--textproc/p5-RTF-Writer/pkg-plist4
-rw-r--r--textproc/p5-Regex-PreSuf/pkg-plist4
-rw-r--r--textproc/p5-Regexp-Common/pkg-plist4
-rw-r--r--textproc/p5-Regexp-Log-Common/pkg-plist10
-rw-r--r--textproc/p5-Regexp-Log/pkg-plist6
-rw-r--r--textproc/p5-SVG/pkg-plist4
-rw-r--r--textproc/p5-Search-Saryer/pkg-plist4
-rw-r--r--textproc/p5-Search-VectorSpace/pkg-plist4
-rw-r--r--textproc/p5-Sort-ArbBiLex/pkg-plist4
-rw-r--r--textproc/p5-Sort-Fields/pkg-plist4
-rw-r--r--textproc/p5-Sort-Naturally/pkg-plist4
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/pkg-plist4
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist8
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/pkg-plist4
-rw-r--r--textproc/p5-String-Divert/pkg-plist6
-rw-r--r--textproc/p5-String-Koremutake/pkg-plist6
-rw-r--r--textproc/p5-String-Scanf/pkg-plist4
-rw-r--r--textproc/p5-String-ShellQuote/pkg-plist4
-rw-r--r--textproc/p5-String-ShowDiff/pkg-plist4
-rw-r--r--textproc/p5-String-Strip/pkg-plist4
-rw-r--r--textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist12
-rw-r--r--textproc/p5-TeX-Hyphen/pkg-plist4
-rw-r--r--textproc/p5-Template-Extract/pkg-plist4
-rw-r--r--textproc/p5-Template-Magic/pkg-plist8
-rw-r--r--textproc/p5-Text-ASCIITable/pkg-plist4
-rw-r--r--textproc/p5-Text-Affixes/pkg-plist6
-rw-r--r--textproc/p5-Text-Aligner/pkg-plist4
-rw-r--r--textproc/p5-Text-Aspell/pkg-plist4
-rw-r--r--textproc/p5-Text-Autoformat/pkg-plist4
-rw-r--r--textproc/p5-Text-Balanced/pkg-plist4
-rw-r--r--textproc/p5-Text-BibTeX/pkg-plist4
-rw-r--r--textproc/p5-Text-Bind/pkg-plist4
-rw-r--r--textproc/p5-Text-CSV-Simple/pkg-plist6
-rw-r--r--textproc/p5-Text-CSV/pkg-plist6
-rw-r--r--textproc/p5-Text-Chomp/pkg-plist4
-rw-r--r--textproc/p5-Text-Context-EitherSide/pkg-plist10
-rw-r--r--textproc/p5-Text-Diff-HTML/pkg-plist4
-rw-r--r--textproc/p5-Text-Diff/pkg-plist4
-rw-r--r--textproc/p5-Text-DoubleMetaphone/pkg-plist4
-rw-r--r--textproc/p5-Text-EtText/pkg-plist4
-rw-r--r--textproc/p5-Text-ExtractWords/pkg-plist6
-rw-r--r--textproc/p5-Text-FillIn/pkg-plist4
-rw-r--r--textproc/p5-Text-Filter-Chain/pkg-plist2
-rw-r--r--textproc/p5-Text-Filter/pkg-plist4
-rw-r--r--textproc/p5-Text-FixedLength-Extra/pkg-plist2
-rw-r--r--textproc/p5-Text-FixedLength/pkg-plist4
-rw-r--r--textproc/p5-Text-Flowchart/pkg-plist4
-rw-r--r--textproc/p5-Text-Format/pkg-plist4
-rw-r--r--textproc/p5-Text-FormatTable/pkg-plist6
-rw-r--r--textproc/p5-Text-German/pkg-plist6
-rw-r--r--textproc/p5-Text-Glob/pkg-plist4
-rw-r--r--textproc/p5-Text-Graphics/pkg-plist2
-rw-r--r--textproc/p5-Text-MagicTemplate/pkg-plist12
-rw-r--r--textproc/p5-Text-Metaphone/pkg-plist4
-rw-r--r--textproc/p5-Text-NSP/pkg-plist6
-rw-r--r--textproc/p5-Text-Ngram/pkg-plist4
-rw-r--r--textproc/p5-Text-Ngrams/pkg-plist4
-rw-r--r--textproc/p5-Text-Original/pkg-plist4
-rw-r--r--textproc/p5-Text-ParagraphDiff/pkg-plist4
-rw-r--r--textproc/p5-Text-Query/pkg-plist4
-rw-r--r--textproc/p5-Text-Quoted/pkg-plist2
-rw-r--r--textproc/p5-Text-RecordParser/pkg-plist2
-rw-r--r--textproc/p5-Text-Reflow/pkg-plist4
-rw-r--r--textproc/p5-Text-Reform/pkg-plist4
-rw-r--r--textproc/p5-Text-Repository/pkg-plist6
-rw-r--r--textproc/p5-Text-Shellwords/pkg-plist4
-rw-r--r--textproc/p5-Text-Similarity/pkg-plist4
-rw-r--r--textproc/p5-Text-SimpleTable/pkg-plist2
-rw-r--r--textproc/p5-Text-SimpleTemplate/pkg-plist4
-rw-r--r--textproc/p5-Text-Striphigh/pkg-plist4
-rw-r--r--textproc/p5-Text-Table/pkg-plist4
-rw-r--r--textproc/p5-Text-Tabs+Wrap/pkg-plist4
-rw-r--r--textproc/p5-Text-TabularDisplay/pkg-plist4
-rw-r--r--textproc/p5-Text-Template/pkg-plist4
-rw-r--r--textproc/p5-Text-Textile/pkg-plist4
-rw-r--r--textproc/p5-Text-Tmpl/pkg-plist4
-rw-r--r--textproc/p5-Text-VimColor/pkg-plist4
-rw-r--r--textproc/p5-Text-WikiFormat/pkg-plist8
-rw-r--r--textproc/p5-Text-Wrapper/pkg-plist4
-rw-r--r--textproc/p5-Time-Human/pkg-plist4
-rw-r--r--textproc/p5-Tk-XMLViewer/pkg-plist4
-rw-r--r--textproc/p5-Tree-Nary/pkg-plist4
-rw-r--r--textproc/p5-UML-Sequence/pkg-plist6
-rw-r--r--textproc/p5-UML-State/pkg-plist4
-rw-r--r--textproc/p5-URI-Find/pkg-plist4
-rw-r--r--textproc/p5-WordNet-QueryData/pkg-plist6
-rw-r--r--textproc/p5-WordNet-Similarity/pkg-plist8
-rw-r--r--textproc/p5-XML-Atom-Filter/pkg-plist10
-rw-r--r--textproc/p5-XML-Atom-SimpleFeed/pkg-plist10
-rw-r--r--textproc/p5-XML-Atom-Syndication/pkg-plist8
-rw-r--r--textproc/p5-XML-Atom/pkg-plist2
-rw-r--r--textproc/p5-XML-AutoWriter/pkg-plist4
-rw-r--r--textproc/p5-XML-Catalog/pkg-plist4
-rw-r--r--textproc/p5-XML-Clean/pkg-plist4
-rw-r--r--textproc/p5-XML-DBMS/pkg-plist4
-rw-r--r--textproc/p5-XML-DOM-XPath/pkg-plist8
-rw-r--r--textproc/p5-XML-DT/pkg-plist2
-rw-r--r--textproc/p5-XML-DTDParser/pkg-plist4
-rw-r--r--textproc/p5-XML-DifferenceMarkup/pkg-plist4
-rw-r--r--textproc/p5-XML-Directory/pkg-plist4
-rw-r--r--textproc/p5-XML-Driver-HTML/pkg-plist10
-rw-r--r--textproc/p5-XML-Dumper/pkg-plist2
-rw-r--r--textproc/p5-XML-Elemental/pkg-plist2
-rw-r--r--textproc/p5-XML-Encoding/pkg-plist4
-rw-r--r--textproc/p5-XML-Feed/pkg-plist2
-rw-r--r--textproc/p5-XML-Filter-BufferText/pkg-plist8
-rw-r--r--textproc/p5-XML-Filter-DetectWS/pkg-plist8
-rw-r--r--textproc/p5-XML-Filter-GenericChunk/pkg-plist10
-rw-r--r--textproc/p5-XML-Filter-Reindent/pkg-plist8
-rw-r--r--textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist6
-rw-r--r--textproc/p5-XML-Filter-SAXT/pkg-plist8
-rw-r--r--textproc/p5-XML-Filter-XInclude/pkg-plist8
-rw-r--r--textproc/p5-XML-Filter-XSLT/pkg-plist8
-rw-r--r--textproc/p5-XML-Generator-DBI/pkg-plist8
-rw-r--r--textproc/p5-XML-Generator-PerlData/pkg-plist8
-rw-r--r--textproc/p5-XML-Generator/pkg-plist8
-rw-r--r--textproc/p5-XML-Grove/pkg-plist4
-rw-r--r--textproc/p5-XML-Hadler-HTMLWriter/pkg-plist8
-rw-r--r--textproc/p5-XML-Handler-Trees/pkg-plist8
-rw-r--r--textproc/p5-XML-Handler-YAWriter/pkg-plist8
-rw-r--r--textproc/p5-XML-LibRSVG/pkg-plist4
-rw-r--r--textproc/p5-XML-LibXML-Common/pkg-plist8
-rw-r--r--textproc/p5-XML-LibXML-Iterator/pkg-plist8
-rw-r--r--textproc/p5-XML-LibXML-XPathContext/pkg-plist8
-rw-r--r--textproc/p5-XML-LibXML/pkg-plist10
-rw-r--r--textproc/p5-XML-LibXSLT/pkg-plist4
-rw-r--r--textproc/p5-XML-NamespaceSupport/pkg-plist4
-rw-r--r--textproc/p5-XML-Node/pkg-plist2
-rw-r--r--textproc/p5-XML-NodeFilter/pkg-plist4
-rw-r--r--textproc/p5-XML-Parser-EasyTree/pkg-plist8
-rw-r--r--textproc/p5-XML-Parser-Lite-Tree/pkg-plist12
-rw-r--r--textproc/p5-XML-Parser-Style-Elemental/pkg-plist8
-rw-r--r--textproc/p5-XML-Parser/pkg-plist4
-rw-r--r--textproc/p5-XML-Quote/pkg-plist4
-rw-r--r--textproc/p5-XML-RAI/pkg-plist2
-rw-r--r--textproc/p5-XML-RSS-JavaScript/pkg-plist8
-rw-r--r--textproc/p5-XML-RSS-LibXML/pkg-plist4
-rw-r--r--textproc/p5-XML-RSS/pkg-plist4
-rw-r--r--textproc/p5-XML-RegExp/pkg-plist4
-rw-r--r--textproc/p5-XML-SAX-Expat-Incremental/pkg-plist12
-rw-r--r--textproc/p5-XML-SAX-Expat/pkg-plist8
-rw-r--r--textproc/p5-XML-SAX-ExpatXS/pkg-plist8
-rw-r--r--textproc/p5-XML-SAX-Machines/pkg-plist10
-rw-r--r--textproc/p5-XML-SAX-Simple/pkg-plist8
-rw-r--r--textproc/p5-XML-SAX-Writer/pkg-plist8
-rw-r--r--textproc/p5-XML-SAX/pkg-plist10
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/pkg-plist8
-rw-r--r--textproc/p5-XML-STX/pkg-plist4
-rw-r--r--textproc/p5-XML-Sablotron/pkg-plist4
-rw-r--r--textproc/p5-XML-Schematron/pkg-plist8
-rw-r--r--textproc/p5-XML-SemanticDiff/pkg-plist4
-rw-r--r--textproc/p5-XML-Simple/pkg-plist4
-rw-r--r--textproc/p5-XML-SimpleObject-LibXML/pkg-plist8
-rw-r--r--textproc/p5-XML-SimpleObject/pkg-plist8
-rw-r--r--textproc/p5-XML-Smart/pkg-plist4
-rw-r--r--textproc/p5-XML-Stream/pkg-plist2
-rw-r--r--textproc/p5-XML-TreeBuilder/pkg-plist2
-rw-r--r--textproc/p5-XML-Twig/pkg-plist4
-rw-r--r--textproc/p5-XML-Validator-Schema/pkg-plist8
-rw-r--r--textproc/p5-XML-Writer/pkg-plist4
-rw-r--r--textproc/p5-XML-XBEL/pkg-plist4
-rw-r--r--textproc/p5-XML-XPath/pkg-plist6
-rw-r--r--textproc/p5-XML-XSH/pkg-plist6
-rw-r--r--textproc/p5-XML-XSLT/pkg-plist4
-rw-r--r--textproc/p5-XML-XUpdate-LibXML/pkg-plist10
-rw-r--r--textproc/p5-YAML-Syck/pkg-plist10
-rw-r--r--textproc/p5-YAML/pkg-plist10
-rw-r--r--textproc/p5-YAPE-HTML/pkg-plist4
-rw-r--r--textproc/p5-YAPE-Regex-Explain/pkg-plist2
-rw-r--r--textproc/p5-YAPE-Regex/pkg-plist4
-rw-r--r--textproc/p5-dTemplate/pkg-plist2
-rw-r--r--textproc/p5-libxml/pkg-plist12
-rw-r--r--textproc/p5-podlators/pkg-plist6
-rw-r--r--textproc/p5-xmltv/pkg-plist4
-rw-r--r--textproc/print-n-times/pkg-plist4
-rw-r--r--textproc/py-tvgrab/pkg-plist4
-rw-r--r--textproc/py-xml/pkg-plist2
-rw-r--r--textproc/py-xmltv/pkg-plist4
-rw-r--r--textproc/resume-extensions/pkg-plist2
-rw-r--r--textproc/resume/pkg-plist2
-rw-r--r--textproc/romdict/pkg-plist2
-rw-r--r--textproc/ruby-html-fillinform/pkg-plist2
-rw-r--r--textproc/ruby-html-template/pkg-plist2
-rw-r--r--textproc/scim-input-pad/pkg-plist6
-rw-r--r--textproc/scim-openvanilla/pkg-plist2
-rw-r--r--textproc/scim-table-imengine/pkg-plist4
-rw-r--r--textproc/scim/pkg-plist2
-rw-r--r--textproc/sdf/pkg-plist4
-rw-r--r--textproc/sgmltools-lite/pkg-plist6
-rw-r--r--textproc/smartdoc-devel/pkg-plist2
-rw-r--r--textproc/smartdoc/pkg-plist4
-rw-r--r--textproc/tei-guidelines-p3/pkg-plist2
-rw-r--r--textproc/tei-guidelines-p4/pkg-plist2
-rw-r--r--textproc/tei-lite/pkg-plist2
-rw-r--r--textproc/tei-p3/pkg-plist2
-rw-r--r--textproc/tei-p4/pkg-plist2
-rw-r--r--textproc/txt2html/pkg-plist2
-rw-r--r--textproc/uim/pkg-plist2
-rw-r--r--textproc/xhtml-11/pkg-plist2
-rw-r--r--textproc/xhtml/pkg-plist2
-rw-r--r--textproc/xmlroff/pkg-plist2
305 files changed, 812 insertions, 812 deletions
diff --git a/textproc/add-css-links/pkg-plist b/textproc/add-css-links/pkg-plist
index b514713228bc..36d0daba8cb0 100644
--- a/textproc/add-css-links/pkg-plist
+++ b/textproc/add-css-links/pkg-plist
@@ -1,3 +1,3 @@
share/xsl/xhtml/add-css-links.xsl
-@unexec rmdir %D/share/xsl/xhtml 2>/dev/null || true
-@unexec rmdir %D/share/xsl 2>/dev/null || true
+@dirrmtry share/xsl/xhtml
+@dirrmtry share/xsl
diff --git a/textproc/docbook-241/pkg-plist b/textproc/docbook-241/pkg-plist
index dd4a0158fde2..d9ad42e50973 100644
--- a/textproc/docbook-241/pkg-plist
+++ b/textproc/docbook-241/pkg-plist
@@ -10,4 +10,4 @@ share/sgml/docbook/2.4.1/docbook.dtd
share/sgml/docbook/2.4.1/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
@dirrm share/sgml/docbook/2.4.1
-@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
+@dirrmtry share/sgml/docbook
diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist
index b51362d3e479..9366da32f19f 100644
--- a/textproc/docbook-300/pkg-plist
+++ b/textproc/docbook-300/pkg-plist
@@ -12,4 +12,4 @@ share/sgml/docbook/3.0/docbook.dtd
share/sgml/docbook/3.0/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
@dirrm share/sgml/docbook/3.0
-@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
+@dirrmtry share/sgml/docbook
diff --git a/textproc/docbook-310/pkg-plist b/textproc/docbook-310/pkg-plist
index bdb82867f3b5..55bb9619ef16 100644
--- a/textproc/docbook-310/pkg-plist
+++ b/textproc/docbook-310/pkg-plist
@@ -16,4 +16,4 @@ share/sgml/docbook/3.1/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
share/sgml/docbook/3.1/readme.txt
@dirrm share/sgml/docbook/3.1
-@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
+@dirrmtry share/sgml/docbook
diff --git a/textproc/docbook-400/pkg-plist b/textproc/docbook-400/pkg-plist
index 1db539cf7548..bb7676ec9986 100644
--- a/textproc/docbook-400/pkg-plist
+++ b/textproc/docbook-400/pkg-plist
@@ -14,4 +14,4 @@ share/sgml/docbook/4.0/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog
share/sgml/docbook/4.0/readme.txt
@dirrm share/sgml/docbook/4.0
-@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
+@dirrmtry share/sgml/docbook
diff --git a/textproc/docbook-410/pkg-plist b/textproc/docbook-410/pkg-plist
index f160405a0c15..d6d3f19a1542 100644
--- a/textproc/docbook-410/pkg-plist
+++ b/textproc/docbook-410/pkg-plist
@@ -16,4 +16,4 @@ share/sgml/docbook/4.1/docbook.dcl
share/sgml/docbook/4.1/docbook.dtd
share/sgml/docbook/4.1/readme.txt
@dirrm share/sgml/docbook/4.1
-@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
+@dirrmtry share/sgml/docbook
diff --git a/textproc/docbook-420/pkg-plist b/textproc/docbook-420/pkg-plist
index f9bdddb45683..3ee8d6291a44 100644
--- a/textproc/docbook-420/pkg-plist
+++ b/textproc/docbook-420/pkg-plist
@@ -16,4 +16,4 @@ share/sgml/docbook/4.2/docbookx.dtd
share/sgml/docbook/4.2/soextblx.dtd
share/sgml/docbook/4.2/README
@dirrm share/sgml/docbook/4.2
-@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true
+@dirrmtry share/sgml/docbook
diff --git a/textproc/dsssl-docbook-cygnus/pkg-plist b/textproc/dsssl-docbook-cygnus/pkg-plist
index 463999af6997..07c3bbffa50e 100644
--- a/textproc/dsssl-docbook-cygnus/pkg-plist
+++ b/textproc/dsssl-docbook-cygnus/pkg-plist
@@ -9,4 +9,4 @@ share/sgml/docbook/dsssl/cygnus/catalog
share/sgml/docbook/dsssl/cygnus/cygnus-both.dsl
share/sgml/docbook/dsssl/cygnus/dbtohtml.dsl
@dirrm share/sgml/docbook/dsssl/cygnus
-@unexec rmdir %D/share/sgml/docbook/dsssl 2>/dev/null || true
+@dirrmtry share/sgml/docbook/dsssl
diff --git a/textproc/dtdinst/pkg-plist b/textproc/dtdinst/pkg-plist
index ef504f4454f4..d77689f2242c 100644
--- a/textproc/dtdinst/pkg-plist
+++ b/textproc/dtdinst/pkg-plist
@@ -1,7 +1,7 @@
%%JAVAJARDIR%%/dtdinst.jar
share/xsl/dtdinst/dtdinst2rng.xsl
@dirrm share/xsl/dtdinst
-@unexec rmdir %D/share/xsl 2>/dev/null || true
+@dirrmtry share/xsl
%%PORTDOCS%%%%DOCSDIR%%/copying.txt
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/dtdinst.rng
diff --git a/textproc/dtdparse/pkg-plist b/textproc/dtdparse/pkg-plist
index e3fbdf82f1de..5ca6003996e4 100644
--- a/textproc/dtdparse/pkg-plist
+++ b/textproc/dtdparse/pkg-plist
@@ -16,5 +16,5 @@ bin/dtdparse
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/DTDParse
@dirrm %%SITE_PERL%%/SGML/DTDParse/Format
@dirrm %%SITE_PERL%%/SGML/DTDParse
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SGML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML
+@dirrmtry %%SITE_PERL%%/SGML
diff --git a/textproc/fldiff/pkg-plist b/textproc/fldiff/pkg-plist
index acbcf97bd6e9..242c29728e77 100644
--- a/textproc/fldiff/pkg-plist
+++ b/textproc/fldiff/pkg-plist
@@ -1,4 +1,4 @@
bin/fldiff
share/applications/fldiff.desktop
share/pixmaps/fldiff.png
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist
index d435d22daa9b..08a718f4860c 100644
--- a/textproc/fop/pkg-plist
+++ b/textproc/fop/pkg-plist
@@ -178,9 +178,9 @@ bin/fop
@dirrm %%DATADIR%%/conf
@dirrm %%DATADIR%%/build
@dirrm %%DATADIR%%
-@unexec rmdir %D/%%DOCSDIR%%/skin/css 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%/skin/css
@dirrm %%DOCSDIR%%/skin/images
-@unexec rmdir %D/%%DOCSDIR%%/skin/scripts 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%/skin/scripts
@dirrm %%DOCSDIR%%/skin
@dirrm %%DOCSDIR%%/images
@dirrm %%DOCSDIR%%/fo/images
diff --git a/textproc/gtkspell/pkg-plist b/textproc/gtkspell/pkg-plist
index 4a1c19a7600a..cbd47c558bc1 100644
--- a/textproc/gtkspell/pkg-plist
+++ b/textproc/gtkspell/pkg-plist
@@ -37,5 +37,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkspell.mo
@dirrm %%DOCSDIR%%
@dirrm include/gtkspell-2.0/gtkspell
@dirrm include/gtkspell-2.0
-@unexec rmdir %D/share/locale/rm/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/rm 2>/dev/null || true
+@dirrmtry share/locale/rm/LC_MESSAGES
+@dirrmtry share/locale/rm
diff --git a/textproc/gtkspell2/pkg-plist b/textproc/gtkspell2/pkg-plist
index 4a1c19a7600a..cbd47c558bc1 100644
--- a/textproc/gtkspell2/pkg-plist
+++ b/textproc/gtkspell2/pkg-plist
@@ -37,5 +37,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkspell.mo
@dirrm %%DOCSDIR%%
@dirrm include/gtkspell-2.0/gtkspell
@dirrm include/gtkspell-2.0
-@unexec rmdir %D/share/locale/rm/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/rm 2>/dev/null || true
+@dirrmtry share/locale/rm/LC_MESSAGES
+@dirrmtry share/locale/rm
diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist
index 53a9dad7e359..0e7d93df5374 100644
--- a/textproc/htdig/pkg-plist
+++ b/textproc/htdig/pkg-plist
@@ -265,7 +265,7 @@ www/icons/htdig/star_blank.png
@dirrm lib/htdig
@dirrm lib/htdig_db
@dirrm www/icons/htdig
-@unexec rmdir %D/%%DATADIR%%/common 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/database 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/etc/htdig 2>/dev/null || true
+@dirrmtry %%DATADIR%%/common
+@dirrmtry %%DATADIR%%/database
+@dirrmtry %%DATADIR%%
+@dirrmtry etc/htdig
diff --git a/textproc/liblrdf/pkg-plist b/textproc/liblrdf/pkg-plist
index 263a5746dcb8..a8f6a2e42c24 100644
--- a/textproc/liblrdf/pkg-plist
+++ b/textproc/liblrdf/pkg-plist
@@ -5,5 +5,5 @@ lib/liblrdf.so
lib/liblrdf.so.2
libdata/pkgconfig/lrdf.pc
share/ladspa/rdf/ladspa.rdfs
-@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true
-@unexec rmdir %D/share/ladspa 2>/dev/null || true
+@dirrmtry share/ladspa/rdf
+@dirrmtry share/ladspa
diff --git a/textproc/manued.el/pkg-plist b/textproc/manued.el/pkg-plist
index 11772ce0a7be..5709b03cc020 100644
--- a/textproc/manued.el/pkg-plist
+++ b/textproc/manued.el/pkg-plist
@@ -2,8 +2,8 @@ share/emacs/site-lisp/manued.el
@exec mkdir -p %D/lib/xemacs/site-lisp
@exec ln -sf %D/%F %D/lib/xemacs/site-lisp/manued.el
@unexec rm %D/lib/xemacs/site-lisp/manued.el
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs
%%PORTDOCS%%share/examples/manued.el/sample1.manued
%%PORTDOCS%%share/examples/manued.el/sample2.manued
%%PORTDOCS%%share/examples/manued.el/sample3.manued
diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist
index 10f68fd4d06a..cc8b62bbcda2 100644
--- a/textproc/mifluz/pkg-plist
+++ b/textproc/mifluz/pkg-plist
@@ -93,4 +93,4 @@ lib/libmifluz.so
lib/libmifluz.so.0
@dirrm include/mifluz
@exec mkdir -p %D/var/cache/mifluz
-@unexec rmdir %D/var/cache/mifluz 2>/dev/null || true
+@dirrmtry var/cache/mifluz
diff --git a/textproc/p5-Apache-ParseLog/pkg-plist b/textproc/p5-Apache-ParseLog/pkg-plist
index 95769851c9de..dc661eec948e 100644
--- a/textproc/p5-Apache-ParseLog/pkg-plist
+++ b/textproc/p5-Apache-ParseLog/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Apache/ParseLog.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog 2>/dev/null || true
-@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/ParseLog
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/textproc/p5-Apache-XBEL/pkg-plist b/textproc/p5-Apache-XBEL/pkg-plist
index a5ad0721c31d..9d783857e83a 100644
--- a/textproc/p5-Apache-XBEL/pkg-plist
+++ b/textproc/p5-Apache-XBEL/pkg-plist
@@ -3,5 +3,5 @@
%%XSL%%%%DATADIR%%/apache-xbel.xsl
%%XSL%%@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/XBEL
-@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/textproc/p5-Bloom-Filter/pkg-plist b/textproc/p5-Bloom-Filter/pkg-plist
index 3c6cc5f2f4ec..36d2bdee7814 100644
--- a/textproc/p5-Bloom-Filter/pkg-plist
+++ b/textproc/p5-Bloom-Filter/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Bloom/Filter.pm
-@unexec rmdir %D/%%SITE_PERL%%/Bloom 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bloom
%%SITE_PERL%%/mach/auto/Bloom/Filter/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Bloom/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Bloom 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Bloom/Filter
+@dirrmtry %%SITE_PERL%%/mach/auto/Bloom
diff --git a/textproc/p5-CSS-SAC/pkg-plist b/textproc/p5-CSS-SAC/pkg-plist
index ab0f1dad7c6f..ecbd9a1cdb13 100644
--- a/textproc/p5-CSS-SAC/pkg-plist
+++ b/textproc/p5-CSS-SAC/pkg-plist
@@ -26,5 +26,5 @@
@dirrm %%SITE_PERL%%/CSS/SAC/Selector
@dirrm %%SITE_PERL%%/CSS/SAC
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC
-@unexec rmdir %D/%%SITE_PERL%%/CSS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/CSS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
diff --git a/textproc/p5-CSS-Tiny/pkg-plist b/textproc/p5-CSS-Tiny/pkg-plist
index 0dea64fc634d..72f7d10b80c4 100644
--- a/textproc/p5-CSS-Tiny/pkg-plist
+++ b/textproc/p5-CSS-Tiny/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/CSS/Tiny.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Tiny/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Tiny
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CSS 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS
+@dirrmtry %%SITE_PERL%%/CSS
diff --git a/textproc/p5-Chess-PGN-Parse/pkg-plist b/textproc/p5-Chess-PGN-Parse/pkg-plist
index 9ddb2a4abac9..87590d443363 100644
--- a/textproc/p5-Chess-PGN-Parse/pkg-plist
+++ b/textproc/p5-Chess-PGN-Parse/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Chess/PGN/Parse.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN/Parse/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN/Parse
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Chess/PGN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Chess 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess
+@dirrmtry %%SITE_PERL%%/Chess/PGN
+@dirrmtry %%SITE_PERL%%/Chess
diff --git a/textproc/p5-Data-FormValidator/pkg-plist b/textproc/p5-Data-FormValidator/pkg-plist
index 8583ea54b839..879e22b90939 100644
--- a/textproc/p5-Data-FormValidator/pkg-plist
+++ b/textproc/p5-Data-FormValidator/pkg-plist
@@ -7,4 +7,4 @@
%%SITE_PERL%%/Data/FormValidator/Results.pm
@dirrm %%SITE_PERL%%/Data/FormValidator/Constraints
@dirrm %%SITE_PERL%%/Data/FormValidator
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-DelimMatch/pkg-plist b/textproc/p5-DelimMatch/pkg-plist
index 03e14a538488..15f021d11872 100644
--- a/textproc/p5-DelimMatch/pkg-plist
+++ b/textproc/p5-DelimMatch/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Text/DelimMatch.pm
@dirrm %%SITE_PERL%%/auto/Text/DelimMatch
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch
-@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Devel-TraceSAX/pkg-plist b/textproc/p5-Devel-TraceSAX/pkg-plist
index ab83bf2c8051..831a9a368040 100644
--- a/textproc/p5-Devel-TraceSAX/pkg-plist
+++ b/textproc/p5-Devel-TraceSAX/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Devel/TraceSAX/DB.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel
@dirrm %%SITE_PERL%%/Devel/TraceSAX
-@unexec rmdir %D/lib/perl5/site_perl/5.8.7/Devel 2>/dev/null || true
+@dirrmtry lib/perl5/site_perl/5.8.7/Devel
diff --git a/textproc/p5-Filter-Simple/pkg-plist b/textproc/p5-Filter-Simple/pkg-plist
index 27ef22715155..59e2c6c13aeb 100644
--- a/textproc/p5-Filter-Simple/pkg-plist
+++ b/textproc/p5-Filter-Simple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Filter/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter
+@dirrmtry %%SITE_PERL%%/Filter
diff --git a/textproc/p5-FormValidator-Simple/pkg-plist b/textproc/p5-FormValidator-Simple/pkg-plist
index 791db68574f5..24f99fc1a54d 100644
--- a/textproc/p5-FormValidator-Simple/pkg-plist
+++ b/textproc/p5-FormValidator-Simple/pkg-plist
@@ -12,7 +12,7 @@
%%SITE_PERL%%/FormValidator/Simple/Data.pm
%%SITE_PERL%%/FormValidator/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator/Simple/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/FormValidator/Simple 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/FormValidator 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator/Simple
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator
+@dirrmtry %%SITE_PERL%%/FormValidator/Simple
+@dirrmtry %%SITE_PERL%%/FormValidator
diff --git a/textproc/p5-HTML-Entities-Numbered/pkg-plist b/textproc/p5-HTML-Entities-Numbered/pkg-plist
index 7e349566dd25..f4d48d3e0e3d 100644
--- a/textproc/p5-HTML-Entities-Numbered/pkg-plist
+++ b/textproc/p5-HTML-Entities-Numbered/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/HTML/Entities/Numbered.pm
%%SITE_PERL%%/HTML/Entities/Numbered/Table.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities
@dirrm %%SITE_PERL%%/HTML/Entities/Numbered
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/HTML/Entities 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/Entities
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Format/pkg-plist b/textproc/p5-HTML-Format/pkg-plist
index 840824ec9183..f5d25375b559 100644
--- a/textproc/p5-HTML-Format/pkg-plist
+++ b/textproc/p5-HTML-Format/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/HTML/Formatter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Fraction/pkg-plist b/textproc/p5-HTML-Fraction/pkg-plist
index da8db5f66ece..ba678ba7cd2c 100644
--- a/textproc/p5-HTML-Fraction/pkg-plist
+++ b/textproc/p5-HTML-Fraction/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Fraction.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction 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/Fraction
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-TagFilter/pkg-plist b/textproc/p5-HTML-TagFilter/pkg-plist
index 2a3f9b323803..3d5523d0c4fa 100644
--- a/textproc/p5-HTML-TagFilter/pkg-plist
+++ b/textproc/p5-HTML-TagFilter/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/TagFilter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter 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/TagFilter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-HTML-Tidy/pkg-plist b/textproc/p5-HTML-Tidy/pkg-plist
index b0a39cc8829a..5013d49fc6f0 100644
--- a/textproc/p5-HTML-Tidy/pkg-plist
+++ b/textproc/p5-HTML-Tidy/pkg-plist
@@ -5,6 +5,6 @@ bin/webtidy
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy/Tidy.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy/Tidy.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Tidy
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML
diff --git a/textproc/p5-HTML-Truncate/pkg-plist b/textproc/p5-HTML-Truncate/pkg-plist
index 6d0d8ddcbdbb..81f35454fb31 100644
--- a/textproc/p5-HTML-Truncate/pkg-plist
+++ b/textproc/p5-HTML-Truncate/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/HTML/Truncate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate 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/Truncate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/p5-Hash-Merge/pkg-plist b/textproc/p5-Hash-Merge/pkg-plist
index 17514642296d..e76788b72bbf 100644
--- a/textproc/p5-Hash-Merge/pkg-plist
+++ b/textproc/p5-Hash-Merge/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Hash/Merge.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash
@dirrm %%SITE_PERL%%/Hash
-@unexec rmdir %D/%%SITE_PERL%%/Hash 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Hash
diff --git a/textproc/p5-IDNA-Punycode/pkg-plist b/textproc/p5-IDNA-Punycode/pkg-plist
index f094715883ce..8633ed251d7f 100644
--- a/textproc/p5-IDNA-Punycode/pkg-plist
+++ b/textproc/p5-IDNA-Punycode/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/IDNA/Punycode.pm
%%SITE_PERL%%/IDNA/.Punycode.pm.swp
@dirrm %%SITE_PERL%%/mach/auto/IDNA/Punycode
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/IDNA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IDNA 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/IDNA
+@dirrmtry %%SITE_PERL%%/IDNA
diff --git a/textproc/p5-IO-CSVHeaderFile/pkg-plist b/textproc/p5-IO-CSVHeaderFile/pkg-plist
index f05dec2d79f0..5f9906e100b4 100644
--- a/textproc/p5-IO-CSVHeaderFile/pkg-plist
+++ b/textproc/p5-IO-CSVHeaderFile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/IO/CSVHeaderFile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO
+@dirrmtry %%SITE_PERL%%/IO
diff --git a/textproc/p5-JSON-Syck/pkg-plist b/textproc/p5-JSON-Syck/pkg-plist
index 5aa72cb54f7e..90de263acabe 100644
--- a/textproc/p5-JSON-Syck/pkg-plist
+++ b/textproc/p5-JSON-Syck/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/Syck.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/Syck.bs
%%SITE_PERL%%/%%PERL_ARCH%%/JSON/Syck.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/JSON 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON
diff --git a/textproc/p5-LJ-SpellCheck/pkg-plist b/textproc/p5-LJ-SpellCheck/pkg-plist
index 2707ab5b9d8c..098595ea6e62 100644
--- a/textproc/p5-LJ-SpellCheck/pkg-plist
+++ b/textproc/p5-LJ-SpellCheck/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/LJ/SpellCheck.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ
+@dirrmtry %%SITE_PERL%%/LJ
diff --git a/textproc/p5-Lingua-Conjunction/pkg-plist b/textproc/p5-Lingua-Conjunction/pkg-plist
index e33c2c526586..d30fb0a8ee5f 100644
--- a/textproc/p5-Lingua-Conjunction/pkg-plist
+++ b/textproc/p5-Lingua-Conjunction/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Lingua/Conjunction.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-AddressParse/pkg-plist b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
index ee4050cbedef..fb6115518263 100644
--- a/textproc/p5-Lingua-EN-AddressParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-AddressParse/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Lingua/EN/AddressParse.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Gender/pkg-plist b/textproc/p5-Lingua-EN-Gender/pkg-plist
index 28114c39e6bf..9655837d329d 100644
--- a/textproc/p5-Lingua-EN-Gender/pkg-plist
+++ b/textproc/p5-Lingua-EN-Gender/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/gender.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Infinitive/pkg-plist b/textproc/p5-Lingua-EN-Infinitive/pkg-plist
index 948c563f7166..b4534626fadd 100644
--- a/textproc/p5-Lingua-EN-Infinitive/pkg-plist
+++ b/textproc/p5-Lingua-EN-Infinitive/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/Infinitive.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist b/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist
index e899b4df00e1..d65c706410df 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Lingua/EN/Inflect/Number.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Number/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Number
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Inflect 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN/Inflect
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Lingua-EN-Inflect/pkg-plist
index b397e1ebc7ab..14626be28314 100644
--- a/textproc/p5-Lingua-EN-Inflect/pkg-plist
+++ b/textproc/p5-Lingua-EN-Inflect/pkg-plist
@@ -6,7 +6,7 @@
%%SITE_PERL%%/Lingua/EN/demo_inflect.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-MatchNames/pkg-plist b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
index bf1f57546ad7..623ef46bfe60 100644
--- a/textproc/p5-Lingua-EN-MatchNames/pkg-plist
+++ b/textproc/p5-Lingua-EN-MatchNames/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/MatchNames.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-NameCase/pkg-plist b/textproc/p5-Lingua-EN-NameCase/pkg-plist
index 411f8b0a5870..faea960fc391 100644
--- a/textproc/p5-Lingua-EN-NameCase/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameCase/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/NameCase.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-NameParse/pkg-plist b/textproc/p5-Lingua-EN-NameParse/pkg-plist
index 8fa382da5db7..277a5f4f7111 100644
--- a/textproc/p5-Lingua-EN-NameParse/pkg-plist
+++ b/textproc/p5-Lingua-EN-NameParse/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/Lingua/EN/demo.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrm %%SITE_PERL%%/Lingua/EN
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Nickname/pkg-plist b/textproc/p5-Lingua-EN-Nickname/pkg-plist
index ace6d667c365..69f0994db68a 100644
--- a/textproc/p5-Lingua-EN-Nickname/pkg-plist
+++ b/textproc/p5-Lingua-EN-Nickname/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Lingua/EN/nickhash.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrm %%SITE_PERL%%/Lingua/EN
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
index dd1824999427..74c113e872cd 100644
--- a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Lingua/EN/Numbers/Ordinate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Numbers 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN/Numbers
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Numbers/pkg-plist b/textproc/p5-Lingua-EN-Numbers/pkg-plist
index c3ca9338a694..3ff09c5d8fb8 100644
--- a/textproc/p5-Lingua-EN-Numbers/pkg-plist
+++ b/textproc/p5-Lingua-EN-Numbers/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/Numbers.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Sentence/pkg-plist b/textproc/p5-Lingua-EN-Sentence/pkg-plist
index 86455eb85b62..14a39ec7e756 100644
--- a/textproc/p5-Lingua-EN-Sentence/pkg-plist
+++ b/textproc/p5-Lingua-EN-Sentence/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/Sentence.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Squeeze/pkg-plist b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
index 3d631d057207..9b8c4c77dfa5 100644
--- a/textproc/p5-Lingua-EN-Squeeze/pkg-plist
+++ b/textproc/p5-Lingua-EN-Squeeze/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/Squeeze.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Summarize/pkg-plist b/textproc/p5-Lingua-EN-Summarize/pkg-plist
index dcff42a5271e..6b9bdaf53acd 100644
--- a/textproc/p5-Lingua-EN-Summarize/pkg-plist
+++ b/textproc/p5-Lingua-EN-Summarize/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Lingua/EN/Summarize.pm
%%SITE_PERL%%/Lingua/EN/Summarize/Filters.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Summarize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN/Summarize
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Syllable/pkg-plist b/textproc/p5-Lingua-EN-Syllable/pkg-plist
index 6e3fb503a2f7..3e63f67fb33e 100644
--- a/textproc/p5-Lingua-EN-Syllable/pkg-plist
+++ b/textproc/p5-Lingua-EN-Syllable/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/EN/Syllable.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-EN-Tagger/pkg-plist b/textproc/p5-Lingua-EN-Tagger/pkg-plist
index 9328bac4a424..f513fb9e9438 100644
--- a/textproc/p5-Lingua-EN-Tagger/pkg-plist
+++ b/textproc/p5-Lingua-EN-Tagger/pkg-plist
@@ -7,7 +7,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Tagger/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Tagger
@dirrm %%SITE_PERL%%/Lingua/EN/Tagger
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/EN
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Ident/pkg-plist b/textproc/p5-Lingua-Ident/pkg-plist
index 380848cbc407..b5f8a8e84a58 100644
--- a/textproc/p5-Lingua-Ident/pkg-plist
+++ b/textproc/p5-Lingua-Ident/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Lingua/Ident.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist
bin/trainlid
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/textproc/p5-Lingua-Identify/pkg-plist b/textproc/p5-Lingua-Identify/pkg-plist
index 925cb3bb5062..5dbef2536ef4 100644
--- a/textproc/p5-Lingua-Identify/pkg-plist
+++ b/textproc/p5-Lingua-Identify/pkg-plist
@@ -36,7 +36,7 @@ bin/make-lingua-identify-language
%%SITE_PERL%%/Lingua/Identify/SW.pm
%%SITE_PERL%%/Lingua/Identify/TR.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Identify 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Identify
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Ispell/pkg-plist b/textproc/p5-Lingua-Ispell/pkg-plist
index a35b414b5b19..ae8f5a8946cc 100644
--- a/textproc/p5-Lingua-Ispell/pkg-plist
+++ b/textproc/p5-Lingua-Ispell/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist
%%SITE_PERL%%/Lingua/Ispell.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrm %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-PT-Stemmer/pkg-plist b/textproc/p5-Lingua-PT-Stemmer/pkg-plist
index fb93d4fa980e..c29e01de456d 100644
--- a/textproc/p5-Lingua-PT-Stemmer/pkg-plist
+++ b/textproc/p5-Lingua-PT-Stemmer/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/Lingua/PT/Stemmer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT/Stemmer/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT/Stemmer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
@dirrm %%SITE_PERL%%/Lingua/PT
@dirrm %%SITE_PERL%%/Lingua/GL
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Preferred/pkg-plist b/textproc/p5-Lingua-Preferred/pkg-plist
index 392f69888d2a..2a6a5d5a273e 100644
--- a/textproc/p5-Lingua-Preferred/pkg-plist
+++ b/textproc/p5-Lingua-Preferred/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist
%%SITE_PERL%%/auto/Lingua/Preferred/autosplit.ix
@dirrm %%SITE_PERL%%/auto/Lingua/Preferred
-@unexec rmdir %D/%%SITE_PERL%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Lingua
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Fr/pkg-plist b/textproc/p5-Lingua-Stem-Fr/pkg-plist
index d13cb58743c2..85a389afe7fc 100644
--- a/textproc/p5-Lingua-Stem-Fr/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Fr/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Lingua/Stem/Fr.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Fr/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Fr
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%
diff --git a/textproc/p5-Lingua-Stem-It/pkg-plist b/textproc/p5-Lingua-Stem-It/pkg-plist
index d7319b9eabc4..cbb5addd3ca4 100644
--- a/textproc/p5-Lingua-Stem-It/pkg-plist
+++ b/textproc/p5-Lingua-Stem-It/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Lingua/Stem/It.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/It/.packlist
@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/It
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%
diff --git a/textproc/p5-Lingua-Stem-Ru/pkg-plist b/textproc/p5-Lingua-Stem-Ru/pkg-plist
index b38dd454d718..ef5aa7b024a9 100644
--- a/textproc/p5-Lingua-Stem-Ru/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Ru/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Lingua/Stem/Ru.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Ru/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Ru
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
+@dirrmtry %%SITE_PERL%%
diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
index 7b49f6aa4846..c2469ad7a76f 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Lingua/Stem/Snowball/Da.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Da/.packlist
@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/Da
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
index db98117cba88..22975341b0a5 100644
--- a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Lingua/Stem/Snowball/No.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/No/.packlist
@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/No
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
index e4920e2da592..76027153274c 100644
--- a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Lingua/Stem/Snowball/Se.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Se/.packlist
@dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/Se
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/mach/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-Stem-Snowball/pkg-plist b/textproc/p5-Lingua-Stem-Snowball/pkg-plist
index 21d90f7177d2..96b35789455d 100644
--- a/textproc/p5-Lingua-Stem-Snowball/pkg-plist
+++ b/textproc/p5-Lingua-Stem-Snowball/pkg-plist
@@ -3,8 +3,8 @@ bin/add_stemmer.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Snowball.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Snowball.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua
diff --git a/textproc/p5-Lingua-Stem/pkg-plist b/textproc/p5-Lingua-Stem/pkg-plist
index 923196006fe3..50472eeec8ee 100644
--- a/textproc/p5-Lingua-Stem/pkg-plist
+++ b/textproc/p5-Lingua-Stem/pkg-plist
@@ -9,5 +9,5 @@
%%SITE_PERL%%/Lingua/Stem/Pt.pm
%%SITE_PERL%%/Lingua/Stem/Sv.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Lingua/Stem
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-Lingua-StopWords/pkg-plist b/textproc/p5-Lingua-StopWords/pkg-plist
index c277f6236c9f..2737b17a4dab 100644
--- a/textproc/p5-Lingua-StopWords/pkg-plist
+++ b/textproc/p5-Lingua-StopWords/pkg-plist
@@ -11,7 +11,7 @@
%%SITE_PERL%%/Lingua/StopWords/SV.pm
%%SITE_PERL%%/Lingua/parse.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/StopWords 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/StopWords
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/textproc/p5-NetAddr-IP-Find/pkg-plist b/textproc/p5-NetAddr-IP-Find/pkg-plist
index 09e01e051d9b..fa7c101e052d 100644
--- a/textproc/p5-NetAddr-IP-Find/pkg-plist
+++ b/textproc/p5-NetAddr-IP-Find/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/NetAddr/IP/Find.pm
-@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/NetAddr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/NetAddr/IP
+@dirrmtry %%SITE_PERL%%/NetAddr
%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr
diff --git a/textproc/p5-Number-Format/pkg-plist b/textproc/p5-Number-Format/pkg-plist
index 75772136a33d..a23404dfd774 100644
--- a/textproc/p5-Number-Format/pkg-plist
+++ b/textproc/p5-Number-Format/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format/.packlist
%%SITE_PERL%%/Number/Format.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Number 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number
+@dirrmtry %%SITE_PERL%%/Number
diff --git a/textproc/p5-PDF-API2/pkg-plist b/textproc/p5-PDF-API2/pkg-plist
index 3fd93dac5a4b..ae1d7c978e39 100644
--- a/textproc/p5-PDF-API2/pkg-plist
+++ b/textproc/p5-PDF-API2/pkg-plist
@@ -167,7 +167,7 @@
%%SITE_PERL%%/PDF/API2/Resource/unipaper.txt
%%SITE_PERL%%/PDF/API2/Content/Text.pm
@dirrm %%SITE_PERL%%/mach/auto/PDF/API2
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/PDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/PDF
@dirrm %%SITE_PERL%%/PDF/API2/Basic/PDF
@dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Mort
@dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Kern
@@ -188,4 +188,4 @@
@dirrm %%SITE_PERL%%/PDF/API2/Resource
@dirrm %%SITE_PERL%%/PDF/API2/Content
@dirrm %%SITE_PERL%%/PDF/API2
-@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-PDF-API3/pkg-plist b/textproc/p5-PDF-API3/pkg-plist
index 3fd93dac5a4b..ae1d7c978e39 100644
--- a/textproc/p5-PDF-API3/pkg-plist
+++ b/textproc/p5-PDF-API3/pkg-plist
@@ -167,7 +167,7 @@
%%SITE_PERL%%/PDF/API2/Resource/unipaper.txt
%%SITE_PERL%%/PDF/API2/Content/Text.pm
@dirrm %%SITE_PERL%%/mach/auto/PDF/API2
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/PDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/PDF
@dirrm %%SITE_PERL%%/PDF/API2/Basic/PDF
@dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Mort
@dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Kern
@@ -188,4 +188,4 @@
@dirrm %%SITE_PERL%%/PDF/API2/Resource
@dirrm %%SITE_PERL%%/PDF/API2/Content
@dirrm %%SITE_PERL%%/PDF/API2
-@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist
index a5a1dd6f531b..95c0e1b4fc27 100644
--- a/textproc/p5-PDF-Create/pkg-plist
+++ b/textproc/p5-PDF-Create/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/PDF/Create.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create
@dirrm %%SITE_PERL%%/PDF/Create
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
+@dirrmtry %%SITE_PERL%%/PDF
diff --git a/textproc/p5-POE-Filter-XML/pkg-plist b/textproc/p5-POE-Filter-XML/pkg-plist
index dba16b53a2e9..89a705c95ed9 100644
--- a/textproc/p5-POE-Filter-XML/pkg-plist
+++ b/textproc/p5-POE-Filter-XML/pkg-plist
@@ -7,8 +7,8 @@
%%SITE_PERL%%/POE/Filter/XML/Utils.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/XML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/XML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
@dirrm %%SITE_PERL%%/POE/Filter/XML
-@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Filter
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/textproc/p5-PPI-HTML/pkg-plist b/textproc/p5-PPI-HTML/pkg-plist
index 169c60ac18d6..d6522777ae07 100644
--- a/textproc/p5-PPI-HTML/pkg-plist
+++ b/textproc/p5-PPI-HTML/pkg-plist
@@ -3,6 +3,6 @@ bin/ppi2html
%%SITE_PERL%%/PPI/HTML/Fragment.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/HTML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/HTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI
@dirrm %%SITE_PERL%%/PPI/HTML
-@unexec rmdir %D/%%SITE_PERL%%/PPI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PPI
diff --git a/textproc/p5-PPI/pkg-plist b/textproc/p5-PPI/pkg-plist
index 8335085b8bfb..80e41af763cf 100644
--- a/textproc/p5-PPI/pkg-plist
+++ b/textproc/p5-PPI/pkg-plist
@@ -79,10 +79,10 @@
@dirrm %%SITE_PERL%%/PPI/Token/QuoteLike
@dirrm %%SITE_PERL%%/PPI/Token/Regexp
@dirrm %%SITE_PERL%%/PPI/Token/Quote
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PPI/Statement 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PPI/Structure 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PPI/Document 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PPI/Normal 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PPI/Token 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PPI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI
+@dirrmtry %%SITE_PERL%%/PPI/Statement
+@dirrmtry %%SITE_PERL%%/PPI/Structure
+@dirrmtry %%SITE_PERL%%/PPI/Document
+@dirrmtry %%SITE_PERL%%/PPI/Normal
+@dirrmtry %%SITE_PERL%%/PPI/Token
+@dirrmtry %%SITE_PERL%%/PPI
diff --git a/textproc/p5-Parse-FixedLength/pkg-plist b/textproc/p5-Parse-FixedLength/pkg-plist
index 4ba2d4e7e054..7484ba36a8a8 100644
--- a/textproc/p5-Parse-FixedLength/pkg-plist
+++ b/textproc/p5-Parse-FixedLength/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Parse/FixedLength.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Parse-Syslog/pkg-plist b/textproc/p5-Parse-Syslog/pkg-plist
index 074c9048d381..2db71c4e7168 100644
--- a/textproc/p5-Parse-Syslog/pkg-plist
+++ b/textproc/p5-Parse-Syslog/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Parse/Syslog.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse
+@dirrmtry %%SITE_PERL%%/Parse
diff --git a/textproc/p5-Perl-Critic/pkg-plist b/textproc/p5-Perl-Critic/pkg-plist
index f63d42fec1ec..51c09ca7124f 100644
--- a/textproc/p5-Perl-Critic/pkg-plist
+++ b/textproc/p5-Perl-Critic/pkg-plist
@@ -67,4 +67,4 @@ bin/perlcritic
@dirrm %%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions
@dirrm %%SITE_PERL%%/Perl/Critic/Policy
@dirrm %%SITE_PERL%%/Perl/Critic
-@unexec rmdir %D/%%SITE_PERL%%/Perl 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Perl
diff --git a/textproc/p5-Perl-MinimumVersion/pkg-plist b/textproc/p5-Perl-MinimumVersion/pkg-plist
index 0ee7e6e0445c..69a79e8fed0d 100644
--- a/textproc/p5-Perl-MinimumVersion/pkg-plist
+++ b/textproc/p5-Perl-MinimumVersion/pkg-plist
@@ -2,5 +2,5 @@ bin/perlver
%%SITE_PERL%%/Perl/MinimumVersion.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/MinimumVersion/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/MinimumVersion
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Perl 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl
+@dirrmtry %%SITE_PERL%%/Perl
diff --git a/textproc/p5-PerlPoint-Converters/pkg-plist b/textproc/p5-PerlPoint-Converters/pkg-plist
index 04c0515ff08e..5c77e0247600 100644
--- a/textproc/p5-PerlPoint-Converters/pkg-plist
+++ b/textproc/p5-PerlPoint-Converters/pkg-plist
@@ -7,6 +7,6 @@ bin/pp2latex
%%SITE_PERL%%/PerlPoint/Tags/LaTeX.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint-Converters/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint-Converters
-@unexec rmdir %D/%%SITE_PERL%%/PerlPoint/Tags 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlPoint 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PerlPoint/Tags
+@dirrmtry %%SITE_PERL%%/PerlPoint
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/textproc/p5-PerlPoint-Package/pkg-plist b/textproc/p5-PerlPoint-Package/pkg-plist
index 594b8406469a..df1911ea4c66 100644
--- a/textproc/p5-PerlPoint-Package/pkg-plist
+++ b/textproc/p5-PerlPoint-Package/pkg-plist
@@ -24,9 +24,9 @@ bin/pp2tdo
%%PORTDOCS%%%%EXAMPLESDIR%%/pp2tree
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint/Package
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PerlPoint/Tags 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint
+@dirrmtry %%SITE_PERL%%/PerlPoint/Tags
@dirrm %%SITE_PERL%%/PerlPoint/Generator/SDF
@dirrm %%SITE_PERL%%/PerlPoint/Generator/Object
@dirrm %%SITE_PERL%%/PerlPoint/Generator
-@unexec rmdir %D/%%SITE_PERL%%/PerlPoint 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/PerlPoint
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist
index 3602279b59ff..65da3935eea0 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist
@@ -2,10 +2,10 @@
%%SITE_PERL%%/Plucene/Plugin/Analyzer/SnowballFilter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer/SnowballAnalyzer/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer/SnowballAnalyzer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Plugin/Analyzer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin
+@dirrmtry %%SITE_PERL%%/Plucene/Plugin/Analyzer
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene
+@dirrmtry %%SITE_PERL%%/Plucene/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
+@dirrmtry %%SITE_PERL%%/Plucene
diff --git a/textproc/p5-Plucene/pkg-plist b/textproc/p5-Plucene/pkg-plist
index d43962d78a70..3ad0ec42574d 100644
--- a/textproc/p5-Plucene/pkg-plist
+++ b/textproc/p5-Plucene/pkg-plist
@@ -66,12 +66,12 @@
%%SITE_PERL%%/Plucene/Document/DateSerializer.pm
%%SITE_PERL%%/Plucene/Store/OutputStream.pm
%%SITE_PERL%%/Plucene/Store/InputStream.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene
@dirrm %%SITE_PERL%%/Plucene/Analysis/Standard
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Analysis 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Search/PhraseScorer 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Index 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Document 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene/Store 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Plucene 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Plucene/Analysis
+@dirrmtry %%SITE_PERL%%/Plucene/Search/PhraseScorer
+@dirrmtry %%SITE_PERL%%/Plucene/Search
+@dirrmtry %%SITE_PERL%%/Plucene/Index
+@dirrmtry %%SITE_PERL%%/Plucene/Document
+@dirrmtry %%SITE_PERL%%/Plucene/Store
+@dirrmtry %%SITE_PERL%%/Plucene
diff --git a/textproc/p5-Pod-Constants/pkg-plist b/textproc/p5-Pod-Constants/pkg-plist
index b2fd4e9fa53f..74b0a5bc987a 100644
--- a/textproc/p5-Pod-Constants/pkg-plist
+++ b/textproc/p5-Pod-Constants/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist
%%SITE_PERL%%/Pod/Constants.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-Pod-DocBook/pkg-plist b/textproc/p5-Pod-DocBook/pkg-plist
index be2ab24f469a..4b4ee1494626 100644
--- a/textproc/p5-Pod-DocBook/pkg-plist
+++ b/textproc/p5-Pod-DocBook/pkg-plist
@@ -1,6 +1,6 @@
bin/pod2docbook
%%SITE_PERL%%/Pod/DocBook.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/DocBook/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/DocBook
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-Pod-Escapes/pkg-plist b/textproc/p5-Pod-Escapes/pkg-plist
index 805bf0b26141..b92ce86626cb 100644
--- a/textproc/p5-Pod-Escapes/pkg-plist
+++ b/textproc/p5-Pod-Escapes/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Pod/Escapes.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Escapes/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Escapes
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
+@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist b/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist
index 582fefd984b6..bdde65d96c3c 100644
--- a/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist
+++ b/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist
@@ -1,11 +1,11 @@
%%SITE_PERL%%/Pod/POM/View/HTML/Filter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML/Filter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML/Filter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod/POM/View/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod/POM/View 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod/POM 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View
+@dirrmtry %%SITE_PERL%%/Pod/POM/View/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
+@dirrmtry %%SITE_PERL%%/Pod/POM/View
+@dirrmtry %%SITE_PERL%%/Pod/POM
+@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-POM/pkg-plist b/textproc/p5-Pod-POM/pkg-plist
index 6176a8df90b7..033e9927a9e9 100644
--- a/textproc/p5-Pod-POM/pkg-plist
+++ b/textproc/p5-Pod-POM/pkg-plist
@@ -13,5 +13,5 @@ bin/podlint
@dirrm %%SITE_PERL%%/Pod/POM/View
@dirrm %%SITE_PERL%%/Pod/POM
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-Pod-Parser/pkg-plist b/textproc/p5-Pod-Parser/pkg-plist
index 767ad94ec02d..1a7e7b17bbb5 100644
--- a/textproc/p5-Pod-Parser/pkg-plist
+++ b/textproc/p5-Pod-Parser/pkg-plist
@@ -11,5 +11,5 @@
%%SITE_PERL%%/Pod/Select.pm
%%SITE_PERL%%/Pod/Usage.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-Pod-ProjectDocs/pkg-plist b/textproc/p5-Pod-ProjectDocs/pkg-plist
index 591a47ffc72a..404817d06e83 100644
--- a/textproc/p5-Pod-ProjectDocs/pkg-plist
+++ b/textproc/p5-Pod-ProjectDocs/pkg-plist
@@ -14,6 +14,6 @@ bin/pod2projdocs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/ProjectDocs/.packlist
@dirrm %%SITE_PERL%%/Pod/ProjectDocs/Parser
@dirrm %%SITE_PERL%%/Pod/ProjectDocs
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/ProjectDocs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-Pod-Simple/pkg-plist b/textproc/p5-Pod-Simple/pkg-plist
index bb00ce27b2ee..b503ea4cece5 100644
--- a/textproc/p5-Pod-Simple/pkg-plist
+++ b/textproc/p5-Pod-Simple/pkg-plist
@@ -32,6 +32,6 @@
%%SITE_PERL%%/perlpod.pod
%%SITE_PERL%%/perlpodspec.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
@dirrm %%SITE_PERL%%/Pod/Simple
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/p5-Pod-Stripper/pkg-plist b/textproc/p5-Pod-Stripper/pkg-plist
index cfe1a215dd09..8c32bd1c9b03 100644
--- a/textproc/p5-Pod-Stripper/pkg-plist
+++ b/textproc/p5-Pod-Stripper/pkg-plist
@@ -2,5 +2,5 @@ bin/podstrip
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Stripper/.packlist
%%SITE_PERL%%/Pod/Stripper.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Stripper
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-Pod-Tree/pkg-plist b/textproc/p5-Pod-Tree/pkg-plist
index 38ff276c86be..d2e94dadfdc8 100644
--- a/textproc/p5-Pod-Tree/pkg-plist
+++ b/textproc/p5-Pod-Tree/pkg-plist
@@ -14,7 +14,7 @@ bin/pods2html
%%SITE_PERL%%/Pod/Tree/PerlUtil.pm
%%SITE_PERL%%/Pod/Tree/Pod.pm
@dirrm %%SITE_PERL%%/Pod/Tree
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tree/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tree
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-RADIUS-UserFile/pkg-plist b/textproc/p5-RADIUS-UserFile/pkg-plist
index db40ae1d6961..5bab81da0b46 100644
--- a/textproc/p5-RADIUS-UserFile/pkg-plist
+++ b/textproc/p5-RADIUS-UserFile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/RADIUS/UserFile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/RADIUS 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS
+@dirrmtry %%SITE_PERL%%/RADIUS
diff --git a/textproc/p5-RDF-Core/pkg-plist b/textproc/p5-RDF-Core/pkg-plist
index d59d5eb972dc..ccf45d57d32e 100644
--- a/textproc/p5-RDF-Core/pkg-plist
+++ b/textproc/p5-RDF-Core/pkg-plist
@@ -60,6 +60,6 @@
@dirrm %%SITE_PERL%%/RDF/Core/Model
@dirrm %%SITE_PERL%%/RDF/Core/Storage
@dirrm %%SITE_PERL%%/RDF/Core
-@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/RDF
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
diff --git a/textproc/p5-RDF-Notation3/pkg-plist b/textproc/p5-RDF-Notation3/pkg-plist
index 16cf2514d9a3..567c94c21e01 100644
--- a/textproc/p5-RDF-Notation3/pkg-plist
+++ b/textproc/p5-RDF-Notation3/pkg-plist
@@ -14,6 +14,6 @@
%%SITE_PERL%%/RDF/Notation3/XML.pm
@dirrm %%SITE_PERL%%/RDF/Notation3/Template
@dirrm %%SITE_PERL%%/RDF/Notation3
-@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/RDF
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Notation3
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
diff --git a/textproc/p5-RDF-Simple/pkg-plist b/textproc/p5-RDF-Simple/pkg-plist
index 6fce34366380..278e397bea43 100644
--- a/textproc/p5-RDF-Simple/pkg-plist
+++ b/textproc/p5-RDF-Simple/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/RDF/Simple/Serialiser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF
@dirrm %%SITE_PERL%%/RDF/Simple
-@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/RDF
diff --git a/textproc/p5-RDFStore/pkg-plist b/textproc/p5-RDFStore/pkg-plist
index f161d2c7611e..8c30d03818d5 100644
--- a/textproc/p5-RDFStore/pkg-plist
+++ b/textproc/p5-RDFStore/pkg-plist
@@ -42,4 +42,4 @@
@dirrm %%SITE_PERL%%/RDFStore/Vocabulary
@dirrm %%SITE_PERL%%/RDFStore
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-RTF-Parser/pkg-plist b/textproc/p5-RTF-Parser/pkg-plist
index 3394236eec9f..8cf4e65abf1b 100644
--- a/textproc/p5-RTF-Parser/pkg-plist
+++ b/textproc/p5-RTF-Parser/pkg-plist
@@ -17,4 +17,4 @@ bin/rtf2html
@dirrm %%SITE_PERL%%/RTF/TEXT/Converter
@dirrm %%SITE_PERL%%/RTF/TEXT
@dirrm %%SITE_PERL%%/RTF
-@unexec rmdir %D/%%SITE_PERL%%/RTF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/RTF
diff --git a/textproc/p5-RTF-Tokenizer/pkg-plist b/textproc/p5-RTF-Tokenizer/pkg-plist
index 63b3027a0b40..5a66ffc36753 100644
--- a/textproc/p5-RTF-Tokenizer/pkg-plist
+++ b/textproc/p5-RTF-Tokenizer/pkg-plist
@@ -4,5 +4,5 @@ bin/rtfdump
%%SITE_PERL%%/RTF/Tokenizer.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Tokenizer
@dirrm %%SITE_PERL%%/RTF
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/RTF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF
+@dirrmtry %%SITE_PERL%%/RTF
diff --git a/textproc/p5-RTF-Writer/pkg-plist b/textproc/p5-RTF-Writer/pkg-plist
index 37820f7ff8f6..d4a99a0b7448 100644
--- a/textproc/p5-RTF-Writer/pkg-plist
+++ b/textproc/p5-RTF-Writer/pkg-plist
@@ -6,5 +6,5 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Writer
@dirrm %%SITE_PERL%%/RTF/Writer
@dirrm %%SITE_PERL%%/RTF
-@unexec rmdir %D/%%SITE_PERL%%/RTF 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/RTF
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF
diff --git a/textproc/p5-Regex-PreSuf/pkg-plist b/textproc/p5-Regex-PreSuf/pkg-plist
index e1f513cecfdf..2df3774350ce 100644
--- a/textproc/p5-Regex-PreSuf/pkg-plist
+++ b/textproc/p5-Regex-PreSuf/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Regex/PreSuf.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex/PreSuf/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex/PreSuf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Regex 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex
+@dirrmtry %%SITE_PERL%%/Regex
diff --git a/textproc/p5-Regexp-Common/pkg-plist b/textproc/p5-Regexp-Common/pkg-plist
index 109b839d36aa..21dbaf98c686 100644
--- a/textproc/p5-Regexp-Common/pkg-plist
+++ b/textproc/p5-Regexp-Common/pkg-plist
@@ -33,7 +33,7 @@
%%SITE_PERL%%/Regexp/Common/profanity.pm
%%SITE_PERL%%/Regexp/Common.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
@dirrm %%SITE_PERL%%/Regexp/Common/URI
@dirrm %%SITE_PERL%%/Regexp/Common
-@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Log-Common/pkg-plist b/textproc/p5-Regexp-Log-Common/pkg-plist
index 0a227adaf89a..7910fa61f1b9 100644
--- a/textproc/p5-Regexp-Log-Common/pkg-plist
+++ b/textproc/p5-Regexp-Log-Common/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Regexp/Log/Common.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/Common/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/Common 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Regexp/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/Common
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
+@dirrmtry %%SITE_PERL%%/Regexp/Log
+@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-Regexp-Log/pkg-plist b/textproc/p5-Regexp-Log/pkg-plist
index b97c70cca28e..074170dab5fd 100644
--- a/textproc/p5-Regexp-Log/pkg-plist
+++ b/textproc/p5-Regexp-Log/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Regexp/Log.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp
+@dirrmtry %%SITE_PERL%%/Regexp
diff --git a/textproc/p5-SVG/pkg-plist b/textproc/p5-SVG/pkg-plist
index ce4c86c4c9fb..c53a924d4f3e 100644
--- a/textproc/p5-SVG/pkg-plist
+++ b/textproc/p5-SVG/pkg-plist
@@ -5,8 +5,8 @@
%%SITE_PERL%%/SVG/Extension.pm
%%SITE_PERL%%/SVG/Manual.pm
%%SITE_PERL%%/SVG/XML.pm
-@unexec rmdir %D/%%SITE_PERL%%/SVG 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SVG
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG
%%PORTDOCS%%%%EXAMPLESDIR%%/SVG_02_sample.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/attributeManip.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/image_sample.pl
diff --git a/textproc/p5-Search-Saryer/pkg-plist b/textproc/p5-Search-Saryer/pkg-plist
index 97b2244a408e..4d84dd2c4b18 100644
--- a/textproc/p5-Search-Saryer/pkg-plist
+++ b/textproc/p5-Search-Saryer/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
diff --git a/textproc/p5-Search-VectorSpace/pkg-plist b/textproc/p5-Search-VectorSpace/pkg-plist
index a3d733f7344a..d92a669a0045 100644
--- a/textproc/p5-Search-VectorSpace/pkg-plist
+++ b/textproc/p5-Search-VectorSpace/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Search/VectorSpace.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/VectorSpace/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/VectorSpace
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Search 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
+@dirrmtry %%SITE_PERL%%/Search
diff --git a/textproc/p5-Sort-ArbBiLex/pkg-plist b/textproc/p5-Sort-ArbBiLex/pkg-plist
index e41b834b39fb..7dfefc64bf94 100644
--- a/textproc/p5-Sort-ArbBiLex/pkg-plist
+++ b/textproc/p5-Sort-ArbBiLex/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sort/ArbBiLex.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/textproc/p5-Sort-Fields/pkg-plist b/textproc/p5-Sort-Fields/pkg-plist
index 09c561b1fc78..839a8bc93e9f 100644
--- a/textproc/p5-Sort-Fields/pkg-plist
+++ b/textproc/p5-Sort-Fields/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist
%%SITE_PERL%%/Sort/Fields.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/textproc/p5-Sort-Naturally/pkg-plist b/textproc/p5-Sort-Naturally/pkg-plist
index 368983855711..fe64ead4e682 100644
--- a/textproc/p5-Sort-Naturally/pkg-plist
+++ b/textproc/p5-Sort-Naturally/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Sort/Naturally.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Naturally/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Naturally
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort
+@dirrmtry %%SITE_PERL%%/Sort
diff --git a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
index dd9834b55602..7dc5881f6090 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist
@@ -8,9 +8,9 @@
%%SITE_PERL%%/Spreadsheet/ParseExcel/Utility.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
@dirrm %%SITE_PERL%%/Spreadsheet/ParseExcel
-@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Spreadsheet
%%PORTDOCS%%%%EXAMPLESDIR%%/Excel/AuthorK.xls
%%PORTDOCS%%%%EXAMPLESDIR%%/Excel/AuthorK95.xls
%%PORTDOCS%%%%EXAMPLESDIR%%/Excel/FmtTest.xls
diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist
index 346eb6bd4bbe..03d88b8a3828 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML/Worksheet.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/FromXML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/FromXML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
@dirrm %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML
-@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet/WriteExcel 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel
+@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
index a92819a55c7c..d0d7c0047288 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
+++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist
@@ -128,6 +128,6 @@ bin/chartex
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet
@dirrm %%SITE_PERL%%/Spreadsheet/WriteExcel
-@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Spreadsheet
diff --git a/textproc/p5-String-Divert/pkg-plist b/textproc/p5-String-Divert/pkg-plist
index fd0f2c56d4a6..086c2cf33541 100644
--- a/textproc/p5-String-Divert/pkg-plist
+++ b/textproc/p5-String-Divert/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/String/Divert.pm
%%SITE_PERL%%/String/Divert.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Koremutake/pkg-plist b/textproc/p5-String-Koremutake/pkg-plist
index 8f6acf38fba1..a622fa38a889 100644
--- a/textproc/p5-String-Koremutake/pkg-plist
+++ b/textproc/p5-String-Koremutake/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/String/Koremutake.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Scanf/pkg-plist b/textproc/p5-String-Scanf/pkg-plist
index 603efc4b5c2d..63060ffce52d 100644
--- a/textproc/p5-String-Scanf/pkg-plist
+++ b/textproc/p5-String-Scanf/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist
%%SITE_PERL%%/String/Scanf.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist
index f7041dee08e7..fdd55b1e7d27 100644
--- a/textproc/p5-String-ShellQuote/pkg-plist
+++ b/textproc/p5-String-ShellQuote/pkg-plist
@@ -2,5 +2,5 @@ bin/shell-quote
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist
%%SITE_PERL%%/String/ShellQuote.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-ShowDiff/pkg-plist b/textproc/p5-String-ShowDiff/pkg-plist
index e559f8f71cab..1d17c2bfdaae 100644
--- a/textproc/p5-String-ShowDiff/pkg-plist
+++ b/textproc/p5-String-ShowDiff/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/String/ShowDiff.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShowDiff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShowDiff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/String
diff --git a/textproc/p5-String-Strip/pkg-plist b/textproc/p5-String-Strip/pkg-plist
index 9fb91550c52e..f40dfce73b2d 100644
--- a/textproc/p5-String-Strip/pkg-plist
+++ b/textproc/p5-String-Strip/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/String/Strip.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String
diff --git a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
index 90a2717818bf..d091b981263a 100644
--- a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
+++ b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Syntax/Highlight/Perl/Improved.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/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/Highlight/Perl 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Syntax 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax
+@dirrmtry %%SITE_PERL%%/Syntax/Highlight/Perl
+@dirrmtry %%SITE_PERL%%/Syntax/Highlight
+@dirrmtry %%SITE_PERL%%/Syntax
diff --git a/textproc/p5-TeX-Hyphen/pkg-plist b/textproc/p5-TeX-Hyphen/pkg-plist
index 6d6cfca3fde7..c1623c6053a2 100644
--- a/textproc/p5-TeX-Hyphen/pkg-plist
+++ b/textproc/p5-TeX-Hyphen/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen
@dirrm %%SITE_PERL%%/TeX/Hyphen
-@unexec rmdir %D/%%SITE_PERL%%/TeX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/TeX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX
diff --git a/textproc/p5-Template-Extract/pkg-plist b/textproc/p5-Template-Extract/pkg-plist
index 97d0f66ecf97..cd293b6246c7 100644
--- a/textproc/p5-Template-Extract/pkg-plist
+++ b/textproc/p5-Template-Extract/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/Template/Extract/Parser.pm
%%SITE_PERL%%/Template/Extract/Run.pm
@dirrm %%SITE_PERL%%/Template/Extract
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Template
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Extract/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Extract
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
diff --git a/textproc/p5-Template-Magic/pkg-plist b/textproc/p5-Template-Magic/pkg-plist
index 5244226e31fc..6557ed3f9fe5 100644
--- a/textproc/p5-Template-Magic/pkg-plist
+++ b/textproc/p5-Template-Magic/pkg-plist
@@ -15,7 +15,7 @@
@dirrm %%SITE_PERL%%/auto/Template/Magic
@dirrm %%SITE_PERL%%/auto/Template
@dirrm %%SITE_PERL%%/Template/Magic
-@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/Template 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Template
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template
+@dirrmtry %%SITE_PERL%%/Bundle/Template
+@dirrmtry %%SITE_PERL%%/Bundle
diff --git a/textproc/p5-Text-ASCIITable/pkg-plist b/textproc/p5-Text-ASCIITable/pkg-plist
index 1e5e864adab4..f75c707205f8 100644
--- a/textproc/p5-Text-ASCIITable/pkg-plist
+++ b/textproc/p5-Text-ASCIITable/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/Text/ASCIITable/Wrap.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
@dirrm %%SITE_PERL%%/Text/ASCIITable
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
%%PORTDOCS%%%%EXAMPLESDIR%%/ansi-example.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/p5-Text-Affixes/pkg-plist b/textproc/p5-Text-Affixes/pkg-plist
index c4cea6ed15d6..b4abcbc0ad1d 100644
--- a/textproc/p5-Text-Affixes/pkg-plist
+++ b/textproc/p5-Text-Affixes/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/Text/Affixes.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Affixes
@dirrm %%SITE_PERL%%/auto/Text/Affixes
-@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Aligner/pkg-plist b/textproc/p5-Text-Aligner/pkg-plist
index 093547840c58..7016a60c2ad8 100644
--- a/textproc/p5-Text-Aligner/pkg-plist
+++ b/textproc/p5-Text-Aligner/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Aligner.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aligner/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aligner
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Aspell/pkg-plist b/textproc/p5-Text-Aspell/pkg-plist
index 2bfcd9725ba1..f934f7a97a86 100644
--- a/textproc/p5-Text-Aspell/pkg-plist
+++ b/textproc/p5-Text-Aspell/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell/Aspell.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell/Aspell.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Autoformat/pkg-plist b/textproc/p5-Text-Autoformat/pkg-plist
index 90d918cdb338..c72125c91b85 100644
--- a/textproc/p5-Text-Autoformat/pkg-plist
+++ b/textproc/p5-Text-Autoformat/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Autoformat.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Balanced/pkg-plist b/textproc/p5-Text-Balanced/pkg-plist
index f96ab93507be..5817ba02d5c5 100644
--- a/textproc/p5-Text-Balanced/pkg-plist
+++ b/textproc/p5-Text-Balanced/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Balanced/.packlist
%%SITE_PERL%%/Text/Balanced.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Balanced
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-BibTeX/pkg-plist b/textproc/p5-Text-BibTeX/pkg-plist
index bc7c224496cd..cb5fa428d9cb 100644
--- a/textproc/p5-Text-BibTeX/pkg-plist
+++ b/textproc/p5-Text-BibTeX/pkg-plist
@@ -14,6 +14,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX/BibTeX.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Bind/pkg-plist b/textproc/p5-Text-Bind/pkg-plist
index d528cb84fbfa..9daa96817abe 100644
--- a/textproc/p5-Text-Bind/pkg-plist
+++ b/textproc/p5-Text-Bind/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist
%%SITE_PERL%%/Text/Bind.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV-Simple/pkg-plist b/textproc/p5-Text-CSV-Simple/pkg-plist
index 4eb38dcad786..e7cce3444697 100644
--- a/textproc/p5-Text-CSV-Simple/pkg-plist
+++ b/textproc/p5-Text-CSV-Simple/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Text/CSV/Simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text/CSV 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV
+@dirrmtry %%SITE_PERL%%/Text/CSV
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-CSV/pkg-plist b/textproc/p5-Text-CSV/pkg-plist
index 884dc486ee10..7d0716135b9c 100644
--- a/textproc/p5-Text-CSV/pkg-plist
+++ b/textproc/p5-Text-CSV/pkg-plist
@@ -11,7 +11,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist
%%SITE_PERL%%/Text/CSV.pm
@dirrm %%SITE_PERL%%/auto/Text/CSV
-@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Text
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Chomp/pkg-plist b/textproc/p5-Text-Chomp/pkg-plist
index fa47e1a0a37d..a0920cf991e7 100644
--- a/textproc/p5-Text-Chomp/pkg-plist
+++ b/textproc/p5-Text-Chomp/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Chomp.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Chomp/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Chomp
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Context-EitherSide/pkg-plist b/textproc/p5-Text-Context-EitherSide/pkg-plist
index 6fd1754ba900..86593615ed17 100644
--- a/textproc/p5-Text-Context-EitherSide/pkg-plist
+++ b/textproc/p5-Text-Context-EitherSide/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Text/Context/EitherSide.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text/Context 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text/Context
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff-HTML/pkg-plist b/textproc/p5-Text-Diff-HTML/pkg-plist
index 1d1b9c052857..e066197c36bd 100644
--- a/textproc/p5-Text-Diff-HTML/pkg-plist
+++ b/textproc/p5-Text-Diff-HTML/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Text/Diff/HTML.pm
-@unexec rmdir %D/%%SITE_PERL%%/Text/Diff 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text/Diff
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Diff/pkg-plist b/textproc/p5-Text-Diff/pkg-plist
index d59ca682fb75..d65398db9628 100644
--- a/textproc/p5-Text-Diff/pkg-plist
+++ b/textproc/p5-Text-Diff/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Text/Diff/Table.pm
%%SITE_PERL%%/Text/Diff.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
@dirrm %%SITE_PERL%%/Text/Diff
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-DoubleMetaphone/pkg-plist b/textproc/p5-Text-DoubleMetaphone/pkg-plist
index d2ec9b13893d..564e3cf57ade 100644
--- a/textproc/p5-Text-DoubleMetaphone/pkg-plist
+++ b/textproc/p5-Text-DoubleMetaphone/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-EtText/pkg-plist b/textproc/p5-Text-EtText/pkg-plist
index 242e02a0f3e1..348016a24140 100644
--- a/textproc/p5-Text-EtText/pkg-plist
+++ b/textproc/p5-Text-EtText/pkg-plist
@@ -8,6 +8,6 @@ bin/ettext2html
%%SITE_PERL%%/Text/EtText/HTML2EtText.pm
%%SITE_PERL%%/Text/EtText/EtText2HTML.pm
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
@unexec rmdir %D/%%SITE_PERL%%/Text/EtText
-@unexec rmdir %D/%%SITE_PERL%%/Text 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ExtractWords/pkg-plist b/textproc/p5-Text-ExtractWords/pkg-plist
index e06cc814957a..423729672827 100644
--- a/textproc/p5-Text-ExtractWords/pkg-plist
+++ b/textproc/p5-Text-ExtractWords/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/ExtractWords.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-FillIn/pkg-plist b/textproc/p5-Text-FillIn/pkg-plist
index 211fa5669e6f..ee7fac3e0ec9 100644
--- a/textproc/p5-Text-FillIn/pkg-plist
+++ b/textproc/p5-Text-FillIn/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist
%%SITE_PERL%%/Text/FillIn.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Filter-Chain/pkg-plist b/textproc/p5-Text-Filter-Chain/pkg-plist
index 0a2e61f99637..58edb7d32329 100644
--- a/textproc/p5-Text-Filter-Chain/pkg-plist
+++ b/textproc/p5-Text-Filter-Chain/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist
%%SITE_PERL%%/Text/Filter/Chain.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain
-@unexec rmdir %D/%%SITE_PERL%%/Text/Filter 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text/Filter
diff --git a/textproc/p5-Text-Filter/pkg-plist b/textproc/p5-Text-Filter/pkg-plist
index bebd509d24d2..6f0745592af9 100644
--- a/textproc/p5-Text-Filter/pkg-plist
+++ b/textproc/p5-Text-Filter/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist
%%SITE_PERL%%/Text/Filter.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-FixedLength-Extra/pkg-plist b/textproc/p5-Text-FixedLength-Extra/pkg-plist
index a6fe8de83e28..94c61b52ec32 100644
--- a/textproc/p5-Text-FixedLength-Extra/pkg-plist
+++ b/textproc/p5-Text-FixedLength-Extra/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist
%%SITE_PERL%%/Text/FixedLength/Extra.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra
-@unexec rmdir %D/%%SITE_PERL%%/Text/FixedLength 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text/FixedLength
diff --git a/textproc/p5-Text-FixedLength/pkg-plist b/textproc/p5-Text-FixedLength/pkg-plist
index 247a041f1050..8f34bc4a2bce 100644
--- a/textproc/p5-Text-FixedLength/pkg-plist
+++ b/textproc/p5-Text-FixedLength/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist
%%SITE_PERL%%/Text/FixedLength.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Flowchart/pkg-plist b/textproc/p5-Text-Flowchart/pkg-plist
index 59f6ddccf34e..75382e08f58b 100644
--- a/textproc/p5-Text-Flowchart/pkg-plist
+++ b/textproc/p5-Text-Flowchart/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist
%%SITE_PERL%%/Text/Flowchart.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Format/pkg-plist b/textproc/p5-Text-Format/pkg-plist
index f7dfaa4c6207..fe670e04790d 100644
--- a/textproc/p5-Text-Format/pkg-plist
+++ b/textproc/p5-Text-Format/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format/.packlist
%%SITE_PERL%%/Text/Format.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-FormatTable/pkg-plist b/textproc/p5-Text-FormatTable/pkg-plist
index 815052f34e75..20b9b443beef 100644
--- a/textproc/p5-Text-FormatTable/pkg-plist
+++ b/textproc/p5-Text-FormatTable/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist
%%SITE_PERL%%/Text/FormatTable.pm
%%SITE_PERL%%/Text/example.pl
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-German/pkg-plist b/textproc/p5-Text-German/pkg-plist
index 559f77c4985b..41ce0fe6fb3e 100644
--- a/textproc/p5-Text-German/pkg-plist
+++ b/textproc/p5-Text-German/pkg-plist
@@ -10,6 +10,6 @@
%%SITE_PERL%%/Text/German/Vorsilbe.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/German/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/German
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text/German 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text/German
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Glob/pkg-plist b/textproc/p5-Text-Glob/pkg-plist
index d48254e71c70..6afcd969fc9b 100644
--- a/textproc/p5-Text-Glob/pkg-plist
+++ b/textproc/p5-Text-Glob/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Glob/.packlist
%%SITE_PERL%%/Text/Glob.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Glob
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Graphics/pkg-plist b/textproc/p5-Text-Graphics/pkg-plist
index e6daf9f81182..f14481c224da 100644
--- a/textproc/p5-Text-Graphics/pkg-plist
+++ b/textproc/p5-Text-Graphics/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist
%%SITE_PERL%%/Text/Graphics.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-MagicTemplate/pkg-plist b/textproc/p5-Text-MagicTemplate/pkg-plist
index e92fe01c3400..36f35e420189 100644
--- a/textproc/p5-Text-MagicTemplate/pkg-plist
+++ b/textproc/p5-Text-MagicTemplate/pkg-plist
@@ -11,11 +11,11 @@
%%SITE_PERL%%/auto/Text/MagicTemplate/FillInForm.al
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MagicTemplate/.packlist
@dirrm %%SITE_PERL%%/Text/MagicTemplate
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
+@dirrmtry %%SITE_PERL%%/Text
@dirrm %%SITE_PERL%%/auto/Text/MagicTemplate
@dirrm %%SITE_PERL%%/mach/auto/Text/MagicTemplate
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Text
+@dirrmtry %%SITE_PERL%%/Bundle/Text
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/auto/Text
diff --git a/textproc/p5-Text-Metaphone/pkg-plist b/textproc/p5-Text-Metaphone/pkg-plist
index 0c37d8351f80..f52d34f6c6c3 100644
--- a/textproc/p5-Text-Metaphone/pkg-plist
+++ b/textproc/p5-Text-Metaphone/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist
index af6d40ef0100..1e96f2b1b548 100644
--- a/textproc/p5-Text-NSP/pkg-plist
+++ b/textproc/p5-Text-NSP/pkg-plist
@@ -66,6 +66,6 @@ bin/sort-bigrams.pl
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP
@dirrm %%SITE_PERL%%/auto/Text/NSP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Ngram/pkg-plist b/textproc/p5-Text-Ngram/pkg-plist
index ee1fda6040c1..357071127e34 100644
--- a/textproc/p5-Text-Ngram/pkg-plist
+++ b/textproc/p5-Text-Ngram/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram/Ngram.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Ngrams/pkg-plist b/textproc/p5-Text-Ngrams/pkg-plist
index 5897a19a870e..517514fdba64 100644
--- a/textproc/p5-Text-Ngrams/pkg-plist
+++ b/textproc/p5-Text-Ngrams/pkg-plist
@@ -3,5 +3,5 @@ bin/ngrams.pl
%%SITE_PERL%%/Text/ngrams.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngrams/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngrams
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Original/pkg-plist b/textproc/p5-Text-Original/pkg-plist
index f25ab7da98f2..a9fdef0f6d17 100644
--- a/textproc/p5-Text-Original/pkg-plist
+++ b/textproc/p5-Text-Original/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Original.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Original/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Original
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-ParagraphDiff/pkg-plist b/textproc/p5-Text-ParagraphDiff/pkg-plist
index 12300733672b..8e7c1340e09c 100644
--- a/textproc/p5-Text-ParagraphDiff/pkg-plist
+++ b/textproc/p5-Text-ParagraphDiff/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/Text/ParagraphDiff.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Query/pkg-plist b/textproc/p5-Text-Query/pkg-plist
index 915a490f642f..70d79f81a5bf 100644
--- a/textproc/p5-Text-Query/pkg-plist
+++ b/textproc/p5-Text-Query/pkg-plist
@@ -14,5 +14,5 @@
%%SITE_PERL%%/Text/Query/ParseSimple.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query
@dirrm %%SITE_PERL%%/Text/Query
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Quoted/pkg-plist b/textproc/p5-Text-Quoted/pkg-plist
index b05e25a5112f..27c1a744bdca 100644
--- a/textproc/p5-Text-Quoted/pkg-plist
+++ b/textproc/p5-Text-Quoted/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/mach/auto/Text/Quoted/.packlist
%%SITE_PERL%%/Text/Quoted.pm
@dirrm %%SITE_PERL%%/mach/auto/Text/Quoted
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-RecordParser/pkg-plist b/textproc/p5-Text-RecordParser/pkg-plist
index f503a91b53fb..345ead037cf7 100644
--- a/textproc/p5-Text-RecordParser/pkg-plist
+++ b/textproc/p5-Text-RecordParser/pkg-plist
@@ -3,4 +3,4 @@ bin/tabmerge
%%SITE_PERL%%/Text/RecordParser.pm
%%SITE_PERL%%/Text/RecordParser/Tab.pm
@dirrm %%SITE_PERL%%/Text/RecordParser
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Reflow/pkg-plist b/textproc/p5-Text-Reflow/pkg-plist
index e33d8f1484b8..b13cb0883cdd 100644
--- a/textproc/p5-Text-Reflow/pkg-plist
+++ b/textproc/p5-Text-Reflow/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow/Reflow.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow/Reflow.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-Reform/pkg-plist b/textproc/p5-Text-Reform/pkg-plist
index a8c92a807d59..9b0275ae0c35 100644
--- a/textproc/p5-Text-Reform/pkg-plist
+++ b/textproc/p5-Text-Reform/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/Text/demo_ws.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reform/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reform
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Repository/pkg-plist b/textproc/p5-Text-Repository/pkg-plist
index b2c6d838e139..3e16c76336a4 100644
--- a/textproc/p5-Text-Repository/pkg-plist
+++ b/textproc/p5-Text-Repository/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist
%%SITE_PERL%%/Text/Repository.pm
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Shellwords/pkg-plist b/textproc/p5-Text-Shellwords/pkg-plist
index 3dd3fa82f9fd..01e55fc2d4da 100644
--- a/textproc/p5-Text-Shellwords/pkg-plist
+++ b/textproc/p5-Text-Shellwords/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Shellwords.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Similarity/pkg-plist b/textproc/p5-Text-Similarity/pkg-plist
index 07bee2c47519..8fffbee49b10 100644
--- a/textproc/p5-Text-Similarity/pkg-plist
+++ b/textproc/p5-Text-Similarity/pkg-plist
@@ -5,5 +5,5 @@ bin/text_compare.pl
%%SITE_PERL%%/Text/Similarity/Overlaps.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Similarity
@dirrm %%SITE_PERL%%/Text/Similarity
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-SimpleTable/pkg-plist b/textproc/p5-Text-SimpleTable/pkg-plist
index e5dfcb0280b5..3ba462a3440a 100644
--- a/textproc/p5-Text-SimpleTable/pkg-plist
+++ b/textproc/p5-Text-SimpleTable/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Text/SimpleTable.pm
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-SimpleTemplate/pkg-plist b/textproc/p5-Text-SimpleTemplate/pkg-plist
index 9c482e006df9..eb7f4ab18f27 100644
--- a/textproc/p5-Text-SimpleTemplate/pkg-plist
+++ b/textproc/p5-Text-SimpleTemplate/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist
%%SITE_PERL%%/Text/SimpleTemplate.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Striphigh/pkg-plist b/textproc/p5-Text-Striphigh/pkg-plist
index 32bc1c7d0345..5f90e412f4c6 100644
--- a/textproc/p5-Text-Striphigh/pkg-plist
+++ b/textproc/p5-Text-Striphigh/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Striphigh.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Striphigh/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Striphigh
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Table/pkg-plist b/textproc/p5-Text-Table/pkg-plist
index 6e948666e1fd..ff01e55a327c 100644
--- a/textproc/p5-Text-Table/pkg-plist
+++ b/textproc/p5-Text-Table/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Table.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Table/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Table
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/textproc/p5-Text-Tabs+Wrap/pkg-plist b/textproc/p5-Text-Tabs+Wrap/pkg-plist
index b5a0eafed825..9978b2e401a0 100644
--- a/textproc/p5-Text-Tabs+Wrap/pkg-plist
+++ b/textproc/p5-Text-Tabs+Wrap/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/.packlist
%%SITE_PERL%%/Text/Wrap.pm
%%SITE_PERL%%/Text/Tabs.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-TabularDisplay/pkg-plist b/textproc/p5-Text-TabularDisplay/pkg-plist
index 8bd64ef40d30..145982ee604d 100644
--- a/textproc/p5-Text-TabularDisplay/pkg-plist
+++ b/textproc/p5-Text-TabularDisplay/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/TabularDisplay.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/TabularDisplay/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/TabularDisplay
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Template/pkg-plist b/textproc/p5-Text-Template/pkg-plist
index b8dcff442e26..ac586f1f540d 100644
--- a/textproc/p5-Text-Template/pkg-plist
+++ b/textproc/p5-Text-Template/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Text/Template/Preprocess.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
@dirrm %%SITE_PERL%%/Text/Template
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Textile/pkg-plist b/textproc/p5-Text-Textile/pkg-plist
index f5e2ba788026..f41548b2611f 100644
--- a/textproc/p5-Text-Textile/pkg-plist
+++ b/textproc/p5-Text-Textile/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Text/Textile.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Textile/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Textile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Tmpl/pkg-plist b/textproc/p5-Text-Tmpl/pkg-plist
index 9094eac83d63..d279dd83e13a 100644
--- a/textproc/p5-Text-Tmpl/pkg-plist
+++ b/textproc/p5-Text-Tmpl/pkg-plist
@@ -7,5 +7,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/Text/template_extend.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Text/Tmpl.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text
diff --git a/textproc/p5-Text-VimColor/pkg-plist b/textproc/p5-Text-VimColor/pkg-plist
index d809319020c3..4c389bf4a6b9 100644
--- a/textproc/p5-Text-VimColor/pkg-plist
+++ b/textproc/p5-Text-VimColor/pkg-plist
@@ -7,5 +7,5 @@ bin/text-vimcolor
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor
@dirrm %%SITE_PERL%%/Text/VimColor
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-WikiFormat/pkg-plist b/textproc/p5-Text-WikiFormat/pkg-plist
index 76316f1969bf..7db249bcff76 100644
--- a/textproc/p5-Text-WikiFormat/pkg-plist
+++ b/textproc/p5-Text-WikiFormat/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/Text/WikiFormat.pm
%%SITE_PERL%%/Text/WikiFormat/Blocks.pm
-@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text/WikiFormat 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Text
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text/WikiFormat
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Text-Wrapper/pkg-plist b/textproc/p5-Text-Wrapper/pkg-plist
index 3a7e09e44eb4..d64eae0a8df9 100644
--- a/textproc/p5-Text-Wrapper/pkg-plist
+++ b/textproc/p5-Text-Wrapper/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist
%%SITE_PERL%%/Text/Wrapper.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-Time-Human/pkg-plist b/textproc/p5-Time-Human/pkg-plist
index 68be7dc8675f..843739fd7eeb 100644
--- a/textproc/p5-Time-Human/pkg-plist
+++ b/textproc/p5-Time-Human/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Human/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Human
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time
%%SITE_PERL%%/Time/Human.pm
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Time
diff --git a/textproc/p5-Tk-XMLViewer/pkg-plist b/textproc/p5-Tk-XMLViewer/pkg-plist
index fa12c1a4749d..6740be896bae 100644
--- a/textproc/p5-Tk-XMLViewer/pkg-plist
+++ b/textproc/p5-Tk-XMLViewer/pkg-plist
@@ -3,5 +3,5 @@ bin/tkxmlview
%%SITE_PERL%%/Tk/XMLViewer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk
+@dirrmtry %%SITE_PERL%%/Tk
diff --git a/textproc/p5-Tree-Nary/pkg-plist b/textproc/p5-Tree-Nary/pkg-plist
index 97994796f75c..87020f311914 100644
--- a/textproc/p5-Tree-Nary/pkg-plist
+++ b/textproc/p5-Tree-Nary/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist
%%SITE_PERL%%/Tree/Nary.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree
+@dirrmtry %%SITE_PERL%%/Tree
diff --git a/textproc/p5-UML-Sequence/pkg-plist b/textproc/p5-UML-Sequence/pkg-plist
index 0d49d1a79850..5931a57f358b 100644
--- a/textproc/p5-UML-Sequence/pkg-plist
+++ b/textproc/p5-UML-Sequence/pkg-plist
@@ -14,6 +14,6 @@ bin/seq2svg.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Sequence/.packlist
@dirrm %%SITE_PERL%%/UML/Sequence
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Sequence
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/UML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML
+@dirrmtry %%SITE_PERL%%/UML
+@dirrmtry %%SITE_PERL%%/Devel
diff --git a/textproc/p5-UML-State/pkg-plist b/textproc/p5-UML-State/pkg-plist
index 5e9532923539..f6175f852ffd 100644
--- a/textproc/p5-UML-State/pkg-plist
+++ b/textproc/p5-UML-State/pkg-plist
@@ -6,5 +6,5 @@ bin/drawstate.pl
%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/State/.packlist
@dirrm %%SITE_PERL%%/UML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/State
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/UML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML
+@dirrmtry %%SITE_PERL%%/UML
diff --git a/textproc/p5-URI-Find/pkg-plist b/textproc/p5-URI-Find/pkg-plist
index c2d831fef15c..83ee9ddb862e 100644
--- a/textproc/p5-URI-Find/pkg-plist
+++ b/textproc/p5-URI-Find/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/URI/Find/Schemeless.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI
@dirrm %%SITE_PERL%%/URI/Find
-@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/URI
diff --git a/textproc/p5-WordNet-QueryData/pkg-plist b/textproc/p5-WordNet-QueryData/pkg-plist
index 40c9bcd1c173..27c4840289f2 100644
--- a/textproc/p5-WordNet-QueryData/pkg-plist
+++ b/textproc/p5-WordNet-QueryData/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/WordNet/QueryData.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/WordNet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/WordNet
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet
diff --git a/textproc/p5-WordNet-Similarity/pkg-plist b/textproc/p5-WordNet-Similarity/pkg-plist
index b26984aa27c2..69892220f085 100644
--- a/textproc/p5-WordNet-Similarity/pkg-plist
+++ b/textproc/p5-WordNet-Similarity/pkg-plist
@@ -35,7 +35,7 @@ bin/semCorFreq.pl
%%SITE_PERL%%/WordNet/Similarity/ICFinder.pm
%%SITE_PERL%%/WordNet/Similarity/PathFinder.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WordNet/Similarity 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/WordNet 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet
+@dirrmtry %%SITE_PERL%%/WordNet/Similarity
+@dirrmtry %%SITE_PERL%%/WordNet
diff --git a/textproc/p5-XML-Atom-Filter/pkg-plist b/textproc/p5-XML-Atom-Filter/pkg-plist
index 419f06c9b6c3..f05cd9bfd056 100644
--- a/textproc/p5-XML-Atom-Filter/pkg-plist
+++ b/textproc/p5-XML-Atom-Filter/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/XML/Atom/Filter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Atom 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/Atom
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
index 5a5ed466fa12..eb0c3b2dbcde 100644
--- a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
+++ b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/XML/Atom/SimpleFeed.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Atom 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/Atom
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Atom-Syndication/pkg-plist b/textproc/p5-XML-Atom-Syndication/pkg-plist
index ff6696941e1b..be948a93ded6 100644
--- a/textproc/p5-XML-Atom-Syndication/pkg-plist
+++ b/textproc/p5-XML-Atom-Syndication/pkg-plist
@@ -4,8 +4,8 @@
%%SITE_PERL%%/XML/Atom/Syndication/Characters.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Syndication/.packlist
@dirrm %%SITE_PERL%%/XML/Atom/Syndication
-@unexec rmdir %D/%%SITE_PERL%%/XML/Atom 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Atom
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Syndication
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Atom/pkg-plist b/textproc/p5-XML-Atom/pkg-plist
index abc959fff4d1..d3dda073aa6f 100644
--- a/textproc/p5-XML-Atom/pkg-plist
+++ b/textproc/p5-XML-Atom/pkg-plist
@@ -10,4 +10,4 @@
%%SITE_PERL%%/XML/Atom/Thing.pm
%%SITE_PERL%%/XML/Atom/Util.pm
@dirrm %%SITE_PERL%%/XML/Atom
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-AutoWriter/pkg-plist b/textproc/p5-XML-AutoWriter/pkg-plist
index ade8b824b029..6e9509e5aa10 100644
--- a/textproc/p5-XML-AutoWriter/pkg-plist
+++ b/textproc/p5-XML-AutoWriter/pkg-plist
@@ -6,5 +6,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/AutoWriter/.packlist
@dirrm %%SITE_PERL%%/XML/Doctype
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/AutoWriter
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Catalog/pkg-plist b/textproc/p5-XML-Catalog/pkg-plist
index 3dcc2a3063e7..b32bb89f4741 100644
--- a/textproc/p5-XML-Catalog/pkg-plist
+++ b/textproc/p5-XML-Catalog/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/XML/Catalog.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Clean/pkg-plist b/textproc/p5-XML-Clean/pkg-plist
index 25c06aff75a5..e6f5c3c2770a 100644
--- a/textproc/p5-XML-Clean/pkg-plist
+++ b/textproc/p5-XML-Clean/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean/.packlist
%%SITE_PERL%%/XML/Clean.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DBMS/pkg-plist b/textproc/p5-XML-DBMS/pkg-plist
index 7211b99d2c91..8f3fe0571663 100644
--- a/textproc/p5-XML-DBMS/pkg-plist
+++ b/textproc/p5-XML-DBMS/pkg-plist
@@ -8,5 +8,5 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/sales2.map
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XMLtoDBMS
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-DOM-XPath/pkg-plist b/textproc/p5-XML-DOM-XPath/pkg-plist
index fcc1a61d856c..643f92715afb 100644
--- a/textproc/p5-XML-DOM-XPath/pkg-plist
+++ b/textproc/p5-XML-DOM-XPath/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/XML/DOM/XPath.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/XPath/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/XPath
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/DOM 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/DOM
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DT/pkg-plist b/textproc/p5-XML-DT/pkg-plist
index 5ac51467f078..5fb522de7a5c 100644
--- a/textproc/p5-XML-DT/pkg-plist
+++ b/textproc/p5-XML-DT/pkg-plist
@@ -3,4 +3,4 @@ bin/mkdtdskel
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT/.packlist
%%SITE_PERL%%/XML/DT.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DTDParser/pkg-plist b/textproc/p5-XML-DTDParser/pkg-plist
index 9fe4a9825ea8..77a36a10d52d 100644
--- a/textproc/p5-XML-DTDParser/pkg-plist
+++ b/textproc/p5-XML-DTDParser/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/XML/DTDParser.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DTDParser/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DTDParser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-DifferenceMarkup/pkg-plist b/textproc/p5-XML-DifferenceMarkup/pkg-plist
index 22298e5526dc..545611a1f78c 100644
--- a/textproc/p5-XML-DifferenceMarkup/pkg-plist
+++ b/textproc/p5-XML-DifferenceMarkup/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DifferenceMarkup/.packlist
%%SITE_PERL%%/XML/DifferenceMarkup.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DifferenceMarkup
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Directory/pkg-plist b/textproc/p5-XML-Directory/pkg-plist
index 05878eb9b77e..9b15e87887b2 100644
--- a/textproc/p5-XML-Directory/pkg-plist
+++ b/textproc/p5-XML-Directory/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/XML/Directory/String.pm
@dirrm %%SITE_PERL%%/XML/Directory
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Driver-HTML/pkg-plist b/textproc/p5-XML-Driver-HTML/pkg-plist
index f43da6cc1ddf..a2974fab6ecc 100644
--- a/textproc/p5-XML-Driver-HTML/pkg-plist
+++ b/textproc/p5-XML-Driver-HTML/pkg-plist
@@ -2,8 +2,8 @@ bin/html2xhtml
%%SITE_PERL%%/XML/Driver/HTML.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML
-@unexec rmdir %D/%%SITE_PERL%%/XML/Driver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Driver
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Dumper/pkg-plist b/textproc/p5-XML-Dumper/pkg-plist
index 10f520c1a76e..b53e285088cc 100644
--- a/textproc/p5-XML-Dumper/pkg-plist
+++ b/textproc/p5-XML-Dumper/pkg-plist
@@ -1,4 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist
%%SITE_PERL%%/XML/Dumper.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Elemental/pkg-plist b/textproc/p5-XML-Elemental/pkg-plist
index c6c7235b8233..18835ab86a0d 100644
--- a/textproc/p5-XML-Elemental/pkg-plist
+++ b/textproc/p5-XML-Elemental/pkg-plist
@@ -11,4 +11,4 @@
@dirrm %%SITE_PERL%%/XML/Parser/Style
@dirrm %%SITE_PERL%%/XML/Parser
@dirrm %%SITE_PERL%%/XML/Elemental
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Encoding/pkg-plist b/textproc/p5-XML-Encoding/pkg-plist
index cea86c5de505..4a6b72995117 100644
--- a/textproc/p5-XML-Encoding/pkg-plist
+++ b/textproc/p5-XML-Encoding/pkg-plist
@@ -3,5 +3,5 @@ bin/make_encmap
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist
%%SITE_PERL%%/XML/Encoding.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Feed/pkg-plist b/textproc/p5-XML-Feed/pkg-plist
index 70df8ff11dc7..96632effd143 100644
--- a/textproc/p5-XML-Feed/pkg-plist
+++ b/textproc/p5-XML-Feed/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/XML/Feed/Entry.pm
%%SITE_PERL%%/XML/Feed/RSS.pm
@dirrm %%SITE_PERL%%/XML/Feed
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Filter-BufferText/pkg-plist b/textproc/p5-XML-Filter-BufferText/pkg-plist
index 5b3ec2828b6b..57ccdc18d6fb 100644
--- a/textproc/p5-XML-Filter-BufferText/pkg-plist
+++ b/textproc/p5-XML-Filter-BufferText/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/BufferText/.packlist
%%SITE_PERL%%/XML/Filter/BufferText.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/BufferText
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-DetectWS/pkg-plist b/textproc/p5-XML-Filter-DetectWS/pkg-plist
index 6f5380d016c2..cc49c6327951 100644
--- a/textproc/p5-XML-Filter-DetectWS/pkg-plist
+++ b/textproc/p5-XML-Filter-DetectWS/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist
%%SITE_PERL%%/XML/Filter/DetectWS.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-GenericChunk/pkg-plist b/textproc/p5-XML-Filter-GenericChunk/pkg-plist
index 80e36d11ea31..d5b9cfb5b5a5 100644
--- a/textproc/p5-XML-Filter-GenericChunk/pkg-plist
+++ b/textproc/p5-XML-Filter-GenericChunk/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/XML/Filter/CharacterChunk.pm
%%SITE_PERL%%/XML/Filter/GenericChunk.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-Reindent/pkg-plist b/textproc/p5-XML-Filter-Reindent/pkg-plist
index f70f6504f983..27641ef412cf 100644
--- a/textproc/p5-XML-Filter-Reindent/pkg-plist
+++ b/textproc/p5-XML-Filter-Reindent/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist
%%SITE_PERL%%/XML/Filter/Reindent.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist b/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist
index 2fe67388ebc7..4a5c00beb8e5 100644
--- a/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist
+++ b/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/XML/Filter/SAX1toSAX2.pm
%%SITE_PERL%%/XML/Filter/SAX2toSAX1.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAX1toSAX2
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-SAXT/pkg-plist b/textproc/p5-XML-Filter-SAXT/pkg-plist
index 629338a8642e..7d1997876c6c 100644
--- a/textproc/p5-XML-Filter-SAXT/pkg-plist
+++ b/textproc/p5-XML-Filter-SAXT/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist
%%SITE_PERL%%/XML/Filter/SAXT.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-XInclude/pkg-plist b/textproc/p5-XML-Filter-XInclude/pkg-plist
index 130b64b321de..1faf29a475ab 100644
--- a/textproc/p5-XML-Filter-XInclude/pkg-plist
+++ b/textproc/p5-XML-Filter-XInclude/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist
%%SITE_PERL%%/XML/Filter/XInclude.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Filter-XSLT/pkg-plist b/textproc/p5-XML-Filter-XSLT/pkg-plist
index da376ee4441d..5887a0fa42f7 100644
--- a/textproc/p5-XML-Filter-XSLT/pkg-plist
+++ b/textproc/p5-XML-Filter-XSLT/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/XML/Filter/XSLT.pm
%%SITE_PERL%%/XML/Filter/XSLT/LibXSLT.pm
@dirrm %%SITE_PERL%%/XML/Filter/XSLT
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Generator-DBI/pkg-plist b/textproc/p5-XML-Generator-DBI/pkg-plist
index 7e5b40aec0ac..57730fb0c48d 100644
--- a/textproc/p5-XML-Generator-DBI/pkg-plist
+++ b/textproc/p5-XML-Generator-DBI/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/DBI/.packlist
%%SITE_PERL%%/XML/Generator/DBI.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/Generator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Generator
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/DBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Generator-PerlData/pkg-plist b/textproc/p5-XML-Generator-PerlData/pkg-plist
index cdf813f18c00..84468c26d66f 100644
--- a/textproc/p5-XML-Generator-PerlData/pkg-plist
+++ b/textproc/p5-XML-Generator-PerlData/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/XML/Generator/PerlData.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/PerlData/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/PerlData
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Generator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/XML/Generator
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator
diff --git a/textproc/p5-XML-Generator/pkg-plist b/textproc/p5-XML-Generator/pkg-plist
index 2e9093120fcc..a00d12db8ac8 100644
--- a/textproc/p5-XML-Generator/pkg-plist
+++ b/textproc/p5-XML-Generator/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/.packlist
%%SITE_PERL%%/XML/Generator/DOM.pm
%%SITE_PERL%%/XML/Generator.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Generator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/Generator
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Grove/pkg-plist b/textproc/p5-XML-Grove/pkg-plist
index 43887eb0b053..c75e404e9972 100644
--- a/textproc/p5-XML-Grove/pkg-plist
+++ b/textproc/p5-XML-Grove/pkg-plist
@@ -12,6 +12,6 @@
%%SITE_PERL%%/XML/Grove/XPointer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/Grove
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist b/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist
index e7ba67f04ba2..42501a4f6e8d 100644
--- a/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist
+++ b/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/XML/Handler/HTMLWriter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/HTMLWriter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/HTMLWriter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/Handler
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Handler-Trees/pkg-plist b/textproc/p5-XML-Handler-Trees/pkg-plist
index 54e137f21bd1..e99fde22e520 100644
--- a/textproc/p5-XML-Handler-Trees/pkg-plist
+++ b/textproc/p5-XML-Handler-Trees/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Trees/.packlist
%%SITE_PERL%%/XML/Handler/Trees.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Handler
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Trees
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-plist b/textproc/p5-XML-Handler-YAWriter/pkg-plist
index f34eba0011d9..16e368d157a4 100644
--- a/textproc/p5-XML-Handler-YAWriter/pkg-plist
+++ b/textproc/p5-XML-Handler-YAWriter/pkg-plist
@@ -2,7 +2,7 @@
bin/xmlpretty
%%SITE_PERL%%/XML/Handler/YAWriter.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter
-@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Handler
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-LibRSVG/pkg-plist b/textproc/p5-XML-LibRSVG/pkg-plist
index 86578b451ad4..4b42c67356dd 100644
--- a/textproc/p5-XML-LibRSVG/pkg-plist
+++ b/textproc/p5-XML-LibRSVG/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-LibXML-Common/pkg-plist b/textproc/p5-XML-LibXML-Common/pkg-plist
index 43553b9bf828..c8ed94e6d69a 100644
--- a/textproc/p5-XML-LibXML-Common/pkg-plist
+++ b/textproc/p5-XML-LibXML-Common/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so
%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-LibXML-Iterator/pkg-plist b/textproc/p5-XML-LibXML-Iterator/pkg-plist
index 25d2c724bd60..64a9e9cf42eb 100644
--- a/textproc/p5-XML-LibXML-Iterator/pkg-plist
+++ b/textproc/p5-XML-LibXML-Iterator/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/XML/LibXML/NodeList/Iterator.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Iterator/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Iterator
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/LibXML/NodeList
-@unexec rmdir %D/%%SITE_PERL%%/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/LibXML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-LibXML-XPathContext/pkg-plist b/textproc/p5-XML-LibXML-XPathContext/pkg-plist
index f499f0dd0cb8..ead6c944ae15 100644
--- a/textproc/p5-XML-LibXML-XPathContext/pkg-plist
+++ b/textproc/p5-XML-LibXML-XPathContext/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/XPathContext/XPathContext.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/XPathContext/XPathContext.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/XPathContext
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-LibXML/pkg-plist b/textproc/p5-XML-LibXML/pkg-plist
index c4afb81fb009..353623c14236 100644
--- a/textproc/p5-XML-LibXML/pkg-plist
+++ b/textproc/p5-XML-LibXML/pkg-plist
@@ -26,8 +26,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Text.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/LibXML.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/LibXML.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-LibXSLT/pkg-plist b/textproc/p5-XML-LibXSLT/pkg-plist
index 22f090040a21..ec656832fbd6 100644
--- a/textproc/p5-XML-LibXSLT/pkg-plist
+++ b/textproc/p5-XML-LibXSLT/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-NamespaceSupport/pkg-plist b/textproc/p5-XML-NamespaceSupport/pkg-plist
index caf403ad7273..5ea514b2f4c7 100644
--- a/textproc/p5-XML-NamespaceSupport/pkg-plist
+++ b/textproc/p5-XML-NamespaceSupport/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NamespaceSupport/.packlist
%%SITE_PERL%%/XML/NamespaceSupport.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NamespaceSupport
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Node/pkg-plist b/textproc/p5-XML-Node/pkg-plist
index 6f52ccd88f8b..fc4bc8eeffc6 100644
--- a/textproc/p5-XML-Node/pkg-plist
+++ b/textproc/p5-XML-Node/pkg-plist
@@ -4,4 +4,4 @@
%%SITE_PERL%%/XML/parse-testsuite.pl
%%SITE_PERL%%/%%PERL_ARCH%%//auto/XML/Node/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Node
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-NodeFilter/pkg-plist b/textproc/p5-XML-NodeFilter/pkg-plist
index 44fd2755bf1f..01155fb046c8 100644
--- a/textproc/p5-XML-NodeFilter/pkg-plist
+++ b/textproc/p5-XML-NodeFilter/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/XML/NodeFilter.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NodeFilter/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NodeFilter
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parser-EasyTree/pkg-plist b/textproc/p5-XML-Parser-EasyTree/pkg-plist
index 456e6a400e2a..5c281b6c2752 100644
--- a/textproc/p5-XML-Parser-EasyTree/pkg-plist
+++ b/textproc/p5-XML-Parser-EasyTree/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/EasyTree/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/EasyTree
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
%%SITE_PERL%%/XML/Parser/EasyTree.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Parser-Lite-Tree/pkg-plist b/textproc/p5-XML-Parser-Lite-Tree/pkg-plist
index b54e32340f97..095ca1df862a 100644
--- a/textproc/p5-XML-Parser-Lite-Tree/pkg-plist
+++ b/textproc/p5-XML-Parser-Lite-Tree/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/XML/Parser/Lite/Tree.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/Parser/Lite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Parser/Lite
+@dirrmtry %%SITE_PERL%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/XML
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite/Tree/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite/Tree
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Parser-Style-Elemental/pkg-plist b/textproc/p5-XML-Parser-Style-Elemental/pkg-plist
index b3e95b585c16..57f179ba15a3 100644
--- a/textproc/p5-XML-Parser-Style-Elemental/pkg-plist
+++ b/textproc/p5-XML-Parser-Style-Elemental/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/XML/Parser/Style/Elemental.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/Elemental/.packlist
@dirrm %%SITE_PERL%%/XML/Parser/Style
-@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/Elemental
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist
index 93a72aad8e45..999e5dbab161 100644
--- a/textproc/p5-XML-Parser/pkg-plist
+++ b/textproc/p5-XML-Parser/pkg-plist
@@ -32,8 +32,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/LWPExternEnt.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-Quote/pkg-plist b/textproc/p5-XML-Quote/pkg-plist
index 0f801611d94e..a270fce1bcde 100644
--- a/textproc/p5-XML-Quote/pkg-plist
+++ b/textproc/p5-XML-Quote/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/Quote.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-RAI/pkg-plist b/textproc/p5-XML-RAI/pkg-plist
index 3974e5619f57..0311ba883fc7 100644
--- a/textproc/p5-XML-RAI/pkg-plist
+++ b/textproc/p5-XML-RAI/pkg-plist
@@ -12,4 +12,4 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RAI
@dirrm %%SITE_PERL%%/XML/RSS/Parser
@dirrm %%SITE_PERL%%/XML/RSS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-RSS-JavaScript/pkg-plist b/textproc/p5-XML-RSS-JavaScript/pkg-plist
index 0dccc3b0c9be..aa8dbf9a40c0 100644
--- a/textproc/p5-XML-RSS-JavaScript/pkg-plist
+++ b/textproc/p5-XML-RSS-JavaScript/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/JavaScript/.packlist
%%SITE_PERL%%/XML/RSS/JavaScript.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/JavaScript
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/RSS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/RSS
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS-LibXML/pkg-plist b/textproc/p5-XML-RSS-LibXML/pkg-plist
index 8d1a18db642c..e94b0e51e426 100644
--- a/textproc/p5-XML-RSS-LibXML/pkg-plist
+++ b/textproc/p5-XML-RSS-LibXML/pkg-plist
@@ -10,5 +10,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-RSS-LibXML/.packlist
@dirrm %%SITE_PERL%%/XML/RSS/LibXML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-RSS-LibXML
-@unexec rmdir %D/%%SITE_PERL%%/XML/RSS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/RSS
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RSS/pkg-plist b/textproc/p5-XML-RSS/pkg-plist
index 92f4cfc3896b..90650a7b2470 100644
--- a/textproc/p5-XML-RSS/pkg-plist
+++ b/textproc/p5-XML-RSS/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/XML/RSS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-RegExp/pkg-plist b/textproc/p5-XML-RegExp/pkg-plist
index 66c16735198d..c05a5832cc39 100644
--- a/textproc/p5-XML-RegExp/pkg-plist
+++ b/textproc/p5-XML-RegExp/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist
%%SITE_PERL%%/XML/RegExp.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist b/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist
index e5e02606699f..bb297acc23b1 100644
--- a/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist
+++ b/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/XML/SAX/Expat/Incremental.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/Incremental/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/Incremental
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX/Expat 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/SAX/Expat
+@dirrmtry %%SITE_PERL%%/XML/SAX
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SAX-Expat/pkg-plist b/textproc/p5-XML-SAX-Expat/pkg-plist
index 9a0699c56fc8..b8a710ac166f 100644
--- a/textproc/p5-XML-SAX-Expat/pkg-plist
+++ b/textproc/p5-XML-SAX-Expat/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/.packlist
%%SITE_PERL%%/XML/SAX/Expat.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/SAX
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SAX-ExpatXS/pkg-plist b/textproc/p5-XML-SAX-ExpatXS/pkg-plist
index 1e07d41730e2..45e0f2dc2e52 100644
--- a/textproc/p5-XML-SAX-ExpatXS/pkg-plist
+++ b/textproc/p5-XML-SAX-ExpatXS/pkg-plist
@@ -23,7 +23,7 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/ExpatXS
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SAX-Machines/pkg-plist b/textproc/p5-XML-SAX-Machines/pkg-plist
index e54b6ee30a77..eb5fd805bf15 100644
--- a/textproc/p5-XML-SAX-Machines/pkg-plist
+++ b/textproc/p5-XML-SAX-Machines/pkg-plist
@@ -14,12 +14,12 @@
%%SITE_PERL%%/XML/SAX/Pipeline.pm
%%SITE_PERL%%/XML/SAX/Tap.pm
@dirrm %%SITE_PERL%%/XML/SAX/Machines
-@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Filter
+@dirrmtry %%SITE_PERL%%/XML/SAX
+@dirrmtry %%SITE_PERL%%/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Machines
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
%%EXAMPLESDIR%%/append_to_xml_file
%%EXAMPLESDIR%%/output_to_process
%%EXAMPLESDIR%%/xml_records_thru_libxslt
diff --git a/textproc/p5-XML-SAX-Simple/pkg-plist b/textproc/p5-XML-SAX-Simple/pkg-plist
index 09c659fa7771..421cf276ced2 100644
--- a/textproc/p5-XML-SAX-Simple/pkg-plist
+++ b/textproc/p5-XML-SAX-Simple/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Simple/.packlist
%%SITE_PERL%%/XML/SAX/Simple.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Simple
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/SAX
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SAX-Writer/pkg-plist b/textproc/p5-XML-SAX-Writer/pkg-plist
index 6c39bdf88bba..398b40a6c9b9 100644
--- a/textproc/p5-XML-SAX-Writer/pkg-plist
+++ b/textproc/p5-XML-SAX-Writer/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/XML/SAX/Writer/XML.pm
@dirrm %%SITE_PERL%%/XML/SAX/Writer
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Writer
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/SAX
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SAX/pkg-plist b/textproc/p5-XML-SAX/pkg-plist
index 85fede55996c..001c110d01fa 100644
--- a/textproc/p5-XML-SAX/pkg-plist
+++ b/textproc/p5-XML-SAX/pkg-plist
@@ -24,8 +24,8 @@
%%SITE_PERL%%/XML/SAX/PurePerl/XMLDecl.pm
%%SITE_PERL%%/XML/SAX/placeholder.pl
@dirrm %%SITE_PERL%%/XML/SAX/PurePerl/Reader
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX/PurePerl 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/SAX/PurePerl
+@dirrmtry %%SITE_PERL%%/XML/SAX
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
index 6cc0140de83a..490584b9e1ec 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
+++ b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron/.packlist
%%SITE_PERL%%/XML/SAXDriver/Sablotron.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron
-@unexec rmdir %D/%%SITE_PERL%%/XML/SAXDriver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/SAXDriver
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-STX/pkg-plist b/textproc/p5-XML-STX/pkg-plist
index 56e94ed278a7..28f6e13755d7 100644
--- a/textproc/p5-XML-STX/pkg-plist
+++ b/textproc/p5-XML-STX/pkg-plist
@@ -13,8 +13,8 @@ bin/stxview.pl
%%SITE_PERL%%/XML/STX/Writer.pm
@dirrm %%SITE_PERL%%/XML/STX
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/STX
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
%%PORTDOCS%%%%EXAMPLESDIR%%/stx-filter.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/tester.pl
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/p5-XML-Sablotron/pkg-plist b/textproc/p5-XML-Sablotron/pkg-plist
index 260a538e961b..b57154ad6f2f 100644
--- a/textproc/p5-XML-Sablotron/pkg-plist
+++ b/textproc/p5-XML-Sablotron/pkg-plist
@@ -10,8 +10,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron/DOM
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron/Situation
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML
diff --git a/textproc/p5-XML-Schematron/pkg-plist b/textproc/p5-XML-Schematron/pkg-plist
index 119153e0c2db..b4d522e3a364 100644
--- a/textproc/p5-XML-Schematron/pkg-plist
+++ b/textproc/p5-XML-Schematron/pkg-plist
@@ -3,7 +3,7 @@
%%SITE_PERL%%/XML/Schematron/LibXSLT.pm
%%SITE_PERL%%/XML/Schematron/Sablotron.pm
%%SITE_PERL%%/XML/Schematron/XPath.pm
-@unexec rmdir %D/%%SITE_PERL%%/XML/Schematron 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Schematron
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-SemanticDiff/pkg-plist b/textproc/p5-XML-SemanticDiff/pkg-plist
index e751bff9d526..c4e579c5c63a 100644
--- a/textproc/p5-XML-SemanticDiff/pkg-plist
+++ b/textproc/p5-XML-SemanticDiff/pkg-plist
@@ -3,6 +3,6 @@ bin/xmlsemdiff
%%SITE_PERL%%/XML/SemanticDiff/BasicHandler.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SemanticDiff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SemanticDiff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/SemanticDiff
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Simple/pkg-plist b/textproc/p5-XML-Simple/pkg-plist
index 3c97b5dc4e4c..42033e0f855f 100644
--- a/textproc/p5-XML-Simple/pkg-plist
+++ b/textproc/p5-XML-Simple/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/XML/Simple.pm
%%SITE_PERL%%/XML/Simple/FAQ.pod
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/Simple
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SimpleObject-LibXML/pkg-plist b/textproc/p5-XML-SimpleObject-LibXML/pkg-plist
index ce8c961b7ca9..a0e602079d7e 100644
--- a/textproc/p5-XML-SimpleObject-LibXML/pkg-plist
+++ b/textproc/p5-XML-SimpleObject-LibXML/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/XML/SimpleObject/LibXML.pm
%%SITE_PERL%%/XML/SimpleObject/ex.pl
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject/LibXML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/SimpleObject 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/SimpleObject
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-SimpleObject/pkg-plist b/textproc/p5-XML-SimpleObject/pkg-plist
index f48ca8526745..61d017cdc87b 100644
--- a/textproc/p5-XML-SimpleObject/pkg-plist
+++ b/textproc/p5-XML-SimpleObject/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/XML/SimpleObject.pm
%%SITE_PERL%%/XML/SimpleObject/Enhanced.pm
%%SITE_PERL%%/XML/ex.pl
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/SimpleObject 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/SimpleObject
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Smart/pkg-plist b/textproc/p5-XML-Smart/pkg-plist
index 933510d9bb2d..c961d8c07bca 100644
--- a/textproc/p5-XML-Smart/pkg-plist
+++ b/textproc/p5-XML-Smart/pkg-plist
@@ -14,6 +14,6 @@
%%SITE_PERL%%/XML/Smart/XPath.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Smart/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Smart
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/Smart
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Stream/pkg-plist b/textproc/p5-XML-Stream/pkg-plist
index 2b193d5fc710..589affba7cb3 100644
--- a/textproc/p5-XML-Stream/pkg-plist
+++ b/textproc/p5-XML-Stream/pkg-plist
@@ -13,4 +13,4 @@
@dirrm %%SITE_PERL%%/XML/Stream/Parser
@dirrm %%SITE_PERL%%/XML/Stream/XPath
@dirrm %%SITE_PERL%%/XML/Stream
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-TreeBuilder/pkg-plist b/textproc/p5-XML-TreeBuilder/pkg-plist
index 91d97f64549f..82c78c33971e 100644
--- a/textproc/p5-XML-TreeBuilder/pkg-plist
+++ b/textproc/p5-XML-TreeBuilder/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/XML/Element.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Twig/pkg-plist b/textproc/p5-XML-Twig/pkg-plist
index f96a7b90d2f8..6059ab166903 100644
--- a/textproc/p5-XML-Twig/pkg-plist
+++ b/textproc/p5-XML-Twig/pkg-plist
@@ -8,6 +8,6 @@ bin/xml_split
%%SITE_PERL%%/XML/Twig/XPath.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/Twig
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Validator-Schema/pkg-plist b/textproc/p5-XML-Validator-Schema/pkg-plist
index 25726eb3028e..59e21385e115 100644
--- a/textproc/p5-XML-Validator-Schema/pkg-plist
+++ b/textproc/p5-XML-Validator-Schema/pkg-plist
@@ -16,8 +16,8 @@
%%SITE_PERL%%/XML/Validator/Schema/Util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator/Schema/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator/Schema
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/Validator/Schema
-@unexec rmdir %D/%%SITE_PERL%%/XML/Validator 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Validator
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-Writer/pkg-plist b/textproc/p5-XML-Writer/pkg-plist
index c2cb893f639c..63e7181a7ed4 100644
--- a/textproc/p5-XML-Writer/pkg-plist
+++ b/textproc/p5-XML-Writer/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/XML/Writer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Writer/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Writer
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XBEL/pkg-plist b/textproc/p5-XML-XBEL/pkg-plist
index 69a4c6bb2ad2..a64cade9398e 100644
--- a/textproc/p5-XML-XBEL/pkg-plist
+++ b/textproc/p5-XML-XBEL/pkg-plist
@@ -12,6 +12,6 @@
%%SITE_PERL%%/XML/XBEL/url.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XBEL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XBEL
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
@dirrm %%SITE_PERL%%/XML/XBEL
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XPath/pkg-plist b/textproc/p5-XML-XPath/pkg-plist
index 5b9376390dc3..39d3c1df23bd 100644
--- a/textproc/p5-XML-XPath/pkg-plist
+++ b/textproc/p5-XML-XPath/pkg-plist
@@ -23,6 +23,6 @@ bin/xpath
%%SITE_PERL%%/XML/XPath/Boolean.pm
%%SITE_PERL%%/XML/XPath.pm
@dirrm %%SITE_PERL%%/XML/XPath/Node
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/XPath 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath
+@dirrmtry %%SITE_PERL%%/XML/XPath
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XSH/pkg-plist b/textproc/p5-XML-XSH/pkg-plist
index 4488604f3ada..55e5a12f0ed2 100644
--- a/textproc/p5-XML-XSH/pkg-plist
+++ b/textproc/p5-XML-XSH/pkg-plist
@@ -12,9 +12,9 @@ bin/xsh
%%SITE_PERL%%/XML/XSH/LibXMLCompat.pm
%%SITE_PERL%%/XML/XSH/Parser.pm
@dirrm %%SITE_PERL%%/XML/XSH
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
%%SITE_PERL%%/Inline/XSH.pm
-@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Inline
diff --git a/textproc/p5-XML-XSLT/pkg-plist b/textproc/p5-XML-XSLT/pkg-plist
index 00e2539e44d9..8505bde5b2f2 100644
--- a/textproc/p5-XML-XSLT/pkg-plist
+++ b/textproc/p5-XML-XSLT/pkg-plist
@@ -2,5 +2,5 @@ bin/xslt-parser
%%SITE_PERL%%/XML/XSLT.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSLT/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSLT
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-XML-XUpdate-LibXML/pkg-plist b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
index 85568936a176..94e49e4c3a93 100644
--- a/textproc/p5-XML-XUpdate-LibXML/pkg-plist
+++ b/textproc/p5-XML-XUpdate-LibXML/pkg-plist
@@ -3,8 +3,8 @@ bin/xupdate
%%SITE_PERL%%/XML/XUpdate/LibXML.pm
%%SITE_PERL%%/XML/Normalize/LibXML.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/XUpdate 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Normalize 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
+@dirrmtry %%SITE_PERL%%/XML/XUpdate
+@dirrmtry %%SITE_PERL%%/XML/Normalize
+@dirrmtry %%SITE_PERL%%/XML
diff --git a/textproc/p5-YAML-Syck/pkg-plist b/textproc/p5-YAML-Syck/pkg-plist
index f40dc00bc31d..35157dd0077d 100644
--- a/textproc/p5-YAML-Syck/pkg-plist
+++ b/textproc/p5-YAML-Syck/pkg-plist
@@ -5,8 +5,8 @@
%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Syck.pm
%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader/Syck.pm
%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper/Syck.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/YAML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML
diff --git a/textproc/p5-YAML/pkg-plist b/textproc/p5-YAML/pkg-plist
index 5c4357ccad7c..fcb08d4384c0 100644
--- a/textproc/p5-YAML/pkg-plist
+++ b/textproc/p5-YAML/pkg-plist
@@ -12,8 +12,8 @@ bin/ysh
%%SITE_PERL%%/YAML/Node.pm
%%SITE_PERL%%/YAML/Tag.pm
%%SITE_PERL%%/YAML/Types.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/YAML/Dumper 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/YAML/Loader 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/YAML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML
+@dirrmtry %%SITE_PERL%%/YAML/Dumper
+@dirrmtry %%SITE_PERL%%/YAML/Loader
+@dirrmtry %%SITE_PERL%%/Test
+@dirrmtry %%SITE_PERL%%/YAML
diff --git a/textproc/p5-YAPE-HTML/pkg-plist b/textproc/p5-YAPE-HTML/pkg-plist
index 4ce85d9fec38..7d7bb7de8af6 100644
--- a/textproc/p5-YAPE-HTML/pkg-plist
+++ b/textproc/p5-YAPE-HTML/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/YAPE/HTML/Element.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/HTML/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/HTML
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
@dirrm %%SITE_PERL%%/YAPE/HTML
-@unexec rmdir %D/%%SITE_PERL%%/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/YAPE
@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
@unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true
diff --git a/textproc/p5-YAPE-Regex-Explain/pkg-plist b/textproc/p5-YAPE-Regex-Explain/pkg-plist
index 60cff8626a0f..c33eece8d906 100644
--- a/textproc/p5-YAPE-Regex-Explain/pkg-plist
+++ b/textproc/p5-YAPE-Regex-Explain/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/YAPE/Regex/Explain.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain
-@unexec rmdir %D/%%SITE_PERL%%/YAPE/Regex 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/YAPE/Regex
@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex 2>/dev/null || true
@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
@unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true
diff --git a/textproc/p5-YAPE-Regex/pkg-plist b/textproc/p5-YAPE-Regex/pkg-plist
index b26ee65fa7a9..a10e0b62383e 100644
--- a/textproc/p5-YAPE-Regex/pkg-plist
+++ b/textproc/p5-YAPE-Regex/pkg-plist
@@ -3,8 +3,8 @@
%%SITE_PERL%%/YAPE/Regex/Element.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE
@dirrm %%SITE_PERL%%/YAPE/Regex
-@unexec rmdir %D/%%SITE_PERL%%/YAPE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/YAPE
@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true
@unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true
diff --git a/textproc/p5-dTemplate/pkg-plist b/textproc/p5-dTemplate/pkg-plist
index a525be2b21aa..1f398b0b6464 100644
--- a/textproc/p5-dTemplate/pkg-plist
+++ b/textproc/p5-dTemplate/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/dTemplate.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate
diff --git a/textproc/p5-libxml/pkg-plist b/textproc/p5-libxml/pkg-plist
index d0b2d65d3708..b875dc67eef1 100644
--- a/textproc/p5-libxml/pkg-plist
+++ b/textproc/p5-libxml/pkg-plist
@@ -16,9 +16,9 @@
%%SITE_PERL%%/XML/Perl2SAX.pm
%%SITE_PERL%%/XML/SAX2Perl.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl
-@unexec rmdir %D/%%SITE_PERL%%/Data/Grove 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML/PatAct 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data/Grove
+@dirrmtry %%SITE_PERL%%/XML/Handler
+@dirrmtry %%SITE_PERL%%/XML/Parser
+@dirrmtry %%SITE_PERL%%/XML/PatAct
+@dirrmtry %%SITE_PERL%%/XML
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/textproc/p5-podlators/pkg-plist b/textproc/p5-podlators/pkg-plist
index 63a817c1e6f9..7bfaf495571b 100644
--- a/textproc/p5-podlators/pkg-plist
+++ b/textproc/p5-podlators/pkg-plist
@@ -7,6 +7,6 @@
%%SITE_PERL%%/Pod/Text/Color.pm
%%SITE_PERL%%/Pod/Text/Overstrike.pm
%%SITE_PERL%%/Pod/Text/Termcap.pm
-@unexec rmdir %D/%%SITE_PERL%%/Pod/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Pod/Text
+@dirrmtry %%SITE_PERL%%/Pod
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist
index 29f905d03b25..26f7ed0ebabf 100644
--- a/textproc/p5-xmltv/pkg-plist
+++ b/textproc/p5-xmltv/pkg-plist
@@ -83,5 +83,5 @@ bin/tv_to_text
@dirrm %%SITE_PERL%%/XMLTV/ProgressBar
@dirrm %%SITE_PERL%%/XMLTV/Ask
@dirrm %%SITE_PERL%%/XMLTV
-@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true
-@unexec rmdir %D/%%CGIDIR%% 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%
+@dirrmtry %%CGIDIR%%
diff --git a/textproc/print-n-times/pkg-plist b/textproc/print-n-times/pkg-plist
index 240647013cf8..11b2213f5049 100644
--- a/textproc/print-n-times/pkg-plist
+++ b/textproc/print-n-times/pkg-plist
@@ -1,3 +1,3 @@
share/xsl/string/print-n-times.xsl
-@unexec rmdir %D/share/xsl/string 2>/dev/null || true
-@unexec rmdir %D/share/xsl 2>/dev/null || true
+@dirrmtry share/xsl/string
+@dirrmtry share/xsl
diff --git a/textproc/py-tvgrab/pkg-plist b/textproc/py-tvgrab/pkg-plist
index 9a51cc79a3f4..03647531b7de 100644
--- a/textproc/py-tvgrab/pkg-plist
+++ b/textproc/py-tvgrab/pkg-plist
@@ -60,5 +60,5 @@
%%PYTHON_SITELIBDIR%%/tvgrab/xmltv.pyo
share/locale/pt_BR/LC_MESSAGES/pytvgrab.mo
@dirrm %%PYTHON_SITELIBDIR%%/tvgrab
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist
index 2c78fba98e1a..4129e958ba1c 100644
--- a/textproc/py-xml/pkg-plist
+++ b/textproc/py-xml/pkg-plist
@@ -1060,4 +1060,4 @@ bin/xmlproc_val
@dirrm %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/dom/de
@dirrm %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/dom
@dirrm %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%
diff --git a/textproc/py-xmltv/pkg-plist b/textproc/py-xmltv/pkg-plist
index 644befa2b12d..76c1d95a58be 100644
--- a/textproc/py-xmltv/pkg-plist
+++ b/textproc/py-xmltv/pkg-plist
@@ -1,5 +1,5 @@
%%PYTHON_SITELIBDIR%%/xmltv.py
%%PYTHON_SITELIBDIR%%/xmltv.pyc
%%PYTHON_SITELIBDIR%%/xmltv.pyo
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/textproc/resume-extensions/pkg-plist b/textproc/resume-extensions/pkg-plist
index f096681cd894..e6dcc1c5e6d7 100644
--- a/textproc/resume-extensions/pkg-plist
+++ b/textproc/resume-extensions/pkg-plist
@@ -8,4 +8,4 @@ share/xsl/resume-extensions/params.xsl
@dirrm share/xsl/resume-extensions/lib
@dirrm share/xsl/resume-extensions/format
@dirrm share/xsl/resume-extensions
-@unexec rmdir %D/share/xsl 2>/dev/null || true
+@dirrmtry share/xsl
diff --git a/textproc/resume/pkg-plist b/textproc/resume/pkg-plist
index 78b8101ab8aa..007f8f32c924 100644
--- a/textproc/resume/pkg-plist
+++ b/textproc/resume/pkg-plist
@@ -67,7 +67,7 @@ share/xsl/resume/params.xsl
@dirrm share/xsl/resume/format
@dirrm share/xsl/resume/country
@dirrm share/xsl/resume
-@unexec rmdir %D/share/xsl 2>/dev/null || true
+@dirrmtry share/xsl
%%JAVAJARDIR%%/xmlresume-filter.jar
%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/Makefile
diff --git a/textproc/romdict/pkg-plist b/textproc/romdict/pkg-plist
index ac2ede2d8908..4da2bd37aa97 100644
--- a/textproc/romdict/pkg-plist
+++ b/textproc/romdict/pkg-plist
@@ -1,3 +1,3 @@
lib/dictd/eng-rom.dict.dz
lib/dictd/eng-rom.index
-@unexec rmdir %D/lib/dictd 2>/dev/null || true
+@dirrmtry lib/dictd
diff --git a/textproc/ruby-html-fillinform/pkg-plist b/textproc/ruby-html-fillinform/pkg-plist
index 305f7d252276..68fe105bce5e 100644
--- a/textproc/ruby-html-fillinform/pkg-plist
+++ b/textproc/ruby-html-fillinform/pkg-plist
@@ -1,6 +1,6 @@
%%RUBY_SITELIBDIR%%/html/fillform.rb
%%RUBY_SITELIBDIR%%/html/fillinform.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/html 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/html
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo.cgi
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo.rhtml
%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
diff --git a/textproc/ruby-html-template/pkg-plist b/textproc/ruby-html-template/pkg-plist
index 9315fe262b31..9e2d1df1ab7b 100644
--- a/textproc/ruby-html-template/pkg-plist
+++ b/textproc/ruby-html-template/pkg-plist
@@ -1,5 +1,5 @@
%%RUBY_SITELIBDIR%%/html/template.rb
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/html 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/html
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cond.html
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cond.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/env.html
diff --git a/textproc/scim-input-pad/pkg-plist b/textproc/scim-input-pad/pkg-plist
index dc41f7a6da3e..5d04e36b1dc2 100644
--- a/textproc/scim-input-pad/pkg-plist
+++ b/textproc/scim-input-pad/pkg-plist
@@ -11,6 +11,6 @@ share/scim/input-pad/base.pad
share/scim/input-pad/chinese.pad
share/scim/input-pad/japanese.pad
share/scim/input-pad/keyboard.pad
-@unexec rmdir %D/lib/scim-1.0/Helper 2>/dev/null || true
-@unexec rmdir %D/lib 2>/dev/null || true
-@unexec rmdir %D/share/scim/input-pad 2>/dev/null || true
+@dirrmtry lib/scim-1.0/Helper
+@dirrmtry lib
+@dirrmtry share/scim/input-pad
diff --git a/textproc/scim-openvanilla/pkg-plist b/textproc/scim-openvanilla/pkg-plist
index d60f1f7eca68..666252e200d6 100644
--- a/textproc/scim-openvanilla/pkg-plist
+++ b/textproc/scim-openvanilla/pkg-plist
@@ -1,4 +1,4 @@
lib/scim-1.0/IMEngine/OVLoader-SCIM.a
lib/scim-1.0/IMEngine/OVLoader-SCIM.la
lib/scim-1.0/IMEngine/OVLoader-SCIM.so
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist
index bdfb7463866d..5711d78a0204 100644
--- a/textproc/scim-table-imengine/pkg-plist
+++ b/textproc/scim-table-imengine/pkg-plist
@@ -27,5 +27,5 @@ share/locale/it/LC_MESSAGES/scim-tables.mo
%%SKIM%%@unexec rmdir %D/share/config.kcfg 2>/dev/null || true
%%SKIM%%@unexec rmdir %D/share/services/skimconfiguredialog 2>/dev/null || true
%%SKIM%%@cwd %%X11BASE%%
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index 6f88e6143b5e..c843bf6eeecc 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -110,7 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
@dirrm include/scim-1.0/x11
@dirrm include/scim-1.0/gtk
@dirrm include/scim-1.0
-@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true
+@dirrmtry lib/gtk-2.0/immodules
@dirrm lib/scim-1.0/1.4.0/Config
@dirrm lib/scim-1.0/1.4.0/Filter
@dirrm lib/scim-1.0/1.4.0/FrontEnd
diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist
index 6a8f15e0459e..975589db3a6a 100644
--- a/textproc/sdf/pkg-plist
+++ b/textproc/sdf/pkg-plist
@@ -651,5 +651,5 @@ share/doc/sdf/website
@dirrm %%SITE_PERL%%/sdf/home/images
@dirrm %%SITE_PERL%%/sdf/home
@dirrm %%SITE_PERL%%/sdf
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF
+@dirrmtry %%SITE_PERL%%/Pod
diff --git a/textproc/sgmltools-lite/pkg-plist b/textproc/sgmltools-lite/pkg-plist
index b2e9b8e6e926..901e495d47c1 100644
--- a/textproc/sgmltools-lite/pkg-plist
+++ b/textproc/sgmltools-lite/pkg-plist
@@ -40,6 +40,6 @@ share/sgml/misc/sgmltools/VERSION
@dirrm share/sgml/misc/sgmltools/python
@dirrm share/sgml/misc/sgmltools
@dirrm etc/sgml/catalog.d
-@unexec rmdir %D/etc/sgml 2>/dev/null || true
-@unexec rmdir %D/share/sgml/dtd 2>/dev/null || true
-@unexec rmdir %D/share/sgml/misc 2>/dev/null || true
+@dirrmtry etc/sgml
+@dirrmtry share/sgml/dtd
+@dirrmtry share/sgml/misc
diff --git a/textproc/smartdoc-devel/pkg-plist b/textproc/smartdoc-devel/pkg-plist
index 7ee3158bf8e8..8d25a980a618 100644
--- a/textproc/smartdoc-devel/pkg-plist
+++ b/textproc/smartdoc-devel/pkg-plist
@@ -18,4 +18,4 @@ share/xml/smartdoc/catalog
@dirrm %%EXAMPLESDIR%%/pure
@dirrm %%EXAMPLESDIR%%/html4
@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
diff --git a/textproc/smartdoc/pkg-plist b/textproc/smartdoc/pkg-plist
index 1b51618dbc73..c7d2111a7939 100644
--- a/textproc/smartdoc/pkg-plist
+++ b/textproc/smartdoc/pkg-plist
@@ -14,8 +14,8 @@ share/emacs/site-lisp/sdoc-mode.el
share/xml/catalog
share/xml/smartdoc/PureSmartDoc.dtd
share/xml/smartdoc/catalog
-@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
+@dirrmtry lib/xemacs/site-lisp
+@dirrmtry lib/xemacs
@dirrm share/xml/smartdoc
@dirrm %%EXAMPLESDIR%%/pure
@dirrm %%EXAMPLESDIR%%/html4
diff --git a/textproc/tei-guidelines-p3/pkg-plist b/textproc/tei-guidelines-p3/pkg-plist
index 4e804caca236..0179eb505451 100644
--- a/textproc/tei-guidelines-p3/pkg-plist
+++ b/textproc/tei-guidelines-p3/pkg-plist
@@ -726,4 +726,4 @@
%%PDF%%@dirrm share/doc/tei/p3/pdf
%%P3X%%@dirrm share/doc/tei/p3/p3x
@dirrm share/doc/tei/p3
-@unexec rmdir %D/share/doc/tei 2> /dev/null || true
+@dirrmtry share/doc/tei
diff --git a/textproc/tei-guidelines-p4/pkg-plist b/textproc/tei-guidelines-p4/pkg-plist
index 680e22af19b9..45f48f981132 100644
--- a/textproc/tei-guidelines-p4/pkg-plist
+++ b/textproc/tei-guidelines-p4/pkg-plist
@@ -743,4 +743,4 @@
@dirrm %%DOCSDIR%%/DTD
@dirrm %%DOCSDIR%%/Figures
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/doc/tei/ 2>/dev/null || true
+@dirrmtry share/doc/tei/
diff --git a/textproc/tei-lite/pkg-plist b/textproc/tei-lite/pkg-plist
index a48f39e84f16..d29f59638994 100644
--- a/textproc/tei-lite/pkg-plist
+++ b/textproc/tei-lite/pkg-plist
@@ -4,4 +4,4 @@ share/sgml/tei/lite/teilite.tag
share/sgml/tei/lite/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
@dirrm share/sgml/tei/lite
-@unexec rmdir %D/share/sgml/tei 2>/dev/null || true
+@dirrmtry share/sgml/tei
diff --git a/textproc/tei-p3/pkg-plist b/textproc/tei-p3/pkg-plist
index 4b61ae2aa245..f678994e2ab3 100644
--- a/textproc/tei-p3/pkg-plist
+++ b/textproc/tei-p3/pkg-plist
@@ -49,4 +49,4 @@ share/sgml/tei/p3/teivers2.ent
share/sgml/tei/p3/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
@dirrm share/sgml/tei/p3
-@unexec rmdir %D/share/sgml/tei 2>/dev/null || true
+@dirrmtry share/sgml/tei
diff --git a/textproc/tei-p4/pkg-plist b/textproc/tei-p4/pkg-plist
index 779f44c0b349..9513c1df6c1e 100644
--- a/textproc/tei-p4/pkg-plist
+++ b/textproc/tei-p4/pkg-plist
@@ -55,4 +55,4 @@ share/sgml/tei/p4/teilite.dec
share/sgml/tei/p4/catalog
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
@dirrm share/sgml/tei/p4/
-@unexec rmdir %D/share/sgml/tei 2>/dev/null || true
+@dirrmtry share/sgml/tei
diff --git a/textproc/txt2html/pkg-plist b/textproc/txt2html/pkg-plist
index 13fc957da52b..478f6cdfc48d 100644
--- a/textproc/txt2html/pkg-plist
+++ b/textproc/txt2html/pkg-plist
@@ -1,3 +1,3 @@
bin/txt2html
%%SITE_PERL%%/HTML/TextToHTML.pm
-@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/HTML
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index fc023a235fd8..9a1025058df9 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -129,7 +129,7 @@ share/locale/ko/LC_MESSAGES/uim.mo
@dirrm include/uim
@dirrm lib/uim/plugin
@dirrm lib/uim
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
%%GNOME%%@dirrm %%DATADIR%%/helperdata
%%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/textproc/xhtml-11/pkg-plist b/textproc/xhtml-11/pkg-plist
index 4762fdd9e1c2..6790561eaae4 100644
--- a/textproc/xhtml-11/pkg-plist
+++ b/textproc/xhtml-11/pkg-plist
@@ -8,4 +8,4 @@ share/xml/xhtml/1.1/xhtml11.dtd
share/xml/xhtml/1.1/xml1.dcl
share/xml/xhtml/1.1/xml1n.dcl
@dirrm share/xml/xhtml/1.1
-@unexec rmdir %D/share/xml/xhtml 2>/dev/null || true
+@dirrmtry share/xml/xhtml
diff --git a/textproc/xhtml/pkg-plist b/textproc/xhtml/pkg-plist
index 879764ad7541..146f74bca152 100644
--- a/textproc/xhtml/pkg-plist
+++ b/textproc/xhtml/pkg-plist
@@ -13,4 +13,4 @@ share/xml/dtd/xhtml/xhtml1-strict.dtd
share/xml/dtd/xhtml/xhtml1-transitional.dtd
share/xml/dtd/xhtml/xhtml1.dcl
@dirrm share/xml/dtd/xhtml
-@unexec rmdir %D/share/xml/dtd 2>/dev/null || true
+@dirrmtry share/xml/dtd
diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist
index c56e216a1c74..cbf89be9750b 100644
--- a/textproc/xmlroff/pkg-plist
+++ b/textproc/xmlroff/pkg-plist
@@ -358,7 +358,7 @@ share/xml/libfo-0.3.3/catalog.xml
share/xml/libfo-0.3.3/libfo-compat.xsl
share/xml/libfo-0.3.3/xmlroff.fo
@dirrm share/xml/libfo-0.3.3
-@unexec rmdir %D/share/xml 2>/dev/null || true
+@dirrmtry share/xml
@dirrm %%DOCSDIR%%
@dirrm include/libfo-0.3/util
@dirrm include/libfo-0.3/property