summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/atk/pkg-plist24
-rw-r--r--accessibility/dasher/pkg-plist4
-rw-r--r--accessibility/gail/pkg-plist8
-rw-r--r--accessibility/gnome-mag/pkg-plist8
-rw-r--r--accessibility/gnomemag/pkg-plist8
-rw-r--r--accessibility/gok/pkg-plist4
-rw-r--r--astro/p5-Astro-MoonPhase/pkg-plist4
-rw-r--r--astro/p5-Astro-Sunrise/pkg-plist4
-rw-r--r--astro/p5-GPS/pkg-plist6
-rw-r--r--astro/p5-Geo-METAR/pkg-plist4
-rw-r--r--astro/starplot/pkg-plist12
-rw-r--r--biology/ncbi-toolkit/pkg-plist2
-rw-r--r--biology/p5-Bio-ASN1-EntrezGene/pkg-plist12
-rw-r--r--biology/p5-bioperl-devel/pkg-plist4
-rw-r--r--biology/t_coffee/pkg-plist6
-rw-r--r--cad/geda-gschem/pkg-plist24
-rw-r--r--cad/geda-netlist/pkg-plist6
-rw-r--r--cad/geda-symcheck/pkg-plist2
-rw-r--r--cad/geda-utils/pkg-plist2
-rw-r--r--cad/gnetlist/pkg-plist6
-rw-r--r--cad/gschem/pkg-plist24
-rw-r--r--cad/gwave/pkg-plist2
-rw-r--r--cad/systemc/pkg-plist10
-rw-r--r--chinese/CJK/pkg-plist2
-rw-r--r--chinese/auto-tw-l10n/pkg-plist2
-rw-r--r--chinese/firebird/pkg-plist2
-rw-r--r--chinese/iiimf-le-chewing/pkg-plist4
-rw-r--r--chinese/iiimf-le-xcin/pkg-plist8
-rw-r--r--chinese/lunar/pkg-plist2
-rw-r--r--chinese/msttf/pkg-plist4
-rw-r--r--chinese/p5-Encode-HanConvert/pkg-plist2
-rw-r--r--chinese/p5-Encode-HanExtra/pkg-plist4
-rw-r--r--chinese/p5-Lingua-ZH-TaBE/pkg-plist6
-rw-r--r--chinese/p5-Lingua-ZH-Toke/pkg-plist8
-rw-r--r--chinese/pcmanx/pkg-plist6
-rw-r--r--chinese/phpbb-tw/pkg-plist18
-rw-r--r--chinese/scim-pinyin/pkg-plist4
-rw-r--r--chinese/scim-tables/pkg-plist2
-rw-r--r--chinese/stardict-dict-zh_CN/pkg-plist2
-rw-r--r--chinese/stardict2-dict-zh_CN/pkg-plist2
-rw-r--r--chinese/stardict2-dict-zh_TW/pkg-plist2
-rw-r--r--chinese/xpdf/pkg-plist2
-rw-r--r--comms/cutecom/pkg-plist4
-rw-r--r--comms/efax-gtk/pkg-plist2
-rw-r--r--comms/gscmxx/pkg-plist2
-rw-r--r--comms/kallers/pkg-plist20
-rw-r--r--comms/klog/pkg-plist12
-rw-r--r--comms/libticables/pkg-plist2
-rw-r--r--comms/mgetty+sendfax/pkg-plist2
-rw-r--r--comms/minicom/pkg-plist2
-rw-r--r--comms/p5-Device-Modem/pkg-plist4
-rw-r--r--comms/p5-Device-SerialPort/pkg-plist6
-rw-r--r--comms/p5-Fax-Hylafax-Client/pkg-plist10
-rw-r--r--comms/scmxx/pkg-plist16
-rw-r--r--comms/xlog/pkg-plist14
-rw-r--r--comms/yaps/pkg-plist2
-rw-r--r--converters/konwert/pkg-plist4
-rw-r--r--converters/ktextdecode/pkg-plist4
-rw-r--r--converters/p5-Convert-ASCII-Armour/pkg-plist10
-rw-r--r--converters/p5-Convert-ASN1/pkg-plist4
-rw-r--r--converters/p5-Convert-BER/pkg-plist4
-rw-r--r--converters/p5-Convert-BinHex/pkg-plist6
-rw-r--r--converters/p5-Convert-Binary-C/pkg-plist8
-rw-r--r--converters/p5-Convert-IBM390/pkg-plist4
-rw-r--r--converters/p5-Convert-UUlib/pkg-plist4
-rw-r--r--converters/p5-Cstools/pkg-plist4
-rw-r--r--converters/p5-JSON/pkg-plist2
-rw-r--r--converters/p5-JSON1/pkg-plist2
-rw-r--r--converters/p5-MIME-Base32/pkg-plist4
-rw-r--r--converters/p5-MIME-Base64/pkg-plist4
-rw-r--r--converters/p5-Text-Iconv/pkg-plist4
-rw-r--r--converters/p5-Text-Unidecode/pkg-plist8
-rw-r--r--converters/p5-Unicode-RecursiveDowngrade/pkg-plist4
-rw-r--r--converters/p5-Unicode-String/pkg-plist4
-rw-r--r--converters/p5-Unicode-UTF8simple/pkg-plist4
-rw-r--r--databases/firebird-devel/pkg-plist2
-rw-r--r--databases/firebird-server/pkg-plist4
-rw-r--r--databases/firebird2-server/pkg-plist4
-rw-r--r--databases/firebird20-server/pkg-plist4
-rw-r--r--databases/gnats4/pkg-plist2
-rw-r--r--databases/ip4r/pkg-plist4
-rw-r--r--databases/ksqlanalyzer/pkg-plist16
-rw-r--r--databases/ksqlshell/pkg-plist28
-rw-r--r--databases/libdbi-drivers/pkg-plist4
-rw-r--r--databases/libgda2/pkg-plist4
-rw-r--r--databases/libgda3/pkg-plist4
-rw-r--r--databases/libgnomedb/pkg-plist4
-rw-r--r--databases/linux-oracle-instantclient-basic/pkg-plist4
-rw-r--r--databases/linux-oracle-instantclient-sdk/pkg-plist4
-rw-r--r--databases/linux-oracle-instantclient-sqlplus/pkg-plist2
-rw-r--r--databases/mergeant/pkg-plist4
-rw-r--r--databases/mysql-administrator/pkg-plist2
-rw-r--r--databases/mysql323-server/pkg-plist2
-rw-r--r--databases/mysql40-server/pkg-plist2
-rw-r--r--databases/mysql41-server/pkg-plist4
-rw-r--r--databases/mysql50-server/pkg-plist6
-rw-r--r--databases/mysql51-server/pkg-plist6
-rw-r--r--databases/mysql54-server/pkg-plist6
-rw-r--r--databases/mysql55-server/pkg-plist6
-rw-r--r--databases/mysql60-server/pkg-plist6
-rw-r--r--databases/mytop/pkg-plist2
-rw-r--r--databases/p5-AsciiDB-TagFile/pkg-plist4
-rw-r--r--databases/p5-Cache-Memcached-Managed/pkg-plist12
-rw-r--r--databases/p5-Cache-Memcached/pkg-plist4
-rw-r--r--databases/p5-Class-DBI-AbstractSearch/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-AsForm/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-AutoLoader/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-BaseDSN/pkg-plist4
-rw-r--r--databases/p5-Class-DBI-DATA-Schema/pkg-plist12
-rw-r--r--databases/p5-Class-DBI-DDL/pkg-plist4
-rw-r--r--databases/p5-Class-DBI-FromCGI/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Loader-Relationship/pkg-plist12
-rw-r--r--databases/p5-Class-DBI-Loader/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Oracle/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Pager/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Pg/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist12
-rw-r--r--databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist12
-rw-r--r--databases/p5-Class-DBI-Plugin-Type/pkg-plist12
-rw-r--r--databases/p5-Class-DBI-Plugin/pkg-plist10
-rw-r--r--databases/p5-Class-DBI-Replication/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-SAK/pkg-plist4
-rw-r--r--databases/p5-Class-DBI-SQLite/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Sweet/pkg-plist6
-rw-r--r--databases/p5-Class-DBI-ToSax/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-Untaint/pkg-plist8
-rw-r--r--databases/p5-Class-DBI-mysql/pkg-plist8
-rw-r--r--databases/p5-Class-DBI/pkg-plist18
-rw-r--r--databases/p5-DBD-CSV/pkg-plist6
-rw-r--r--databases/p5-DBD-InterBase/pkg-plist4
-rw-r--r--databases/p5-DBD-LDAP/pkg-plist4
-rw-r--r--databases/p5-DBD-Mock/pkg-plist4
-rw-r--r--databases/p5-DBD-ODBC/pkg-plist4
-rw-r--r--databases/p5-DBD-Oracle/pkg-plist4
-rw-r--r--databases/p5-DBD-Pg-13/pkg-plist4
-rw-r--r--databases/p5-DBD-Pg/pkg-plist4
-rw-r--r--databases/p5-DBD-PgPP/pkg-plist4
-rw-r--r--databases/p5-DBD-PgSPI/pkg-plist4
-rw-r--r--databases/p5-DBD-SQLite/pkg-plist6
-rw-r--r--databases/p5-DBD-SQLite2/pkg-plist6
-rw-r--r--databases/p5-DBD-XBase/pkg-plist2
-rw-r--r--databases/p5-DBD-mysql/pkg-plist8
-rw-r--r--databases/p5-DBI-Shell/pkg-plist10
-rw-r--r--databases/p5-DBI/pkg-plist6
-rw-r--r--databases/p5-DBIx-Abstract/pkg-plist8
-rw-r--r--databases/p5-DBIx-Browse/pkg-plist4
-rw-r--r--databases/p5-DBIx-Class-Loader/pkg-plist12
-rw-r--r--databases/p5-DBIx-Class/pkg-plist22
-rw-r--r--databases/p5-DBIx-ContextualFetch/pkg-plist4
-rw-r--r--databases/p5-DBIx-DBSchema/pkg-plist4
-rw-r--r--databases/p5-DBIx-DataSource/pkg-plist4
-rw-r--r--databases/p5-DBIx-Ease/pkg-plist4
-rw-r--r--databases/p5-DBIx-Recordset/pkg-plist4
-rw-r--r--databases/p5-DBIx-SearchBuilder/pkg-plist6
-rw-r--r--databases/p5-DBIx-Sequence/pkg-plist8
-rw-r--r--databases/p5-DBIx-Simple/pkg-plist4
-rw-r--r--databases/p5-DBIx-TableHash/pkg-plist4
-rw-r--r--databases/p5-DBIx-Tree/pkg-plist6
-rw-r--r--databases/p5-DBIx-XHTML_Table/pkg-plist4
-rw-r--r--databases/p5-DBM-Deep/pkg-plist4
-rw-r--r--databases/p5-Data-Page/pkg-plist2
-rw-r--r--databases/p5-Exception-Class-DBI/pkg-plist4
-rw-r--r--databases/p5-GraphViz-DBI/pkg-plist2
-rw-r--r--databases/p5-Ima-DBI/pkg-plist4
-rw-r--r--databases/p5-Jifty-DBI/pkg-plist16
-rw-r--r--databases/p5-MLDBM-Sync/pkg-plist4
-rw-r--r--databases/p5-MySQL-Diff/pkg-plist4
-rw-r--r--databases/p5-Mysql-Diff/pkg-plist4
-rw-r--r--databases/p5-Mysql/pkg-plist4
-rw-r--r--databases/p5-POE-Component-DBIAgent/pkg-plist8
-rw-r--r--databases/p5-POE-Component-EasyDBI/pkg-plist8
-rw-r--r--databases/p5-POE-Component-LaDBI/pkg-plist8
-rw-r--r--databases/p5-ResourcePool-Resource-DBI/pkg-plist6
-rw-r--r--databases/p5-SQL-Abstract-Limit/pkg-plist4
-rw-r--r--databases/p5-SQL-Abstract/pkg-plist4
-rw-r--r--databases/p5-SQL-Statement/pkg-plist8
-rw-r--r--databases/p5-SQL-Translator/pkg-plist4
-rw-r--r--databases/p5-SQLite-Work/pkg-plist4
-rw-r--r--databases/p5-Search-InvertedIndex/pkg-plist12
-rw-r--r--databases/p5-Search-Namazu/pkg-plist4
-rw-r--r--databases/p5-Text-Query-SQL/pkg-plist8
-rw-r--r--databases/p5-Time-Piece-MySQL/pkg-plist4
-rw-r--r--databases/p5-sqlrelay/pkg-plist4
-rw-r--r--databases/percona55-server/pkg-plist6
-rw-r--r--databases/pgaccess/pkg-plist2
-rw-r--r--databases/pgworksheet/pkg-plist16
-rw-r--r--databases/postgis/pkg-plist8
-rw-r--r--databases/postgresql-jdbc/pkg-plist2
-rw-r--r--databases/postgresql-libpgeasy/pkg-plist4
-rw-r--r--databases/py-dbutils/pkg-plist8
-rw-r--r--deskutils/alacarte/pkg-plist2
-rw-r--r--deskutils/basket/pkg-plist50
-rw-r--r--deskutils/buoh/pkg-plist2
-rw-r--r--deskutils/cycle/pkg-plist16
-rw-r--r--deskutils/deskbar-applet/pkg-plist4
-rw-r--r--deskutils/dragstack/pkg-plist14
-rw-r--r--deskutils/egroupware/pkg-plist6
-rw-r--r--deskutils/evolution-jescs/pkg-plist4
-rw-r--r--deskutils/gnome-blog/pkg-plist4
-rw-r--r--deskutils/gnome-pim/pkg-plist12
-rw-r--r--deskutils/gnomeblog/pkg-plist4
-rw-r--r--deskutils/gnomepim/pkg-plist12
-rw-r--r--deskutils/horde-kronolith/pkg-plist4
-rw-r--r--deskutils/horde-mnemo/pkg-plist4
-rw-r--r--deskutils/horde-nag/pkg-plist4
-rw-r--r--deskutils/horde4-kronolith/pkg-plist4
-rw-r--r--deskutils/horde4-mnemo/pkg-plist4
-rw-r--r--deskutils/horde4-nag/pkg-plist4
-rw-r--r--deskutils/kblticker/pkg-plist8
-rw-r--r--deskutils/kickpim/pkg-plist32
-rw-r--r--deskutils/klipoquery/pkg-plist12
-rw-r--r--deskutils/krefty/pkg-plist26
-rw-r--r--deskutils/kronolith/pkg-plist4
-rw-r--r--deskutils/ktagebuch/pkg-plist24
-rw-r--r--deskutils/kuake/pkg-plist22
-rw-r--r--deskutils/logjam/pkg-plist12
-rw-r--r--deskutils/mcatalog/pkg-plist4
-rw-r--r--deskutils/metabar/pkg-plist20
-rw-r--r--deskutils/mnemo/pkg-plist4
-rw-r--r--deskutils/multisync-backup/pkg-plist2
-rw-r--r--deskutils/multisync-syncml/pkg-plist2
-rw-r--r--deskutils/nag/pkg-plist4
-rw-r--r--deskutils/nautilus-actions/pkg-plist6
-rw-r--r--deskutils/nautilus-open-terminal/pkg-plist4
-rw-r--r--deskutils/p5-Data-ICal/pkg-plist12
-rw-r--r--deskutils/plans/pkg-plist6
-rw-r--r--deskutils/pypanel/pkg-plist4
-rw-r--r--deskutils/rox-memo/pkg-plist2
-rw-r--r--deskutils/sugarcrm/pkg-plist4
-rw-r--r--deskutils/tomboy/pkg-plist4
-rw-r--r--deskutils/xcalendar/pkg-plist4
-rw-r--r--deskutils/xfce4-calendar/pkg-plist2
-rw-r--r--deskutils/xfce4-notes-plugin/pkg-plist8
-rw-r--r--deskutils/xfce4-xkb-plugin/pkg-plist6
-rw-r--r--deskutils/xpad/pkg-plist2
-rw-r--r--print/latex-cjk/pkg-plist2
236 files changed, 787 insertions, 787 deletions
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index 88bec4c1e7af..9664e6c246c1 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -110,17 +110,17 @@ share/locale/zh_CN/LC_MESSAGES/atk10.mo
share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrm %%DOCSDIR%%
@exec mkdir -p %D/%%DOCSDIR%%
-@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/as 2> /dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gl 2> /dev/null || true
-@unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/li 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/mr 2> /dev/null || true
-@unexec rmdir %D/share/locale/tk/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/tk 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/li/LC_MESSAGES
+@dirrmtry share/locale/li
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist
index 1f6aa03b3f04..baf14dc3aa72 100644
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@@ -250,8 +250,8 @@ share/locale/ug/LC_MESSAGES/dasher.mo
share/locale/uk/LC_MESSAGES/dasher.mo
share/locale/zh_CN/LC_MESSAGES/dasher.mo
share/locale/zh_TW/LC_MESSAGES/dasher.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrm share/gnome/omf/dasher
@dirrm share/gnome/help/dasher/eu/figures
@dirrm share/gnome/help/dasher/eu
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 5d46f0d5be4e..55bca627a18d 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -84,7 +84,7 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
@dirrm include/gail-1.0/libgail-util
@dirrm include/gail-1.0
@dirrm share/doc/gail-libgail-util
-@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ku 2> /dev/null || true
-@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/as 2> /dev/null || true
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index f08199c13582..a617b34619ac 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -94,10 +94,10 @@ share/locale/uk/LC_MESSAGES/gnome-mag.mo
share/locale/vi/LC_MESSAGES/gnome-mag.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
@dirrm share/gnome/idl/gnome-mag-1.0
@dirrm share/gnome/gnome-mag/1_32
@dirrm share/gnome/gnome-mag
diff --git a/accessibility/gnomemag/pkg-plist b/accessibility/gnomemag/pkg-plist
index f08199c13582..a617b34619ac 100644
--- a/accessibility/gnomemag/pkg-plist
+++ b/accessibility/gnomemag/pkg-plist
@@ -94,10 +94,10 @@ share/locale/uk/LC_MESSAGES/gnome-mag.mo
share/locale/vi/LC_MESSAGES/gnome-mag.mo
share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
-@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
@dirrm share/gnome/idl/gnome-mag-1.0
@dirrm share/gnome/gnome-mag/1_32
@dirrm share/gnome/gnome-mag
diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist
index 0194363683d6..a460e052dfd2 100644
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@@ -624,8 +624,8 @@ share/locale/uk/LC_MESSAGES/gok.mo
share/locale/vi/LC_MESSAGES/gok.mo
share/locale/zh_CN/LC_MESSAGES/gok.mo
share/locale/zh_TW/LC_MESSAGES/gok.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/omf/gok
@dirrm share/gnome/help/gok/C
@dirrm share/gnome/help/gok
diff --git a/astro/p5-Astro-MoonPhase/pkg-plist b/astro/p5-Astro-MoonPhase/pkg-plist
index 29b4210e6bd1..1edc04910346 100644
--- a/astro/p5-Astro-MoonPhase/pkg-plist
+++ b/astro/p5-Astro-MoonPhase/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Astro/MoonPhase.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/MoonPhase
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-Astro-Sunrise/pkg-plist b/astro/p5-Astro-Sunrise/pkg-plist
index 86532a053696..e0c8cad8f615 100644
--- a/astro/p5-Astro-Sunrise/pkg-plist
+++ b/astro/p5-Astro-Sunrise/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise/.packlist
%%SITE_PERL%%/Astro/Sunrise.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/Sunrise
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
+@dirrmtry %%SITE_PERL%%/Astro
diff --git a/astro/p5-GPS/pkg-plist b/astro/p5-GPS/pkg-plist
index 515cdec0f0cd..42e72e1454ac 100644
--- a/astro/p5-GPS/pkg-plist
+++ b/astro/p5-GPS/pkg-plist
@@ -11,6 +11,6 @@
@dirrm %%SITE_PERL%%/auto/GPS/Garmin
@dirrm %%SITE_PERL%%/auto/GPS/Serial
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS/Garmin
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/GPS 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/GPS 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GPS
+@dirrmtry %%SITE_PERL%%/GPS
+@dirrmtry %%SITE_PERL%%/auto/GPS
diff --git a/astro/p5-Geo-METAR/pkg-plist b/astro/p5-Geo-METAR/pkg-plist
index 711bdd4759e8..81491926dc8a 100644
--- a/astro/p5-Geo-METAR/pkg-plist
+++ b/astro/p5-Geo-METAR/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Geo/METAR.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/METAR
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
+@dirrmtry %%SITE_PERL%%/Geo
diff --git a/astro/starplot/pkg-plist b/astro/starplot/pkg-plist
index 17a86dc31e26..7acb105be2d6 100644
--- a/astro/starplot/pkg-plist
+++ b/astro/starplot/pkg-plist
@@ -19,9 +19,9 @@ share/starplot/test.stars
@dirrm %%DOCSDIR%%/html/images
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/locale/en@boldquot/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en@boldquot 2> /dev/null || true
-@unexec rmdir %D/share/locale/en@quot/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en@quot 2> /dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/es 2> /dev/null || true
+@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+@dirrmtry share/locale/en@boldquot
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/en@quot
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
diff --git a/biology/ncbi-toolkit/pkg-plist b/biology/ncbi-toolkit/pkg-plist
index 65243b4295eb..47e298485a59 100644
--- a/biology/ncbi-toolkit/pkg-plist
+++ b/biology/ncbi-toolkit/pkg-plist
@@ -759,4 +759,4 @@ lib/ncbi/libvibrant.a
%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
%%PORTDOCS%%@dirrm %%DOCSDIR%%/seq_install
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/biology/p5-Bio-ASN1-EntrezGene/pkg-plist b/biology/p5-Bio-ASN1-EntrezGene/pkg-plist
index c69aaacde5d6..95fce70b67b5 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/pkg-plist
+++ b/biology/p5-Bio-ASN1-EntrezGene/pkg-plist
@@ -4,9 +4,9 @@
%%SITE_PERL%%/Bio/ASN1/Sequence/Indexer.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/ASN1/EntrezGene/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/ASN1/EntrezGene
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/ASN1 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bio/ASN1/EntrezGene 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bio/ASN1/Sequence 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bio/ASN1 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bio 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio/ASN1
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio
+@dirrmtry %%SITE_PERL%%/Bio/ASN1/EntrezGene
+@dirrmtry %%SITE_PERL%%/Bio/ASN1/Sequence
+@dirrmtry %%SITE_PERL%%/Bio/ASN1
+@dirrmtry %%SITE_PERL%%/Bio
diff --git a/biology/p5-bioperl-devel/pkg-plist b/biology/p5-bioperl-devel/pkg-plist
index 6643135c2a62..7079b9e6f069 100644
--- a/biology/p5-bioperl-devel/pkg-plist
+++ b/biology/p5-bioperl-devel/pkg-plist
@@ -1456,7 +1456,7 @@ bin/bp_unflatten_seq.pl
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%/models
@dirrm %%DATADIR%%
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bio
@dirrm %%SITE_PERL%%/Bio/Variation/IO
@dirrm %%SITE_PERL%%/Bio/Variation
@dirrm %%SITE_PERL%%/Bio/TreeIO
@@ -1568,4 +1568,4 @@ bin/bp_unflatten_seq.pl
@dirrm %%SITE_PERL%%/Bio/Annotation
@dirrm %%SITE_PERL%%/Bio/AlignIO
@dirrm %%SITE_PERL%%/Bio/Align
-@unexec rmdir %D/%%SITE_PERL%%/Bio 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bio
diff --git a/biology/t_coffee/pkg-plist b/biology/t_coffee/pkg-plist
index a60991b5f435..0f08b4e45ba9 100644
--- a/biology/t_coffee/pkg-plist
+++ b/biology/t_coffee/pkg-plist
@@ -51,7 +51,7 @@ bin/t_coffee
%%DATADIR%%/license.txt
%%DATADIR%%/html/t_coffee.html
%%DATADIR%%/html/t_coffee4html.cgi
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
+@dirrmtry %%EXAMPLESDIR%%
@dirrm %%DATADIR%%/html
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/cad/geda-gschem/pkg-plist b/cad/geda-gschem/pkg-plist
index 17420ca23f13..eb3ceb0522f0 100644
--- a/cad/geda-gschem/pkg-plist
+++ b/cad/geda-gschem/pkg-plist
@@ -34,16 +34,16 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
@dirrm share/gEDA/bitmap
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
diff --git a/cad/geda-netlist/pkg-plist b/cad/geda-netlist/pkg-plist
index 6405c6ee6f8f..fece6401e9f1 100644
--- a/cad/geda-netlist/pkg-plist
+++ b/cad/geda-netlist/pkg-plist
@@ -46,6 +46,6 @@ share/gEDA/scheme/gnet-cascade.scm
share/gEDA/scheme/gnet-redac.scm
share/gEDA/scheme/gnet-systemc.scm
share/gEDA/scheme/gnet-eagle.scm
-@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/readmes
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
diff --git a/cad/geda-symcheck/pkg-plist b/cad/geda-symcheck/pkg-plist
index 8dce2be362e9..59da26b9ea8c 100644
--- a/cad/geda-symcheck/pkg-plist
+++ b/cad/geda-symcheck/pkg-plist
@@ -1,4 +1,4 @@
bin/gsymcheck
share/doc/geda-doc/man/gsymcheck.html
share/gEDA/system-gsymcheckrc
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/man
diff --git a/cad/geda-utils/pkg-plist b/cad/geda-utils/pkg-plist
index 674da1e9471a..355a2c856ef6 100644
--- a/cad/geda-utils/pkg-plist
+++ b/cad/geda-utils/pkg-plist
@@ -18,4 +18,4 @@ share/doc/geda-doc/readmes/README.gsch2pcb
share/doc/geda-doc/readmes/README.olib
share/doc/geda-doc/readmes/README.tragesym
share/gEDA/system-gschlasrc
-@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/readmes
diff --git a/cad/gnetlist/pkg-plist b/cad/gnetlist/pkg-plist
index 6405c6ee6f8f..fece6401e9f1 100644
--- a/cad/gnetlist/pkg-plist
+++ b/cad/gnetlist/pkg-plist
@@ -46,6 +46,6 @@ share/gEDA/scheme/gnet-cascade.scm
share/gEDA/scheme/gnet-redac.scm
share/gEDA/scheme/gnet-systemc.scm
share/gEDA/scheme/gnet-eagle.scm
-@unexec rmdir %D/share/doc/geda-doc/readmes 2>/dev/null || true
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/readmes
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
diff --git a/cad/gschem/pkg-plist b/cad/gschem/pkg-plist
index 17420ca23f13..eb3ceb0522f0 100644
--- a/cad/gschem/pkg-plist
+++ b/cad/gschem/pkg-plist
@@ -34,16 +34,16 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
share/locale/es_ES/LC_MESSAGES/geda-gschem.mo
share/locale/it_IT/LC_MESSAGES/geda-gschem.mo
share/locale/fr_FR/LC_MESSAGES/geda-gschem.mo
-@unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
+@dirrmtry share/doc/geda-doc/man
+@dirrmtry share/gEDA/scheme
@dirrm share/gEDA/bitmap
-@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/it_IT 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/fr_FR 2> /dev/null || true
+@dirrmtry share/locale/de_DE/LC_MESSAGES
+@dirrmtry share/locale/de_DE
+@dirrmtry share/locale/nl_NL/LC_MESSAGES
+@dirrmtry share/locale/nl_NL
+@dirrmtry share/locale/ja_JP/LC_MESSAGES
+@dirrmtry share/locale/ja_JP
+@dirrmtry share/locale/it_IT/LC_MESSAGES
+@dirrmtry share/locale/it_IT
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR
diff --git a/cad/gwave/pkg-plist b/cad/gwave/pkg-plist
index e62afab24972..610672a0c050 100644
--- a/cad/gwave/pkg-plist
+++ b/cad/gwave/pkg-plist
@@ -19,4 +19,4 @@ share/guile/app/gwave/export.scm
share/guile/app/gwave/gtk-helpers.scm
share/guile/app/gwave/utils.scm
@dirrm share/guile/app/gwave
-@unexec rmdir %D/share/guile/app 2>/dev/null || true
+@dirrmtry share/guile/app
diff --git a/cad/systemc/pkg-plist b/cad/systemc/pkg-plist
index 9a1b023a4ba0..3cc18c655f30 100644
--- a/cad/systemc/pkg-plist
+++ b/cad/systemc/pkg-plist
@@ -279,12 +279,12 @@ systemc/include/sysc/utils/sc_vector.h
systemc/include/systemc
systemc/include/systemc.h
systemc/lib-freebsd/libsystemc.a
-@unexec rmdir %D/systemc/docs 2>/dev/null || true
+@dirrmtry systemc/docs
@dirrm systemc/examples/sysc/2.1
@dirrm systemc/examples/sysc/fft
@dirrm systemc/examples/sysc
@dirrm systemc/examples/systemc
-@unexec rmdir %D/systemc/examples 2>/dev/null || true
+@dirrmtry systemc/examples
@dirrm systemc/include/sysc/communication
@dirrm systemc/include/sysc/datatypes/bit
@dirrm systemc/include/sysc/datatypes/fx
@@ -306,6 +306,6 @@ systemc/lib-freebsd/libsystemc.a
@dirrm systemc/include/sysc/tracing
@dirrm systemc/include/sysc/utils
@dirrm systemc/include/sysc
-@unexec rmdir %D/systemc/include 2>/dev/null || true
-@unexec rmdir %D/systemc/lib-freebsd 2>/dev/null || true
-@unexec rmdir %D/systemc 2>/dev/null || true
+@dirrmtry systemc/include
+@dirrmtry systemc/lib-freebsd
+@dirrmtry systemc
diff --git a/chinese/CJK/pkg-plist b/chinese/CJK/pkg-plist
index f06c1a409392..5374fc02b2b2 100644
--- a/chinese/CJK/pkg-plist
+++ b/chinese/CJK/pkg-plist
@@ -475,7 +475,7 @@ share/texmf/tex/latex/CJK/thai/thaicjk.ldf
@dirrm share/texmf/fonts/tfm/arphic/argbkai
@dirrm share/texmf/fonts/tfm/arphic/argbsung
@dirrm share/texmf/fonts/tfm/arphic
-@unexec rmdir %D/share/texmf/fonts/truetype/arphic 2>/dev/null || true
+@dirrmtry share/texmf/fonts/truetype/arphic
@dirrm share/texmf/hbf2gf
@dirrm share/texmf/tex/latex/CJK/Bg5
@dirrm share/texmf/tex/latex/CJK/CEF
diff --git a/chinese/auto-tw-l10n/pkg-plist b/chinese/auto-tw-l10n/pkg-plist
index cd5a99af0ae0..4eb95abdacce 100644
--- a/chinese/auto-tw-l10n/pkg-plist
+++ b/chinese/auto-tw-l10n/pkg-plist
@@ -10,4 +10,4 @@ share/skel/zh_TW.Big5/dot.vimrc
share/skel/zh_TW.Big5/dot.xinitrc
share/skel/zh_TW.Big5/make.conf
share/skel/zh_TW.Big5/outta-port.supfile
-@unexec rmdir %D/share/skel/zh_TW.Big5 2>/dev/null || true
+@dirrmtry share/skel/zh_TW.Big5
diff --git a/chinese/firebird/pkg-plist b/chinese/firebird/pkg-plist
index eb141a4874c4..abf1ad9a4a73 100644
--- a/chinese/firebird/pkg-plist
+++ b/chinese/firebird/pkg-plist
@@ -591,5 +591,5 @@ bbs/boards/notepad/M.960994672.A
@dirrm bbs/0Announce/bms
@dirrm bbs/0Announce/bbslist
@dirrm bbs/0Announce
-@unexec rmdir %D/bbs/log 2>/dev/null || true
+@dirrmtry bbs/log
@dirrm bbs
diff --git a/chinese/iiimf-le-chewing/pkg-plist b/chinese/iiimf-le-chewing/pkg-plist
index 19a46f37995f..2207cebccf64 100644
--- a/chinese/iiimf-le-chewing/pkg-plist
+++ b/chinese/iiimf-le-chewing/pkg-plist
@@ -1,3 +1,3 @@
lib/im/leif/chewing.so
-@unexec rmdir %D/lib/im/leif 2>/dev/null || true
-@unexec rmdir %D/lib/im 2>/dev/null || true
+@dirrmtry lib/im/leif
+@dirrmtry lib/im
diff --git a/chinese/iiimf-le-xcin/pkg-plist b/chinese/iiimf-le-xcin/pkg-plist
index c612b08a9db5..cb305d174c0b 100644
--- a/chinese/iiimf-le-xcin/pkg-plist
+++ b/chinese/iiimf-le-xcin/pkg-plist
@@ -16,7 +16,7 @@ lib/iiim/locale/zh_TW/xcin/tab/sys.tab
lib/iiim/locale/zh_TW/xcin/tab/telecode.tab
@dirrm lib/iiim/locale/zh_TW/xcin/tab
@dirrm lib/iiim/locale/zh_TW/xcin
-@unexec rmdir %D/lib/iiim/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/lib/iiim/locale 2>/dev/null || true
-@unexec rmdir %D/lib/iiim/le/xcin 2>/dev/null || true
-@unexec rmdir %D/lib/iiim/le 2>/dev/null || true
+@dirrmtry lib/iiim/locale/zh_TW
+@dirrmtry lib/iiim/locale
+@dirrmtry lib/iiim/le/xcin
+@dirrmtry lib/iiim/le
diff --git a/chinese/lunar/pkg-plist b/chinese/lunar/pkg-plist
index 84285b79ad5b..171c713a3971 100644
--- a/chinese/lunar/pkg-plist
+++ b/chinese/lunar/pkg-plist
@@ -1,4 +1,4 @@
@comment $FreeBSD$
bin/lunar
share/chinese/lunar.bitmap
-@unexec rmdir %D/share/chinese 2>/dev/null || true
+@dirrmtry share/chinese
diff --git a/chinese/msttf/pkg-plist b/chinese/msttf/pkg-plist
index cadb49339013..4df0d5dd603e 100644
--- a/chinese/msttf/pkg-plist
+++ b/chinese/msttf/pkg-plist
@@ -1,5 +1,5 @@
share/fonts/TrueType/simhei.ttf
share/fonts/TrueType/simsun.ttc
share/fonts/TrueType/tahoma.ttf
-@unexec rmdir %D/share/fonts/TrueType 2>/dev/null || true
-@unexec rmdir %D/share/fonts 2>/dev/null || true
+@dirrmtry share/fonts/TrueType
+@dirrmtry share/fonts
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index 1cd13f83b8b7..f1c7d3f2e99a 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -10,7 +10,7 @@ bin/g2b.pl
%%NEW%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/HanConvert.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
%%OLD%%@dirrm %%SITE_PERL%%/Encode/HanConvert
%%OLD%%@unexec rmdir %D/%%SITE_PERL%%/Encode 2>/dev/null || true
%%NEW%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert
diff --git a/chinese/p5-Encode-HanExtra/pkg-plist b/chinese/p5-Encode-HanExtra/pkg-plist
index e9213012f43f..511f93983628 100644
--- a/chinese/p5-Encode-HanExtra/pkg-plist
+++ b/chinese/p5-Encode-HanExtra/pkg-plist
@@ -6,7 +6,7 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Encode/ConfigLocal.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI1.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI2.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode
diff --git a/chinese/p5-Lingua-ZH-TaBE/pkg-plist b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
index 24f46aff424d..c377ca4ba91a 100644
--- a/chinese/p5-Lingua-ZH-TaBE/pkg-plist
+++ b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/chinese/p5-Lingua-ZH-Toke/pkg-plist b/chinese/p5-Lingua-ZH-Toke/pkg-plist
index 479fca35a85e..d74b87edb403 100644
--- a/chinese/p5-Lingua-ZH-Toke/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Toke/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Lingua/ZH/Toke.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/pcmanx/pkg-plist b/chinese/pcmanx/pkg-plist
index ad5e880825d9..c39c5bec73bb 100644
--- a/chinese/pcmanx/pkg-plist
+++ b/chinese/pcmanx/pkg-plist
@@ -14,7 +14,7 @@ lib/libpcmanx_core.so.0
%%DATADIR%%/nancy_bot/example_usages.data
share/applications/pcmanx.desktop
share/pixmaps/pcmanx.png
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/nancy_bot 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true
+@dirrmtry share/applications
+@dirrmtry %%DATADIR%%/nancy_bot
+@dirrmtry %%DATADIR%%/script
@dirrm %%DATADIR%%
diff --git a/chinese/phpbb-tw/pkg-plist b/chinese/phpbb-tw/pkg-plist
index d3ad757e8f43..b627736bde44 100644
--- a/chinese/phpbb-tw/pkg-plist
+++ b/chinese/phpbb-tw/pkg-plist
@@ -344,17 +344,17 @@
@exec touch %B/config.php
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/doc 2>/dev/null || true
+@dirrmtry share/doc
@dirrm %%DATADIR%%/contrib
@dirrm %%DATADIR%%
@dirrm %%PHPBBDIR%%/admin
@dirrm %%PHPBBDIR%%/cache
@dirrm %%PHPBBDIR%%/db
@dirrm %%PHPBBDIR%%/images/smiles
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/gallery 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/upload 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
+@dirrmtry %%PHPBBDIR%%/images/avatars/upload
+@dirrmtry %%PHPBBDIR%%/images/avatars
+@dirrmtry %%PHPBBDIR%%/images
@dirrm %%PHPBBDIR%%/includes
@dirrm %%PHPBBDIR%%/install/schemas
@dirrm %%PHPBBDIR%%/install
@@ -362,11 +362,11 @@
@dirrm %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan
@dirrm %%PHPBBDIR%%/language/lang_english/email
@dirrm %%PHPBBDIR%%/language/lang_english
-@unexec rmdir %D/%%PHPBBDIR%%/language 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/language
@dirrm %%PHPBBDIR%%/templates/subSilver/admin
@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/
@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
-@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver/images 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/templates 2>/dev/null || true
+@dirrmtry %%PHPBBDIR%%/templates/subSilver/images
+@dirrmtry %%PHPBBDIR%%/templates/subSilver
+@dirrmtry %%PHPBBDIR%%/templates
@unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
diff --git a/chinese/scim-pinyin/pkg-plist b/chinese/scim-pinyin/pkg-plist
index f9fb8730c9ce..fe80075a1ff0 100644
--- a/chinese/scim-pinyin/pkg-plist
+++ b/chinese/scim-pinyin/pkg-plist
@@ -12,6 +12,6 @@ share/scim/pinyin/pinyin_phrase_lib
share/scim/pinyin/pinyin_table
share/scim/pinyin/special_table
share/scim/icons/smart-pinyin.png
-@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true
-@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true
+@dirrmtry lib/scim-1.0/IMEngine
+@dirrmtry lib/scim-1.0/SetupUI
@dirrm share/scim/pinyin
diff --git a/chinese/scim-tables/pkg-plist b/chinese/scim-tables/pkg-plist
index b430540e0497..da4b4d5ddbaa 100644
--- a/chinese/scim-tables/pkg-plist
+++ b/chinese/scim-tables/pkg-plist
@@ -32,4 +32,4 @@ share/scim/icons/Wu.png
share/scim/icons/Wubi.png
share/scim/icons/ZhuYin.png
share/scim/icons/Ziranma.png
-@unexec rmdir %D/share/scim/tables 2>/dev/null || true
+@dirrmtry share/scim/tables
diff --git a/chinese/stardict-dict-zh_CN/pkg-plist b/chinese/stardict-dict-zh_CN/pkg-plist
index 3b83dd39f0be..2d531e97e656 100644
--- a/chinese/stardict-dict-zh_CN/pkg-plist
+++ b/chinese/stardict-dict-zh_CN/pkg-plist
@@ -16,4 +16,4 @@ share/gnome/stardict/dic/xdict-ce-gb.ifo
share/gnome/stardict/dic/xdict-ec-gb.dict.dz
share/gnome/stardict/dic/xdict-ec-gb.idx
share/gnome/stardict/dic/xdict-ec-gb.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/chinese/stardict2-dict-zh_CN/pkg-plist b/chinese/stardict2-dict-zh_CN/pkg-plist
index 3b83dd39f0be..2d531e97e656 100644
--- a/chinese/stardict2-dict-zh_CN/pkg-plist
+++ b/chinese/stardict2-dict-zh_CN/pkg-plist
@@ -16,4 +16,4 @@ share/gnome/stardict/dic/xdict-ce-gb.ifo
share/gnome/stardict/dic/xdict-ec-gb.dict.dz
share/gnome/stardict/dic/xdict-ec-gb.idx
share/gnome/stardict/dic/xdict-ec-gb.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/chinese/stardict2-dict-zh_TW/pkg-plist b/chinese/stardict2-dict-zh_TW/pkg-plist
index 96e97f1c7b53..9eb4682250bd 100644
--- a/chinese/stardict2-dict-zh_TW/pkg-plist
+++ b/chinese/stardict2-dict-zh_TW/pkg-plist
@@ -19,4 +19,4 @@ share/gnome/stardict/dic/xdict-ce-big5.ifo
share/gnome/stardict/dic/xdict-ec-big5.dict.dz
share/gnome/stardict/dic/xdict-ec-big5.idx
share/gnome/stardict/dic/xdict-ec-big5.ifo
-@unexec rmdir %D/share/gnome/stardict/dic 2>/dev/null || true
+@dirrmtry share/gnome/stardict/dic
diff --git a/chinese/xpdf/pkg-plist b/chinese/xpdf/pkg-plist
index 12439e04ee1f..d4e992f6b9b6 100644
--- a/chinese/xpdf/pkg-plist
+++ b/chinese/xpdf/pkg-plist
@@ -13,4 +13,4 @@
@unexec rm -f %D/etc/xpdfrc.chinese-traditional
@dirrm %%DATADIR%%/chinese-simplified
@dirrm %%DATADIR%%/chinese-traditional
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/comms/cutecom/pkg-plist b/comms/cutecom/pkg-plist
index 9136a93faa07..407465d61313 100644
--- a/comms/cutecom/pkg-plist
+++ b/comms/cutecom/pkg-plist
@@ -1,4 +1,4 @@
bin/cutecom
share/applnk/Utilities/cutecom.desktop
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/comms/efax-gtk/pkg-plist b/comms/efax-gtk/pkg-plist
index c39c8ad735fe..d8cfc3c63f41 100644
--- a/comms/efax-gtk/pkg-plist
+++ b/comms/efax-gtk/pkg-plist
@@ -3,4 +3,4 @@ bin/efax-0.9a
bin/efix-0.9a
etc/efax-gtkrc
share/applications/efax-gtk.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/comms/gscmxx/pkg-plist b/comms/gscmxx/pkg-plist
index 1759f68572fa..17b56f3a5ab1 100644
--- a/comms/gscmxx/pkg-plist
+++ b/comms/gscmxx/pkg-plist
@@ -38,4 +38,4 @@ share/gscmxx/i18n/italian
@dirrm share/gscmxx
@dirrm share/pixmaps/gscmxx/groups
@dirrm share/pixmaps/gscmxx
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+@dirrmtry share/pixmaps
diff --git a/comms/kallers/pkg-plist b/comms/kallers/pkg-plist
index 3ddeaee74416..d94741570fea 100644
--- a/comms/kallers/pkg-plist
+++ b/comms/kallers/pkg-plist
@@ -8,16 +8,16 @@ share/autostart/kallers.desktop
share/icons/hicolor/16x16/apps/kallers.png
share/icons/hicolor/32x32/apps/kallers.png
share/icons/hicolor/48x48/apps/kallers.png
-@unexec rmdir %D/share/applnk/Toys 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Toys
+@dirrmtry share/applnk
@dirrm share/apps/kallers/sound
@dirrm share/apps/kallers/pics
@dirrm share/apps/kallers
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
diff --git a/comms/klog/pkg-plist b/comms/klog/pkg-plist
index 1e3107c8c789..dca169860a94 100644
--- a/comms/klog/pkg-plist
+++ b/comms/klog/pkg-plist
@@ -6,9 +6,9 @@ share/doc/HTML/en/klog/index.docbook
share/icons/locolor/16x16/apps/klog.png
share/icons/locolor/32x32/apps/klog.png
@dirrm share/doc/HTML/en/klog
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/applnk/Applications
diff --git a/comms/libticables/pkg-plist b/comms/libticables/pkg-plist
index 14b9fd88f771..3e44992262a5 100644
--- a/comms/libticables/pkg-plist
+++ b/comms/libticables/pkg-plist
@@ -10,4 +10,4 @@ lib/libticables.so
lib/libticables.so.12
libdata/pkgconfig/ticables.pc
share/locale/fr/LC_MESSAGES/libticables.mo
-@unexec rmdir %D/include/tilp 2>/dev/null || true
+@dirrmtry include/tilp
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 126d1ebf9ddc..8a0642bf5157 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -93,7 +93,7 @@ sbin/faxrunqd
sbin/mgetty
sbin/sendfax
sbin/vgetty
-@unexec rmdir %D/etc/mgetty+sendfax 2>/dev/null || true
+@dirrmtry etc/mgetty+sendfax
@dirrm lib/mgetty+sendfax/samples/new_fax.all
@dirrm lib/mgetty+sendfax/samples
@dirrm lib/mgetty+sendfax
diff --git a/comms/minicom/pkg-plist b/comms/minicom/pkg-plist
index 112f079e1866..066b4c81d9e6 100644
--- a/comms/minicom/pkg-plist
+++ b/comms/minicom/pkg-plist
@@ -13,7 +13,7 @@ etc/minicom/minicom.users
%%NLS%%share/locale/pt_BR/LC_MESSAGES/minicom.mo
%%NLS%%share/locale/ru/LC_MESSAGES/minicom.mo
@exec /usr/sbin/chown uucp %D/etc/minicom
-@unexec rmdir %D/etc/minicom 2>/dev/null || true
+@dirrmtry etc/minicom
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/comms/p5-Device-Modem/pkg-plist b/comms/p5-Device-Modem/pkg-plist
index a2aa75ce1887..0c09f6e5866a 100644
--- a/comms/p5-Device-Modem/pkg-plist
+++ b/comms/p5-Device-Modem/pkg-plist
@@ -8,8 +8,8 @@
@dirrm %%SITE_PERL%%/Device/Modem/Protocol
@dirrm %%SITE_PERL%%/Device/Modem
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/Modem
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Device 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
+@dirrmtry %%SITE_PERL%%/Device
%%PORTDOCS%%%%EXAMPLESDIR%%/xmodem.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/shell.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/dial.pl
diff --git a/comms/p5-Device-SerialPort/pkg-plist b/comms/p5-Device-SerialPort/pkg-plist
index 5d10e873f573..b1980725db19 100644
--- a/comms/p5-Device-SerialPort/pkg-plist
+++ b/comms/p5-Device-SerialPort/pkg-plist
@@ -3,6 +3,6 @@ bin/modemtest
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort/SerialPort.so
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Device 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Device 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device/SerialPort
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Device
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Device
diff --git a/comms/p5-Fax-Hylafax-Client/pkg-plist b/comms/p5-Fax-Hylafax-Client/pkg-plist
index 2d68dc813754..1caa6f69129d 100644
--- a/comms/p5-Fax-Hylafax-Client/pkg-plist
+++ b/comms/p5-Fax-Hylafax-Client/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Fax/Hylafax/Client.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Fax/Hylafax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Fax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Fax/Hylafax
+@dirrmtry %%SITE_PERL%%/Fax
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax/Client
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax/Hylafax
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Fax
diff --git a/comms/scmxx/pkg-plist b/comms/scmxx/pkg-plist
index 65ff96465e53..d72e0391ebab 100644
--- a/comms/scmxx/pkg-plist
+++ b/comms/scmxx/pkg-plist
@@ -14,11 +14,11 @@ share/locale/ru/LC_MESSAGES/scmxx.mo
%%EXAMPLESDIR%%/vCalendar.vcs
%%EXAMPLESDIR%%/vCard.vcf
@dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/man/de/man1 2>/dev/null || true
-@unexec rmdir %D/man/de/ 2>/dev/null || true
-@unexec rmdir %D/man/ru/man1 2>/dev/null || true
-@unexec rmdir %D/man/ru/ 2>/dev/null || true
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry man/de/man1
+@dirrmtry man/de/
+@dirrmtry man/ru/man1
+@dirrmtry man/ru/
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index f97805bc18a0..c30405b2b688 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -61,10 +61,10 @@ share/pixmaps/xlog/xlog.xpm
@dirrm share/pixmaps/xlog
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec rmdir %D/share/applications 2> /dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2> /dev/null || true
-@unexec rmdir %D/share/applnk 2> /dev/null || true
-@unexec rmdir %D/share/application-registry 2> /dev/null || true
-@unexec rmdir %D/share/mimelnk/text 2> /dev/null || true
-@unexec rmdir %D/share/mimelnk 2> /dev/null || true
-@unexec rmdir %D/share/mime-info 2> /dev/null || true
+@dirrmtry share/applications
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
+@dirrmtry share/application-registry
+@dirrmtry share/mimelnk/text
+@dirrmtry share/mimelnk
+@dirrmtry share/mime-info
diff --git a/comms/yaps/pkg-plist b/comms/yaps/pkg-plist
index 6001c95c32ae..a40dc38be2c4 100644
--- a/comms/yaps/pkg-plist
+++ b/comms/yaps/pkg-plist
@@ -4,4 +4,4 @@ etc/yaps.rc.sample
%%PORTDOCS%%%%DOCSDIR%%/yaps.doc
%%PORTDOCS%%%%DOCSDIR%%/yaps.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/yaps 2>/dev/null || true
+@dirrmtry share/yaps
diff --git a/converters/konwert/pkg-plist b/converters/konwert/pkg-plist
index 661535a323c3..54481cf70af5 100644
--- a/converters/konwert/pkg-plist
+++ b/converters/konwert/pkg-plist
@@ -985,8 +985,8 @@ lib/konwert/aux/512bold1
%%DATADIR%%/filters/winwest-macroman
%%DATADIR%%/filters/xjp-UTF8
%%DATADIR%%/filters/xmetodo-UTF8
-@unexec rmdir %D/man/pl/man1 2>/dev/null || true
-@unexec rmdir %D/man/pl 2>/dev/null || true
+@dirrmtry man/pl/man1
+@dirrmtry man/pl
@dirrm lib/konwert/aux
@dirrm lib/konwert/devel
@dirrm lib/konwert
diff --git a/converters/ktextdecode/pkg-plist b/converters/ktextdecode/pkg-plist
index 53490564cf97..f7548962955e 100644
--- a/converters/ktextdecode/pkg-plist
+++ b/converters/ktextdecode/pkg-plist
@@ -4,5 +4,5 @@ share/icons/hicolor/16x16/apps/ktextdecode.png
share/icons/hicolor/32x32/apps/ktextdecode.png
share/icons/locolor/16x16/apps/ktextdecode.png
share/icons/locolor/32x32/apps/ktextdecode.png
-@unexec rmdir %D/share/applnk/Applications/ 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Applications/
+@dirrmtry share/applnk
diff --git a/converters/p5-Convert-ASCII-Armour/pkg-plist b/converters/p5-Convert-ASCII-Armour/pkg-plist
index 2b76d5da9256..9b71419e8dac 100644
--- a/converters/p5-Convert-ASCII-Armour/pkg-plist
+++ b/converters/p5-Convert-ASCII-Armour/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Convert/ASCII/Armor.pm
%%SITE_PERL%%/Convert/ASCII/Armour.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert/ASCII
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-ASN1/pkg-plist b/converters/p5-Convert-ASN1/pkg-plist
index e2099131d07d..e11dadb63f9e 100644
--- a/converters/p5-Convert-ASN1/pkg-plist
+++ b/converters/p5-Convert-ASN1/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1
@dirrm %%SITE_PERL%%/Convert/ASN1
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-BER/pkg-plist b/converters/p5-Convert-BER/pkg-plist
index b6460f2ac7b9..04bdf85996b7 100644
--- a/converters/p5-Convert-BER/pkg-plist
+++ b/converters/p5-Convert-BER/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Convert/BER.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-BinHex/pkg-plist b/converters/p5-Convert-BinHex/pkg-plist
index f1037fccfba7..3e29c1d855b3 100644
--- a/converters/p5-Convert-BinHex/pkg-plist
+++ b/converters/p5-Convert-BinHex/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Convert/BinHex.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Convert
+@dirrmtry %%SITE_PERL%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Convert-Binary-C/pkg-plist b/converters/p5-Convert-Binary-C/pkg-plist
index 7f4006b8c485..57805048b5cc 100644
--- a/converters/p5-Convert-Binary-C/pkg-plist
+++ b/converters/p5-Convert-Binary-C/pkg-plist
@@ -6,7 +6,7 @@ bin/ccconfig
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/C.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Convert-IBM390/pkg-plist b/converters/p5-Convert-IBM390/pkg-plist
index 01f605bc6577..9da67050b140 100644
--- a/converters/p5-Convert-IBM390/pkg-plist
+++ b/converters/p5-Convert-IBM390/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
diff --git a/converters/p5-Convert-UUlib/pkg-plist b/converters/p5-Convert-UUlib/pkg-plist
index ef7cce22d80c..13ad94957684 100644
--- a/converters/p5-Convert-UUlib/pkg-plist
+++ b/converters/p5-Convert-UUlib/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/UUlib.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/UUlib.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
diff --git a/converters/p5-Cstools/pkg-plist b/converters/p5-Cstools/pkg-plist
index deb282af80a8..3a5be7a06eda 100644
--- a/converters/p5-Cstools/pkg-plist
+++ b/converters/p5-Cstools/pkg-plist
@@ -25,5 +25,5 @@ bin/dbfcstocs
%%SITE_PERL%%/Cz/Time.pm
@dirrm %%SITE_PERL%%/Cz/Cstocs/enc
@dirrm %%SITE_PERL%%/Cz/Cstocs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cz 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz
+@dirrmtry %%SITE_PERL%%/Cz
diff --git a/converters/p5-JSON/pkg-plist b/converters/p5-JSON/pkg-plist
index d987bb6e320e..98eae60d8619 100644
--- a/converters/p5-JSON/pkg-plist
+++ b/converters/p5-JSON/pkg-plist
@@ -9,4 +9,4 @@
@dirrm %%SITE_PERL%%/JSONRPC/Transport
@dirrm %%SITE_PERL%%/JSONRPC
@dirrm %%SITE_PERL%%/JSON
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/converters/p5-JSON1/pkg-plist b/converters/p5-JSON1/pkg-plist
index d987bb6e320e..98eae60d8619 100644
--- a/converters/p5-JSON1/pkg-plist
+++ b/converters/p5-JSON1/pkg-plist
@@ -9,4 +9,4 @@
@dirrm %%SITE_PERL%%/JSONRPC/Transport
@dirrm %%SITE_PERL%%/JSONRPC
@dirrm %%SITE_PERL%%/JSON
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/converters/p5-MIME-Base32/pkg-plist b/converters/p5-MIME-Base32/pkg-plist
index 8d39e7dd7ffc..0fd817019ab6 100644
--- a/converters/p5-MIME-Base32/pkg-plist
+++ b/converters/p5-MIME-Base32/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/MIME/Base32.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base32/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base32
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/MIME
diff --git a/converters/p5-MIME-Base64/pkg-plist b/converters/p5-MIME-Base64/pkg-plist
index bcac9f94a3d8..b05f9c28a6cf 100644
--- a/converters/p5-MIME-Base64/pkg-plist
+++ b/converters/p5-MIME-Base64/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Base64.pm
%%SITE_PERL%%/%%PERL_ARCH%%/MIME/QuotedPrint.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index 1fd71d9c3969..d7c708afb917 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv
-@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/converters/p5-Text-Unidecode/pkg-plist b/converters/p5-Text-Unidecode/pkg-plist
index 07f3dacec726..83baafde3875 100644
--- a/converters/p5-Text-Unidecode/pkg-plist
+++ b/converters/p5-Text-Unidecode/pkg-plist
@@ -180,7 +180,7 @@
%%SITE_PERL%%/Text/Unidecode/xfe.pm
%%SITE_PERL%%/Text/Unidecode/xff.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text/Unidecode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text/Unidecode
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/converters/p5-Unicode-RecursiveDowngrade/pkg-plist b/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
index 9745f8afddb3..4f4b81f7e97f 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
+++ b/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Unicode/RecursiveDowngrade.pm
-@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Unicode
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/RecursiveDowngrade/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/RecursiveDowngrade
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
diff --git a/converters/p5-Unicode-String/pkg-plist b/converters/p5-Unicode-String/pkg-plist
index 7e271d3f1277..1e5ed9fe970b 100644
--- a/converters/p5-Unicode-String/pkg-plist
+++ b/converters/p5-Unicode-String/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
diff --git a/converters/p5-Unicode-UTF8simple/pkg-plist b/converters/p5-Unicode-UTF8simple/pkg-plist
index d6fcd3670644..776d994d4f26 100644
--- a/converters/p5-Unicode-UTF8simple/pkg-plist
+++ b/converters/p5-Unicode-UTF8simple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Unicode/UTF8simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry %%SITE_PERL%%/Unicode
diff --git a/databases/firebird-devel/pkg-plist b/databases/firebird-devel/pkg-plist
index e8de4cbbe6db..240ada730238 100644
--- a/databases/firebird-devel/pkg-plist
+++ b/databases/firebird-devel/pkg-plist
@@ -104,4 +104,4 @@ firebird/security2.fdb
@dirrm firebird/include
@dirrm firebird/intl
@dirrm firebird/lib
-@unexec rmdir %D/firebird 2>/dev/null || true
+@dirrmtry firebird
diff --git a/databases/firebird-server/pkg-plist b/databases/firebird-server/pkg-plist
index 0a94428c5d71..8e200a428ccb 100644
--- a/databases/firebird-server/pkg-plist
+++ b/databases/firebird-server/pkg-plist
@@ -11,7 +11,7 @@ sbin/gds_drop
@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true
%%CONFDIR%%/aliases.conf.sample
@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
@cwd /
@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true
%%LOCALSTATEDIR%%/security.fdb.sample
@@ -30,4 +30,4 @@ sbin/gds_drop
@dirrm %%LOCALSTATEDIR%%/UDF
@dirrm %%LOCALSTATEDIR%%/help
@dirrm %%LOCALSTATEDIR%%/intl
-@unexec rmdir %D/%%LOCALSTATEDIR%% 2>/dev/null || true
+@dirrmtry %%LOCALSTATEDIR%%
diff --git a/databases/firebird2-server/pkg-plist b/databases/firebird2-server/pkg-plist
index 0a94428c5d71..8e200a428ccb 100644
--- a/databases/firebird2-server/pkg-plist
+++ b/databases/firebird2-server/pkg-plist
@@ -11,7 +11,7 @@ sbin/gds_drop
@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true
%%CONFDIR%%/aliases.conf.sample
@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
@cwd /
@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true
%%LOCALSTATEDIR%%/security.fdb.sample
@@ -30,4 +30,4 @@ sbin/gds_drop
@dirrm %%LOCALSTATEDIR%%/UDF
@dirrm %%LOCALSTATEDIR%%/help
@dirrm %%LOCALSTATEDIR%%/intl
-@unexec rmdir %D/%%LOCALSTATEDIR%% 2>/dev/null || true
+@dirrmtry %%LOCALSTATEDIR%%
diff --git a/databases/firebird20-server/pkg-plist b/databases/firebird20-server/pkg-plist
index 0a94428c5d71..8e200a428ccb 100644
--- a/databases/firebird20-server/pkg-plist
+++ b/databases/firebird20-server/pkg-plist
@@ -11,7 +11,7 @@ sbin/gds_drop
@unexec (cmp -s %D/%%CONFDIR%%/aliases.conf %D/%%CONFDIR%%/aliases.conf.sample && rm -f %D/%%CONFDIR%%/aliases.conf) || true
%%CONFDIR%%/aliases.conf.sample
@exec [ -f %B/aliases.conf ] || cp %B/%f %B/aliases.conf
-@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true
+@dirrmtry %%CONFDIR%%
@cwd /
@unexec (cmp -s %D/%%LOCALSTATEDIR%%/security.fdb %D/%%LOCALSTATEDIR%%/security.fdb.sample && rm -f %D/%%LOCALSTATEDIR%%/security.fdb) || true
%%LOCALSTATEDIR%%/security.fdb.sample
@@ -30,4 +30,4 @@ sbin/gds_drop
@dirrm %%LOCALSTATEDIR%%/UDF
@dirrm %%LOCALSTATEDIR%%/help
@dirrm %%LOCALSTATEDIR%%/intl
-@unexec rmdir %D/%%LOCALSTATEDIR%% 2>/dev/null || true
+@dirrmtry %%LOCALSTATEDIR%%
diff --git a/databases/gnats4/pkg-plist b/databases/gnats4/pkg-plist
index 277c7cb9617c..95885edd0678 100644
--- a/databases/gnats4/pkg-plist
+++ b/databases/gnats4/pkg-plist
@@ -20,7 +20,7 @@ etc/gnats/defaults/states
etc/gnats/defaults/submitters
etc/gnats/send-pr.conf
@dirrm etc/gnats/defaults
-@unexec rmdir %D/etc/gnats 2>/dev/null || true
+@dirrmtry etc/gnats
%%SERVER%%libexec/gnats/at-pr
%%SERVER%%libexec/gnats/check-db
%%SERVER%%libexec/gnats/delete-pr
diff --git a/databases/ip4r/pkg-plist b/databases/ip4r/pkg-plist
index 8623167a89d6..84476d22af8f 100644
--- a/databases/ip4r/pkg-plist
+++ b/databases/ip4r/pkg-plist
@@ -2,5 +2,5 @@
lib/postgresql/ip4r.so
share/doc/postgresql/contrib/README.ip4r
share/postgresql/contrib/ip4r.sql
-@unexec rmdir %D/share/doc/postgresql/contrib 2>/dev/null || true
-@unexec rmdir %D/share/postgresql/contrib 2>/dev/null || true
+@dirrmtry share/doc/postgresql/contrib
+@dirrmtry share/postgresql/contrib
diff --git a/databases/ksqlanalyzer/pkg-plist b/databases/ksqlanalyzer/pkg-plist
index a63713355e90..05f07a78cf59 100644
--- a/databases/ksqlanalyzer/pkg-plist
+++ b/databases/ksqlanalyzer/pkg-plist
@@ -3,11 +3,11 @@ share/applnk/Applications/ksqlanalyzer.desktop
share/icons/locolor/16x16/apps/ksqlanalyzer.png
share/icons/locolor/32x32/apps/ksqlanalyzer.png
share/locale/de/LC_MESSAGES/ksqlanalyzer.mo
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/databases/ksqlshell/pkg-plist b/databases/ksqlshell/pkg-plist
index 4954e96169a6..4255fe97a3ac 100644
--- a/databases/ksqlshell/pkg-plist
+++ b/databases/ksqlshell/pkg-plist
@@ -68,19 +68,19 @@ share/doc/HTML/en/ksqlshell/index.docbook
share/icons/hicolor/32x32/apps/ksqlshell.png
share/icons/locolor/16x16/apps/ksqlshell.png
share/locale/de/LC_MESSAGES/ksqlshell.mo
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/hicolor
+@dirrmtry share/icons
+@dirrmtry share/doc/HTML
@dirrm share/doc/HTML/en/ksqlshell
@dirrm share/doc/HTML/de/ksqlshell
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
@dirrm share/apps/ksqlshell/icons/hicolor/32x32/actions
@dirrm share/apps/ksqlshell/icons/hicolor/32x32
@dirrm share/apps/ksqlshell/icons/hicolor/16x16/actions
@@ -88,6 +88,6 @@ share/locale/de/LC_MESSAGES/ksqlshell.mo
@dirrm share/apps/ksqlshell/icons/hicolor
@dirrm share/apps/ksqlshell/icons
@dirrm share/apps/ksqlshell
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/databases/libdbi-drivers/pkg-plist b/databases/libdbi-drivers/pkg-plist
index d5dce76742ec..6a6ea6cc206c 100644
--- a/databases/libdbi-drivers/pkg-plist
+++ b/databases/libdbi-drivers/pkg-plist
@@ -4,7 +4,7 @@
%%SQLITE3%%lib/dbd/libsqlite3.so
%%FIREBIRD%%lib/dbd/libfirebird.so
%%FREETDS%%lib/dbd/libfreetds.so
-@unexec rmdir %D/lib/dbd 2>/dev/null || true
+@dirrmtry lib/dbd
%%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c136.html
%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c35.html
@@ -52,4 +52,4 @@
%%SQLITE2%%@dirrm %%DOCSDIR%%/dbd_sqlite
%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
%%FREETDS%%@dirrm %%DOCSDIR%%/dbd_freetds
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 8abb8de9f003..f0d247f46f65 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -202,8 +202,8 @@ share/locale/uk/LC_MESSAGES/libgda-3.mo
share/locale/vi/LC_MESSAGES/libgda-3.mo
share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/libgda/xml
@dirrm share/gnome/libgda
@dirrm lib/libgda-%%VERSION%%/providers
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 8abb8de9f003..f0d247f46f65 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -202,8 +202,8 @@ share/locale/uk/LC_MESSAGES/libgda-3.mo
share/locale/vi/LC_MESSAGES/libgda-3.mo
share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/libgda/xml
@dirrm share/gnome/libgda
@dirrm lib/libgda-%%VERSION%%/providers
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index ae8277b86814..fdaf3f3e7029 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -384,8 +384,8 @@ share/locale/uk/LC_MESSAGES/libgnomedb-3.mo
share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/pixmaps/libgnomedb
@dirrm share/gnome/omf/libgnomedb
@dirrm share/gnome/libgnomedb/dtd
diff --git a/databases/linux-oracle-instantclient-basic/pkg-plist b/databases/linux-oracle-instantclient-basic/pkg-plist
index 3029618aa2e9..e3fc67cc0367 100644
--- a/databases/linux-oracle-instantclient-basic/pkg-plist
+++ b/databases/linux-oracle-instantclient-basic/pkg-plist
@@ -8,8 +8,8 @@ usr/lib/oracle/%%PORTVERSION%%/client/lib/ojdbc14.jar
@dirrm usr/lib/oracle/%%PORTVERSION%%/client
@dirrm usr/lib/oracle/%%PORTVERSION%%
@dirrm usr/lib/oracle
-@unexec rmdir %D/usr/lib 2>/dev/null || true
-@unexec rmdir %D/usr 2>/dev/null || true
+@dirrmtry usr/lib
+@dirrmtry usr
@unexec cp %D/etc/ld.so.conf %D/etc/ld.so.conf.bak && sed "/\/usr\/lib\/oracle\/%%PORTVERSION%%\/client\/lib/d" %D/etc/ld.so.conf.bak > %D/etc/ld.so.conf && rm %D/etc/ld.so.conf.bak
@exec echo /usr/lib/oracle/%%PORTVERSION%%/client/lib >> %D/etc/ld.so.conf
@exec %D/sbin/ldconfig
diff --git a/databases/linux-oracle-instantclient-sdk/pkg-plist b/databases/linux-oracle-instantclient-sdk/pkg-plist
index a9681bc6f211..5e1250427561 100644
--- a/databases/linux-oracle-instantclient-sdk/pkg-plist
+++ b/databases/linux-oracle-instantclient-sdk/pkg-plist
@@ -38,5 +38,5 @@ usr/include/oracle/%%PORTVERSION%%/client/xa.h
@dirrm usr/share/oracle/%%PORTVERSION%%/client
@dirrm usr/share/oracle/%%PORTVERSION%%
@dirrm usr/share/oracle
-@unexec rmdir %D/usr/include 2>/dev/null || true
-@unexec rmdir %D/usr/share 2>/dev/null || true
+@dirrmtry usr/include
+@dirrmtry usr/share
diff --git a/databases/linux-oracle-instantclient-sqlplus/pkg-plist b/databases/linux-oracle-instantclient-sqlplus/pkg-plist
index 33ffdeeea3da..bd35b0e98e67 100644
--- a/databases/linux-oracle-instantclient-sqlplus/pkg-plist
+++ b/databases/linux-oracle-instantclient-sqlplus/pkg-plist
@@ -4,4 +4,4 @@ usr/lib/oracle/%%PORTVERSION%%/client/lib/glogin.sql
usr/lib/oracle/%%PORTVERSION%%/client/lib/libsqlplus.so
usr/lib/oracle/%%PORTVERSION%%/client/lib/libsqlplusic.so
@dirrm usr/lib/oracle/%%PORTVERSION%%/client/bin
-@unexec rmdir %D/usr/bin 2>/dev/null || true
+@dirrmtry usr/bin
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index 53fe7bdf3854..fa89db31d7be 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -88,8 +88,8 @@ share/locale/tr/LC_MESSAGES/mergeant.mo
share/locale/uk/LC_MESSAGES/mergeant.mo
share/locale/vi/LC_MESSAGES/mergeant.mo
share/locale/zh_CN/LC_MESSAGES/mergeant.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/pixmaps/mergeant
@dirrm share/gnome/omf/mergeant
@dirrm share/gnome/help/mergeant/C/stylesheet-images
diff --git a/databases/mysql-administrator/pkg-plist b/databases/mysql-administrator/pkg-plist
index b94aaa630265..6f9a47bf00dc 100644
--- a/databases/mysql-administrator/pkg-plist
+++ b/databases/mysql-administrator/pkg-plist
@@ -170,4 +170,4 @@ share/mysql-gui/common/thread_stop.png
@dirrm share/mysql-gui/common
@dirrm share/mysql-gui/administrator
@dirrm share/mysql-gui
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index 7614e0dd1e77..65ec9e8fec3b 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -100,7 +100,7 @@ libexec/mysqld
%%DATADIR%%/swedish/errmsg.txt
%%DATADIR%%/ukrainian/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.txt
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index 6cf9c57cfffc..2a054eac2c0a 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -104,7 +104,7 @@ libexec/mysqld
%%DATADIR%%/swedish/errmsg.txt
%%DATADIR%%/ukrainian/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.txt
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index ae0e3f2e68f8..955fc5fec43b 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -163,7 +163,7 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
%%NDB%%@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -189,4 +189,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index f859bf3b28fd..f8dc70e0c995 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -135,8 +135,8 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry include/mysql
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -161,4 +161,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index f859bf3b28fd..f8dc70e0c995 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -135,8 +135,8 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry include/mysql
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -161,4 +161,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index f859bf3b28fd..f8dc70e0c995 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -135,8 +135,8 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry include/mysql
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -161,4 +161,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index f859bf3b28fd..f8dc70e0c995 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -135,8 +135,8 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry include/mysql
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -161,4 +161,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index f859bf3b28fd..f8dc70e0c995 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -135,8 +135,8 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry include/mysql
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -161,4 +161,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/mytop/pkg-plist b/databases/mytop/pkg-plist
index 9ecee01737d7..15c950b6bb9a 100644
--- a/databases/mytop/pkg-plist
+++ b/databases/mytop/pkg-plist
@@ -1,3 +1,3 @@
bin/mytop
%%SITE_PERL%%/%%PERL_ARCH%%/auto/mytop/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/mytop 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/mytop
diff --git a/databases/p5-AsciiDB-TagFile/pkg-plist b/databases/p5-AsciiDB-TagFile/pkg-plist
index ab6a3bc82032..ea04f3847a13 100644
--- a/databases/p5-AsciiDB-TagFile/pkg-plist
+++ b/databases/p5-AsciiDB-TagFile/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/AsciiDB/TagFile.pm
%%SITE_PERL%%/AsciiDB/TagRecord.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB/TagFile
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/AsciiDB 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AsciiDB
+@dirrmtry %%SITE_PERL%%/AsciiDB
diff --git a/databases/p5-Cache-Memcached-Managed/pkg-plist b/databases/p5-Cache-Memcached-Managed/pkg-plist
index ee00a35e88df..496529cc7d9a 100644
--- a/databases/p5-Cache-Memcached-Managed/pkg-plist
+++ b/databases/p5-Cache-Memcached-Managed/pkg-plist
@@ -2,9 +2,9 @@
%%SITE_PERL%%/Cache/Memcached/Managed/Inactive.pm
%%SITE_PERL%%/Cache/Memcached/Managed/Multi.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Managed/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Managed 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache/Memcached/Managed 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache/Memcached 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/Managed
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/Cache/Memcached/Managed
+@dirrmtry %%SITE_PERL%%/Cache/Memcached
+@dirrmtry %%SITE_PERL%%/Cache
diff --git a/databases/p5-Cache-Memcached/pkg-plist b/databases/p5-Cache-Memcached/pkg-plist
index 99d450804e86..67c162b3d7b9 100644
--- a/databases/p5-Cache-Memcached/pkg-plist
+++ b/databases/p5-Cache-Memcached/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Cache/Memcached.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache/Memcached
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cache
+@dirrmtry %%SITE_PERL%%/Cache
diff --git a/databases/p5-Class-DBI-AbstractSearch/pkg-plist b/databases/p5-Class-DBI-AbstractSearch/pkg-plist
index 39818c602dd4..d9187805d734 100644
--- a/databases/p5-Class-DBI-AbstractSearch/pkg-plist
+++ b/databases/p5-Class-DBI-AbstractSearch/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Class/DBI/AbstractSearch.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AbstractSearch/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AbstractSearch
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-AsForm/pkg-plist b/databases/p5-Class-DBI-AsForm/pkg-plist
index 72ab20f0dfeb..9450ce73ee63 100644
--- a/databases/p5-Class-DBI-AsForm/pkg-plist
+++ b/databases/p5-Class-DBI-AsForm/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/AsForm.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AsForm/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AsForm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-AutoLoader/pkg-plist b/databases/p5-Class-DBI-AutoLoader/pkg-plist
index a08839305b9b..3653f351838c 100644
--- a/databases/p5-Class-DBI-AutoLoader/pkg-plist
+++ b/databases/p5-Class-DBI-AutoLoader/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/AutoLoader.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AutoLoader/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/AutoLoader
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-BaseDSN/pkg-plist b/databases/p5-Class-DBI-BaseDSN/pkg-plist
index 01aef1edb17d..8a3bb9223164 100644
--- a/databases/p5-Class-DBI-BaseDSN/pkg-plist
+++ b/databases/p5-Class-DBI-BaseDSN/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Class/DBI/BaseDSN.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-DATA-Schema/pkg-plist b/databases/p5-Class-DBI-DATA-Schema/pkg-plist
index faf33e15cebd..e9375b27c888 100644
--- a/databases/p5-Class-DBI-DATA-Schema/pkg-plist
+++ b/databases/p5-Class-DBI-DATA-Schema/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Class/DBI/DATA/Schema.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DATA/Schema/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DATA/Schema
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DATA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/DATA 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DATA
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI/DATA
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-DDL/pkg-plist b/databases/p5-Class-DBI-DDL/pkg-plist
index 1eefbc3b2650..6961517d1de2 100644
--- a/databases/p5-Class-DBI-DDL/pkg-plist
+++ b/databases/p5-Class-DBI-DDL/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DDL/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/DDL
@dirrm %%SITE_PERL%%/Class/DBI/DDL
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-FromCGI/pkg-plist b/databases/p5-Class-DBI-FromCGI/pkg-plist
index 6422cf706ab1..ca00f4fcbd86 100644
--- a/databases/p5-Class-DBI-FromCGI/pkg-plist
+++ b/databases/p5-Class-DBI-FromCGI/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/FromCGI.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromCGI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromCGI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Loader-Relationship/pkg-plist b/databases/p5-Class-DBI-Loader-Relationship/pkg-plist
index 201a151d4eb9..c99720b9fd67 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/pkg-plist
+++ b/databases/p5-Class-DBI-Loader-Relationship/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Class/DBI/Loader/Relationship.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader/Relationship/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader/Relationship
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Loader 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI/Loader
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Loader/pkg-plist b/databases/p5-Class-DBI-Loader/pkg-plist
index d9e149fde467..3993bc195d6e 100644
--- a/databases/p5-Class-DBI-Loader/pkg-plist
+++ b/databases/p5-Class-DBI-Loader/pkg-plist
@@ -6,8 +6,8 @@
%%SITE_PERL%%/Class/DBI/Loader/mysql.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Loader
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
@dirrm %%SITE_PERL%%/Class/DBI/Loader
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Oracle/pkg-plist b/databases/p5-Class-DBI-Oracle/pkg-plist
index 5d865b5130cb..6b37ab6c941d 100644
--- a/databases/p5-Class-DBI-Oracle/pkg-plist
+++ b/databases/p5-Class-DBI-Oracle/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/Oracle.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Oracle/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Oracle
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Pager/pkg-plist b/databases/p5-Class-DBI-Pager/pkg-plist
index e7dcfbbb80ac..3f1b86118b74 100644
--- a/databases/p5-Class-DBI-Pager/pkg-plist
+++ b/databases/p5-Class-DBI-Pager/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Class/DBI/Pager.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Pager/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Pager
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Pg/pkg-plist b/databases/p5-Class-DBI-Pg/pkg-plist
index f71b54c2c966..6641293e8284 100644
--- a/databases/p5-Class-DBI-Pg/pkg-plist
+++ b/databases/p5-Class-DBI-Pg/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/Pg.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Pg/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Pg
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist b/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist
index 0de08ae66be5..a8da9c8a0529 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Class/DBI/Plugin/AbstractCount.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/AbstractCount/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/AbstractCount
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist b/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist
index 7737f040bfd7..5a9c948bf42d 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Class/DBI/Plugin/RetrieveAll.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/RetrieveAll/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/RetrieveAll
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Plugin-Type/pkg-plist b/databases/p5-Class-DBI-Plugin-Type/pkg-plist
index e2fb6b34d682..ea7518a37ec3 100644
--- a/databases/p5-Class-DBI-Plugin-Type/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin-Type/pkg-plist
@@ -1,9 +1,9 @@
%%SITE_PERL%%/Class/DBI/Plugin/Type.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/Type/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/Type
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Plugin/pkg-plist b/databases/p5-Class-DBI-Plugin/pkg-plist
index cfd96f445bb0..660d45d2a673 100644
--- a/databases/p5-Class-DBI-Plugin/pkg-plist
+++ b/databases/p5-Class-DBI-Plugin/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/Plugin.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Plugin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Replication/pkg-plist b/databases/p5-Class-DBI-Replication/pkg-plist
index ea6f6ab52213..b5a0020a8802 100644
--- a/databases/p5-Class-DBI-Replication/pkg-plist
+++ b/databases/p5-Class-DBI-Replication/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/Replication.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Replication/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Replication
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-SAK/pkg-plist b/databases/p5-Class-DBI-SAK/pkg-plist
index 7ed499f4137d..58d0356465e6 100644
--- a/databases/p5-Class-DBI-SAK/pkg-plist
+++ b/databases/p5-Class-DBI-SAK/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Class/DBI/SAK.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-SQLite/pkg-plist b/databases/p5-Class-DBI-SQLite/pkg-plist
index ce5b5a2bc918..ab3bc7925cee 100644
--- a/databases/p5-Class-DBI-SQLite/pkg-plist
+++ b/databases/p5-Class-DBI-SQLite/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/Class/DBI/SQLite.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/SQLite/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/SQLite
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Sweet/pkg-plist b/databases/p5-Class-DBI-Sweet/pkg-plist
index eb0fa97ade49..98814702fba7 100644
--- a/databases/p5-Class-DBI-Sweet/pkg-plist
+++ b/databases/p5-Class-DBI-Sweet/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Class/DBI/Sweet.pm
%%SITE_PERL%%/Class/DBI/Sweet/Topping.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Sweet 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI/Sweet
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-ToSax/pkg-plist b/databases/p5-Class-DBI-ToSax/pkg-plist
index a06e7a39fe8c..ace0f96d2815 100644
--- a/databases/p5-Class-DBI-ToSax/pkg-plist
+++ b/databases/p5-Class-DBI-ToSax/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/ToSax.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/ToSax/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/ToSax
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-Untaint/pkg-plist b/databases/p5-Class-DBI-Untaint/pkg-plist
index 8b4ae6e0452b..6cebeda9f279 100644
--- a/databases/p5-Class-DBI-Untaint/pkg-plist
+++ b/databases/p5-Class-DBI-Untaint/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/Untaint.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Untaint/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/Untaint
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI-mysql/pkg-plist b/databases/p5-Class-DBI-mysql/pkg-plist
index 715746b0cf62..228a19a6e527 100644
--- a/databases/p5-Class-DBI-mysql/pkg-plist
+++ b/databases/p5-Class-DBI-mysql/pkg-plist
@@ -1,7 +1,7 @@
%%SITE_PERL%%/Class/DBI/mysql.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/mysql/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/mysql
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
diff --git a/databases/p5-Class-DBI/pkg-plist b/databases/p5-Class-DBI/pkg-plist
index 81e0dc29d500..89e29b525e17 100644
--- a/databases/p5-Class-DBI/pkg-plist
+++ b/databases/p5-Class-DBI/pkg-plist
@@ -15,12 +15,12 @@
%%SITE_PERL%%/Class/DBI/Search/Basic.pm
%%SITE_PERL%%/Class/DBI/SQL/Transformer.pm
%%SITE_PERL%%/Class/DBI/Test/SQLite.pm
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/SQL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Relationship 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI/Cascade 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Class/DBI/Test
+@dirrmtry %%SITE_PERL%%/Class/DBI/SQL
+@dirrmtry %%SITE_PERL%%/Class/DBI/Search
+@dirrmtry %%SITE_PERL%%/Class/DBI/Relationship
+@dirrmtry %%SITE_PERL%%/Class/DBI/Cascade
+@dirrmtry %%SITE_PERL%%/Class/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI
+@dirrmtry %%SITE_PERL%%/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class
diff --git a/databases/p5-DBD-CSV/pkg-plist b/databases/p5-DBD-CSV/pkg-plist
index 15d00dd79217..d1bf0675d9c9 100644
--- a/databases/p5-DBD-CSV/pkg-plist
+++ b/databases/p5-DBD-CSV/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/CSV/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/CSV
@dirrm %%SITE_PERL%%/Bundle/DBD
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/DBD
diff --git a/databases/p5-DBD-InterBase/pkg-plist b/databases/p5-DBD-InterBase/pkg-plist
index a6a8aa39be45..bfc2cfece751 100644
--- a/databases/p5-DBD-InterBase/pkg-plist
+++ b/databases/p5-DBD-InterBase/pkg-plist
@@ -5,6 +5,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/InterBase/InterBase.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/InterBase/InterBase.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD/InterBase
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/InterBase
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
diff --git a/databases/p5-DBD-LDAP/pkg-plist b/databases/p5-DBD-LDAP/pkg-plist
index b7547fae4726..ccff000a0b30 100644
--- a/databases/p5-DBD-LDAP/pkg-plist
+++ b/databases/p5-DBD-LDAP/pkg-plist
@@ -1,6 +1,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/LDAP/.packlist
%%SITE_PERL%%/DBD/LDAP.pm
%%SITE_PERL%%/JLdap.pm
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBD
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/LDAP
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
diff --git a/databases/p5-DBD-Mock/pkg-plist b/databases/p5-DBD-Mock/pkg-plist
index eb984b860dd8..24a85c45997b 100644
--- a/databases/p5-DBD-Mock/pkg-plist
+++ b/databases/p5-DBD-Mock/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DBD/Mock.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Mock/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Mock
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/DBD
diff --git a/databases/p5-DBD-ODBC/pkg-plist b/databases/p5-DBD-ODBC/pkg-plist
index 9db6ece5a445..f48fc50351ce 100644
--- a/databases/p5-DBD-ODBC/pkg-plist
+++ b/databases/p5-DBD-ODBC/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/ODBC/ODBC.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/ODBC/ODBC.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/ODBC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD/ODBC
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
diff --git a/databases/p5-DBD-Oracle/pkg-plist b/databases/p5-DBD-Oracle/pkg-plist
index aa36ba299b6a..2e27f21e9cb6 100644
--- a/databases/p5-DBD-Oracle/pkg-plist
+++ b/databases/p5-DBD-Oracle/pkg-plist
@@ -24,5 +24,5 @@ bin/ora_explain
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD/Oracle
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
diff --git a/databases/p5-DBD-Pg-13/pkg-plist b/databases/p5-DBD-Pg-13/pkg-plist
index cc8695626dc9..2f1e89c4a2d0 100644
--- a/databases/p5-DBD-Pg-13/pkg-plist
+++ b/databases/p5-DBD-Pg-13/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
diff --git a/databases/p5-DBD-Pg/pkg-plist b/databases/p5-DBD-Pg/pkg-plist
index cc8695626dc9..2f1e89c4a2d0 100644
--- a/databases/p5-DBD-Pg/pkg-plist
+++ b/databases/p5-DBD-Pg/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
diff --git a/databases/p5-DBD-PgPP/pkg-plist b/databases/p5-DBD-PgPP/pkg-plist
index 91ed9aea0dbf..ea36c07b55ea 100644
--- a/databases/p5-DBD-PgPP/pkg-plist
+++ b/databases/p5-DBD-PgPP/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/DBD/DBD-PgPP.ja.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgPP/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgPP
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
diff --git a/databases/p5-DBD-PgSPI/pkg-plist b/databases/p5-DBD-PgSPI/pkg-plist
index dbff3ab971bf..b5c3b81a161e 100644
--- a/databases/p5-DBD-PgSPI/pkg-plist
+++ b/databases/p5-DBD-PgSPI/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgSPI/PgSPI.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgSPI/PgSPI.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/PgSPI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
diff --git a/databases/p5-DBD-SQLite/pkg-plist b/databases/p5-DBD-SQLite/pkg-plist
index f679c6b3357a..4fe9a9fec2a9 100644
--- a/databases/p5-DBD-SQLite/pkg-plist
+++ b/databases/p5-DBD-SQLite/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/SQLite.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
diff --git a/databases/p5-DBD-SQLite2/pkg-plist b/databases/p5-DBD-SQLite2/pkg-plist
index 7cda5ab0da53..25945df9a7e8 100644
--- a/databases/p5-DBD-SQLite2/pkg-plist
+++ b/databases/p5-DBD-SQLite2/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/SQLite2.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/SQLite2.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLite2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
diff --git a/databases/p5-DBD-XBase/pkg-plist b/databases/p5-DBD-XBase/pkg-plist
index 22060dfc6d0c..cbd96f5f99b5 100644
--- a/databases/p5-DBD-XBase/pkg-plist
+++ b/databases/p5-DBD-XBase/pkg-plist
@@ -11,4 +11,4 @@ bin/indexdump
%%SITE_PERL%%/%%PERL_ARCH%%/auto/XBase/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XBase
@dirrm %%SITE_PERL%%/XBase
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBD
diff --git a/databases/p5-DBD-mysql/pkg-plist b/databases/p5-DBD-mysql/pkg-plist
index c335d6bf49a7..969a1750a6fd 100644
--- a/databases/p5-DBD-mysql/pkg-plist
+++ b/databases/p5-DBD-mysql/pkg-plist
@@ -10,7 +10,7 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD/mysql
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mysql
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/mysql
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
diff --git a/databases/p5-DBI-Shell/pkg-plist b/databases/p5-DBI-Shell/pkg-plist
index 47e17b00e710..6df67c5d42b1 100644
--- a/databases/p5-DBI-Shell/pkg-plist
+++ b/databases/p5-DBI-Shell/pkg-plist
@@ -7,9 +7,9 @@ bin/dbish
%%SITE_PERL%%/DBI/Shell/FindSqlFile.pm
%%SITE_PERL%%/DBI/Format/SQLMinus.pm
%%SITE_PERL%%/DBI/Shell.pm
-@unexec rmdir %D/%%SITE_PERL%%/DBI/Shell 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBI/Format 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBI 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBI/Shell
+@dirrmtry %%SITE_PERL%%/DBI/Format
+@dirrmtry %%SITE_PERL%%/DBI
@unexec rm %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Shell/.packlist 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Shell 2> /dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI 2> /dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI/Shell
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBI
diff --git a/databases/p5-DBI/pkg-plist b/databases/p5-DBI/pkg-plist
index b01db23874ef..7048de54e709 100644
--- a/databases/p5-DBI/pkg-plist
+++ b/databases/p5-DBI/pkg-plist
@@ -45,6 +45,6 @@ bin/dbiproxy
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Win32 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Win32
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
diff --git a/databases/p5-DBIx-Abstract/pkg-plist b/databases/p5-DBIx-Abstract/pkg-plist
index 8353efbfc648..c593d97d254b 100644
--- a/databases/p5-DBIx-Abstract/pkg-plist
+++ b/databases/p5-DBIx-Abstract/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/DBIx/Abstract.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Abstract/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Abstract
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Abstract 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Abstract 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Abstract
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx/Abstract
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Browse/pkg-plist b/databases/p5-DBIx-Browse/pkg-plist
index e00d7367753b..e0ba124a361f 100644
--- a/databases/p5-DBIx-Browse/pkg-plist
+++ b/databases/p5-DBIx-Browse/pkg-plist
@@ -3,5 +3,5 @@
@dirrm %%SITE_PERL%%/DBIx/Browse/
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Browse/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Browse/
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Class-Loader/pkg-plist b/databases/p5-DBIx-Class-Loader/pkg-plist
index 69aa062cc7ee..f6cf0690eea1 100644
--- a/databases/p5-DBIx-Class-Loader/pkg-plist
+++ b/databases/p5-DBIx-Class-Loader/pkg-plist
@@ -6,9 +6,9 @@
%%SITE_PERL%%/DBIx/Class/Loader/SQLite.pm
%%SITE_PERL%%/DBIx/Class/Loader.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Loader/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Loader 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/Loader 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/Loader
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Loader
+@dirrmtry %%SITE_PERL%%/DBIx/Class
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Class/pkg-plist b/databases/p5-DBIx-Class/pkg-plist
index ced575a105e8..197bf10d5268 100644
--- a/databases/p5-DBIx-Class/pkg-plist
+++ b/databases/p5-DBIx-Class/pkg-plist
@@ -59,14 +59,14 @@
%%SITE_PERL%%/DBIx/Class/Table.pm
%%SITE_PERL%%/DBIx/Class/Test/SQLite.pm
%%SITE_PERL%%/DBIx/Class/UUIDColumns.pm
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/Test 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/Storage/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/Storage 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/Relationship 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/PK/Auto 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/PK 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/Manual 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/ClassResolver 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class/CDBICompat 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Class 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Test
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Storage/DBI
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Storage
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Relationship
+@dirrmtry %%SITE_PERL%%/DBIx/Class/PK/Auto
+@dirrmtry %%SITE_PERL%%/DBIx/Class/PK
+@dirrmtry %%SITE_PERL%%/DBIx/Class/Manual
+@dirrmtry %%SITE_PERL%%/DBIx/Class/ClassResolver
+@dirrmtry %%SITE_PERL%%/DBIx/Class/CDBICompat
+@dirrmtry %%SITE_PERL%%/DBIx/Class
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-ContextualFetch/pkg-plist b/databases/p5-DBIx-ContextualFetch/pkg-plist
index 88122395b8de..ec59e8927c51 100644
--- a/databases/p5-DBIx-ContextualFetch/pkg-plist
+++ b/databases/p5-DBIx-ContextualFetch/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/ContextualFetch/.packlist
%%SITE_PERL%%/DBIx/ContextualFetch.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/ContextualFetch
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBIx
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
diff --git a/databases/p5-DBIx-DBSchema/pkg-plist b/databases/p5-DBIx-DBSchema/pkg-plist
index 67188110a6b5..8f99a3f51407 100644
--- a/databases/p5-DBIx-DBSchema/pkg-plist
+++ b/databases/p5-DBIx-DBSchema/pkg-plist
@@ -14,8 +14,8 @@
%%SITE_PERL%%/DBIx/DBSchema/_util.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DBSchema/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DBSchema
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
@dirrm %%SITE_PERL%%/DBIx/DBSchema/DBD
@dirrm %%SITE_PERL%%/DBIx/DBSchema/ColGroup
@dirrm %%SITE_PERL%%/DBIx/DBSchema
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-DataSource/pkg-plist b/databases/p5-DBIx-DataSource/pkg-plist
index 4b7c499d71c0..ba24b0410a9c 100644
--- a/databases/p5-DBIx-DataSource/pkg-plist
+++ b/databases/p5-DBIx-DataSource/pkg-plist
@@ -5,5 +5,5 @@
%%SITE_PERL%%/DBIx/DataSource/Pg.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/DataSource
@dirrm %%SITE_PERL%%/DBIx/DataSource
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Ease/pkg-plist b/databases/p5-DBIx-Ease/pkg-plist
index 9e6b90a5d5e0..e8b2e9bf5d44 100644
--- a/databases/p5-DBIx-Ease/pkg-plist
+++ b/databases/p5-DBIx-Ease/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DBIx/Ease.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Ease/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Ease
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Recordset/pkg-plist b/databases/p5-DBIx-Recordset/pkg-plist
index ba9380b9033b..93c53dbaccae 100644
--- a/databases/p5-DBIx-Recordset/pkg-plist
+++ b/databases/p5-DBIx-Recordset/pkg-plist
@@ -7,5 +7,5 @@
%%SITE_PERL%%/DBIx/Recordset/FileSeq.pm
@dirrm %%SITE_PERL%%/DBIx/Recordset
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Recordset
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBIx
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
diff --git a/databases/p5-DBIx-SearchBuilder/pkg-plist b/databases/p5-DBIx-SearchBuilder/pkg-plist
index 746ac334331a..22c10699b0f6 100644
--- a/databases/p5-DBIx-SearchBuilder/pkg-plist
+++ b/databases/p5-DBIx-SearchBuilder/pkg-plist
@@ -17,6 +17,6 @@
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SearchBuilder
@dirrm %%SITE_PERL%%/DBIx/SearchBuilder/Record
@dirrm %%SITE_PERL%%/DBIx/SearchBuilder/Handle
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/SearchBuilder 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx/SearchBuilder
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Sequence/pkg-plist b/databases/p5-DBIx-Sequence/pkg-plist
index b0947422bb6b..90bf0213db81 100644
--- a/databases/p5-DBIx-Sequence/pkg-plist
+++ b/databases/p5-DBIx-Sequence/pkg-plist
@@ -2,7 +2,7 @@
%%SITE_PERL%%/DBIx/Sequence.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Sequence/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Sequence
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Sequence 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx/Sequence 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Sequence
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx/Sequence
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Simple/pkg-plist b/databases/p5-DBIx-Simple/pkg-plist
index ab32d43bf8bc..777a148c7ac9 100644
--- a/databases/p5-DBIx-Simple/pkg-plist
+++ b/databases/p5-DBIx-Simple/pkg-plist
@@ -4,6 +4,6 @@
%%SITE_PERL%%/DBIx/Simple/SQE.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Simple/.packlist
@dirrm %%SITE_PERL%%/DBIx/Simple
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBIx
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
diff --git a/databases/p5-DBIx-TableHash/pkg-plist b/databases/p5-DBIx-TableHash/pkg-plist
index 9b56793dcaf7..8e02876efa48 100644
--- a/databases/p5-DBIx-TableHash/pkg-plist
+++ b/databases/p5-DBIx-TableHash/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DBIx/TableHash.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/TableHash/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/TableHash
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-Tree/pkg-plist b/databases/p5-DBIx-Tree/pkg-plist
index b1e22c1be63d..fee0185e40ca 100644
--- a/databases/p5-DBIx-Tree/pkg-plist
+++ b/databases/p5-DBIx-Tree/pkg-plist
@@ -3,6 +3,6 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Tree/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Tree
@dirrm %%SITE_PERL%%/auto/DBIx/Tree
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-XHTML_Table/pkg-plist b/databases/p5-DBIx-XHTML_Table/pkg-plist
index 77863e2b45e5..a361638905b4 100644
--- a/databases/p5-DBIx-XHTML_Table/pkg-plist
+++ b/databases/p5-DBIx-XHTML_Table/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DBIx/XHTML_Table.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XHTML_Table/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XHTML_Table
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBM-Deep/pkg-plist b/databases/p5-DBM-Deep/pkg-plist
index 2af22cc049b0..4744781514f8 100644
--- a/databases/p5-DBM-Deep/pkg-plist
+++ b/databases/p5-DBM-Deep/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/DBM/Deep.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBM/Deep/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBM/Deep
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBM 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/DBM 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBM
+@dirrmtry %%SITE_PERL%%/DBM
diff --git a/databases/p5-Data-Page/pkg-plist b/databases/p5-Data-Page/pkg-plist
index a46d81121345..5ced68b6bc30 100644
--- a/databases/p5-Data-Page/pkg-plist
+++ b/databases/p5-Data-Page/pkg-plist
@@ -1,2 +1,2 @@
%%SITE_PERL%%/Data/Page.pm
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/databases/p5-Exception-Class-DBI/pkg-plist b/databases/p5-Exception-Class-DBI/pkg-plist
index d99543c47bf1..57dbb2233c8c 100644
--- a/databases/p5-Exception-Class-DBI/pkg-plist
+++ b/databases/p5-Exception-Class-DBI/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/Exception/Class/DBI.pm
-@unexec rmdir %D/%%%SITE_PERL%%/Exception/Class 2>/dev/null || true
-@unexec rmdir %D/%%%SITE_PERL%%/Exception 2>/dev/null || true
+@dirrmtry %%%SITE_PERL%%/Exception/Class
+@dirrmtry %%%SITE_PERL%%/Exception
diff --git a/databases/p5-GraphViz-DBI/pkg-plist b/databases/p5-GraphViz-DBI/pkg-plist
index 8aa446b361c2..c124df571db7 100644
--- a/databases/p5-GraphViz-DBI/pkg-plist
+++ b/databases/p5-GraphViz-DBI/pkg-plist
@@ -2,4 +2,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/DBI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz/DBI
@unexec rmdir %%SITE_PERL%%/%%PERL_ARCH%%/auto/GraphViz 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/GraphViz 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/GraphViz
diff --git a/databases/p5-Ima-DBI/pkg-plist b/databases/p5-Ima-DBI/pkg-plist
index a69444391e90..7035750edfa8 100644
--- a/databases/p5-Ima-DBI/pkg-plist
+++ b/databases/p5-Ima-DBI/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ima/DBI/.packlist
%%SITE_PERL%%/Ima/DBI.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ima/DBI
-@unexec rmdir %D/%%SITE_PERL%%/Ima 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ima 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Ima
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ima
diff --git a/databases/p5-Jifty-DBI/pkg-plist b/databases/p5-Jifty-DBI/pkg-plist
index f52bfd39c380..c84faea80356 100644
--- a/databases/p5-Jifty-DBI/pkg-plist
+++ b/databases/p5-Jifty-DBI/pkg-plist
@@ -24,11 +24,11 @@
%%SITE_PERL%%/Jifty/DBI/Handle/Sybase.pm
%%SITE_PERL%%/Jifty/DBI/Handle/mysqlPP.pm
%%SITE_PERL%%/Jifty/DBI/Handle/Oracle.pm
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Jifty/DBI/Record 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Jifty/DBI/Filter 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Jifty/DBI/Collection 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Jifty/DBI/Handle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Jifty/DBI 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Jifty 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/DBI
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty
+@dirrmtry %%SITE_PERL%%/Jifty/DBI/Record
+@dirrmtry %%SITE_PERL%%/Jifty/DBI/Filter
+@dirrmtry %%SITE_PERL%%/Jifty/DBI/Collection
+@dirrmtry %%SITE_PERL%%/Jifty/DBI/Handle
+@dirrmtry %%SITE_PERL%%/Jifty/DBI
+@dirrmtry %%SITE_PERL%%/Jifty
diff --git a/databases/p5-MLDBM-Sync/pkg-plist b/databases/p5-MLDBM-Sync/pkg-plist
index 609fe1aebeeb..0d3721ce35eb 100644
--- a/databases/p5-MLDBM-Sync/pkg-plist
+++ b/databases/p5-MLDBM-Sync/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/MLDBM/Sync/SDBM_File.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/Sync/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM/Sync
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MLDBM
@dirrm %%SITE_PERL%%/MLDBM/Sync
-@unexec rmdir %D/%%SITE_PERL%%/MLDBM 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/MLDBM
diff --git a/databases/p5-MySQL-Diff/pkg-plist b/databases/p5-MySQL-Diff/pkg-plist
index 3c18a20a2ce0..e93f65f8889d 100644
--- a/databases/p5-MySQL-Diff/pkg-plist
+++ b/databases/p5-MySQL-Diff/pkg-plist
@@ -5,5 +5,5 @@
bin/mysqldiff
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL/Diff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL/Diff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MySQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL
+@dirrmtry %%SITE_PERL%%/MySQL
diff --git a/databases/p5-Mysql-Diff/pkg-plist b/databases/p5-Mysql-Diff/pkg-plist
index 3c18a20a2ce0..e93f65f8889d 100644
--- a/databases/p5-Mysql-Diff/pkg-plist
+++ b/databases/p5-Mysql-Diff/pkg-plist
@@ -5,5 +5,5 @@
bin/mysqldiff
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL/Diff/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL/Diff
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MySQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MySQL
+@dirrmtry %%SITE_PERL%%/MySQL
diff --git a/databases/p5-Mysql/pkg-plist b/databases/p5-Mysql/pkg-plist
index 28eb305dd2e5..e9ee49efec03 100644
--- a/databases/p5-Mysql/pkg-plist
+++ b/databases/p5-Mysql/pkg-plist
@@ -10,5 +10,5 @@ bin/dbimon
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Msql-Mysql-modules
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Mysql
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/DBD
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
diff --git a/databases/p5-POE-Component-DBIAgent/pkg-plist b/databases/p5-POE-Component-DBIAgent/pkg-plist
index eb28d829b63b..098aeb56451f 100644
--- a/databases/p5-POE-Component-DBIAgent/pkg-plist
+++ b/databases/p5-POE-Component-DBIAgent/pkg-plist
@@ -4,7 +4,7 @@
%%SITE_PERL%%/POE/Component/DBIAgent/Queue.pm
@dirrm %%SITE_PERL%%/POE/Component/DBIAgent
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/DBIAgent
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/databases/p5-POE-Component-EasyDBI/pkg-plist b/databases/p5-POE-Component-EasyDBI/pkg-plist
index 00040bdf6aef..06f755b11eac 100644
--- a/databases/p5-POE-Component-EasyDBI/pkg-plist
+++ b/databases/p5-POE-Component-EasyDBI/pkg-plist
@@ -2,8 +2,8 @@
%%SITE_PERL%%/POE/Component/EasyDBI/SubProcess.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/EasyDBI/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/EasyDBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
@dirrm %%SITE_PERL%%/POE/Component/EasyDBI
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
diff --git a/databases/p5-POE-Component-LaDBI/pkg-plist b/databases/p5-POE-Component-LaDBI/pkg-plist
index 4d2cc7a063c2..a3c80c785f54 100644
--- a/databases/p5-POE-Component-LaDBI/pkg-plist
+++ b/databases/p5-POE-Component-LaDBI/pkg-plist
@@ -5,8 +5,8 @@
%%SITE_PERL%%/POE/Component/LaDBI/Request.pm
%%SITE_PERL%%/POE/Component/LaDBI/Response.pm
@dirrm %%SITE_PERL%%/POE/Component/LaDBI
-@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/POE/Component
+@dirrmtry %%SITE_PERL%%/POE
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/LaDBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
diff --git a/databases/p5-ResourcePool-Resource-DBI/pkg-plist b/databases/p5-ResourcePool-Resource-DBI/pkg-plist
index e2fcb2a34551..9210ba28dc0d 100644
--- a/databases/p5-ResourcePool-Resource-DBI/pkg-plist
+++ b/databases/p5-ResourcePool-Resource-DBI/pkg-plist
@@ -12,6 +12,6 @@
%%SITE_PERL%%/ResourcePool/Factory/DBI.pod
@dirrm %%SITE_PERL%%/ResourcePool/Command/DBI
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/DBI
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource
+@dirrmtry %%SITE_PERL%%/ResourcePool/Resource
+@dirrmtry %%SITE_PERL%%/ResourcePool/Factory
diff --git a/databases/p5-SQL-Abstract-Limit/pkg-plist b/databases/p5-SQL-Abstract-Limit/pkg-plist
index 49e21f55b88a..71ce618be051 100644
--- a/databases/p5-SQL-Abstract-Limit/pkg-plist
+++ b/databases/p5-SQL-Abstract-Limit/pkg-plist
@@ -1,3 +1,3 @@
%%SITE_PERL%%/SQL/Abstract/Limit.pm
-@unexec rmdir %D/%%SITE_PERL%%/SQL/Abstract 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SQL/Abstract
+@dirrmtry %%SITE_PERL%%/SQL
diff --git a/databases/p5-SQL-Abstract/pkg-plist b/databases/p5-SQL-Abstract/pkg-plist
index 22e7cf3ea4b3..941c0facaf4d 100644
--- a/databases/p5-SQL-Abstract/pkg-plist
+++ b/databases/p5-SQL-Abstract/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Abstract/.packlist
%%SITE_PERL%%/SQL/Abstract.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Abstract
-@unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SQL
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL
diff --git a/databases/p5-SQL-Statement/pkg-plist b/databases/p5-SQL-Statement/pkg-plist
index 639e8ace7d91..d5d6ecef84b1 100644
--- a/databases/p5-SQL-Statement/pkg-plist
+++ b/databases/p5-SQL-Statement/pkg-plist
@@ -12,9 +12,9 @@
%%SITE_PERL%%/SQL/Statement/Syntax.pod
%%SITE_PERL%%/SQL/Statement/Util.pm
@dirrm %%SITE_PERL%%/SQL/Statement
-@unexec rmdir %D/%%SITE_PERL%%/SQL/Dialects 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SQL/Dialects
+@dirrmtry %%SITE_PERL%%/SQL
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Statement
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL
diff --git a/databases/p5-SQL-Translator/pkg-plist b/databases/p5-SQL-Translator/pkg-plist
index cc47029b34ed..baea4b3eb573 100644
--- a/databases/p5-SQL-Translator/pkg-plist
+++ b/databases/p5-SQL-Translator/pkg-plist
@@ -66,7 +66,7 @@ bin/sqlt-graph
%%SITE_PERL%%/SQL/Translator/Utils.pm
%%SITE_PERL%%/Test/SQL/Translator.pm
@dirrm %%SITE_PERL%%/Test/SQL
-@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Test
@dirrm %%SITE_PERL%%/SQL/Translator/Schema/Graph
@dirrm %%SITE_PERL%%/SQL/Translator/Schema
@dirrm %%SITE_PERL%%/SQL/Translator/Producer/XML
@@ -77,4 +77,4 @@ bin/sqlt-graph
@dirrm %%SITE_PERL%%/SQL/Translator/Parser/DB2
@dirrm %%SITE_PERL%%/SQL/Translator/Parser
@dirrm %%SITE_PERL%%/SQL/Translator
-@unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SQL
diff --git a/databases/p5-SQLite-Work/pkg-plist b/databases/p5-SQLite-Work/pkg-plist
index d735f408918a..f9f76574f2d9 100644
--- a/databases/p5-SQLite-Work/pkg-plist
+++ b/databases/p5-SQLite-Work/pkg-plist
@@ -5,5 +5,5 @@ bin/sqlw_import
%%SITE_PERL%%/SQLite/Work/Template.pm
%%SITE_PERL%%/SQLite/Work/CGI.pm
%%SITE_PERL%%/SQLite/Work/Mail.pm
-@unexec rmdir %D/%%SITE_PERL%%/SQLite/Work 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/SQLite 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/SQLite/Work
+@dirrmtry %%SITE_PERL%%/SQLite
diff --git a/databases/p5-Search-InvertedIndex/pkg-plist b/databases/p5-Search-InvertedIndex/pkg-plist
index 6f008d258028..d180d9f54bb9 100644
--- a/databases/p5-Search-InvertedIndex/pkg-plist
+++ b/databases/p5-Search-InvertedIndex/pkg-plist
@@ -11,9 +11,9 @@
@dirrm %%SITE_PERL%%/Search/InvertedIndex/Query
@dirrm %%SITE_PERL%%/Search/InvertedIndex
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/InvertedIndex
-@unexec rmdir %D/%%SITE_PERL%%/Search/InvertedIndex/DB 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Search/InvertedIndex/Query 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Search/InvertedIndex 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/InvertedIndex 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Search/InvertedIndex/DB
+@dirrmtry %%SITE_PERL%%/Search/InvertedIndex/Query
+@dirrmtry %%SITE_PERL%%/Search/InvertedIndex
+@dirrmtry %%SITE_PERL%%/Search
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/InvertedIndex
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
diff --git a/databases/p5-Search-Namazu/pkg-plist b/databases/p5-Search-Namazu/pkg-plist
index 1f7aa662d663..66b9fcf944d9 100644
--- a/databases/p5-Search-Namazu/pkg-plist
+++ b/databases/p5-Search-Namazu/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu/Namazu.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Namazu
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search
diff --git a/databases/p5-Text-Query-SQL/pkg-plist b/databases/p5-Text-Query-SQL/pkg-plist
index c464700811a9..8d19d396fb7d 100644
--- a/databases/p5-Text-Query-SQL/pkg-plist
+++ b/databases/p5-Text-Query-SQL/pkg-plist
@@ -7,7 +7,7 @@
%%SITE_PERL%%/Text/Query/SolveSQL.pm
%%SITE_PERL%%/Bundle/Text/Query/BuildSQL.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query/SQL
-@unexec rmdir %D/%%SITE_PERL%%/Bundle/Text/Query 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%%/Text/Query 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Bundle/Text/Query
+@dirrmtry %%SITE_PERL%%/Bundle/Text
+@dirrmtry %%SITE_PERL%%/Bundle
+@dirrmtry %%SITE_PERL%%/Text/Query
diff --git a/databases/p5-Time-Piece-MySQL/pkg-plist b/databases/p5-Time-Piece-MySQL/pkg-plist
index cfb9995709b6..6bec24e40bae 100644
--- a/databases/p5-Time-Piece-MySQL/pkg-plist
+++ b/databases/p5-Time-Piece-MySQL/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/MySQL/.packlist
%%SITE_PERL%%/Time/Piece/MySQL.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Piece/MySQL
-@unexec rmdir %D/%%SITE_PERL%%/Time/Piece 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Time/Piece
+@dirrmtry %%SITE_PERL%%/Time
diff --git a/databases/p5-sqlrelay/pkg-plist b/databases/p5-sqlrelay/pkg-plist
index b5ea2df64997..031fe7fc7819 100644
--- a/databases/p5-sqlrelay/pkg-plist
+++ b/databases/p5-sqlrelay/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/DBD/SQLRelay.pm
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBD
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLRelay/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/SQLRelay
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
%%SITE_PERL%%/%%PERL_ARCH%%/SQLRelay/Connection.pm
%%SITE_PERL%%/%%PERL_ARCH%%/SQLRelay/Cursor.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQLRelay/Connection/.packlist
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index f859bf3b28fd..f8dc70e0c995 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -135,8 +135,8 @@ libexec/mysqld
%%NDB%%@dirrm include/mysql/ndb/mgmapi
%%NDB%%@dirrm include/mysql/ndb/ndbapi
%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
+@dirrmtry include/mysql
+@dirrmtry lib/mysql
@dirrm %%DATADIR%%/charsets
@dirrm %%DATADIR%%/czech
@dirrm %%DATADIR%%/danish
@@ -161,4 +161,4 @@ libexec/mysqld
@dirrm %%DATADIR%%/spanish
@dirrm %%DATADIR%%/swedish
@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
+@dirrmtry %%DATADIR%%
diff --git a/databases/pgaccess/pkg-plist b/databases/pgaccess/pkg-plist
index bd8c4d0a0d8b..26844e6e3a85 100644
--- a/databases/pgaccess/pkg-plist
+++ b/databases/pgaccess/pkg-plist
@@ -391,7 +391,7 @@ share/postgresql/pgaccess/utils/mkkit.tcl
@dirrm share/postgresql/pgaccess/extra
@dirrm share/postgresql/pgaccess/demo
@dirrm share/postgresql/pgaccess
-@unexec rmdir %D/share/postgresql 2> /dev/null || true
+@dirrmtry share/postgresql
%%PORTDOCS%%@dirrm share/doc/postgresql/pgaccess/tutorial
%%PORTDOCS%%@dirrm share/doc/postgresql/pgaccess
%%PORTDOCS%%@unexec rmdir %D/share/doc/postgresql 2> /dev/null || true
diff --git a/databases/pgworksheet/pkg-plist b/databases/pgworksheet/pkg-plist
index db401ce001f5..38ba03067148 100644
--- a/databases/pgworksheet/pkg-plist
+++ b/databases/pgworksheet/pkg-plist
@@ -36,12 +36,12 @@ share/pixmaps/pgworksheet/pgworksheet-32.png
share/locale/fr/LC_MESSAGES/pgworksheet.mo
share/locale/ja/LC_MESSAGES/pgworksheet.mo
@dirrm %%PYTHON_SITELIBDIR%%/pgw
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
@dirrm share/pixmaps/pgworksheet
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/locale/ja/LC_MESSAGES
+@dirrmtry share/locale/ja
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale
+@dirrmtry share/applications
diff --git a/databases/postgis/pkg-plist b/databases/postgis/pkg-plist
index 98bf96cb3c30..233eb7b4eb90 100644
--- a/databases/postgis/pkg-plist
+++ b/databases/postgis/pkg-plist
@@ -13,7 +13,7 @@ lib/postgresql/liblwgeom.so.1
%%DATADIR%%/utils/create_undef.pl
%%DATADIR%%/utils/README
%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%/utils 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
-@unexec rmdir %D/lib 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DATADIR%%/utils
+@dirrmtry %%DATADIR%%
+@dirrmtry lib
diff --git a/databases/postgresql-jdbc/pkg-plist b/databases/postgresql-jdbc/pkg-plist
index e13d99227721..e7695f1cf5a5 100644
--- a/databases/postgresql-jdbc/pkg-plist
+++ b/databases/postgresql-jdbc/pkg-plist
@@ -21,4 +21,4 @@
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/jdbc 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql-libpgeasy/pkg-plist b/databases/postgresql-libpgeasy/pkg-plist
index d2724ac79a0e..811df7aa9ce2 100644
--- a/databases/postgresql-libpgeasy/pkg-plist
+++ b/databases/postgresql-libpgeasy/pkg-plist
@@ -11,5 +11,5 @@ lib/libpgeasy.so.3
%%PORTDOCS%%%%DOCSDIR%%/libpgeasy.html
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/examples/postgresql 2>/dev/null || true
-@unexec rmdir %D/share/doc/postgresql 2>/dev/null || true
+@dirrmtry share/examples/postgresql
+@dirrmtry share/doc/postgresql
diff --git a/databases/py-dbutils/pkg-plist b/databases/py-dbutils/pkg-plist
index c9126b969700..3d574acb812b 100644
--- a/databases/py-dbutils/pkg-plist
+++ b/databases/py-dbutils/pkg-plist
@@ -66,7 +66,7 @@
%%PYTHON_SITELIBDIR%%/DBUtils/SolidDB.pyo
%%PYTHON_SITELIBDIR%%/DBUtils/SolidPg.pyo
%%PYTHON_SITELIBDIR%%/DBUtils/__init__.pyo
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/DBUtils/Testing 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/DBUtils/Examples 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/DBUtils/Docs 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/DBUtils 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%/DBUtils/Testing
+@dirrmtry %%PYTHON_SITELIBDIR%%/DBUtils/Examples
+@dirrmtry %%PYTHON_SITELIBDIR%%/DBUtils/Docs
+@dirrmtry %%PYTHON_SITELIBDIR%%/DBUtils
diff --git a/deskutils/alacarte/pkg-plist b/deskutils/alacarte/pkg-plist
index 39afb27f4d5c..073e075d3c8d 100644
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@@ -6,7 +6,7 @@ share/locale/nb/LC_MESSAGES/alacarte.mo
share/locale/nl/LC_MESSAGES/alacarte.mo
share/locale/no/LC_MESSAGES/alacarte.mo
share/applications/alacarte.desktop
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
@cwd %%LOCALBASE%%
%%PYTHON_SITELIBDIR%%/Alacarte/MenuHandler.py
%%PYTHON_SITELIBDIR%%/Alacarte/PyXDGMenuHandler.py
diff --git a/deskutils/basket/pkg-plist b/deskutils/basket/pkg-plist
index a7b5797f753c..792b81b5fbde 100644
--- a/deskutils/basket/pkg-plist
+++ b/deskutils/basket/pkg-plist
@@ -17,30 +17,30 @@ share/locale/fr/LC_MESSAGES/basket.mo
share/locale/nl/LC_MESSAGES/basket.mo
share/locale/pl_PL/LC_MESSAGES/basket.mo
share/locale/zh_TW/LC_MESSAGES/basket.mo
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/128x128 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
+@dirrmtry share/icons/crystalsvg/scalable/apps
+@dirrmtry share/icons/crystalsvg/scalable
+@dirrmtry share/icons/crystalsvg/64x64/apps
+@dirrmtry share/icons/crystalsvg/64x64
+@dirrmtry share/icons/crystalsvg/48x48/apps
+@dirrmtry share/icons/crystalsvg/48x48
+@dirrmtry share/icons/crystalsvg/32x32/apps
+@dirrmtry share/icons/crystalsvg/32x32
+@dirrmtry share/icons/crystalsvg/22x22/apps
+@dirrmtry share/icons/crystalsvg/22x22
+@dirrmtry share/icons/crystalsvg/16x16/apps
+@dirrmtry share/icons/crystalsvg/16x16
+@dirrmtry share/icons/crystalsvg/128x128/apps
+@dirrmtry share/icons/crystalsvg/128x128
+@dirrmtry share/icons/crystalsvg
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/basket
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/basket
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/deskutils/buoh/pkg-plist b/deskutils/buoh/pkg-plist
index 3b14bc9818e8..9ab5c41782bd 100644
--- a/deskutils/buoh/pkg-plist
+++ b/deskutils/buoh/pkg-plist
@@ -16,4 +16,4 @@ share/pixmaps/buoh64x64.png
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/comics
@dirrm %%DATADIR%%
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry share/applications
diff --git a/deskutils/cycle/pkg-plist b/deskutils/cycle/pkg-plist
index 31ccd86d0d71..3f64386d7034 100644
--- a/deskutils/cycle/pkg-plist
+++ b/deskutils/cycle/pkg-plist
@@ -29,14 +29,14 @@ share/locale/es/LC_MESSAGES/cycle.mo
share/locale/gl/LC_MESSAGES/cycle.mo
share/locale/ru/LC_MESSAGES/cycle.mo
share/locale/sk/LC_MESSAGES/cycle.mo
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
%%DOCSDIR%%/README.html
%%DOCSDIR%%/README_de.html
%%DOCSDIR%%/README_ru.html
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index e037e9ea7d79..2864a860d360 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -146,7 +146,7 @@ share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/gnomedesktop
%%EVO%%@dirrm %%PYTHON_SITELIBDIR%%/deskbar/evolution
@dirrm %%PYTHON_SITELIBDIR%%/deskbar
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
@dirrm lib/deskbar-applet/handlers
@dirrm lib/deskbar-applet
diff --git a/deskutils/dragstack/pkg-plist b/deskutils/dragstack/pkg-plist
index 98f61c650759..b7d97d3801d8 100644
--- a/deskutils/dragstack/pkg-plist
+++ b/deskutils/dragstack/pkg-plist
@@ -3,10 +3,10 @@ lib/libdragstack.so
lib/libdragstack.so.1
share/apps/kicker/applets/dragstack.desktop
share/icons/hicolor/32x32/apps/dragstack.png
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
diff --git a/deskutils/egroupware/pkg-plist b/deskutils/egroupware/pkg-plist
index 68d4d5442f92..aab7b0046a8f 100644
--- a/deskutils/egroupware/pkg-plist
+++ b/deskutils/egroupware/pkg-plist
@@ -7375,7 +7375,7 @@ www/data-dist/egroupware/wiki/templates/jerryr/images/navbar-over.png
www/data-dist/egroupware/wiki/templates/jerryr/images/navbar.png
www/data-dist/egroupware/wiki/templates/literati/images/navbar.png
www/data-dist/egroupware/xmlrpc.php
-@unexec rmdir %D/www/data-dist/egroupware 2>/dev/null || true
+@dirrmtry www/data-dist/egroupware
@dirrm www/data-dist/egroupware/wiki/templates/literati/images
@dirrm www/data-dist/egroupware/wiki/templates/literati
@dirrm www/data-dist/egroupware/wiki/templates/jerryr/images
@@ -8126,5 +8126,5 @@ www/data-dist/egroupware/xmlrpc.php
@dirrm www/data-dist/egroupware/addressbook/inc/export
@dirrm www/data-dist/egroupware/addressbook/inc
@dirrm www/data-dist/egroupware/addressbook
-@unexec rmdir %D/www/data-dist/egroupware/fudforum 2>/dev/null || true
-@unexec rmdir %D/www/data-dist/egroupware 2>/dev/null || true
+@dirrmtry www/data-dist/egroupware/fudforum
+@dirrmtry www/data-dist/egroupware
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index 7666ed7410f7..549117ad81c1 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -34,7 +34,7 @@ share/locale/uk/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
-@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_HK 2> /dev/null || true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
@dirrm share/gnome/evolution-jescs/glade
@dirrm share/gnome/evolution-jescs
diff --git a/deskutils/gnome-blog/pkg-plist b/deskutils/gnome-blog/pkg-plist
index 66baaec8650f..23b5eec84ba1 100644
--- a/deskutils/gnome-blog/pkg-plist
+++ b/deskutils/gnome-blog/pkg-plist
@@ -54,5 +54,5 @@ share/gnome/applications/gnome-blog.desktop
share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
share/gnome/pixmaps/gnome-blog.png
@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@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/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index e027e12e4d81..c5193da467ec 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -69,12 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
share/locale/wa/LC_MESSAGES/gnome-pim.mo
share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
-@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gd 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw 2> /dev/null || true
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/kw/LC_MESSAGES
+@dirrmtry share/locale/kw
@dirrm share/gnome/help/gnomecard/eu
@dirrm share/gnome/help/gnomecard/C
@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/gnomeblog/pkg-plist b/deskutils/gnomeblog/pkg-plist
index 66baaec8650f..23b5eec84ba1 100644
--- a/deskutils/gnomeblog/pkg-plist
+++ b/deskutils/gnomeblog/pkg-plist
@@ -54,5 +54,5 @@ share/gnome/applications/gnome-blog.desktop
share/gnome/gnome-2.0/ui/GNOME_BlogApplet.xml
share/gnome/pixmaps/gnome-blog.png
@dirrm %%PYTHON_SITELIBDIR%%/gnomeblog
-@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/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index e027e12e4d81..c5193da467ec 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -69,12 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
share/locale/wa/LC_MESSAGES/gnome-pim.mo
share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
-@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gd 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gv 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/kw 2> /dev/null || true
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
+@dirrmtry share/locale/gv/LC_MESSAGES
+@dirrmtry share/locale/gv
+@dirrmtry share/locale/kw/LC_MESSAGES
+@dirrmtry share/locale/kw
@dirrm share/gnome/help/gnomecard/eu
@dirrm share/gnome/help/gnomecard/C
@dirrm share/gnome/help/gnomecard
diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde-kronolith/pkg-plist
index bfee675d8a50..327cb9d73a0e 100644
--- a/deskutils/horde-kronolith/pkg-plist
+++ b/deskutils/horde-kronolith/pkg-plist
@@ -283,5 +283,5 @@
@dirrm %%KRONOLITHDIR%%/lib/Driver
@dirrm %%KRONOLITHDIR%%/lib/Block
@dirrm %%KRONOLITHDIR%%/lib
-@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true
+@dirrmtry %%KRONOLITHDIR%%/config
+@dirrmtry %%KRONOLITHDIR%%
diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde-mnemo/pkg-plist
index 816549d83396..35a4a06d49d8 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde-mnemo/pkg-plist
@@ -185,5 +185,5 @@
@dirrm %%MNEMODIR%%/lib/Driver
@dirrm %%MNEMODIR%%/lib/Block
@dirrm %%MNEMODIR%%/lib
-@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
+@dirrmtry %%MNEMODIR%%/config
+@dirrmtry %%MNEMODIR%%
diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde-nag/pkg-plist
index f8516bc705b9..2cf660b6f809 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde-nag/pkg-plist
@@ -204,5 +204,5 @@
@dirrm %%NAGDIR%%/lib/Driver
@dirrm %%NAGDIR%%/lib/Block
@dirrm %%NAGDIR%%/lib
-@unexec rmdir %D/%%NAGDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%NAGDIR%% 2>/dev/null || true
+@dirrmtry %%NAGDIR%%/config
+@dirrmtry %%NAGDIR%%
diff --git a/deskutils/horde4-kronolith/pkg-plist b/deskutils/horde4-kronolith/pkg-plist
index bfee675d8a50..327cb9d73a0e 100644
--- a/deskutils/horde4-kronolith/pkg-plist
+++ b/deskutils/horde4-kronolith/pkg-plist
@@ -283,5 +283,5 @@
@dirrm %%KRONOLITHDIR%%/lib/Driver
@dirrm %%KRONOLITHDIR%%/lib/Block
@dirrm %%KRONOLITHDIR%%/lib
-@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true
+@dirrmtry %%KRONOLITHDIR%%/config
+@dirrmtry %%KRONOLITHDIR%%
diff --git a/deskutils/horde4-mnemo/pkg-plist b/deskutils/horde4-mnemo/pkg-plist
index 816549d83396..35a4a06d49d8 100644
--- a/deskutils/horde4-mnemo/pkg-plist
+++ b/deskutils/horde4-mnemo/pkg-plist
@@ -185,5 +185,5 @@
@dirrm %%MNEMODIR%%/lib/Driver
@dirrm %%MNEMODIR%%/lib/Block
@dirrm %%MNEMODIR%%/lib
-@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
+@dirrmtry %%MNEMODIR%%/config
+@dirrmtry %%MNEMODIR%%
diff --git a/deskutils/horde4-nag/pkg-plist b/deskutils/horde4-nag/pkg-plist
index f8516bc705b9..2cf660b6f809 100644
--- a/deskutils/horde4-nag/pkg-plist
+++ b/deskutils/horde4-nag/pkg-plist
@@ -204,5 +204,5 @@
@dirrm %%NAGDIR%%/lib/Driver
@dirrm %%NAGDIR%%/lib/Block
@dirrm %%NAGDIR%%/lib
-@unexec rmdir %D/%%NAGDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%NAGDIR%% 2>/dev/null || true
+@dirrmtry %%NAGDIR%%/config
+@dirrmtry %%NAGDIR%%
diff --git a/deskutils/kblticker/pkg-plist b/deskutils/kblticker/pkg-plist
index 285886a8f470..ad62c79235ff 100644
--- a/deskutils/kblticker/pkg-plist
+++ b/deskutils/kblticker/pkg-plist
@@ -15,8 +15,8 @@ share/icons/hicolor/64x64/apps/kblticker.png
share/sounds/kblticker_bells.wav
share/sounds/kblticker_whistles.wav
@dirrm share/doc/HTML/en/kblticker
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/kblticker/icons/hicolor/16x16/actions
@dirrm share/apps/kblticker/icons/hicolor/22x22/actions
@dirrm share/apps/kblticker/icons/hicolor/16x16
@@ -24,5 +24,5 @@ share/sounds/kblticker_whistles.wav
@dirrm share/apps/kblticker/icons/hicolor
@dirrm share/apps/kblticker/icons
@dirrm share/apps/kblticker
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk
diff --git a/deskutils/kickpim/pkg-plist b/deskutils/kickpim/pkg-plist
index e31247d2ba77..2b299a877eea 100644
--- a/deskutils/kickpim/pkg-plist
+++ b/deskutils/kickpim/pkg-plist
@@ -25,23 +25,23 @@ share/locale/fr/LC_MESSAGES/kickpim.mo
share/locale/it/LC_MESSAGES/kickpim.mo
share/locale/nl/LC_MESSAGES/kickpim.mo
share/locale/pl/LC_MESSAGES/kickpim.mo
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale
@dirrm share/doc/HTML/en/kickpim
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/kickpim/info
@dirrm share/apps/kickpim/icons
@dirrm share/apps/kickpim
-@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
diff --git a/deskutils/klipoquery/pkg-plist b/deskutils/klipoquery/pkg-plist
index 89d75742dfcb..f45641119886 100644
--- a/deskutils/klipoquery/pkg-plist
+++ b/deskutils/klipoquery/pkg-plist
@@ -6,9 +6,9 @@ share/doc/HTML/en/klipoquery/common
share/doc/HTML/en/klipoquery/index.cache.bz2
share/doc/HTML/en/klipoquery/index.docbook
@dirrm share/doc/HTML/en/klipoquery
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/config 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true
-@unexec rmdir %D/share/apps/kicker 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/config
+@dirrmtry share/apps/kicker/applets
+@dirrmtry share/apps/kicker
+@dirrmtry share/apps
diff --git a/deskutils/krefty/pkg-plist b/deskutils/krefty/pkg-plist
index fca312ada9f8..c6f5dfa02591 100644
--- a/deskutils/krefty/pkg-plist
+++ b/deskutils/krefty/pkg-plist
@@ -15,19 +15,19 @@ share/doc/HTML/en/krefty/krefty01.png
share/icons/hicolor/16x16/apps/krefty.png
share/icons/hicolor/32x32/apps/krefty.png
share/services/krefty_part.desktop
-@unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/services
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/krefty
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/krefty/data
@dirrm share/apps/krefty
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-@unexec rmdir %D/lib/kde3 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
+@dirrmtry lib/kde3
diff --git a/deskutils/kronolith/pkg-plist b/deskutils/kronolith/pkg-plist
index bfee675d8a50..327cb9d73a0e 100644
--- a/deskutils/kronolith/pkg-plist
+++ b/deskutils/kronolith/pkg-plist
@@ -283,5 +283,5 @@
@dirrm %%KRONOLITHDIR%%/lib/Driver
@dirrm %%KRONOLITHDIR%%/lib/Block
@dirrm %%KRONOLITHDIR%%/lib
-@unexec rmdir %D/%%KRONOLITHDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%KRONOLITHDIR%% 2>/dev/null || true
+@dirrmtry %%KRONOLITHDIR%%/config
+@dirrmtry %%KRONOLITHDIR%%
diff --git a/deskutils/ktagebuch/pkg-plist b/deskutils/ktagebuch/pkg-plist
index ce3e48e6d991..39cc9e33b746 100644
--- a/deskutils/ktagebuch/pkg-plist
+++ b/deskutils/ktagebuch/pkg-plist
@@ -38,17 +38,17 @@ share/icons/hicolor/16x16/apps/ktagebuch.png
share/icons/hicolor/32x32/apps/ktagebuch.png
share/locale/de/LC_MESSAGES/ktagebuch.mo
share/locale/es/LC_MESSAGES/ktagebuch.mo
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/ktagebuch
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
@dirrm share/doc/HTML/de/ktagebuch
-@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/de
+@dirrmtry share/doc/HTML
@dirrm share/apps/ktagebuch/icons/crystalsvg/32x32/actions
@dirrm share/apps/ktagebuch/icons/crystalsvg/32x32
@dirrm share/apps/ktagebuch/icons/crystalsvg/16x16/actions
@@ -56,6 +56,6 @@ share/locale/es/LC_MESSAGES/ktagebuch.mo
@dirrm share/apps/ktagebuch/icons/crystalsvg
@dirrm share/apps/ktagebuch/icons
@dirrm share/apps/ktagebuch
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Applications
+@dirrmtry share/applnk
diff --git a/deskutils/kuake/pkg-plist b/deskutils/kuake/pkg-plist
index 7ce8a1ba95a9..a3d001d99119 100644
--- a/deskutils/kuake/pkg-plist
+++ b/deskutils/kuake/pkg-plist
@@ -6,16 +6,16 @@ share/doc/HTML/en/kuake/index.cache.bz2
share/doc/HTML/en/kuake/index.docbook
share/icons/locolor/16x16/apps/kuake.png
share/icons/locolor/32x32/apps/kuake.png
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons
@dirrm share/doc/HTML/en/kuake
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
@dirrm share/apps/kuake
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Utilities
+@dirrmtry share/applnk
diff --git a/deskutils/logjam/pkg-plist b/deskutils/logjam/pkg-plist
index 29e10e77ac5b..a3e4100cfe73 100644
--- a/deskutils/logjam/pkg-plist
+++ b/deskutils/logjam/pkg-plist
@@ -11,9 +11,9 @@ share/locale/he/LC_MESSAGES/logjam.mo
share/locale/ru_RU/LC_MESSAGES/logjam.mo
share/locale/uk_UA/LC_MESSAGES/logjam.mo
share/locale/ja/LC_MESSAGES/logjam.mo
-@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true
-@unexec rmdir %D/share/locale/uk_UA/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/uk_UA 2> /dev/null || true
+@dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES
+@dirrmtry share/locale/en_US.UTF-8
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/uk_UA/LC_MESSAGES
+@dirrmtry share/locale/uk_UA
diff --git a/deskutils/mcatalog/pkg-plist b/deskutils/mcatalog/pkg-plist
index abd5e068fc63..7c15a2b84c46 100644
--- a/deskutils/mcatalog/pkg-plist
+++ b/deskutils/mcatalog/pkg-plist
@@ -56,8 +56,8 @@ share/locale/pt_BR/LC_MESSAGES/mcatalog.mo
share/locale/rw/LC_MESSAGES/mcatalog.mo
share/locale/sv/LC_MESSAGES/mcatalog.mo
share/locale/zh_CN/LC_MESSAGES/mcatalog.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm share/gnome/mcatalog/templates
@dirrm share/gnome/mcatalog/pixmaps/wood
@dirrm share/gnome/mcatalog/pixmaps/metal
diff --git a/deskutils/metabar/pkg-plist b/deskutils/metabar/pkg-plist
index ee9a515b635e..39ae14971da9 100644
--- a/deskutils/metabar/pkg-plist
+++ b/deskutils/metabar/pkg-plist
@@ -7,15 +7,15 @@ share/apps/metabar/html/layout.html
share/apps/metabar/iconsrc
share/icons/hicolor/16x16/apps/metabar.png
share/icons/hicolor/32x32/apps/metabar.png
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrm share/apps/metabar/html
@dirrm share/apps/metabar
-@unexec rmdir %D/share/apps/konqsidebartng/entries 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqsidebartng/add 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqsidebartng 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@dirrmtry share/apps/konqsidebartng/entries
+@dirrmtry share/apps/konqsidebartng/add
+@dirrmtry share/apps/konqsidebartng
+@dirrmtry share/apps
diff --git a/deskutils/mnemo/pkg-plist b/deskutils/mnemo/pkg-plist
index 816549d83396..35a4a06d49d8 100644
--- a/deskutils/mnemo/pkg-plist
+++ b/deskutils/mnemo/pkg-plist
@@ -185,5 +185,5 @@
@dirrm %%MNEMODIR%%/lib/Driver
@dirrm %%MNEMODIR%%/lib/Block
@dirrm %%MNEMODIR%%/lib
-@unexec rmdir %D/%%MNEMODIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%MNEMODIR%% 2>/dev/null || true
+@dirrmtry %%MNEMODIR%%/config
+@dirrmtry %%MNEMODIR%%
diff --git a/deskutils/multisync-backup/pkg-plist b/deskutils/multisync-backup/pkg-plist
index 4951094725bb..228b69201c14 100644
--- a/deskutils/multisync-backup/pkg-plist
+++ b/deskutils/multisync-backup/pkg-plist
@@ -1,4 +1,4 @@
lib/multisync/libbackup_plugin.a
lib/multisync/libbackup_plugin.so
lib/multisync/libbackup_plugin.so.0
-@unexec rmdir %D/lib/multisync 2>/dev/null || true
+@dirrmtry lib/multisync
diff --git a/deskutils/multisync-syncml/pkg-plist b/deskutils/multisync-syncml/pkg-plist
index 3f8bb429d3b0..5952ced1d5e0 100644
--- a/deskutils/multisync-syncml/pkg-plist
+++ b/deskutils/multisync-syncml/pkg-plist
@@ -1,4 +1,4 @@
lib/multisync/libsyncml_plugin.a
lib/multisync/libsyncml_plugin.so
lib/multisync/libsyncml_plugin.so.0
-@unexec rmdir %D/lib/multisync 2>/dev/null || true
+@dirrmtry lib/multisync
diff --git a/deskutils/nag/pkg-plist b/deskutils/nag/pkg-plist
index f8516bc705b9..2cf660b6f809 100644
--- a/deskutils/nag/pkg-plist
+++ b/deskutils/nag/pkg-plist
@@ -204,5 +204,5 @@
@dirrm %%NAGDIR%%/lib/Driver
@dirrm %%NAGDIR%%/lib/Block
@dirrm %%NAGDIR%%/lib
-@unexec rmdir %D/%%NAGDIR%%/config 2>/dev/null || true
-@unexec rmdir %D/%%NAGDIR%% 2>/dev/null || true
+@dirrmtry %%NAGDIR%%/config
+@dirrmtry %%NAGDIR%%
diff --git a/deskutils/nautilus-actions/pkg-plist b/deskutils/nautilus-actions/pkg-plist
index 3cbdea0b06cd..83589ef2ee8b 100644
--- a/deskutils/nautilus-actions/pkg-plist
+++ b/deskutils/nautilus-actions/pkg-plist
@@ -8,6 +8,6 @@ share/locale/fr/LC_MESSAGES/nautilus-actions.mo
%%DATADIR%%/nact/nautilus-actions-config.glade
%%DATADIR%%/nact/nautilus-actions-icon.png
share/pixmaps/nautilus-actions-icon.png
-@unexec rmdir %D/%%DATADIR%%/nact 2> /dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
-@unexec rmdir %D/share/applications 2> /dev/null || true
+@dirrmtry %%DATADIR%%/nact
+@dirrmtry %%DATADIR%%
+@dirrmtry share/applications
diff --git a/deskutils/nautilus-open-terminal/pkg-plist b/deskutils/nautilus-open-terminal/pkg-plist
index f2476f62a777..a094116ff017 100644
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@@ -32,5 +32,5 @@ share/locale/tr/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/uk/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-open-terminal.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
diff --git a/deskutils/p5-Data-ICal/pkg-plist b/deskutils/p5-Data-ICal/pkg-plist
index 3057b9b77f48..fc3d42fe695e 100644
--- a/deskutils/p5-Data-ICal/pkg-plist
+++ b/deskutils/p5-Data-ICal/pkg-plist
@@ -13,10 +13,10 @@
%%SITE_PERL%%/Data/ICal/Entry/Todo.pm
%%SITE_PERL%%/Data/ICal/Property.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/Data/ICal/Entry/TimeZone 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/ICal/Entry/Alarm 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Data/ICal/Entry/TimeZone
+@dirrmtry %%SITE_PERL%%/Data/ICal/Entry/Alarm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ICal
@dirrm %%SITE_PERL%%/Data/ICal/Entry
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data/ICal 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data
+@dirrmtry %%SITE_PERL%%/Data/ICal
+@dirrmtry %%SITE_PERL%%/Data
diff --git a/deskutils/plans/pkg-plist b/deskutils/plans/pkg-plist
index 427c1e3f6680..2d0dc379b40c 100644
--- a/deskutils/plans/pkg-plist
+++ b/deskutils/plans/pkg-plist
@@ -330,7 +330,7 @@
%%DIR%%/zh_tw.pl
@dirrm %%DIR%%/theme/icons
@dirrm %%DIR%%/theme/graphics
-@unexec rmdir %D/%%DIR%%/theme 2>/dev/null || true
-@unexec rmdir %D/%%DIR%%/sessions 2>/dev/null || true
-@unexec rmdir %D/%%DIR%%/data 2>/dev/null || true
+@dirrmtry %%DIR%%/theme
+@dirrmtry %%DIR%%/sessions
+@dirrmtry %%DIR%%/data
@unexec rmdir %D/%%DIR%% 2>/dev/null || echo "Note: %D/%%DIR%% not empty -- not deleted!"
diff --git a/deskutils/pypanel/pkg-plist b/deskutils/pypanel/pkg-plist
index 6f6850ca8d3b..836d885950c3 100644
--- a/deskutils/pypanel/pkg-plist
+++ b/deskutils/pypanel/pkg-plist
@@ -3,5 +3,5 @@ bin/pypanel
%%DATADIR%%/pypanelrc
%%PYTHON_SITELIBDIR%%/ppmodule.so
@dirrm %%DATADIR%%
-@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/deskutils/rox-memo/pkg-plist b/deskutils/rox-memo/pkg-plist
index 36d222d84b5e..6fc1c525de34 100644
--- a/deskutils/rox-memo/pkg-plist
+++ b/deskutils/rox-memo/pkg-plist
@@ -42,4 +42,4 @@ apps/Memo/pretty_time.pyo
@dirrm apps/Memo/Messages
@dirrm apps/Memo/Help
@dirrm apps/Memo
-@unexec rmdir %D/apps 2>/dev/null || true
+@dirrmtry apps
diff --git a/deskutils/sugarcrm/pkg-plist b/deskutils/sugarcrm/pkg-plist
index 15db15a1b5ab..5a5d90ed0f5a 100644
--- a/deskutils/sugarcrm/pkg-plist
+++ b/deskutils/sugarcrm/pkg-plist
@@ -1877,8 +1877,8 @@
@dirrm %%SUGARCRMDIR%%/cache/layout
@dirrm %%SUGARCRMDIR%%/cache/pdf
@dirrm %%SUGARCRMDIR%%/cache/upload
-@unexec rmdir %D/%%SUGARCRMDIR%%/cache/xml 2>/dev/null || true
-@unexec rmdir %D/%%SUGARCRMDIR%%/cache 2>/dev/null || true
+@dirrmtry %%SUGARCRMDIR%%/cache/xml
+@dirrmtry %%SUGARCRMDIR%%/cache
@unexec rmdir %D/%%SUGARCRMDIR%% 2>/dev/null ||( echo "===> There are files/directories remaining under %D/%%SUGARCRMDIR%%. If you wish to deinstall sugarcrm completely, inspect this directory for any files you may want to keep and then remove it. Deinstall process kept these files/directories intact:" | fmt && for i in $(find %D/%%SUGARCRMDIR%%); do echo " - $i"; done)
%%PORTDOCS%%%%DOCSDIR%%/INSTALLATION.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index aecfa307f3f8..8007408936b6 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -37,7 +37,7 @@ share/locale/sv/LC_MESSAGES/tomboy.mo
share/locale/tr/LC_MESSAGES/tomboy.mo
share/locale/uk/LC_MESSAGES/tomboy.mo
share/locale/zh_CN/LC_MESSAGES/tomboy.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
@dirrm lib/tomboy/Plugins
@dirrm lib/tomboy
diff --git a/deskutils/xcalendar/pkg-plist b/deskutils/xcalendar/pkg-plist
index 90013f6c7dcf..56cfb0bc61e2 100644
--- a/deskutils/xcalendar/pkg-plist
+++ b/deskutils/xcalendar/pkg-plist
@@ -10,5 +10,5 @@ lib/X11/xcalendar/rarrow.xbm
lib/X11/xcalendar/xcalendar.hlp
@dirrm lib/X11/xcalendar
@dirrm lib/X11/ja_JP.eucJP/xcalendar
-@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true
-@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true
+@dirrmtry lib/X11/ja_JP.eucJP/app-defaults
+@dirrmtry lib/X11/ja_JP.eucJP
diff --git a/deskutils/xfce4-calendar/pkg-plist b/deskutils/xfce4-calendar/pkg-plist
index 0d76bbbfe5ab..e89e88e7dc59 100644
--- a/deskutils/xfce4-calendar/pkg-plist
+++ b/deskutils/xfce4-calendar/pkg-plist
@@ -52,4 +52,4 @@ share/locale/uk/LC_MESSAGES/xfcalendar.mo
share/locale/vi/LC_MESSAGES/xfcalendar.mo
share/locale/zh_CN/LC_MESSAGES/xfcalendar.mo
share/locale/zh_TW/LC_MESSAGES/xfcalendar.mo
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
+@dirrmtry lib/xfce4/mcs-plugins
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 25236aa4ef08..0490b922c820 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -1,6 +1,6 @@
lib/xfce4/panel-plugins/libnotes.so
share/xfce4/notes/note.png
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/notes 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrmtry share/xfce4/notes
+@dirrmtry share/xfce4
diff --git a/deskutils/xfce4-xkb-plugin/pkg-plist b/deskutils/xfce4-xkb-plugin/pkg-plist
index 65c6de37159f..f4ba969afc1c 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-plist
+++ b/deskutils/xfce4-xkb-plugin/pkg-plist
@@ -75,6 +75,6 @@ share/xfce4/xkb/flags/ye.png
share/xfce4/xkb/flags/yu.png
@dirrm share/xfce4/xkb/flags
@dirrm share/xfce4/xkb
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true
+@dirrmtry share/xfce4
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
index 2f8a442b50fd..5396fdde2d8a 100644
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -19,4 +19,4 @@ share/locale/sk/LC_MESSAGES/xpad.mo
share/locale/sl/LC_MESSAGES/xpad.mo
share/locale/vi/LC_MESSAGES/xpad.mo
share/locale/zh_TW/LC_MESSAGES/xpad.mo
-@unexec rmdir %D/share/applications 2>/dev/null || true
+@dirrmtry share/applications
diff --git a/print/latex-cjk/pkg-plist b/print/latex-cjk/pkg-plist
index f06c1a409392..5374fc02b2b2 100644
--- a/print/latex-cjk/pkg-plist
+++ b/print/latex-cjk/pkg-plist
@@ -475,7 +475,7 @@ share/texmf/tex/latex/CJK/thai/thaicjk.ldf
@dirrm share/texmf/fonts/tfm/arphic/argbkai
@dirrm share/texmf/fonts/tfm/arphic/argbsung
@dirrm share/texmf/fonts/tfm/arphic
-@unexec rmdir %D/share/texmf/fonts/truetype/arphic 2>/dev/null || true
+@dirrmtry share/texmf/fonts/truetype/arphic
@dirrm share/texmf/hbf2gf
@dirrm share/texmf/tex/latex/CJK/Bg5
@dirrm share/texmf/tex/latex/CJK/CEF