diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 05:52:28 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 05:52:28 +0000 |
| commit | d568611c3eb334453c4a0352b61f081a623d72f1 (patch) | |
| tree | c3c2e5147c98015eb1ada868e403a08ef31d9123 /databases | |
| parent | Better fix for the problem on AMD64 and Pentium4 since rev1.4. (diff) | |
eplace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Notes
Notes:
svn path=/head/; revision=154134
Diffstat (limited to 'databases')
75 files changed, 490 insertions, 490 deletions
diff --git a/databases/dbXML/pkg-plist b/databases/dbXML/pkg-plist index 7b44ae809d64..3af75ae1cc04 100644 --- a/databases/dbXML/pkg-plist +++ b/databases/dbXML/pkg-plist @@ -1386,10 +1386,10 @@ bin/dbxmlctl @dirrm %%T%%/docs/src @dirrm %%T%%/docs/licenses @dirrm %%T%%/docs/notes -@unexec rmdir %D/%%T%%/docs > /dev/null 2>&1 || true +@dirrmtry %%T%%/docs @dirrm %%T%%/icons -@unexec rmdir %D/%%T%%/config > /dev/null 2>&1 || true +@dirrmtry %%T%%/config @dirrm %%T%%/idl -@unexec rmdir %D/%%T%%/logs > /dev/null 2>&1 || true +@dirrmtry %%T%%/logs @dirrm %%T%%/xml -@unexec rmdir %D/%%T%% > /dev/null 2>&1 || true +@dirrmtry %%T%% diff --git a/databases/firebird-server/pkg-plist.client b/databases/firebird-server/pkg-plist.client index 1e600c2e67dd..8b61d85d22d4 100644 --- a/databases/firebird-server/pkg-plist.client +++ b/databases/firebird-server/pkg-plist.client @@ -20,7 +20,7 @@ lib/libib_util.so @unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi %%CONFDIR%%/firebird.conf.sample @exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf -@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true +@dirrmtry %%CONFDIR%% %%DATADIR%%/de_DE.msg %%DATADIR%%/firebird.msg %%DATADIR%%/fr_FR.msg diff --git a/databases/firebird2-server/pkg-plist.client b/databases/firebird2-server/pkg-plist.client index 1e600c2e67dd..8b61d85d22d4 100644 --- a/databases/firebird2-server/pkg-plist.client +++ b/databases/firebird2-server/pkg-plist.client @@ -20,7 +20,7 @@ lib/libib_util.so @unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi %%CONFDIR%%/firebird.conf.sample @exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf -@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true +@dirrmtry %%CONFDIR%% %%DATADIR%%/de_DE.msg %%DATADIR%%/firebird.msg %%DATADIR%%/fr_FR.msg diff --git a/databases/firebird20-server/pkg-plist.client b/databases/firebird20-server/pkg-plist.client index 1e600c2e67dd..8b61d85d22d4 100644 --- a/databases/firebird20-server/pkg-plist.client +++ b/databases/firebird20-server/pkg-plist.client @@ -20,7 +20,7 @@ lib/libib_util.so @unexec if cmp -s %D/%%CONFDIR%%/firebird.conf %D/%%CONFDIR%%/firebird.conf.sample; then rm -f %D/%%CONFDIR%%/firebird.conf; fi %%CONFDIR%%/firebird.conf.sample @exec [ -f %B/firebird.conf ] || cp %B/%f %B/firebird.conf -@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true +@dirrmtry %%CONFDIR%% %%DATADIR%%/de_DE.msg %%DATADIR%%/firebird.msg %%DATADIR%%/fr_FR.msg diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index 955fc5fec43b..324514595b0c 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -162,7 +162,7 @@ libexec/mysqld %%NDB%%@dirrm include/mysql/ndb/mgmapi %%NDB%%@dirrm include/mysql/ndb/ndbapi %%NDB%%@dirrm include/mysql/ndb -%%NDB%%@unexec rmdir %D/include/mysql 2> /dev/null || true +%%NDB%%@dirrmtry include/mysql @dirrmtry lib/mysql @dirrm %%DATADIR%%/charsets @dirrm %%DATADIR%%/czech diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist index 93473bffb585..6c08d0af261a 100644 --- a/databases/p5-DBD-Excel/pkg-plist +++ b/databases/p5-DBD-Excel/pkg-plist @@ -16,4 +16,4 @@ @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 +%%PORTDOCS%%@dirrmtry share/examples/DBD-Excel diff --git a/databases/p5-DBIx-SQLEngine/pkg-plist b/databases/p5-DBIx-SQLEngine/pkg-plist index 10ae9d0a2ec9..0048bb77755c 100644 --- a/databases/p5-DBIx-SQLEngine/pkg-plist +++ b/databases/p5-DBIx-SQLEngine/pkg-plist @@ -61,7 +61,7 @@ @dirrm %%SITE_PERL%%/DBIx/SQLEngine/Schema @dirrm %%SITE_PERL%%/DBIx/SQLEngine/Utility @dirrm %%SITE_PERL%%/DBIx/SQLEngine -@unexec rmdir %D%%SITE_PERL%%/DBIx 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/DBIx %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SQLEngine/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/SQLEngine -@unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx diff --git a/databases/pgaccess/pkg-plist b/databases/pgaccess/pkg-plist index 26844e6e3a85..49f27e2ce48c 100644 --- a/databases/pgaccess/pkg-plist +++ b/databases/pgaccess/pkg-plist @@ -394,4 +394,4 @@ share/postgresql/pgaccess/utils/mkkit.tcl @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 +%%PORTDOCS%%@dirrmtry share/doc/postgresql diff --git a/databases/php-sqlrelay/Makefile b/databases/php-sqlrelay/Makefile index ef541abaa9d9..d16cd78cbfbd 100644 --- a/databases/php-sqlrelay/Makefile +++ b/databases/php-sqlrelay/Makefile @@ -50,7 +50,7 @@ pre-install: post-install: dir=`php-config --extension-dir | ${SED} 's,^${LOCALBASE}/,,'`; \ ${ECHO_CMD} "$$dir/sql_relay.so" >> ${TMPPLIST}; \ - ${ECHO_CMD} "@unexec rmdir %D/$$dir 2>/dev/null || true" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrmtry $$dir" >> ${TMPPLIST} @${MKDIR} ${PREFIX}/etc/php @${ECHO_CMD} extension=sql_relay.so \ >> ${PREFIX}/etc/php/extensions.ini @@ -64,7 +64,7 @@ post-install: >> ${TMPPLIST} @${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \ >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \ + @${ECHO_CMD} "@dirrmtry etc/php" \ >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index ae9652fd4dd3..87e5db041dd4 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -109,7 +109,7 @@ post-patch: ${SED} -e "s,^\.,%%MYADMDIR%%," >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \ + -e "s,^\.$$,@dirrmtry %%MYADMDIR%%," \ -e "s,^\.,@dirrm %%MYADMDIR%%," >>${PLIST} pre-install: diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile index ae9652fd4dd3..87e5db041dd4 100644 --- a/databases/phpmyadmin211/Makefile +++ b/databases/phpmyadmin211/Makefile @@ -109,7 +109,7 @@ post-patch: ${SED} -e "s,^\.,%%MYADMDIR%%," >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e "s,^\.$$,@unexec rmdir %D/%%MYADMDIR%% 2>/dev/null || true," \ + -e "s,^\.$$,@dirrmtry %%MYADMDIR%%," \ -e "s,^\.,@dirrm %%MYADMDIR%%," >>${PLIST} pre-install: diff --git a/databases/postgis/pkg-plist b/databases/postgis/pkg-plist index 233eb7b4eb90..cc089bc2e0ea 100644 --- a/databases/postgis/pkg-plist +++ b/databases/postgis/pkg-plist @@ -12,7 +12,7 @@ lib/postgresql/liblwgeom.so.1 %%DATADIR%%/utils/test_joinestimation.pl %%DATADIR%%/utils/create_undef.pl %%DATADIR%%/utils/README -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry lib/postgresql @dirrmtry %%DATADIR%%/utils @dirrmtry %%DATADIR%% diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile index a2ee5df8f225..3e5356a2358b 100644 --- a/databases/postgresql-docs/Makefile +++ b/databases/postgresql-docs/Makefile @@ -44,6 +44,6 @@ post-install: ${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \ ${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\ ${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\ - ${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST} + ${ECHO} "@dirrmtry ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST} .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql-jdbc/pkg-plist b/databases/postgresql-jdbc/pkg-plist index e7695f1cf5a5..03d29388aa49 100644 --- a/databases/postgresql-jdbc/pkg-plist +++ b/databases/postgresql-jdbc/pkg-plist @@ -18,7 +18,7 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/threadsafe.java %%JAVAJARDIR%%/postgresql.jar %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/jdbc/corba -%%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 +%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/jdbc +%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrmtry share/postgresql @dirrmtry %%DOCSDIR%% 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 diff --git a/databases/postgresql74-server/pkg-plist-client b/databases/postgresql74-server/pkg-plist-client index bdce037056e9..041d674b33a8 100644 --- a/databases/postgresql74-server/pkg-plist-client +++ b/databases/postgresql74-server/pkg-plist-client @@ -410,9 +410,9 @@ lib/libpgtypes.a lib/libpgtypes.so lib/libpgtypes.so.1 %%DOCSDIR%%/README-client -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@dirrmtry %%DOCSDIR%% share/postgresql/pg_service.conf.sample -@unexec rmdir %D/share/postgresql 2>/dev/null || true +@dirrmtry share/postgresql %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo @@ -490,12 +490,12 @@ share/postgresql/pg_service.conf.sample %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.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/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/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 @dirrm include/postgresql diff --git a/databases/postgresql74-server/pkg-plist-contrib b/databases/postgresql74-server/pkg-plist-contrib index 99006e7e61fa..203006014135 100644 --- a/databases/postgresql74-server/pkg-plist-contrib +++ b/databases/postgresql74-server/pkg-plist-contrib @@ -138,8 +138,8 @@ share/postgresql/contrib/tsearch.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/postgresql74-server/pkg-plist-plperl b/databases/postgresql74-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql74-server/pkg-plist-plperl +++ b/databases/postgresql74-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/postgresql74-server/pkg-plist-plpython b/databases/postgresql74-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql74-server/pkg-plist-plpython +++ b/databases/postgresql74-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/postgresql74-server/pkg-plist-pltcl b/databases/postgresql74-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql74-server/pkg-plist-pltcl +++ b/databases/postgresql74-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/postgresql74-server/pkg-plist-server b/databases/postgresql74-server/pkg-plist-server index 9da9fdf0c62c..32b27790c8b1 100644 --- a/databases/postgresql74-server/pkg-plist-server +++ b/databases/postgresql74-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/conversion_create.sql share/postgresql/information_schema.sql share/postgresql/pg_hba.conf.sample @@ -53,12 +53,12 @@ share/postgresql/sql_features.txt %%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 @@ -70,8 +70,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 diff --git a/databases/postgresql74-server/pkg-plist-tcltk b/databases/postgresql74-server/pkg-plist-tcltk index f4b49ae59eeb..ad1c0ca9184c 100644 --- a/databases/postgresql74-server/pkg-plist-tcltk +++ b/databases/postgresql74-server/pkg-plist-tcltk @@ -2,11 +2,11 @@ bin/pgtclsh include/libpgtcl.h lib/tcl%%TCLVERSION%%/Pgtcl1.3/pkgIndex.tcl @dirrm lib/tcl%%TCLVERSION%%/Pgtcl1.3 -@unexec rmdir %D/lib/tcl%%TCLVERSION%% 2>/dev/null || true +@dirrmtry lib/tcl%%TCLVERSION%% lib/libpgtcl.a lib/libpgtcl.so lib/libpgtcl.so.2 %%TK%%bin/pgtksh %%DOCSDIR%%/README-tcltk -@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/postgresql80-server/pkg-plist-client b/databases/postgresql80-server/pkg-plist-client index 3d4497fcdbd7..50d2103784a3 100644 --- a/databases/postgresql80-server/pkg-plist-client +++ b/databases/postgresql80-server/pkg-plist-client @@ -433,10 +433,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 @@ -584,19 +584,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/postgresql80-server/pkg-plist-contrib b/databases/postgresql80-server/pkg-plist-contrib index fd3f553e5b25..6aa759533233 100644 --- a/databases/postgresql80-server/pkg-plist-contrib +++ b/databases/postgresql80-server/pkg-plist-contrib @@ -130,8 +130,8 @@ share/postgresql/contrib/tsearch.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/postgresql80-server/pkg-plist-plperl b/databases/postgresql80-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql80-server/pkg-plist-plperl +++ b/databases/postgresql80-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/postgresql80-server/pkg-plist-plpython b/databases/postgresql80-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql80-server/pkg-plist-plpython +++ b/databases/postgresql80-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/postgresql80-server/pkg-plist-pltcl b/databases/postgresql80-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql80-server/pkg-plist-pltcl +++ b/databases/postgresql80-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/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server index 9b9478022a74..654010402baa 100644 --- a/databases/postgresql80-server/pkg-plist-server +++ b/databases/postgresql80-server/pkg-plist-server @@ -31,7 +31,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/conversion_create.sql share/postgresql/information_schema.sql share/postgresql/pg_hba.conf.sample @@ -61,20 +61,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 @@ -663,8 +663,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 diff --git a/databases/postgresql81-server/pkg-plist-client b/databases/postgresql81-server/pkg-plist-client index f60a533f4a98..c39bd07b8b0e 100644 --- a/databases/postgresql81-server/pkg-plist-client +++ b/databases/postgresql81-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/postgresql81-server/pkg-plist-contrib b/databases/postgresql81-server/pkg-plist-contrib index aba5a7b1cc19..6152ee5852dc 100644 --- a/databases/postgresql81-server/pkg-plist-contrib +++ b/databases/postgresql81-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/postgresql81-server/pkg-plist-plperl b/databases/postgresql81-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql81-server/pkg-plist-plperl +++ b/databases/postgresql81-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/postgresql81-server/pkg-plist-plpython b/databases/postgresql81-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql81-server/pkg-plist-plpython +++ b/databases/postgresql81-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/postgresql81-server/pkg-plist-pltcl b/databases/postgresql81-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql81-server/pkg-plist-pltcl +++ b/databases/postgresql81-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/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server index 9c00caef50c8..9e2451b51f86 100644 --- a/databases/postgresql81-server/pkg-plist-server +++ b/databases/postgresql81-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 diff --git a/databases/postgresql82-server/pkg-plist-client b/databases/postgresql82-server/pkg-plist-client index f60a533f4a98..c39bd07b8b0e 100644 --- a/databases/postgresql82-server/pkg-plist-client +++ b/databases/postgresql82-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/postgresql82-server/pkg-plist-contrib b/databases/postgresql82-server/pkg-plist-contrib index aba5a7b1cc19..6152ee5852dc 100644 --- a/databases/postgresql82-server/pkg-plist-contrib +++ b/databases/postgresql82-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/postgresql82-server/pkg-plist-plperl b/databases/postgresql82-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql82-server/pkg-plist-plperl +++ b/databases/postgresql82-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/postgresql82-server/pkg-plist-plpython b/databases/postgresql82-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql82-server/pkg-plist-plpython +++ b/databases/postgresql82-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/postgresql82-server/pkg-plist-pltcl b/databases/postgresql82-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql82-server/pkg-plist-pltcl +++ b/databases/postgresql82-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/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server index 9c00caef50c8..9e2451b51f86 100644 --- a/databases/postgresql82-server/pkg-plist-server +++ b/databases/postgresql82-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 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 diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client index f60a533f4a98..c39bd07b8b0e 100644 --- a/databases/postgresql84-server/pkg-plist-client +++ b/databases/postgresql84-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/postgresql84-server/pkg-plist-contrib b/databases/postgresql84-server/pkg-plist-contrib index aba5a7b1cc19..6152ee5852dc 100644 --- a/databases/postgresql84-server/pkg-plist-contrib +++ b/databases/postgresql84-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/postgresql84-server/pkg-plist-plperl b/databases/postgresql84-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql84-server/pkg-plist-plperl +++ b/databases/postgresql84-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/postgresql84-server/pkg-plist-plpython b/databases/postgresql84-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql84-server/pkg-plist-plpython +++ b/databases/postgresql84-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/postgresql84-server/pkg-plist-pltcl b/databases/postgresql84-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql84-server/pkg-plist-pltcl +++ b/databases/postgresql84-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/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server index 9c00caef50c8..9e2451b51f86 100644 --- a/databases/postgresql84-server/pkg-plist-server +++ b/databases/postgresql84-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 diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client index f60a533f4a98..c39bd07b8b0e 100644 --- a/databases/postgresql90-server/pkg-plist-client +++ b/databases/postgresql90-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/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib index aba5a7b1cc19..6152ee5852dc 100644 --- a/databases/postgresql90-server/pkg-plist-contrib +++ b/databases/postgresql90-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/postgresql90-server/pkg-plist-plperl b/databases/postgresql90-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql90-server/pkg-plist-plperl +++ b/databases/postgresql90-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/postgresql90-server/pkg-plist-plpython b/databases/postgresql90-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql90-server/pkg-plist-plpython +++ b/databases/postgresql90-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/postgresql90-server/pkg-plist-pltcl b/databases/postgresql90-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql90-server/pkg-plist-pltcl +++ b/databases/postgresql90-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/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server index 9c00caef50c8..9e2451b51f86 100644 --- a/databases/postgresql90-server/pkg-plist-server +++ b/databases/postgresql90-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 diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client index f60a533f4a98..c39bd07b8b0e 100644 --- a/databases/postgresql91-server/pkg-plist-client +++ b/databases/postgresql91-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/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib index aba5a7b1cc19..6152ee5852dc 100644 --- a/databases/postgresql91-server/pkg-plist-contrib +++ b/databases/postgresql91-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/postgresql91-server/pkg-plist-plperl b/databases/postgresql91-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql91-server/pkg-plist-plperl +++ b/databases/postgresql91-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/postgresql91-server/pkg-plist-plpython b/databases/postgresql91-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql91-server/pkg-plist-plpython +++ b/databases/postgresql91-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/postgresql91-server/pkg-plist-pltcl b/databases/postgresql91-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql91-server/pkg-plist-pltcl +++ b/databases/postgresql91-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/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server index 9c00caef50c8..9e2451b51f86 100644 --- a/databases/postgresql91-server/pkg-plist-server +++ b/databases/postgresql91-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 diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client index f60a533f4a98..c39bd07b8b0e 100644 --- a/databases/postgresql92-server/pkg-plist-client +++ b/databases/postgresql92-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/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib index aba5a7b1cc19..6152ee5852dc 100644 --- a/databases/postgresql92-server/pkg-plist-contrib +++ b/databases/postgresql92-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/postgresql92-server/pkg-plist-plperl b/databases/postgresql92-server/pkg-plist-plperl index 8d4f20e33bbf..c84ea2e6d16c 100644 --- a/databases/postgresql92-server/pkg-plist-plperl +++ b/databases/postgresql92-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/postgresql92-server/pkg-plist-plpython b/databases/postgresql92-server/pkg-plist-plpython index 184c2fd1d21e..d3c29953b6b5 100644 --- a/databases/postgresql92-server/pkg-plist-plpython +++ b/databases/postgresql92-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/postgresql92-server/pkg-plist-pltcl b/databases/postgresql92-server/pkg-plist-pltcl index bf4aae772537..47036c2a4e2a 100644 --- a/databases/postgresql92-server/pkg-plist-pltcl +++ b/databases/postgresql92-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/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server index 9c00caef50c8..9e2451b51f86 100644 --- a/databases/postgresql92-server/pkg-plist-server +++ b/databases/postgresql92-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 |