Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

26 files changed, 53 insertions, 53 deletions

diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
index e5008a031872..3a31848cbf55 100644
--- a/databases/fpc-ibase/pkg-plist
+++ b/databases/fpc-ibase/pkg-plist
@@ -4,7 +4,7 @@
 %%INSTDIR%%/ibase60.o
 %%INSTDIR%%/ibase60.ppu
 @dirrm %%INSTDIR%%
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units/freebsd 2>/dev/null || true
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units 2>/dev/null || true
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/fpc 2>/dev/null || true
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index 816cf786b3e4..fe76ecb3db1d 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -6,7 +6,7 @@
 %%INSTDIR%%/mysql_version.o
 %%INSTDIR%%/mysql_version.ppu
 @dirrm %%INSTDIR%%
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units/freebsd 2>/dev/null || true
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units 2>/dev/null || true
-@unexec rmdir %D/lib/fpc/%%PORTVERSION%% 2>/dev/null || true
-@unexec rmdir %D/lib/fpc 2>/dev/null || true
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
diff --git a/databases/gnatsweb4/pkg-plist b/databases/gnatsweb4/pkg-plist
index 64b648f94ab4..88b705363f6b 100644
--- a/databases/gnatsweb4/pkg-plist
+++ b/databases/gnatsweb4/pkg-plist
@@ -2,7 +2,7 @@
 @unexec if cmp -s %D/etc/gnatsweb/gnatsweb-site.pl %D/etc/gnatsweb/gnatsweb-site.pl.default; then rm -f %D/etc/gnatsweb/gnatsweb-site.pl; fi
 etc/gnatsweb/gnatsweb-site.pl.default
 @exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl
-@unexec rmdir %D/etc/gnatsweb 2>/dev/null || true
+@dirrmtry etc/gnatsweb
 %%CGI_DIR%%/gnatsweb.pl
 %%CGI_DIR%%/gnatsweb-site.pl
 %%CGI_DIR%%/gnatsweb.html
diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist
index 1c9d8d6d21c4..684d91c33b01 100644
--- a/databases/libiodbc/pkg-plist
+++ b/databases/libiodbc/pkg-plist
@@ -40,4 +40,4 @@ libdata/pkgconfig/libiodbc.pc
 %%PORTDOCS%%%%EXAMPLESDIR%%/iodbctest.c
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/etc/libiodbc 2>/dev/null || true
+@dirrmtry etc/libiodbc
diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist
index 9184e318a518..70a24bb1b79a 100644
--- a/databases/namazu2/pkg-plist
+++ b/databases/namazu2/pkg-plist
@@ -145,10 +145,10 @@ share/namazu/template/NMZ.tips.ja
 share/namazu/template/NMZ.tips.pl
 @dirrm share/namazu/template
 @dirrm share/namazu
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja_JP.SJIS/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja_JP.SJIS 2>/dev/null || true
-@unexec rmdir %D/var/namazu/index 2>/dev/null || true
-@unexec rmdir %D/var/namazu 2>/dev/null || true
-@unexec rmdir %D/var 2>/dev/null || true
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/ja_JP.SJIS/LC_MESSAGES
+@dirrmtry share/locale/ja_JP.SJIS
+@dirrmtry var/namazu/index
+@dirrmtry var/namazu
+@dirrmtry var
diff --git a/databases/p5-ApacheDBILogConfig/pkg-plist b/databases/p5-ApacheDBILogConfig/pkg-plist
index d83ea4ff9dca..32881ce70fec 100644
--- a/databases/p5-ApacheDBILogConfig/pkg-plist
+++ b/databases/p5-ApacheDBILogConfig/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/Apache/DBILogConfig.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBILogConfig/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBILogConfig
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/databases/p5-CDB_File-Generator/pkg-plist b/databases/p5-CDB_File-Generator/pkg-plist
index cc017161cb7b..2a620d8aadde 100644
--- a/databases/p5-CDB_File-Generator/pkg-plist
+++ b/databases/p5-CDB_File-Generator/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/CDB_File/Generator.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/CDB_File 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File
+@dirrmtry %%SITE_PERL%%/CDB_File
diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist
index a8954cdb34e8..93473bffb585 100644
--- a/databases/p5-DBD-Excel/pkg-plist
+++ b/databases/p5-DBD-Excel/pkg-plist
@@ -13,7 +13,7 @@
 %%PORTDOCS%%share/examples/DBD-Excel/texj.pl
 %%PORTDOCS%%share/examples/DBD-Excel/thidden.pl
 %%PORTDOCS%%share/examples/DBD-Excel/thidden.xls
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel 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/Excel
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
 %%PORTDOCS%%@unexec rmdir %D/share/examples/DBD-Excel 2>/dev/null || true
