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

Approved by:    krion@
PR:             ports/88711 (related)

6 files changed, 50 insertions, 50 deletions

diff --git a/databases/postgresql83-server/pkg-plist-client b/databases/postgresql83-server/pkg-plist-client
index f60a533f4a98..c39bd07b8b0e 100644
--- a/databases/postgresql83-server/pkg-plist-client
+++ b/databases/postgresql83-server/pkg-plist-client
@@ -447,10 +447,10 @@ lib/postgresql/pgxs/src/nls-global.mk
 @dirrm lib/postgresql/pgxs
 @dirrm lib/postgresql
 %%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
 share/postgresql/pg_service.conf.sample
 share/postgresql/psqlrc.sample
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry share/postgresql
 %%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
@@ -598,19 +598,19 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/pl
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
diff --git a/databases/postgresql83-server/pkg-plist-contrib b/databases/postgresql83-server/pkg-plist-contrib
index aba5a7b1cc19..6152ee5852dc 100644
--- a/databases/postgresql83-server/pkg-plist-contrib
+++ b/databases/postgresql83-server/pkg-plist-contrib
@@ -101,8 +101,8 @@ share/postgresql/contrib/timetravel.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/untsearch2.sql
 share/postgresql/contrib/user_locks.sql
-@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%%/contrib >&2 2> /dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% >&2 2> /dev/null || true
-@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true
+@dirrmtry share/postgresql/contrib >&2
+@dirrmtry share/postgresql >&2
+@dirrmtry %%DOCSDIR%%/contrib >&2
+@dirrmtry %%DOCSDIR%% >&2
+@dirrmtry lib/postgresql >&2
diff --git a/databases/postgresql83-server/pkg-plist-plperl b/databases/postgresql83-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql83-server/pkg-plist-plperl
+++ b/databases/postgresql83-server/pkg-plist-plperl
@@ -1,4 +1,4 @@
 %%DOCSDIR%%/README-plperl
 lib/postgresql/plperl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql83-server/pkg-plist-plpython b/databases/postgresql83-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql83-server/pkg-plist-plpython
+++ b/databases/postgresql83-server/pkg-plist-plpython
@@ -1,4 +1,4 @@
 %%DOCSDIR%%/README-plpython
 lib/postgresql/plpython.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry lib/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql83-server/pkg-plist-pltcl b/databases/postgresql83-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql83-server/pkg-plist-pltcl
+++ b/databases/postgresql83-server/pkg-plist-pltcl
@@ -1,9 +1,9 @@
 %%DOCSDIR%%/README-pltcl
 lib/postgresql/pltcl.so
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
+@dirrmtry lib/postgresql
 bin/pltcl_loadmod
 bin/pltcl_delmod
 bin/pltcl_listmod
 share/postgresql/unknown.pltcl
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry %%DOCSDIR%%
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 9c00caef50c8..9e2451b51f86 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -32,7 +32,7 @@ lib/postgresql/utf8_and_win1258.so
 lib/postgresql/utf8_and_win874.so
 lib/postgresql/plpgsql.so
 %%DOCSDIR%%/README-server
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
 share/postgresql/pg_hba.conf.sample
@@ -62,20 +62,20 @@ share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/cs
+%%GETTEXT%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ko
+%%GETTEXT%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sk
+%%GETTEXT%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/ro
+%%GETTEXT%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/sl
+%%GETTEXT%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
 share/postgresql/timezone/Africa/Algiers
 share/postgresql/timezone/Africa/Luanda
 share/postgresql/timezone/Africa/Porto-Novo
@@ -664,8 +664,8 @@ share/postgresql/dot.cshrc.dist
 @exec [ -f ~pgsql/.profile ] || (cp %D/share/postgresql/dot.profile.dist ~pgsql/.profile && chown pgsql:pgsql ~pgsql/.profile)
 @exec [ -f ~pgsql/.cshrc ] || (cp %D/share/postgresql/dot.cshrc.dist ~pgsql/.cshrc && chown pgsql:pgsql ~pgsql/.cshrc)
 @unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
-@unexec rmdir %D/lib/postgresql 2>/dev/null || true
-@unexec rmdir %D/pgsql 2>/dev/null || true
+@dirrmtry share/postgresql
+@dirrmtry etc/periodic/daily
+@dirrmtry etc/periodic
+@dirrmtry lib/postgresql
+@dirrmtry pgsql