summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 01:29:46 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 01:29:46 +0000
commit913a5a5cbae4d0f429ae82617b4e1fca51867d49 (patch)
treef99bd9b91ec272158b0ee070a9ec0871177d6ea8 /databases
parentReplace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry (diff)
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Notes
Notes: svn path=/head/; revision=154109
Diffstat (limited to 'databases')
-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
115 files changed, 362 insertions, 362 deletions
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