diff --git a/databases/p5-DBD-File/pkg-plist b/databases/p5-DBD-File/pkg-plist
index bd0b62f57a6f..9139b3bff68a 100644
--- a/databases/p5-DBD-File/pkg-plist
+++ b/databases/p5-DBD-File/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/DBD/File.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/File/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/File
-@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-Google/pkg-plist b/databases/p5-DBD-Google/pkg-plist
index 7451f5dca69d..59e4a1fe6b00 100644
--- a/databases/p5-DBD-Google/pkg-plist
+++ b/databases/p5-DBD-Google/pkg-plist
@@ -6,7 +6,7 @@
 %%SITE_PERL%%/DBD/Google/st.pm
 %%SITE_PERL%%/SQL/Dialects/Google.pm
 @dirrm %%SITE_PERL%%/DBD/Google
-@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/DBD
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Google/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Google
-@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-RAM/pkg-plist b/databases/p5-DBD-RAM/pkg-plist
index 8b8ef341777a..d4ff0b0e101e 100644
--- a/databases/p5-DBD-RAM/pkg-plist
+++ b/databases/p5-DBD-RAM/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/DBD/RAM.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/RAM/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/RAM
-@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-Sybase/pkg-plist b/databases/p5-DBD-Sybase/pkg-plist
index 85e173cbcbbc..dc7f6df3d8ed 100644
--- a/databases/p5-DBD-Sybase/pkg-plist
+++ b/databases/p5-DBD-Sybase/pkg-plist
@@ -4,5 +4,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase/Sybase.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase/Sybase.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase
-@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-DBI-137/pkg-plist b/databases/p5-DBI-137/pkg-plist
index 2e73088e4e53..f362576f7da5 100644
--- a/databases/p5-DBI-137/pkg-plist
+++ b/databases/p5-DBI-137/pkg-plist
@@ -37,6 +37,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-AnyDBD/pkg-plist b/databases/p5-DBIx-AnyDBD/pkg-plist
index 1a29a7ebf3da..a8e7266dc38d 100644
--- a/databases/p5-DBIx-AnyDBD/pkg-plist
+++ b/databases/p5-DBIx-AnyDBD/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/DBIx/AnyDBD.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD
-@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-Password/pkg-plist b/databases/p5-DBIx-Password/pkg-plist
index c9ee2de4a4c3..feff512e97c4 100644
--- a/databases/p5-DBIx-Password/pkg-plist
+++ b/databases/p5-DBIx-Password/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/DBIx/Password.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Password/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Password
-@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-Table/pkg-plist b/databases/p5-DBIx-Table/pkg-plist
index fa709ee90cdf..788459a300c7 100644
--- a/databases/p5-DBIx-Table/pkg-plist
+++ b/databases/p5-DBIx-Table/pkg-plist
@@ -1,5 +1,5 @@
 %%SITE_PERL%%/DBIx/Table.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table 2>/dev/null || true
-@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/Table
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx
+@dirrmtry %%SITE_PERL%%/DBIx
diff --git a/databases/p5-DBIx-XML_RDB/pkg-plist b/databases/p5-DBIx-XML_RDB/pkg-plist
index 2889440e2d97..3dc841551d48 100644
--- a/databases/p5-DBIx-XML_RDB/pkg-plist
+++ b/databases/p5-DBIx-XML_RDB/pkg-plist
@@ -5,5 +5,5 @@ bin/xml2sql.pl
 %%SITE_PERL%%/DBIx/xml2sql.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB
