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

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

6 files changed, 32 insertions, 32 deletions

diff --git a/databases/postgresql73-server/pkg-plist-client b/databases/postgresql73-server/pkg-plist-client
index a9bec3181497..282e1cda6451 100644
--- a/databases/postgresql73-server/pkg-plist-client
+++ b/databases/postgresql73-server/pkg-plist-client
@@ -381,8 +381,8 @@ lib/libpq.a
 lib/libpq.so
 lib/libpq.so.3
 %%DOCSDIR%%/README-client
-@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true
-@unexec rmdir %D/share/postgresql 2>/dev/null || true
+@dirrmtry %%DOCSDIR%%
+@dirrmtry share/postgresql
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
@@ -421,10 +421,10 @@ lib/libpq.so.3
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.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/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/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
 @dirrm include/postgresql
diff --git a/databases/postgresql73-server/pkg-plist-contrib b/databases/postgresql73-server/pkg-plist-contrib
index a8e5c6b5f764..93320a24c62d 100644
--- a/databases/postgresql73-server/pkg-plist-contrib
+++ b/databases/postgresql73-server/pkg-plist-contrib
@@ -133,8 +133,8 @@ share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/timetravel.sql
 share/postgresql/contrib/tsearch.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/postgresql73-server/pkg-plist-plperl b/databases/postgresql73-server/pkg-plist-plperl
index 8d4f20e33bbf..c84ea2e6d16c 100644
--- a/databases/postgresql73-server/pkg-plist-plperl
+++ b/databases/postgresql73-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/postgresql73-server/pkg-plist-plpython b/databases/postgresql73-server/pkg-plist-plpython
index 184c2fd1d21e..d3c29953b6b5 100644
--- a/databases/postgresql73-server/pkg-plist-plpython
+++ b/databases/postgresql73-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/postgresql73-server/pkg-plist-pltcl b/databases/postgresql73-server/pkg-plist-pltcl
index bf4aae772537..47036c2a4e2a 100644
--- a/databases/postgresql73-server/pkg-plist-pltcl
+++ b/databases/postgresql73-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/postgresql73-server/pkg-plist-server b/databases/postgresql73-server/pkg-plist-server
index 59e3de96ed86..795f41b84f87 100644
--- a/databases/postgresql73-server/pkg-plist-server
+++ b/databases/postgresql73-server/pkg-plist-server
@@ -30,7 +30,7 @@ lib/postgresql/utf8_and_win1256.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/postgres.bki
 share/postgresql/postgres.description
 share/postgresql/pg_hba.conf.sample
@@ -47,12 +47,12 @@ share/postgresql/conversion_create.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/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/zh_CN/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_CN
+%%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%GETTEXT%%@dirrmtry share/locale/zh_TW
 @unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
 @unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
 @unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist
@@ -64,8 +64,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