-@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/pgcluster/pkg-plist b/databases/pgcluster/pkg-plist
index ca1df40c4305..f4e10f6c120c 100644
--- a/databases/pgcluster/pkg-plist
+++ b/databases/pgcluster/pkg-plist
@@ -92,4 +92,4 @@ share/postgresql/postgresql.conf.sample
 @dirrm include/postgresql
 @dirrm lib/postgresql
 @dirrm share/postgresql
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry pgsql
diff --git a/databases/ruby-dbd_interbase/pkg-plist b/databases/ruby-dbd_interbase/pkg-plist
index f66292896478..a2c942c8fd18 100644
--- a/databases/ruby-dbd_interbase/pkg-plist
+++ b/databases/ruby-dbd_interbase/pkg-plist
@@ -1,3 +1,3 @@
 %%RUBY_SITELIBDIR%%/DBD/InterBase/InterBase.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/InterBase
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/DBD
diff --git a/databases/ruby-dbd_mysql/pkg-plist b/databases/ruby-dbd_mysql/pkg-plist
index da2327a83d1d..ddaca593ba2a 100644
--- a/databases/ruby-dbd_mysql/pkg-plist
+++ b/databases/ruby-dbd_mysql/pkg-plist
@@ -3,4 +3,4 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%RUBY_SITELIBDIR%%/DBD/Mysql/Mysql.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/Mysql
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/DBD
diff --git a/databases/ruby-dbd_odbc/pkg-plist b/databases/ruby-dbd_odbc/pkg-plist
index 4ad35c935678..49fafe86bdfa 100644
--- a/databases/ruby-dbd_odbc/pkg-plist
+++ b/databases/ruby-dbd_odbc/pkg-plist
@@ -1,3 +1,3 @@
 %%RUBY_SITELIBDIR%%/DBD/ODBC/ODBC.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/ODBC
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/DBD
diff --git a/databases/ruby-dbd_pg/pkg-plist b/databases/ruby-dbd_pg/pkg-plist
index bc83f43917c0..6eef1b1d5718 100644
--- a/databases/ruby-dbd_pg/pkg-plist
+++ b/databases/ruby-dbd_pg/pkg-plist
@@ -2,4 +2,4 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%RUBY_SITELIBDIR%%/DBD/Pg/Pg.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/Pg
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/DBD
diff --git a/databases/ruby-dbd_proxy/pkg-plist b/databases/ruby-dbd_proxy/pkg-plist
index 0702498b5aa9..880760a132f0 100644
--- a/databases/ruby-dbd_proxy/pkg-plist
+++ b/databases/ruby-dbd_proxy/pkg-plist
@@ -1,4 +1,4 @@
 bin/proxyserver.rb
 %%RUBY_SITELIBDIR%%/DBD/Proxy/Proxy.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/Proxy
-@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true
+@dirrmtry %%RUBY_SITELIBDIR%%/DBD
diff --git a/databases/ruby-dbd_sqlite/pkg-plist b/databases/ruby-dbd_sqlite/pkg-plist
index f30461eee16f..27c7d24be25a 100644
--- a/databases/ruby-dbd_sqlite/pkg-plist
+++ b/databases/ruby-dbd_sqlite/pkg-plist
@@ -2,4 +2,4 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite/SQLite.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite
-@unexec rmdir %D/%%RUBY_SITEARCHLIBDIR%%/DBD 2>/dev/null || true
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%/DBD
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index a45194fa3671..7369ccf4749e 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -126,4 +126,4 @@ lib/libtemplate.so.1
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/AdministratorManual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -p %D/etc/ODBCDataSources 2>/dev/null || true
-@unexec rmdir %D/etc/ODBCDataSources 2>/dev/null || true
+@dirrmtry etc/ODBCDataSources
diff --git a/databases/xmysqladmin/pkg-plist b/databases/xmysqladmin/pkg-plist
index 76b5f9e98bbc..a1c63b6a49cf 100644
--- a/databases/xmysqladmin/pkg-plist
+++ b/databases/xmysqladmin/pkg-plist
@@ -1,3 +1,3 @@
 bin/xmysqladmin
 include/X11/pixmaps/mysql.xpm
-@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@dirrmtry include/X11/pixmaps