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 | |
| parent | f35229590b6b5b323c1b01abd2946e20fc1a0476 (diff) | |
| download | ports-d568611c3eb334453c4a0352b61f081a623d72f1.tar.gz ports-d568611c3eb334453c4a0352b61f081a623d72f1.zip | |
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
206 files changed, 1028 insertions, 1025 deletions
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist index 046333d465ac..f91e77f9cd78 100644 --- a/astro/gpsdrive/pkg-plist +++ b/astro/gpsdrive/pkg-plist @@ -59,7 +59,7 @@ share/pixmaps/gpsicon.png %%NLS%%share/locale/sk/LC_MESSAGES/gpsdrive.mo %%NLS%%share/locale/sv/LC_MESSAGES/gpsdrive.mo %%NLS%%share/locale/tr/LC_MESSAGES/gpsdrive.mo -%%NLS%%@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/gr 2> /dev/null || true +%%NLS%%@dirrmtry share/locale/gr/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/gr @dirrmtry share/applications @dirrm %%DATADIR%% diff --git a/audio/cantus/pkg-plist b/audio/cantus/pkg-plist index 98aea4760c26..6d416d64b759 100644 --- a/audio/cantus/pkg-plist +++ b/audio/cantus/pkg-plist @@ -22,9 +22,9 @@ share/pixmaps/cantus/warning.xpm share/pixmaps/cantus/addrecursive.xpm share/gnome/apps/Applications/cantus.desktop @dirrm share/pixmaps/cantus -@unexec rmdir %D/share/pixmaps -@unexec rmdir %D/share/gnome/apps/Applications -@unexec rmdir %D/share/gnome/apps -@unexec rmdir %D/share/gnome +@dirrmtry share/pixmaps +@dirrmtry share/gnome/apps/Applications +@dirrmtry share/gnome/apps +@dirrmtry share/gnome @dirrm doc/Cantus @dirrm doc diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index 6cb865e769cd..be2d0cdd581d 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -103,9 +103,9 @@ pre-install: ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} data -type d ! -empty | ${SORT} -r | \ ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST} - @${ECHO_CMD} '@unexec rmdir %D/share/applications 2>/dev/null || true' >> ${PLIST} - @${ECHO_CMD} '@unexec rmdir %D/man/ru.KOI8-R/man1 2>/dev/null || true' >> ${PLIST} - @${ECHO_CMD} '@unexec rmdir %D/man/ru.KOI8-R 2>/dev/null || true' >> ${PLIST} + @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST} + @${ECHO_CMD} '@dirrmtry man/ru.KOI8-R/man1' >> ${PLIST} + @${ECHO_CMD} '@dirrmtry man/ru.KOI8-R' >> ${PLIST} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hydrogen ${WRKSRC}/hydrogenPlayer ${PREFIX}/bin diff --git a/audio/orpheus/pkg-plist b/audio/orpheus/pkg-plist index 2f810213c465..f012b035f7c9 100644 --- a/audio/orpheus/pkg-plist +++ b/audio/orpheus/pkg-plist @@ -1,3 +1,3 @@ bin/orpheus %%NLS%%share/locale/ru/LC_MESSAGES/orpheus.mo -%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES diff --git a/audio/polypaudio/pkg-plist b/audio/polypaudio/pkg-plist index 2e9925435fc8..d71469eafb7f 100644 --- a/audio/polypaudio/pkg-plist +++ b/audio/polypaudio/pkg-plist @@ -211,4 +211,4 @@ libdata/pkgconfig/polyplib-simple.pc libdata/pkgconfig/polyplib.pc @dirrm lib/polypaudio-%%VERSION%% @dirrm include/polyp -@unexec rmdir %D/etc/polypaudio 2> /dev/null || /usr/bin/true +@dirrmtry etc/polypaudio diff --git a/audio/xmms-kj/pkg-plist b/audio/xmms-kj/pkg-plist index d302c39deeba..22c87dc716f3 100644 --- a/audio/xmms-kj/pkg-plist +++ b/audio/xmms-kj/pkg-plist @@ -1,4 +1,4 @@ lib/xmms/Visualization/libkjofol.so share/xmms/kjofol/default.zip -@unexec rmdir %D/lib/xmms/Visualization 2>&1 >/dev/null || true +@dirrmtry lib/xmms/Visualization @dirrm share/xmms/kjofol diff --git a/cad/alliance/pkg-plist b/cad/alliance/pkg-plist index 258591b16f7a..68cbf5c2ceba 100644 --- a/cad/alliance/pkg-plist +++ b/cad/alliance/pkg-plist @@ -1768,5 +1768,5 @@ alliance/examples/alliance-examples/tuner/tuner_io.c @dirrm alliance/examples/alliance-examples/tuner @dirrm alliance/examples/alliance-examples @dirrm alliance/examples -@unexec rmdir %D/alliance/etc > /dev/null 2>&1 || true -@unexec rmdir %D/alliance > /dev/null 2>&1 || true +@dirrmtry alliance/etc +@dirrmtry alliance diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist index 11fa8ca87ee2..c297dd25cc21 100644 --- a/chinese/gcin-devel/pkg-plist +++ b/chinese/gcin-devel/pkg-plist @@ -49,7 +49,7 @@ share/gnome/control-center-2.0/capplets/gcin-setup.desktop share/icons/gcin.png share/icons/gcin/pin-fixed24.png share/icons/gcin/pin-float16.png -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry share/icons/gcin @dirrmtry share/icons @dirrmtry share/gnome/control-center-2.0/capplets diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist index 11fa8ca87ee2..c297dd25cc21 100644 --- a/chinese/gcin/pkg-plist +++ b/chinese/gcin/pkg-plist @@ -49,7 +49,7 @@ share/gnome/control-center-2.0/capplets/gcin-setup.desktop share/icons/gcin.png share/icons/gcin/pin-fixed24.png share/icons/gcin/pin-float16.png -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry share/icons/gcin @dirrmtry share/icons @dirrmtry share/gnome/control-center-2.0/capplets diff --git a/chinese/iiimf-le-newpy/pkg-plist b/chinese/iiimf-le-newpy/pkg-plist index d02b7a045aa0..b2858ed6fbf4 100644 --- a/chinese/iiimf-le-newpy/pkg-plist +++ b/chinese/iiimf-le-newpy/pkg-plist @@ -14,4 +14,4 @@ lib/iiim/le/newpy/data/UdCiku.dat %%WANT_XAUX%%lib/iiim/le/newpy/help.gif @dirrm lib/iiim/le/newpy/data @dirrm lib/iiim/le/newpy -@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true +@dirrmtry lib/iiim/le diff --git a/chinese/iiimf-le-ude/pkg-plist b/chinese/iiimf-le-ude/pkg-plist index 353765143b79..d73e2f75ffd7 100644 --- a/chinese/iiimf-le-ude/pkg-plist +++ b/chinese/iiimf-le-ude/pkg-plist @@ -2,4 +2,4 @@ lib/iiim/le/ude/ude.so lib/iiim/le/ude/data/pinyin.mb @dirrm lib/iiim/le/ude/data @dirrm lib/iiim/le/ude -@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true +@dirrmtry lib/iiim/le diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist index f1c7d3f2e99a..fbfaef3ac6b2 100644 --- a/chinese/p5-Encode-HanConvert/pkg-plist +++ b/chinese/p5-Encode-HanConvert/pkg-plist @@ -12,6 +12,6 @@ bin/g2b.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanConvert @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode %%OLD%%@dirrm %%SITE_PERL%%/Encode/HanConvert -%%OLD%%@unexec rmdir %D/%%SITE_PERL%%/Encode 2>/dev/null || true +%%OLD%%@dirrmtry %%SITE_PERL%%/Encode %%NEW%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert -%%NEW%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Encode 2>/dev/null || true +%%NEW%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode diff --git a/chinese/xemacs21/pkg-plist b/chinese/xemacs21/pkg-plist index d7937a036e21..bbceebc1a6ba 100644 --- a/chinese/xemacs21/pkg-plist +++ b/chinese/xemacs21/pkg-plist @@ -17,8 +17,8 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/config.values @exec ln -sf ja %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC @unexec rm -f %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.EUC -@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true -@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages/etc 2>/dev/null || true -@unexec rmdir %%PREFIX%%/lib/xemacs/mule-packages 2>/dev/null || true +@dirrmtry lib/xemacs/mule-packages/etc/app-defaults +@dirrmtry lib/xemacs/mule-packages/etc +@dirrmtry lib/xemacs/mule-packages @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%% @dirrm lib/xemacs-%%XEMACS_VER%%/etc/app-defaults/zh_TW.Big5 diff --git a/chinese/zhcon/pkg-plist b/chinese/zhcon/pkg-plist index 5a58ae69dd8b..e66d7816ec8e 100644 --- a/chinese/zhcon/pkg-plist +++ b/chinese/zhcon/pkg-plist @@ -40,10 +40,10 @@ lib/zhcon/input/winzm.mb %%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo %%NLS%%share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo -%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/zh_CN.GBK/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN.GBK +%%NLS%%@dirrmtry share/locale/zh_CN.EUC/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN.EUC @dirrm lib/zhcon/input @dirrm lib/zhcon/font @dirrm lib/zhcon 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 diff --git a/deskutils/gnochm/pkg-plist b/deskutils/gnochm/pkg-plist index 17b0337229d7..881398249b5f 100644 --- a/deskutils/gnochm/pkg-plist +++ b/deskutils/gnochm/pkg-plist @@ -25,7 +25,7 @@ share/mime/packages/gnochm.xml @dirrm share/gnome/help/gnochm @dirrm share/gnome/gnochm/glade @dirrm share/gnome/gnochm -@unexec rmdir %D/man/it/man1 2>/dev/null||true -@unexec rmdir %D/man/it 2>/dev/null||true +@dirrmtry man/it/man1 +@dirrmtry man/it @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/deskutils/narval/pkg-plist b/deskutils/narval/pkg-plist index 9118b8c359d9..f8a49083b440 100644 --- a/deskutils/narval/pkg-plist +++ b/deskutils/narval/pkg-plist @@ -535,4 +535,4 @@ etc/narval/narval.conf.bak @dirrm %%PYTHON_SITELIBDIR%%/narval/communication @dirrm %%PYTHON_SITELIBDIR%%/narval/actions @dirrm %%PYTHON_SITELIBDIR%%/narval -@unexec rmdir %D/etc/narval >/dev/null 2>&1 || true +@dirrmtry etc/narval diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist index 8a7c7ddba574..1daefba49783 100644 --- a/devel/bison2/pkg-plist +++ b/devel/bison2/pkg-plist @@ -53,8 +53,8 @@ share/aclocal/bison-i18n.m4 %%NLS%%share/locale/tr/LC_MESSAGES/bison-runtime.mo %%NLS%%share/locale/vi/LC_MESSAGES/bison.mo %%NLS%%share/locale/vi/LC_MESSAGES/bison-runtime.mo -%%NLS%%@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/rw 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/rw @dirrm %%DATADIR%%/m4sugar @dirrm %%DATADIR%% @dirrmtry share/aclocal diff --git a/devel/cscout-devel/pkg-plist b/devel/cscout-devel/pkg-plist index a36e49606c10..abe84b597ad2 100644 --- a/devel/cscout-devel/pkg-plist +++ b/devel/cscout-devel/pkg-plist @@ -13,7 +13,7 @@ etc/cscout/cscout_incs.GENERIC etc/cscout/cscout_incs.LINUX_GCC etc/cscout/cscout_incs.WIN32_MINGW etc/cscout/cscout_incs.WIN32_MSC -@unexec rmdir %D/etc/cscout || true +@dirrmtry etc/cscout %%PORTDOCS%%%%DOCSDIR%%/access.html %%PORTDOCS%%%%DOCSDIR%%/bib.html diff --git a/devel/cscout/pkg-plist b/devel/cscout/pkg-plist index b9fcf7761a0e..feb00a1649ca 100644 --- a/devel/cscout/pkg-plist +++ b/devel/cscout/pkg-plist @@ -13,7 +13,7 @@ etc/cscout/cscout_incs.GENERIC etc/cscout/cscout_incs.LINUX_GCC etc/cscout/cscout_incs.WIN32_MINGW etc/cscout/cscout_incs.WIN32_MSC -@unexec rmdir %D/etc/cscout || true +@dirrmtry etc/cscout %%PORTDOCS%%%%DOCSDIR%%/access.html %%PORTDOCS%%%%DOCSDIR%%/contents.html %%PORTDOCS%%%%DOCSDIR%%/cvs.html diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile index dcbdcf136495..ae355ef65933 100644 --- a/devel/cvsweb/Makefile +++ b/devel/cvsweb/Makefile @@ -81,7 +81,8 @@ do-install: post-install: .if defined(PACKAGE_BUILDING) - ${ECHO_CMD} "@unexec rmdir %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST} .endif @${CAT} ${PKGMESSAGE} diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile index 045388802df3..a09b0a32f144 100644 --- a/devel/cvsweb3/Makefile +++ b/devel/cvsweb3/Makefile @@ -120,7 +120,9 @@ do-install: post-install: .if defined(PACKAGE_BUILDING) - ${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} %D/${CSSDIR} 2>/dev/null || true" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrmtry ${CSSDIR}" >> ${TMPPLIST} .endif @${CAT} ${PKGMESSAGE} diff --git a/devel/dialyzer/pkg-plist b/devel/dialyzer/pkg-plist index bad7fb97617d..76cdb11feda2 100644 --- a/devel/dialyzer/pkg-plist +++ b/devel/dialyzer/pkg-plist @@ -28,8 +28,8 @@ lib/erlang/lib/dialyzer-%%VERSION%%/src/hipe_icode_type.hrl @dirrm lib/erlang/lib/dialyzer-%%VERSION%%/src @dirrm lib/erlang/lib/dialyzer-%%VERSION%%/ebin @dirrm lib/erlang/lib/dialyzer-%%VERSION%%/doc -@unexec rmdir %D/lib/erlang/lib/dialyzer-%%VERSION%%/plt >/dev/null 2>&1 || true -@unexec rmdir %D/lib/erlang/lib/dialyzer-%%VERSION%% >/dev/null 2>&1 || true +@dirrmtry lib/erlang/lib/dialyzer-%%VERSION%%/plt +@dirrmtry lib/erlang/lib/dialyzer-%%VERSION%% @exec ln -sf dialyzer-%%VERSION%% %D/lib/erlang/lib/dialyzer @unexec rm -f %D/lib/erlang/lib/dialyzer >/dev/null 2>&1 || true @exec ln -sf %D/lib/erlang/lib/dialyzer-%%VERSION%%/dialyzer %D/bin/dialyzer diff --git a/devel/esvn/pkg-plist b/devel/esvn/pkg-plist index e8690c1fd832..94de86732841 100644 --- a/devel/esvn/pkg-plist +++ b/devel/esvn/pkg-plist @@ -107,8 +107,8 @@ bin/esvn-diff-wrapper %%KDE%%@cwd %%LOCALBASE%% %%KDE%%share/applnk/eSvn.desktop %%KDE%%share/icons/hicolor/48x48/apps/esvn.png -%%KDE%%@unexec rmdir %D/share/applnk 2>/dev/null || true -%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -%%KDE%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -%%KDE%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -%%KDE%%@unexec rmdir %D/share/icons 2>/dev/null || true +%%KDE%%@dirrmtry share/applnk +%%KDE%%@dirrmtry share/icons/hicolor/48x48/apps +%%KDE%%@dirrmtry share/icons/hicolor/48x48 +%%KDE%%@dirrmtry share/icons/hicolor +%%KDE%%@dirrmtry share/icons diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist index 97ee55a18524..42008cfe0ee9 100644 --- a/devel/gettext/pkg-plist +++ b/devel/gettext/pkg-plist @@ -304,43 +304,43 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo @dirrm %%DOCSDIR%% @dirrm libdata/gettext-tools @dirrm lib/gettext -@unexec rmdir %%LOCALBASE%%/share/locale/be/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/en@boldquot/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/en@quot/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/gl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/ko/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/nn/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/no/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/be 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/ca 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/cs 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/el 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/en@boldquot 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/en@quot 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/fi 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/gl 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/ko 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/nn 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/no 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/pl 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/pt 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/ro 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/sk 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/sl 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/sr 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/uk 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %%LOCALBASE%%/share/locale/zh_TW 2>/dev/null || true +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/en@boldquot/LC_MESSAGES +@dirrmtry share/locale/en@quot/LC_MESSAGES +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/be +@dirrmtry share/locale/ca +@dirrmtry share/locale/cs +@dirrmtry share/locale/el +@dirrmtry share/locale/en@boldquot +@dirrmtry share/locale/en@quot +@dirrmtry share/locale/fi +@dirrmtry share/locale/gl +@dirrmtry share/locale/ko +@dirrmtry share/locale/nn +@dirrmtry share/locale/no +@dirrmtry share/locale/pl +@dirrmtry share/locale/pt +@dirrmtry share/locale/ro +@dirrmtry share/locale/sk +@dirrmtry share/locale/sl +@dirrmtry share/locale/sr +@dirrmtry share/locale/uk +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/zh_TW diff --git a/devel/libds/pkg-plist b/devel/libds/pkg-plist index c475c32c0b81..83c1294d43d1 100644 --- a/devel/libds/pkg-plist +++ b/devel/libds/pkg-plist @@ -10,4 +10,4 @@ lib/libds.so %%PORTDOCS%%share/doc/libds/queue.html %%PORTDOCS%%share/doc/libds/set.html %%PORTDOCS%%share/doc/libds/stack.html -%%PORTDOCS%%@unexec rmdir %D/share/doc/libds 2>/dev/null || true +%%PORTDOCS%%@dirrmtry share/doc/libds diff --git a/devel/linux-f10-sdl12/pkg-plist.i386 b/devel/linux-f10-sdl12/pkg-plist.i386 index 76916fafd2f9..f822d036c62a 100644 --- a/devel/linux-f10-sdl12/pkg-plist.i386 +++ b/devel/linux-f10-sdl12/pkg-plist.i386 @@ -6,4 +6,4 @@ usr/lib/libSDL-1.1.so.0 usr/lib/libSDL-1.2.so.0 usr/lib/libSDL-1.2.so.0.0.5 @dirrm usr/doc/SDL-1.2.5 -@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true +@dirrmtry usr/doc diff --git a/devel/linux-f8-sdl12/pkg-plist.i386 b/devel/linux-f8-sdl12/pkg-plist.i386 index 76916fafd2f9..f822d036c62a 100644 --- a/devel/linux-f8-sdl12/pkg-plist.i386 +++ b/devel/linux-f8-sdl12/pkg-plist.i386 @@ -6,4 +6,4 @@ usr/lib/libSDL-1.1.so.0 usr/lib/libSDL-1.2.so.0 usr/lib/libSDL-1.2.so.0.0.5 @dirrm usr/doc/SDL-1.2.5 -@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true +@dirrmtry usr/doc diff --git a/devel/linux-glib2/pkg-plist b/devel/linux-glib2/pkg-plist index 574c0dbd7e01..cea8ba446817 100644 --- a/devel/linux-glib2/pkg-plist +++ b/devel/linux-glib2/pkg-plist @@ -79,73 +79,73 @@ usr/share/locale/yi/LC_MESSAGES/glib20.mo usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo @dirrm usr/share/doc/glib2-%%PORTVERSION%% -@unexec rmdir %D/usr/share/locale/am/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/am >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ar/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ar >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/az >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/bg/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/bg >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/bn/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/bn >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/bs/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/bs >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/cy/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/cy >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/en/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/en >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/en_CA/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/en_CA >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/en_GB/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/en_GB >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/eu >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/fa/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/fa >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ga >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/gu/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/gu >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/he/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/he >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/hi/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/hi >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/hr >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/lt >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/lv/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/lv >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/mk/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/mk >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ml/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ml >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/mn/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/mn >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ms/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ms >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/nb/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/nb >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ne/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ne >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/nn >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/or/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/or >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/pa/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/pa >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/sq/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/sq >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/sr@Latn/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/sr@Latn >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/sr@ije/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/sr@ije >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ta/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/ta >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/vi/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/vi >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/wa >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/yi/LC_MESSAGES >/dev/null 2>&1 || true -@unexec rmdir %D/usr/share/locale/yi >/dev/null 2>&1 || true +@dirrmtry usr/share/locale/am/LC_MESSAGES +@dirrmtry usr/share/locale/am +@dirrmtry usr/share/locale/ar/LC_MESSAGES +@dirrmtry usr/share/locale/ar +@dirrmtry usr/share/locale/az/LC_MESSAGES +@dirrmtry usr/share/locale/az +@dirrmtry usr/share/locale/bg/LC_MESSAGES +@dirrmtry usr/share/locale/bg +@dirrmtry usr/share/locale/bn/LC_MESSAGES +@dirrmtry usr/share/locale/bn +@dirrmtry usr/share/locale/bs/LC_MESSAGES +@dirrmtry usr/share/locale/bs +@dirrmtry usr/share/locale/cy/LC_MESSAGES +@dirrmtry usr/share/locale/cy +@dirrmtry usr/share/locale/en/LC_MESSAGES +@dirrmtry usr/share/locale/en +@dirrmtry usr/share/locale/en_CA/LC_MESSAGES +@dirrmtry usr/share/locale/en_CA +@dirrmtry usr/share/locale/en_GB/LC_MESSAGES +@dirrmtry usr/share/locale/en_GB +@dirrmtry usr/share/locale/eu/LC_MESSAGES +@dirrmtry usr/share/locale/eu +@dirrmtry usr/share/locale/fa/LC_MESSAGES +@dirrmtry usr/share/locale/fa +@dirrmtry usr/share/locale/ga/LC_MESSAGES +@dirrmtry usr/share/locale/ga +@dirrmtry usr/share/locale/gu/LC_MESSAGES +@dirrmtry usr/share/locale/gu +@dirrmtry usr/share/locale/he/LC_MESSAGES +@dirrmtry usr/share/locale/he +@dirrmtry usr/share/locale/hi/LC_MESSAGES +@dirrmtry usr/share/locale/hi +@dirrmtry usr/share/locale/hr/LC_MESSAGES +@dirrmtry usr/share/locale/hr +@dirrmtry usr/share/locale/lt/LC_MESSAGES +@dirrmtry usr/share/locale/lt +@dirrmtry usr/share/locale/lv/LC_MESSAGES +@dirrmtry usr/share/locale/lv +@dirrmtry usr/share/locale/mk/LC_MESSAGES +@dirrmtry usr/share/locale/mk +@dirrmtry usr/share/locale/ml/LC_MESSAGES +@dirrmtry usr/share/locale/ml +@dirrmtry usr/share/locale/mn/LC_MESSAGES +@dirrmtry usr/share/locale/mn +@dirrmtry usr/share/locale/ms/LC_MESSAGES +@dirrmtry usr/share/locale/ms +@dirrmtry usr/share/locale/nb/LC_MESSAGES +@dirrmtry usr/share/locale/nb +@dirrmtry usr/share/locale/ne/LC_MESSAGES +@dirrmtry usr/share/locale/ne +@dirrmtry usr/share/locale/nn/LC_MESSAGES +@dirrmtry usr/share/locale/nn +@dirrmtry usr/share/locale/or/LC_MESSAGES +@dirrmtry usr/share/locale/or +@dirrmtry usr/share/locale/pa/LC_MESSAGES +@dirrmtry usr/share/locale/pa +@dirrmtry usr/share/locale/sq/LC_MESSAGES +@dirrmtry usr/share/locale/sq +@dirrmtry usr/share/locale/sr@Latn/LC_MESSAGES +@dirrmtry usr/share/locale/sr@Latn +@dirrmtry usr/share/locale/sr@ije/LC_MESSAGES +@dirrmtry usr/share/locale/sr@ije +@dirrmtry usr/share/locale/ta/LC_MESSAGES +@dirrmtry usr/share/locale/ta +@dirrmtry usr/share/locale/vi/LC_MESSAGES +@dirrmtry usr/share/locale/vi +@dirrmtry usr/share/locale/wa/LC_MESSAGES +@dirrmtry usr/share/locale/wa +@dirrmtry usr/share/locale/yi/LC_MESSAGES +@dirrmtry usr/share/locale/yi diff --git a/devel/linux-sdl12/pkg-plist.i386 b/devel/linux-sdl12/pkg-plist.i386 index 76916fafd2f9..f822d036c62a 100644 --- a/devel/linux-sdl12/pkg-plist.i386 +++ b/devel/linux-sdl12/pkg-plist.i386 @@ -6,4 +6,4 @@ usr/lib/libSDL-1.1.so.0 usr/lib/libSDL-1.2.so.0 usr/lib/libSDL-1.2.so.0.0.5 @dirrm usr/doc/SDL-1.2.5 -@unexec rmdir %D/usr/doc 2>&1 >/dev/null || true +@dirrmtry usr/doc diff --git a/devel/linux_devtools/pkg-plist b/devel/linux_devtools/pkg-plist index dc1b844575a5..5c52f89ca3fe 100644 --- a/devel/linux_devtools/pkg-plist +++ b/devel/linux_devtools/pkg-plist @@ -5006,5 +5006,5 @@ usr/X11R6/man/man3/gluUnProject.3x.gz @dirrm usr/X11R6/include/X11 @dirrm usr/X11R6/lib/X11/config @dirrm usr/X11R6/lib/X11 -@unexec rmdir %D/usr/X11R6/man/man1 >/dev/null 2>&1 || true -@unexec rmdir %D/usr/X11R6/man/man3 >/dev/null 2>&1 || true +@dirrmtry usr/X11R6/man/man1 +@dirrmtry usr/X11R6/man/man3 diff --git a/devel/p5-Data-Swap/pkg-plist b/devel/p5-Data-Swap/pkg-plist index deacf058c5b3..5b2694f597fb 100644 --- a/devel/p5-Data-Swap/pkg-plist +++ b/devel/p5-Data-Swap/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap/Swap.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap/Swap.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Swap -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Data || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Data diff --git a/devel/p5-Log-Accounting-SVK/pkg-plist b/devel/p5-Log-Accounting-SVK/pkg-plist index ec751489c244..b9496741f8fa 100644 --- a/devel/p5-Log-Accounting-SVK/pkg-plist +++ b/devel/p5-Log-Accounting-SVK/pkg-plist @@ -4,5 +4,5 @@ bin/svk-accounting.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting/SVK @dirrmtry %%SITE_PERL%%/Log/Accounting @dirrmtry %%SITE_PERL%%/Log -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting 2>/dev/null ||true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null ||true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Accounting +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log diff --git a/devel/p5-Module-Info-File/pkg-plist b/devel/p5-Module-Info-File/pkg-plist index d0d3251d175c..77a4b0b4edbc 100644 --- a/devel/p5-Module-Info-File/pkg-plist +++ b/devel/p5-Module-Info-File/pkg-plist @@ -2,7 +2,7 @@ bin/version.pl %%SITE_PERL%%/Module/Info/File.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info/File/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info/File -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info 2>/dev/null | true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null | true -@unexec rmdir %D/%%SITE_PERL%%/Module/Info 2>/dev/null | true -@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null | true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Info +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module +@dirrmtry %%SITE_PERL%%/Module/Info +@dirrmtry %%SITE_PERL%%/Module diff --git a/devel/p5-Object-MultiType/pkg-plist b/devel/p5-Object-MultiType/pkg-plist index 58b2f80845b6..21620a8e5165 100644 --- a/devel/p5-Object-MultiType/pkg-plist +++ b/devel/p5-Object-MultiType/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Object/MultiType/.packlist %%SITE_PERL%%/Object/MultiType.pm @dirrm %%SITE_PERL%%/mach/auto/Object/MultiType -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Object 2>/dev/null +@dirrmtry %%SITE_PERL%%/mach/auto/Object @dirrmtry %SITE_PERL%%/%%PERL_ARCH%%/Object @dirrmtry %%SITE_PERL%%/Object diff --git a/devel/p5-Test-Pod-Coverage/pkg-plist b/devel/p5-Test-Pod-Coverage/pkg-plist index 424f724873e2..c935cdc2e492 100644 --- a/devel/p5-Test-Pod-Coverage/pkg-plist +++ b/devel/p5-Test-Pod-Coverage/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Test/Pod/Coverage.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/Coverage/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod/Coverage -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod 2>/dev/null | true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null | true -@unexec rmdir %D/%%SITE_PERL%%/Test/Pod 2>/dev/null | true -@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null | true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test +@dirrmtry %%SITE_PERL%%/Test/Pod +@dirrmtry %%SITE_PERL%%/Test diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk index 2991fb31b80c..4a864ef67e1d 100644 --- a/devel/pear/bsd.pear.mk +++ b/devel/pear/bsd.pear.mk @@ -129,14 +129,14 @@ do-generate-plist: if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \ if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \ echo "@dirrm ${LPKGREGDIR}"; \ - if [ -n "${CATEGORY}" ]; then echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; fi; \ - if [ -n "${CATEGORY:M*/*}" ]; then echo "@unexec rmdir %D/${LINSTDIR:H} 2> /dev/null || true"; fi; \ - echo "@unexec rmdir %D/${LPKGREGDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST} + if [ -n "${CATEGORY}" ]; then echo "@dirrmtry ${LINSTDIR}"; fi; \ + if [ -n "${CATEGORY:M*/*}" ]; then echo "@dirrmtry ${LINSTDIR:H}"; fi; \ + echo "@dirrmtry ${LPKGREGDIR:H}"; \ + echo "@dirrmtry ${LDOCSDIR:H}"; \ + echo "@dirrmtry ${LEXAMPLESDIR:H}"; \ + echo "@dirrmtry ${LTESTSDIR:H}"; \ + echo "@dirrmtry ${LDATADIR:H}"; \ + echo "@dirrmtry ${LSQLSDIR:H}") > ${PLIST} . endif . for t in files docs tests sqls scriptfiles examples data diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist index d94139fbb789..cc53c0b8554e 100644 --- a/devel/popt/pkg-plist +++ b/devel/popt/pkg-plist @@ -31,29 +31,29 @@ lib/libpopt.so.0 %%NLS%%share/locale/wa/LC_MESSAGES/popt.mo %%NLS%%share/locale/zh/LC_MESSAGES/popt.mo %%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo -%%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/uk 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/gl 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/fi 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/eu_ES/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/eu_ES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/uk +%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sr +%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sl +%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sk +%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ro +%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/pt +%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/pl +%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/no +%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ko +%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/gl +%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fi +%%NLS%%@dirrmtry share/locale/eu_ES/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/eu_ES +%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/cs diff --git a/devel/porttools/files/patch-cmd_test.in b/devel/porttools/files/patch-cmd_test.in index c73b616f58bc..f5c918f27544 100644 --- a/devel/porttools/files/patch-cmd_test.in +++ b/devel/porttools/files/patch-cmd_test.in @@ -15,7 +15,7 @@ sed -e "s,^${PREFIX}/,," + sudo find ${LOCALBASE}/ -type d | sed "s,^${LOCALBASE}/,," | sort > ${PREFIX}.PLIST_DIRS.before + sudo find ${PREFIX}/ -type d | sed "s,^${PREFIX}/,," | sort > ${PREFIX}.PLIST_DIRS.after -+ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@unexec rmdir %D/"$1" 2>/dev/null || true"}' ++ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@dirrmtry "$1}' fi # Finish with a clean workspace diff --git a/devel/py-kid/pkg-plist b/devel/py-kid/pkg-plist index f121e4ce4a0a..c2721d8bc45b 100644 --- a/devel/py-kid/pkg-plist +++ b/devel/py-kid/pkg-plist @@ -78,8 +78,8 @@ bin/kid %%PORTDOCS%%%%EXAMPLESDIR%%/basic/sysinfo.kid %%PORTDOCS%%%%EXAMPLESDIR%%/basic/tutorial.kid %%PORTDOCS%%%%EXAMPLESDIR%%/basic/tutorial2.kid -%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/cgi 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/basic 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/cgi +%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/basic +%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%% @dirrmtry %%PYTHON_SITELIBDIR%%/kid/test @dirrmtry %%PYTHON_SITELIBDIR%%/kid diff --git a/devel/py-reverse/Makefile b/devel/py-reverse/Makefile index 2b9192a1f60a..f6860a3311ce 100644 --- a/devel/py-reverse/Makefile +++ b/devel/py-reverse/Makefile @@ -28,6 +28,6 @@ post-install: ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${PYTHON_SITELIBDIR}/logilab/pyreverse -type d | ${SORT} -r | \ ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/%%PYTHSON_SITELIBDIR%%/logilab 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry %%PYTHSON_SITELIBDIR%%/logilab" >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/devel/ruby-byaccr/pkg-plist b/devel/ruby-byaccr/pkg-plist index a0b6befb7892..a3e218672269 100644 --- a/devel/ruby-byaccr/pkg-plist +++ b/devel/ruby-byaccr/pkg-plist @@ -4,8 +4,8 @@ bin/byaccr %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/calfunc.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/main.rb %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% -%%PORTDOCS%%@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%% %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.html %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% -%%PORTDOCS%%@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%% diff --git a/dns/libidn/pkg-plist b/dns/libidn/pkg-plist index 20f911395c81..41d9661d7d7c 100644 --- a/dns/libidn/pkg-plist +++ b/dns/libidn/pkg-plist @@ -29,5 +29,5 @@ share/emacs/site-lisp/punycode.el %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%NLS%%@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/rw 2> /dev/null || true +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/rw diff --git a/dns/p5-Net-LibIDN/pkg-plist b/dns/p5-Net-LibIDN/pkg-plist index 631e8c074855..c0b4b4d3cd57 100644 --- a/dns/p5-Net-LibIDN/pkg-plist +++ b/dns/p5-Net-LibIDN/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Net/LibIDN.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/LibIDN -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/dns/p5-Tie-DNS/pkg-plist b/dns/p5-Tie-DNS/pkg-plist index 0073ed6e5a77..2b82bb672492 100644 --- a/dns/p5-Tie-DNS/pkg-plist +++ b/dns/p5-Tie-DNS/pkg-plist @@ -10,4 +10,4 @@ @dirrmtry %%SITE_PERL%%/Tie @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie -%%PORTDOCS%%@unexec rmdir %D/share/examples/p5-Tie-DNS 2>/dev/null || true +%%PORTDOCS%%@dirrmtry share/examples/p5-Tie-DNS diff --git a/editors/joe2/pkg-plist b/editors/joe2/pkg-plist index f3fdcfacdf83..f8039bf4292f 100644 --- a/editors/joe2/pkg-plist +++ b/editors/joe2/pkg-plist @@ -15,5 +15,5 @@ etc/joe/jpicorc %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.cvs -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry etc/joe diff --git a/editors/mp/pkg-plist b/editors/mp/pkg-plist index e7adb13ffb49..1f1c26ba68fa 100644 --- a/editors/mp/pkg-plist +++ b/editors/mp/pkg-plist @@ -14,8 +14,8 @@ bin/mp %%NLS%%share/locale/es/LC_MESSAGES/minimum-profit.mo %%NLS%%share/locale/it/LC_MESSAGES/minimum-profit.mo %%NLS%%share/locale/nl/LC_MESSAGES/minimum-profit.mo -%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES @dirrm %%DOCSDIR%% diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep index 8817c101eac3..415715bbd435 100644 --- a/editors/xemacs-devel-mule/pkg-plist.arch-dep +++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep @@ -405,9 +405,9 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow @exec ln -sf ja %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP @unexec rm -f %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP -@unexec rmdir %D/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true -@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true +@dirrmtry lib/xemacs/mule-packages/etc/app-defaults +@dirrmtry lib/xemacs/mule-packages/etc +@dirrmtry lib/xemacs/mule-packages @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include diff --git a/editors/xemacs21-mule/pkg-plist.arch-dep b/editors/xemacs21-mule/pkg-plist.arch-dep index c2846c40e7d6..a6a40f0d8bd5 100644 --- a/editors/xemacs21-mule/pkg-plist.arch-dep +++ b/editors/xemacs21-mule/pkg-plist.arch-dep @@ -377,14 +377,14 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow @exec ln -sf ja %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP @unexec rm -f %D/lib/xemacs/mule-packages/etc/app-defaults/ja_JP.eucJP -@unexec rmdir %D/lib/xemacs/mule-packages/etc/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true -@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true +@dirrmtry lib/xemacs/mule-packages/etc/app-defaults +@dirrmtry lib/xemacs/mule-packages/etc +@dirrmtry lib/xemacs/mule-packages @dirrm lib/xemacs/site-lisp @dirrm lib/xemacs/site-modules @dirrm lib/xemacs @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include -@unexec rmdir %D/lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules 2>/dev/null || true +@dirrmtry lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%% diff --git a/emulators/vmware-guestd4/pkg-plist b/emulators/vmware-guestd4/pkg-plist index 088fe9ab446d..13209e0bc574 100644 --- a/emulators/vmware-guestd4/pkg-plist +++ b/emulators/vmware-guestd4/pkg-plist @@ -2,8 +2,8 @@ sbin/vmware-checkvm sbin/vmware-guestd etc/rc.d/vmware-guestd.sh %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko -%%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true -%%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools 2>/dev/null || true +%%VMWARE_VMMEMCTL:%%@dirrmtry lib/vmware-tools/modules +%%VMWARE_VMMEMCTL:%%@dirrmtry lib/vmware-tools share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default share/vmware-tools/suspend-vm-default diff --git a/emulators/vmware-guestd5/pkg-plist b/emulators/vmware-guestd5/pkg-plist index 7990fbc1c54a..ae9bba61ccc1 100644 --- a/emulators/vmware-guestd5/pkg-plist +++ b/emulators/vmware-guestd5/pkg-plist @@ -4,8 +4,8 @@ sbin/vmware-guestd etc/rc.d/vmware-guestd.sh %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko %%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko -%%VMWARE_KMODDIR:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true -%%VMWARE_KMODDIR:%%@unexec rmdir %D/lib/vmware-tools 2>/dev/null || true +%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules +%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default diff --git a/emulators/vmware-guestd6/pkg-plist b/emulators/vmware-guestd6/pkg-plist index 7990fbc1c54a..ae9bba61ccc1 100644 --- a/emulators/vmware-guestd6/pkg-plist +++ b/emulators/vmware-guestd6/pkg-plist @@ -4,8 +4,8 @@ sbin/vmware-guestd etc/rc.d/vmware-guestd.sh %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko %%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko -%%VMWARE_KMODDIR:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true -%%VMWARE_KMODDIR:%%@unexec rmdir %D/lib/vmware-tools 2>/dev/null || true +%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules +%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default share/vmware-tools/resume-vm-default diff --git a/finance/grisbi/pkg-plist b/finance/grisbi/pkg-plist index 7a25928436c7..d7a51f27bf98 100644 --- a/finance/grisbi/pkg-plist +++ b/finance/grisbi/pkg-plist @@ -55,14 +55,14 @@ bin/grisbi %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% -%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES diff --git a/ftp/gwget/pkg-plist b/ftp/gwget/pkg-plist index 42d2c213a594..99bb01ac0be8 100644 --- a/ftp/gwget/pkg-plist +++ b/ftp/gwget/pkg-plist @@ -55,6 +55,6 @@ share/locale/tr/LC_MESSAGES/gwget.mo share/locale/zh_CN/LC_MESSAGES/gwget.mo share/locale/zh_TW/LC_MESSAGES/gwget.mo @dirrm include/gwget -%%EPIPHANY:%%@unexec rmdir %D/lib/epiphany-%%VERSION%%/extensions 2>/dev/null || true -%%EPIPHANY:%%@unexec rmdir %D/lib/epiphany-%%VERSION%% 2>/dev/null || true +%%EPIPHANY:%%@dirrmtry lib/epiphany-%%VERSION%%/extensions +%%EPIPHANY:%%@dirrmtry lib/epiphany-%%VERSION%% @dirrm share/gnome/gwget diff --git a/ftp/wgetpro/pkg-plist b/ftp/wgetpro/pkg-plist index 94e9a1dbe996..b1bc73cdc6a5 100644 --- a/ftp/wgetpro/pkg-plist +++ b/ftp/wgetpro/pkg-plist @@ -27,14 +27,14 @@ bin/wpro %%NLS%%share/locale/uk/LC_MESSAGES/wpro.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/wpro.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/wpro.mo -%%NLS%%@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/el/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/no/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2> /dev/null || true +%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/no/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES diff --git a/games/quake3-data/pkg-plist b/games/quake3-data/pkg-plist index 641e635ba91b..0e4b1b762bc8 100644 --- a/games/quake3-data/pkg-plist +++ b/games/quake3-data/pkg-plist @@ -11,6 +11,6 @@ %%TEAMARENA%%%%DATADIR%%/missionpack/pak3.pk3 share/pixmaps/quake3.xpm @dirrmtry share/pixmaps -%%TEAMARENA%%@unexec rmdir %D/%%DATADIR%%/missionpack 2>/dev/null || true +%%TEAMARENA%%@dirrmtry %%DATADIR%%/missionpack @dirrmtry %%DATADIR%%/baseq3 @unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt diff --git a/german/BBBike/pkg-plist.in b/german/BBBike/pkg-plist.in index 55be536302a2..96f914d8727f 100644 --- a/german/BBBike/pkg-plist.in +++ b/german/BBBike/pkg-plist.in @@ -855,7 +855,7 @@ BBBike/lib/%%LOCAL_PERL_ARCH%%/auto/VirtArray/VirtArray.so @dirrm BBBike/data/sehenswuerdigkeit_img @dirrm BBBike/ext/StrassenNetz-CNetFile @dirrm BBBike/lib/%%LOCAL_PERL_ARCH%% -@unexec rmdir %D/BBBike/lib/%%PERL_VER%% 2>/dev/null || true +@dirrmtry BBBike/lib/%%PERL_VER%% @dirrm BBBike/ext/VectorUtil-Inline/t @dirrm BBBike/ext/Strassen-Inline2/t @dirrm BBBike/ext/VectorUtil-Inline diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist index 2735ee22788f..c4ff8619d02a 100644 --- a/graphics/GraphicsMagick/pkg-plist +++ b/graphics/GraphicsMagick/pkg-plist @@ -236,7 +236,7 @@ libdata/pkgconfig/GraphicsMagickWand.pc %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics 2>/dev/null || true +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Graphics @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% diff --git a/graphics/GraphicsMagick12/pkg-plist b/graphics/GraphicsMagick12/pkg-plist index 2735ee22788f..c4ff8619d02a 100644 --- a/graphics/GraphicsMagick12/pkg-plist +++ b/graphics/GraphicsMagick12/pkg-plist @@ -236,7 +236,7 @@ libdata/pkgconfig/GraphicsMagickWand.pc %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics 2>/dev/null || true +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Graphics @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% diff --git a/graphics/GraphicsMagick13/pkg-plist b/graphics/GraphicsMagick13/pkg-plist index 2735ee22788f..c4ff8619d02a 100644 --- a/graphics/GraphicsMagick13/pkg-plist +++ b/graphics/GraphicsMagick13/pkg-plist @@ -236,7 +236,7 @@ libdata/pkgconfig/GraphicsMagickWand.pc %%PORTDOCS%%@dirrm %%DOCSDIR%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics/Magick -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics 2>/dev/null || true +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Graphics %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Graphics @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index b39fd512729f..1539ee667325 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -495,7 +495,7 @@ share/ImageMagick-%%PORTVERSION%%/NEWS @dirrm share/ImageMagick/config @dirrm share/ImageMagick %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick -%%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image 2>/dev/null || true +%%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image @dirrm lib/ImageMagick/modules-%%QBIT%%/filters @dirrm lib/ImageMagick/modules-%%QBIT%%/coders diff --git a/graphics/fyre/pkg-plist b/graphics/fyre/pkg-plist index 75a048038c32..18a128d1c618 100644 --- a/graphics/fyre/pkg-plist +++ b/graphics/fyre/pkg-plist @@ -14,4 +14,4 @@ share/mime/packages/fyre.xml share/mime/application/x-fyre-animation.xml @dirrm share/fyre %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%WITH_FDO%%@unexec rmdir %D/share/applications 2> /dev/null || true +%%WITH_FDO%%@dirrmtry share/applications diff --git a/graphics/gtksee/pkg-plist b/graphics/gtksee/pkg-plist index fa8e7f07b568..3c42a9d673af 100644 --- a/graphics/gtksee/pkg-plist +++ b/graphics/gtksee/pkg-plist @@ -6,7 +6,7 @@ bin/gtksee %%NLS%%share/locale/ru/LC_MESSAGES/gtksee.mo %%NLS%%share/locale/ru_UA/LC_MESSAGES/gtksee.mo %%NLS%%share/locale/zh_CN.EUC/LC_MESSAGES/gtksee.mo -%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ru_UA/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ru_UA 2> /dev/null || true +%%NLS%%@dirrmtry share/locale/zh_CN.EUC/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN.EUC +%%NLS%%@dirrmtry share/locale/ru_UA/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ru_UA diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist index 845a889d4b90..6c4af5080d6c 100644 --- a/graphics/mapserver/pkg-plist +++ b/graphics/mapserver/pkg-plist @@ -20,4 +20,4 @@ bin/sortshp %%WITH_PHP%%@unexec grep -v php_mapscript\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true %%WITH_PHP%%@unexec rm %D/etc/php/extensions.ini.orig %%WITH_PHP%%@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini -%%WITH_PHP%%@unexec rmdir %D/etc/php 2> /dev/null || true +%%WITH_PHP%%@dirrmtry etc/php diff --git a/graphics/p5-Chart-PNGgraph/pkg-plist b/graphics/p5-Chart-PNGgraph/pkg-plist index 762ff8701566..71a424897762 100644 --- a/graphics/p5-Chart-PNGgraph/pkg-plist +++ b/graphics/p5-Chart-PNGgraph/pkg-plist @@ -11,5 +11,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/PNGgraph/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart/PNGgraph @dirrm %%SITE_PERL%%/Chart/PNGgraph -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart > /dev/null 2>&1 || true -@unexec rmdir %D/%%SITE_PERL%%/Chart > /dev/null 2>&1 || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chart +@dirrmtry %%SITE_PERL%%/Chart diff --git a/graphics/p5-Imager-Graph/pkg-plist b/graphics/p5-Imager-Graph/pkg-plist index 2b596f390be8..c1a47da4aa20 100644 --- a/graphics/p5-Imager-Graph/pkg-plist +++ b/graphics/p5-Imager-Graph/pkg-plist @@ -5,4 +5,4 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager/Graph @dirrmtry %%SITE_PERL%%/Imager/Graph @dirrmtry %%SITE_PERL%%/Imager -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager 2>/dev/null ||true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Imager diff --git a/graphics/p5-ming/pkg-plist b/graphics/p5-ming/pkg-plist index f1653cf4186e..de19a5a85151 100644 --- a/graphics/p5-ming/pkg-plist +++ b/graphics/p5-ming/pkg-plist @@ -24,4 +24,4 @@ %%PORTDOCS%%share/examples/perl5/ming/shape.cgi %%PORTDOCS%%share/examples/perl5/ming/sprite.cgi %%PORTDOCS%%@dirrm share/examples/perl5/ming -%%PORTDOCS%%@unexec rmdir %D/share/examples/perl5 2>/dev/null || true +%%PORTDOCS%%@dirrmtry share/examples/perl5 diff --git a/irc/cgiirc/pkg-plist b/irc/cgiirc/pkg-plist index 7251600c0819..266ddbfb065d 100644 --- a/irc/cgiirc/pkg-plist +++ b/irc/cgiirc/pkg-plist @@ -122,4 +122,4 @@ www/cgiirc/nph-irc.cgi @dirrm www/cgiirc/images @dirrm www/cgiirc/formats @dirrm www/cgiirc/docs -@unexec rmdir %D/www/cgiirc >/dev/null 2>&1 || true +@dirrmtry www/cgiirc diff --git a/irc/infobot/pkg-plist b/irc/infobot/pkg-plist index 76b9f64b3e67..e676a5491076 100644 --- a/irc/infobot/pkg-plist +++ b/irc/infobot/pkg-plist @@ -77,6 +77,6 @@ etc/infobot/sane-is.txt @dirrm %%DATADIR%%/extras @dirrm %%DATADIR%%/files @dirrm %%DATADIR%%/scripts -@unexec rmdir %D/etc/infobot > /dev/null 2>&1 || true -@unexec rmdir %D/share/infobot/src > /dev/null 2>&1 || true -@unexec rmdir %D/share/infobot > /dev/null 2>&1 || true +@dirrmtry etc/infobot +@dirrmtry share/infobot/src +@dirrmtry share/infobot diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist index add85c79bca4..feeacf15b1e9 100644 --- a/irc/xchat/pkg-plist +++ b/irc/xchat/pkg-plist @@ -50,6 +50,6 @@ share/locale/vi/LC_MESSAGES/xchat.mo share/locale/zh_CN/LC_MESSAGES/xchat.mo share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo %%NOGNOME:%%share/pixmaps/xchat.png -%%NOGNOME:%%@unexec rmdir %D/etc/X11/applnk/Internet 2>/dev/null || true -%%NOGNOME:%%@unexec rmdir %D/etc/X11/applnk 2>/dev/null || true -%%NOGNOME:%%@unexec rmdir %D/etc/X11 2>/dev/null || true +%%NOGNOME:%%@dirrmtry etc/X11/applnk/Internet +%%NOGNOME:%%@dirrmtry etc/X11/applnk +%%NOGNOME:%%@dirrmtry etc/X11 diff --git a/irc/xchat1/pkg-plist b/irc/xchat1/pkg-plist index add85c79bca4..feeacf15b1e9 100644 --- a/irc/xchat1/pkg-plist +++ b/irc/xchat1/pkg-plist @@ -50,6 +50,6 @@ share/locale/vi/LC_MESSAGES/xchat.mo share/locale/zh_CN/LC_MESSAGES/xchat.mo share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo %%NOGNOME:%%share/pixmaps/xchat.png -%%NOGNOME:%%@unexec rmdir %D/etc/X11/applnk/Internet 2>/dev/null || true -%%NOGNOME:%%@unexec rmdir %D/etc/X11/applnk 2>/dev/null || true -%%NOGNOME:%%@unexec rmdir %D/etc/X11 2>/dev/null || true +%%NOGNOME:%%@dirrmtry etc/X11/applnk/Internet +%%NOGNOME:%%@dirrmtry etc/X11/applnk +%%NOGNOME:%%@dirrmtry etc/X11 diff --git a/japanese/iiimf-le-canna/pkg-plist b/japanese/iiimf-le-canna/pkg-plist index 739e6727c515..d40fcee0a463 100644 --- a/japanese/iiimf-le-canna/pkg-plist +++ b/japanese/iiimf-le-canna/pkg-plist @@ -4,4 +4,4 @@ lib/iiim/le/CannaLE/aux.la lib/iiim/le/CannaLE/aux.a lib/iiim/le/CannaLE/auxmenu @dirrm lib/iiim/le/CannaLE -@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true +@dirrmtry lib/iiim/le diff --git a/japanese/iiimf-le-freewnn/pkg-plist b/japanese/iiimf-le-freewnn/pkg-plist index fdc944d0defc..af9a714942fd 100644 --- a/japanese/iiimf-le-freewnn/pkg-plist +++ b/japanese/iiimf-le-freewnn/pkg-plist @@ -1,3 +1,3 @@ lib/iiim/le/FreeWnnLE/FreeWnnLE.so @dirrm lib/iiim/le/FreeWnnLE -@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true +@dirrmtry lib/iiim/le diff --git a/japanese/mell/pkg-plist b/japanese/mell/pkg-plist index d03071871457..e80d8c325189 100644 --- a/japanese/mell/pkg-plist +++ b/japanese/mell/pkg-plist @@ -10,4 +10,4 @@ share/emacs/site-lisp/mell/mell-string.el share/emacs/site-lisp/mell/mell.el @dirrmtry share/emacs/site-lisp/mell %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/japanese/migemo/pkg-plist b/japanese/migemo/pkg-plist index 2ed4e42d3933..76e47205dd49 100644 --- a/japanese/migemo/pkg-plist +++ b/japanese/migemo/pkg-plist @@ -18,4 +18,4 @@ %%MIGEMO%%share/migemo/user-dict.sample %%MIGEMO%%share/migemo/regex-dict.sample %%MIGEMO%%@dirrm share/migemo -%%ELISP%%@unexec rmdir %D/%%EMACS_SITE_LISPDIR%% 2>/dev/null || true +%%ELISP%%@dirrmtry %%EMACS_SITE_LISPDIR%% diff --git a/japanese/navi2ch-emacs20/pkg-plist b/japanese/navi2ch-emacs20/pkg-plist index 19ce0d6cfc1c..e80bd3544b92 100644 --- a/japanese/navi2ch-emacs20/pkg-plist +++ b/japanese/navi2ch-emacs20/pkg-plist @@ -76,4 +76,4 @@ share/doc/ja/navi2ch/contrib/navi2ch-migemo.el %%LISPDIR%%/navi2ch/navi2ch.el %%LISPDIR%%/navi2ch/navi2ch.elc @dirrm %%LISPDIR%%/navi2ch -%%FSF%%@unexec rmdir %D/%%LISPDIR%% 2>/dev/null || true +%%FSF%%@dirrmtry %%LISPDIR%% diff --git a/japanese/perl5/pkg-plist b/japanese/perl5/pkg-plist index e416663df002..4332027c9eef 100644 --- a/japanese/perl5/pkg-plist +++ b/japanese/perl5/pkg-plist @@ -536,8 +536,8 @@ lib/perl5/%%JPERL_VERSION%%/vars.pm @dirrmtry lib/perl5/site_perl/%%JPERL_VER%% @dirrmtry lib/perl5/site_perl @dirrmtry lib/perl5/%%JPERL_VERSION%%/pod -%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/man/man3 2>/dev/null || true -%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%%/man 2>/dev/null || true +%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%/man/man3 +%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%%/man @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/sdbm @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/re @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%JPERL_ARCH%%/auto/attrs @@ -608,5 +608,5 @@ lib/perl5/%%JPERL_VERSION%%/vars.pm @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/CORE @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%%/B @dirrmtry lib/perl5/%%JPERL_VERSION%%/%%PERL_ARCH%% -%%NOTON4%%@unexec rmdir %D/lib/perl5/%%JPERL_VERSION%% 2>/dev/null || true +%%NOTON4%%@dirrmtry lib/perl5/%%JPERL_VERSION%% @dirrmtry lib/perl5 diff --git a/japanese/prime-el/pkg-plist b/japanese/prime-el/pkg-plist index fc73393a762a..f2f7e4b3c53a 100644 --- a/japanese/prime-el/pkg-plist +++ b/japanese/prime-el/pkg-plist @@ -39,8 +39,8 @@ etc/prime/Custom_prime-el.el %%PORTDOCS%%%%DOCSDIR%%/emacs/customize.html %%PORTDOCS%%%%DOCSDIR%%/emacs/usage.html %%PORTDOCS%%%%DOCSDIR%%/examples/Custom_prime-el.el -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/emacs/figures/screenshots 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/emacs/figures 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/emacs 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/examples 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/emacs/figures/screenshots +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/emacs/figures +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/emacs +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/japanese/prime/pkg-plist b/japanese/prime/pkg-plist index b22e48286efc..37913e5a6b21 100644 --- a/japanese/prime/pkg-plist +++ b/japanese/prime/pkg-plist @@ -72,7 +72,7 @@ etc/prime/Custom_prime.rb %%PORTDOCS%%%%DOCSDIR%%/usage.html %%PORTDOCS%%%%DOCSDIR%%/taiyaki.css %%PORTDOCS%%%%DOCSDIR%%/taiyaki.png -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/examples 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/figures 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/uim 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/figures +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/uim +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/japanese/skk-jisyo/pkg-plist b/japanese/skk-jisyo/pkg-plist index 28f66865c6d8..22c0d9fff841 100644 --- a/japanese/skk-jisyo/pkg-plist +++ b/japanese/skk-jisyo/pkg-plist @@ -1 +1 @@ -@unexec rmdir %D/%%SKKDIR%% > /dev/null 2>&1 || true +@dirrmtry %%SKKDIR%% diff --git a/japanese/suikyo/pkg-plist b/japanese/suikyo/pkg-plist index 2894f4b27d3c..fe2b999f0cf9 100644 --- a/japanese/suikyo/pkg-plist +++ b/japanese/suikyo/pkg-plist @@ -43,6 +43,6 @@ libdata/pkgconfig/suikyo.pc %%PORTDOCS%%%%DOCSDIR%%/elisp/index.html %%PORTDOCS%%%%DOCSDIR%%/ruby/index.html %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/elisp 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%%/ruby 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/elisp +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% diff --git a/java/classpath/Makefile b/java/classpath/Makefile index 18751fa28727..72c2f7797de1 100644 --- a/java/classpath/Makefile +++ b/java/classpath/Makefile @@ -43,6 +43,6 @@ post-install: @${FIND} ${dir} -type d | ${SORT} -r | \ ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .endfor - @${ECHO_CMD} '@unexec rmdir %D/lib/security 2>/dev/null || true' >> ${TMPPLIST} + @${ECHO_CMD} '@dirrmtry lib/security' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/korean/iiimf-le-hangul/pkg-plist b/korean/iiimf-le-hangul/pkg-plist index 242686ebf17e..16d38d0ca76c 100644 --- a/korean/iiimf-le-hangul/pkg-plist +++ b/korean/iiimf-le-hangul/pkg-plist @@ -3,4 +3,4 @@ lib/iiim/le/hangul/hangul.conf lib/iiim/le/hangul/tables/candidate.txt @dirrm lib/iiim/le/hangul/tables @dirrm lib/iiim/le/hangul -@unexec rmdir %D/lib/iiim/le > /dev/null 2>&1 || true +@dirrmtry lib/iiim/le diff --git a/lang/fpc-devel/pkg-plist b/lang/fpc-devel/pkg-plist index 1b6320e123c4..6d6698f39914 100644 --- a/lang/fpc-devel/pkg-plist +++ b/lang/fpc-devel/pkg-plist @@ -5679,4 +5679,4 @@ share/examples/fpc-%%PORTVERSION%%/zvt/testzvt.pp %%PORTDOCS%%@dirrm src/fpc-%%PORTVERSION%%/compiler/alpha %%PORTDOCS%%@dirrm src/fpc-%%PORTVERSION%%/compiler %%PORTDOCS%%@dirrm src/fpc-%%PORTVERSION%% -%%PORTDOCS%%@unexec rmdir %D/src 2> /dev/null || true +%%PORTDOCS%%@dirrmtry src diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile index 386a950c2b12..7c09edb26679 100644 --- a/lang/gcc30/Makefile +++ b/lang/gcc30/Makefile @@ -134,7 +134,7 @@ post-install: ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \ >>${WRKDIR}/PLIST.gcc-lib - (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib + (${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index 40b22f5211c6..f36c936c90f4 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -135,7 +135,7 @@ post-install: ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ | ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \ >>${WRKDIR}/PLIST.gcc-lib - (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib + (${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist index 9c2e837c6c99..243c5e48e42e 100644 --- a/lang/icc/pkg-plist +++ b/lang/icc/pkg-plist @@ -952,4 +952,4 @@ @unexec rmdir %D/%%COMPILERDIR%%/licenses >/dev/null 2>&1 || echo '*** License directory (%D/%%COMPILERDIR%%/licenses/) not removed, it may contain a license.' @dirrm %%COMPILERDIR%%/man/man1 @dirrm %%COMPILERDIR%%/man -@unexec rmdir %D/%%COMPILERDIR%% >/dev/null 2>&1 || true +@dirrmtry %%COMPILERDIR%% diff --git a/lang/icc7/pkg-plist b/lang/icc7/pkg-plist index 4965911ad588..c52cc5ba4f03 100644 --- a/lang/icc7/pkg-plist +++ b/lang/icc7/pkg-plist @@ -1355,4 +1355,4 @@ intel/%%COMPILERDIR%%/ia32/lib/libunwind.a %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training @dirrm intel/%%COMPILERDIR%% @unexec rmdir %D/intel/licenses >/dev/null 2>&1 || echo '*** License directory (%D/intel/licenses/) not removed, it may contain a license.' -@unexec rmdir %D/intel >/dev/null 2>&1 || true +@dirrmtry intel diff --git a/lang/ifc/pkg-plist b/lang/ifc/pkg-plist index ddf9a91e2a31..9b6429b1dc0f 100644 --- a/lang/ifc/pkg-plist +++ b/lang/ifc/pkg-plist @@ -1192,4 +1192,4 @@ @unexec rmdir %D/%%COMPILERDIR%%/licenses >/dev/null 2>&1 || echo '*** License directory (%D/%%COMPILERDIR%%/licenses/) not removed, it may contain a license.' @dirrm %%COMPILERDIR%%/man/man1 @dirrm %%COMPILERDIR%%/man -@unexec rmdir %D/%%COMPILERDIR%% >/dev/null 2>&1 || true +@dirrmtry %%COMPILERDIR%% diff --git a/lang/ifc7/pkg-plist b/lang/ifc7/pkg-plist index efccae78b546..ef757ca08dbf 100644 --- a/lang/ifc7/pkg-plist +++ b/lang/ifc7/pkg-plist @@ -1301,4 +1301,4 @@ intel/%%COMPILERDIR%%/ia32/lib/libunwind.a %%PORTDOCS%%@dirrm intel/%%COMPILERDIR%%/training @dirrm intel/%%COMPILERDIR%% @unexec rmdir %D/intel/licenses >/dev/null 2>&1 || echo '*** License directory (%D/intel/licenses/) not removed, it may contain a license.' -@unexec rmdir %D/intel >/dev/null 2>&1 || true +@dirrmtry intel diff --git a/lang/kroc/pkg-plist b/lang/kroc/pkg-plist index 80b1a6daf4cf..29701a63e065 100644 --- a/lang/kroc/pkg-plist +++ b/lang/kroc/pkg-plist @@ -103,12 +103,12 @@ lib/kroc/libudc.so %%PORTDOCS%%%%DATADIR%%/doc/txt/hostio.txt %%PORTDOCS%%%%DATADIR%%/doc/txt/o2cl.txt %%PORTDOCS%%%%DATADIR%%/doc/txt/pragma.txt -%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/txt 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/sc 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/ps 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/lib 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc/html 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%DATADIR%%/doc 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/txt +%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/sc +%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/ps +%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/lib +%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc/html +%%PORTDOCS%%@dirrmtry %%DATADIR%%/doc @dirrmtry %%DATADIR%%/vtlib @dirrmtry %%DATADIR%%/vtinclude @dirrmtry %%DATADIR%% diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile index 0e90af167bb3..d3807a0c2cba 100644 --- a/lang/python-doc-html/Makefile +++ b/lang/python-doc-html/Makefile @@ -62,7 +62,7 @@ pre-install: @cd ${WRKSRC} && (${FIND} * -type d | \ ${SED} -e 's,^,@dirrm share/doc/${PYTHON_VERSION}/,' | \ ${SORT} -r) >> ${PLIST} - @${ECHO_CMD} "@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry share/doc/%%PYTHON_VERSION%%" >> ${PLIST} .endif do-install: diff --git a/lang/python-doc-html/pkg-plist_html b/lang/python-doc-html/pkg-plist_html index 71c98b60fd0d..5a9eb7824eac 100644 --- a/lang/python-doc-html/pkg-plist_html +++ b/lang/python-doc-html/pkg-plist_html @@ -873,4 +873,4 @@ share/doc/%%PYTHON_VERSION%%/tut/tut.html @dirrm share/doc/%%PYTHON_VERSION%%/doc @dirrm share/doc/%%PYTHON_VERSION%%/dist @dirrm share/doc/%%PYTHON_VERSION%%/api -@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true +@dirrmtry share/doc/%%PYTHON_VERSION%% diff --git a/lang/python-doc-html/pkg-plist_pdf-a4 b/lang/python-doc-html/pkg-plist_pdf-a4 index 5a9100be1fff..dbe570c20a1e 100644 --- a/lang/python-doc-html/pkg-plist_pdf-a4 +++ b/lang/python-doc-html/pkg-plist_pdf-a4 @@ -8,4 +8,4 @@ share/doc/%%PYTHON_VERSION%%/mac.pdf share/doc/%%PYTHON_VERSION%%/ref.pdf share/doc/%%PYTHON_VERSION%%/tut.pdf %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.pdf -@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true +@dirrmtry share/doc/%%PYTHON_VERSION%% diff --git a/lang/python-doc-html/pkg-plist_pdf-letter b/lang/python-doc-html/pkg-plist_pdf-letter index 5a9100be1fff..dbe570c20a1e 100644 --- a/lang/python-doc-html/pkg-plist_pdf-letter +++ b/lang/python-doc-html/pkg-plist_pdf-letter @@ -8,4 +8,4 @@ share/doc/%%PYTHON_VERSION%%/mac.pdf share/doc/%%PYTHON_VERSION%%/ref.pdf share/doc/%%PYTHON_VERSION%%/tut.pdf %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.pdf -@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true +@dirrmtry share/doc/%%PYTHON_VERSION%% diff --git a/lang/python-doc-html/pkg-plist_postscript-a4 b/lang/python-doc-html/pkg-plist_postscript-a4 index d53add6711a1..363d5cf0b47f 100644 --- a/lang/python-doc-html/pkg-plist_postscript-a4 +++ b/lang/python-doc-html/pkg-plist_postscript-a4 @@ -9,4 +9,4 @@ share/doc/%%PYTHON_VERSION%%/ref.ps share/doc/%%PYTHON_VERSION%%/tut.ps share/doc/%%PYTHON_VERSION%%/README %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.ps -@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true +@dirrmtry share/doc/%%PYTHON_VERSION%% diff --git a/lang/python-doc-html/pkg-plist_postscript-letter b/lang/python-doc-html/pkg-plist_postscript-letter index d53add6711a1..363d5cf0b47f 100644 --- a/lang/python-doc-html/pkg-plist_postscript-letter +++ b/lang/python-doc-html/pkg-plist_postscript-letter @@ -9,4 +9,4 @@ share/doc/%%PYTHON_VERSION%%/ref.ps share/doc/%%PYTHON_VERSION%%/tut.ps share/doc/%%PYTHON_VERSION%%/README %%PYTHON22_ONLY%%share/doc/%%PYTHON_VERSION%%/whatsnew22.ps -@unexec rmdir %D/share/doc/%%PYTHON_VERSION%% 2>/dev/null || true +@dirrmtry share/doc/%%PYTHON_VERSION%% diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist index f6d509188dfc..fc9584bb618e 100644 --- a/mail/balsa/pkg-plist +++ b/mail/balsa/pkg-plist @@ -139,7 +139,7 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo @dirrmtry share/locale/rw @dirrm share/gnome/sounds/balsa @dirrm share/gnome/omf/balsa -%%GTKICON%%@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true +%%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes @dirrm share/gnome/help/balsa/C/figures @dirrm share/gnome/help/balsa/C @dirrm share/gnome/help/balsa diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile index b59e7a320d30..9df1f775d55b 100644 --- a/mail/bbmail/Makefile +++ b/mail/bbmail/Makefile @@ -22,7 +22,7 @@ MAN1= bbmail.1 PLIST_FILES= bin/bbmail share/bbtools/bbmail.bb post-install: - @${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \ + @${ECHO_CMD} "@dirrmtry share/bbtools" \ >> ${TMPPLIST} .include <bsd.port.mk> diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist index 0008020e28e0..0596059b0a5c 100644 --- a/mail/claws-mail/pkg-plist +++ b/mail/claws-mail/pkg-plist @@ -206,8 +206,8 @@ libdata/pkgconfig/sylpheed-claws.pc %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime -@unexec rmdir %D/include/sylpheed-claws/plugins 2>/dev/null >/dev/null || true -@dirrm include/sylpheed-claws +@dirrmtry include/sylpheed-claws/plugins +@dirrmtry include/sylpheed-claws %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.deps diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist index dbf1d74a5842..dcc772fd8605 100644 --- a/mail/dspam-devel/pkg-plist +++ b/mail/dspam-devel/pkg-plist @@ -110,7 +110,7 @@ libdata/pkgconfig/dspam.pc %%CGI%%@dirrm www/vhosts/dspam/templates %%CGI%%@dirrm www/vhosts/dspam %%CGI%%@dirrm www/vhosts -%%CGI%%@unexec rmdir %D/www 2>/dev/null || true +%%CGI%%@dirrmtry www @dirrm include/dspam @cwd %%DSPAM_HOME%% firstrun.txt.sample diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist index c48136f12954..0613e614db4b 100644 --- a/mail/dspam/pkg-plist +++ b/mail/dspam/pkg-plist @@ -91,7 +91,7 @@ libdata/pkgconfig/dspam.pc %%CGI%%@dirrm www/vhosts/dspam/templates %%CGI%%@dirrm www/vhosts/dspam %%CGI%%@dirrm www/vhosts -%%CGI%%@unexec rmdir %D/www 2>/dev/null || true +%%CGI%%@dirrmtry www @dirrm include/dspam @cwd %%DSPAM_HOME%% firstrun.txt.sample diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist index 60eb90e166d0..0216e257dafa 100644 --- a/mail/exim/pkg-plist +++ b/mail/exim/pkg-plist @@ -37,7 +37,7 @@ sbin/exiwhat %%PORTDOCS%%%%DOCSDIR%%/pcrepattern.txt %%PORTDOCS%%%%DOCSDIR%%/pcretest.txt %%PORTDOCS%%%%DOCSDIR%%/spec.txt -%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% %%PORTDOCS%%%%EXAMPLESDIR%%/convert4r3 %%PORTDOCS%%%%EXAMPLESDIR%%/convert4r4 %%PORTDOCS%%%%EXAMPLESDIR%%/pcretest @@ -45,8 +45,8 @@ sbin/exiwhat %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%DAEMON%%etc/periodic/daily/150.exim-tidydb %%DAEMON%%etc/periodic/daily/460.exim-mail-rejects -%%DAEMON%%@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true -%%DAEMON%%@unexec rmdir %D/etc/periodic 2>/dev/null || true +%%DAEMON%%@dirrmtry etc/periodic/daily +%%DAEMON%%@dirrmtry etc/periodic @unexec if cmp -s %D/etc/exim/configure %D/etc/exim/configure.default; then rm -f %D/etc/exim/configure; fi etc/exim/configure.default @exec [ -f %B/configure ] || cp %B/%f %B/configure diff --git a/mail/mailman/pkg-plist b/mail/mailman/pkg-plist index 3d9e2bec166e..bb1757914a4c 100644 --- a/mail/mailman/pkg-plist +++ b/mail/mailman/pkg-plist @@ -2103,7 +2103,7 @@ etc/rc.d/mailman.sh @dirrmtry %%MMDIR%%/data @dirrmtry %%MMDIR%%/archives/public @dirrmtry %%MMDIR%%/archives/private -%%SUB_HTDIG%%@unexec rmdir %D/%%MMDIR%%/archives/htdig 2>/dev/null || true +%%SUB_HTDIG%%@dirrmtry %%MMDIR%%/archives/htdig @dirrmtry %%MMDIR%%/archives @dirrmtry %%MMDIR%%/Mailman @dirrmtry %%MMDIR%%/ diff --git a/mail/p5-Email-Date/pkg-plist b/mail/p5-Email-Date/pkg-plist index 1b4c021ca17c..ebd5b491a1ed 100644 --- a/mail/p5-Email-Date/pkg-plist +++ b/mail/p5-Email-Date/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Email/Date.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Date -@unexec rmdir %D/Email 2>/dev/null ||true +@dirrmtry Email diff --git a/mail/p5-Qmail-Envelope/pkg-plist b/mail/p5-Qmail-Envelope/pkg-plist index 8b891c6a1621..587e06cb5b60 100644 --- a/mail/p5-Qmail-Envelope/pkg-plist +++ b/mail/p5-Qmail-Envelope/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Qmail/Envelope.pm -@unexec rmdir %D/%%SITE_PERL%%/Qmail || true +@dirrmtry %%SITE_PERL%%/Qmail %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail/Envelope -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qmail diff --git a/mail/roundcube/pkg-plist b/mail/roundcube/pkg-plist index b5ca51565a4f..3803105c3161 100644 --- a/mail/roundcube/pkg-plist +++ b/mail/roundcube/pkg-plist @@ -358,8 +358,8 @@ @dirrm %%RCUBEDIR%%/program/include @dirrm %%RCUBEDIR%%/program @dirrm %%RCUBEDIR%%/SQL -@unexec rmdir %D/%%RCUBEDIR%%/temp 2>&1 >/dev/null || true -@unexec rmdir %D/%%RCUBEDIR%%/logs 2>&1 >/dev/null || true -@unexec rmdir %D/%%RCUBEDIR%%/config 2>&1 >/dev/null || true -@unexec rmdir %D/%%RCUBEDIR%% 2>&1 >/dev/null || true +@dirrmtry %%RCUBEDIR%%/temp +@dirrmtry %%RCUBEDIR%%/logs +@dirrmtry %%RCUBEDIR%%/config +@dirrmtry %%RCUBEDIR%% @dirrm %%DOCSDIR%% diff --git a/mail/spruce/pkg-plist b/mail/spruce/pkg-plist index a73efe956b63..7375a6d31d36 100644 --- a/mail/spruce/pkg-plist +++ b/mail/spruce/pkg-plist @@ -12,5 +12,5 @@ bin/spruce %%NLS%%share/locale/sk/LC_MESSAGES/spruce.mo %%NLS%%share/locale/sv/LC_MESSAGES/spruce.mo %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/spruce.mo -%%NLS%%@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true +%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ru_RU diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist index 0008020e28e0..0596059b0a5c 100644 --- a/mail/sylpheed-claws/pkg-plist +++ b/mail/sylpheed-claws/pkg-plist @@ -206,8 +206,8 @@ libdata/pkgconfig/sylpheed-claws.pc %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime -@unexec rmdir %D/include/sylpheed-claws/plugins 2>/dev/null >/dev/null || true -@dirrm include/sylpheed-claws +@dirrmtry include/sylpheed-claws/plugins +@dirrmtry include/sylpheed-claws %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so %%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.deps diff --git a/mail/sympa5/pkg-plist b/mail/sympa5/pkg-plist index b12d257a2b22..067efec8fbcc 100644 --- a/mail/sympa5/pkg-plist +++ b/mail/sympa5/pkg-plist @@ -372,26 +372,26 @@ sympa/icons/right.png sympa/icons/sound1.png sympa/icons/text.png sympa/icons/unknown.png -%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/el 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/en_US 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/fi 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/oc/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/oc 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/cs +%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/el +%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en_US +%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fi +%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/oc +%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/pl +%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/pt +%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ro +%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN +%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_TW @dirrm sympa/spool/tmp @dirrm sympa/spool/task @dirrm sympa/spool/outgoing diff --git a/math/vtk-java/pkg-plist b/math/vtk-java/pkg-plist index a2cbea6c9ec5..8b16a5889c47 100644 --- a/math/vtk-java/pkg-plist +++ b/math/vtk-java/pkg-plist @@ -47,5 +47,5 @@ share/java/classes/vtk.jar %%TESTING_ONLY%%share/examples/vtk/Testing/Java/README @dirrmtry %%DOCSDIR%% %%TESTING_ONLY%%@dirrm share/examples/vtk/Testing/Java -%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk/Testing 2>/dev/null || true -%%TESTING_ONLY%%@unexec rmdir %D/share/examples/vtk 2>/dev/null || true +%%TESTING_ONLY%%@dirrmtry share/examples/vtk/Testing +%%TESTING_ONLY%%@dirrmtry share/examples/vtk diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client index 7c255576d595..a90ac979e63a 100644 --- a/misc/amanda-server/pkg-plist.client +++ b/misc/amanda-server/pkg-plist.client @@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true -@unexec rmdir %D/var/amanda 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/amanda/gnutar-lists +@dirrmtry var/amanda +@dirrmtry var @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/amanda25-server/pkg-plist.client b/misc/amanda25-server/pkg-plist.client index 7c255576d595..a90ac979e63a 100644 --- a/misc/amanda25-server/pkg-plist.client +++ b/misc/amanda25-server/pkg-plist.client @@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true -@unexec rmdir %D/var/amanda 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/amanda/gnutar-lists +@dirrmtry var/amanda +@dirrmtry var @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client index 7c255576d595..a90ac979e63a 100644 --- a/misc/amanda26-server/pkg-plist.client +++ b/misc/amanda26-server/pkg-plist.client @@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true -@unexec rmdir %D/var/amanda 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/amanda/gnutar-lists +@dirrmtry var/amanda +@dirrmtry var @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client index 7c255576d595..a90ac979e63a 100644 --- a/misc/amanda32-server/pkg-plist.client +++ b/misc/amanda32-server/pkg-plist.client @@ -97,9 +97,9 @@ share/examples/amanda/amanda.conf share/examples/amanda/chg-multi.conf share/examples/amanda/chg-scsi.conf share/examples/amanda/disklist -@unexec rmdir %D/var/amanda/gnutar-lists 2>/dev/null || true -@unexec rmdir %D/var/amanda 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/amanda/gnutar-lists +@dirrmtry var/amanda +@dirrmtry var @dirrm share/examples/amanda @dirrm share/amanda @dirrm libexec/amanda diff --git a/misc/compat4x/pkg-plist.freebsd4 b/misc/compat4x/pkg-plist.freebsd4 index da57584f7898..35824c35b003 100644 --- a/misc/compat4x/pkg-plist.freebsd4 +++ b/misc/compat4x/pkg-plist.freebsd4 @@ -3,4 +3,4 @@ lib/compat/libfetch.so.2 %%FORBIDDEN:%%lib/compat/libssl.so.1 %%FORBIDDEN:%%lib/compat/libssl.so.2 -@unexec rmdir %D/lib/compat 2>/dev/null || true +@dirrmtry lib/compat diff --git a/misc/compat4x/pkg-plist.freebsd5 b/misc/compat4x/pkg-plist.freebsd5 index 5861550cb91c..2856b16c113e 100644 --- a/misc/compat4x/pkg-plist.freebsd5 +++ b/misc/compat4x/pkg-plist.freebsd5 @@ -40,6 +40,6 @@ %%USE_LDCONFIG%%libdata/ldconfig/compat4x %%USE_LDCONFIG%%%%AMD64_ONLY%%libdata/ldconfig32/compat4x %%AMD64_ONLY%%@exec %%LDCONFIG_LIB32%% -m %D/%%LIBDIR%%/compat -@unexec rmdir %D/%%LIBDIR%%/compat 2>/dev/null || true +@dirrmtry %%LIBDIR%%/compat @comment Hardcode lib32 since we should not remove lib. -@unexec rmdir %D/lib32 2>/dev/null || true +@dirrmtry lib32 diff --git a/misc/compat5x/pkg-plist b/misc/compat5x/pkg-plist index 3328a8c1b48a..c1456bac8d57 100644 --- a/misc/compat5x/pkg-plist +++ b/misc/compat5x/pkg-plist @@ -204,6 +204,6 @@ lib/compat/snmp_netgraph.so.2 %%AMD64%%lib32/compat/snmp_mibII.so.2 %%AMD64%%lib32/compat/snmp_netgraph.so.2 %%AMD64%%@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat -%%AMD64%%@unexec rmdir %D/lib32/compat 2>/dev/null || true -%%AMD64%%@unexec rmdir %D/lib32 2>/dev/null || true +%%AMD64%%@dirrmtry lib32/compat +%%AMD64%%@dirrmtry lib32 @dirrmtry lib/compat diff --git a/misc/findutils/pkg-plist b/misc/findutils/pkg-plist index 1a9d8a7598d6..e98ab54e8222 100644 --- a/misc/findutils/pkg-plist +++ b/misc/findutils/pkg-plist @@ -38,5 +38,5 @@ libexec/gbigram %%NLS%%share/locale/tr/LC_MESSAGES/findutils.mo %%NLS%%share/locale/vi/LC_MESSAGES/findutils.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/findutils.mo -%%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true +%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/lg diff --git a/misc/fortune-mod-culmea-culmilor/Makefile.fortune b/misc/fortune-mod-culmea-culmilor/Makefile.fortune index 1aab580ede3b..bf87d329c18d 100644 --- a/misc/fortune-mod-culmea-culmilor/Makefile.fortune +++ b/misc/fortune-mod-culmea-culmilor/Makefile.fortune @@ -40,6 +40,6 @@ post-install: ${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O} >> ${TMPPLIST}; \ ${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O}.dat >> ${TMPPLIST}; \ fi - @${ECHO_CMD} "@unexec rmdir %D/${_FORTUNE_DIR} 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/share/games 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${_FORTUNE_DIR}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry share/games" >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} diff --git a/misc/globus2/pkg-plist b/misc/globus2/pkg-plist index 6dc8e0aaec6c..a82b97dcc317 100644 --- a/misc/globus2/pkg-plist +++ b/misc/globus2/pkg-plist @@ -1692,4 +1692,4 @@ @dirrm %%GLOBUS_BASE%%bin/%%BASE_FLAVOR%%/shared @dirrm %%GLOBUS_BASE%%bin/%%BASE_FLAVOR%% @dirrm %%GLOBUS_BASE%%bin -@unexec rmdir %D/%%GLOBUS_BASE%% || /usr/bin/true +@dirrmtry %%GLOBUS_BASE%% diff --git a/misc/hello/pkg-plist b/misc/hello/pkg-plist index d0dfbd192c7e..c4a214a16f06 100644 --- a/misc/hello/pkg-plist +++ b/misc/hello/pkg-plist @@ -33,5 +33,5 @@ info/hello.info %%NLS%%share/locale/sv/LC_MESSAGES/hello.mo %%NLS%%share/locale/tr/LC_MESSAGES/hello.mo %%NLS%%share/locale/uk/LC_MESSAGES/hello.mo -%%NLS%%@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true -%%NLS%%@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true +%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/de_DE diff --git a/misc/help2man/pkg-plist b/misc/help2man/pkg-plist index a3192f2cf651..f31ab622e4ac 100644 --- a/misc/help2man/pkg-plist +++ b/misc/help2man/pkg-plist @@ -3,9 +3,9 @@ bin/help2man %%NLS%%share/locale/fi/LC_MESSAGES/help2man.mo %%NLS%%share/locale/fr/LC_MESSAGES/help2man.mo %%NLS%%share/locale/pl/LC_MESSAGES/help2man.mo -%%NLS%%@unexec rmdir %D/man/fi/man1 2>/dev/null || true -%%NLS%%@unexec rmdir %D/man/fi 2>/dev/null || true -%%NLS%%@unexec rmdir %D/man/fr/man1 2>/dev/null || true -%%NLS%%@unexec rmdir %D/man/fr 2>/dev/null || true -%%NLS%%@unexec rmdir %D/man/pl/man1 2>/dev/null || true -%%NLS%%@unexec rmdir %D/man/pl 2>/dev/null || true +%%NLS%%@dirrmtry man/fi/man1 +%%NLS%%@dirrmtry man/fi +%%NLS%%@dirrmtry man/fr/man1 +%%NLS%%@dirrmtry man/fr +%%NLS%%@dirrmtry man/pl/man1 +%%NLS%%@dirrmtry man/pl diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist index 72e006f2b896..2bccc8ca2458 100644 --- a/misc/iso-codes/pkg-plist +++ b/misc/iso-codes/pkg-plist @@ -307,118 +307,118 @@ share/xml/iso-codes/iso_3166_2.xml share/xml/iso-codes/iso_4217.xml share/xml/iso-codes/iso_639.xml @dirrm share/xml/iso-codes -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/zu 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/xh 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/wo/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/wo 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/wal/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/wal 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ve/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ve 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/uz/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/uz 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ur/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ur 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/uk 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tt/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tt 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tl 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tk/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tk 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tig/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/tig 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ti/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ti 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/te 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/syr/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/syr 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sw 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sr 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/so/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/so 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sl 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sk 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sid/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sid 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sa/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/sa 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/rw 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ro 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/pt 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ps/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ps 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/pl 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/om/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/om 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/oc/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/oc/ 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/nso 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/no 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/nn 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/mr 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/mi 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ky 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kw 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kok/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kok 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ko 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kl/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kl 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kk/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/kk 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/iu/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/iu 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/hy 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/haw/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/haw 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/gv 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/gl 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/gez/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/gez 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/fo 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/fi 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/el 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/dv/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/dv 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/cs 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/ca 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/byn/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/byn 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/be 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/aa/LC_MESSAGES 2>/dev/null ||/usr/bin/true -@unexec rmdir %D/share/locale/aa 2>/dev/null ||/usr/bin/true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/wo/LC_MESSAGES +@dirrmtry share/locale/wo +@dirrmtry share/locale/wal/LC_MESSAGES +@dirrmtry share/locale/wal +@dirrmtry share/locale/ve/LC_MESSAGES +@dirrmtry share/locale/ve +@dirrmtry share/locale/uz/LC_MESSAGES +@dirrmtry share/locale/uz +@dirrmtry share/locale/ur/LC_MESSAGES +@dirrmtry share/locale/ur +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tt/LC_MESSAGES +@dirrmtry share/locale/tt +@dirrmtry share/locale/tl/LC_MESSAGES +@dirrmtry share/locale/tl +@dirrmtry share/locale/tk/LC_MESSAGES +@dirrmtry share/locale/tk +@dirrmtry share/locale/tig/LC_MESSAGES +@dirrmtry share/locale/tig +@dirrmtry share/locale/ti/LC_MESSAGES +@dirrmtry share/locale/ti +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/syr/LC_MESSAGES +@dirrmtry share/locale/syr +@dirrmtry share/locale/sw/LC_MESSAGES +@dirrmtry share/locale/sw +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/so/LC_MESSAGES +@dirrmtry share/locale/so +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/sid/LC_MESSAGES +@dirrmtry share/locale/sid +@dirrmtry share/locale/sa/LC_MESSAGES +@dirrmtry share/locale/sa +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/ps/LC_MESSAGES +@dirrmtry share/locale/ps +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/om/LC_MESSAGES +@dirrmtry share/locale/om +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc/ +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/kw/LC_MESSAGES +@dirrmtry share/locale/kw +@dirrmtry share/locale/kok/LC_MESSAGES +@dirrmtry share/locale/kok +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/kl/LC_MESSAGES +@dirrmtry share/locale/kl +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk +@dirrmtry share/locale/iu/LC_MESSAGES +@dirrmtry share/locale/iu +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/haw/LC_MESSAGES +@dirrmtry share/locale/haw +@dirrmtry share/locale/gv/LC_MESSAGES +@dirrmtry share/locale/gv +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/gez/LC_MESSAGES +@dirrmtry share/locale/gez +@dirrmtry share/locale/fo/LC_MESSAGES +@dirrmtry share/locale/fo +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/dv/LC_MESSAGES +@dirrmtry share/locale/dv +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/byn/LC_MESSAGES +@dirrmtry share/locale/byn +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be +@dirrmtry share/locale/aa/LC_MESSAGES +@dirrmtry share/locale/aa @dirrm share/iso-codes diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile index a3e016490be9..112f76190a0c 100644 --- a/misc/ldconfig_compat/Makefile +++ b/misc/ldconfig_compat/Makefile @@ -60,7 +60,7 @@ do-install: .for dir in ${LOCAL_DIRS} @${MKDIR} -p ${prefix}/${dir} @${ECHO_CMD} "@exec mkdir -p %D/${dir}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${dir} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${dir}" >> ${TMPPLIST} .endfor .endfor diff --git a/misc/p5-Business-UPS/pkg-plist b/misc/p5-Business-UPS/pkg-plist index 0ef2fcc238da..6bcdce6dd541 100644 --- a/misc/p5-Business-UPS/pkg-plist +++ b/misc/p5-Business-UPS/pkg-plist @@ -7,4 +7,4 @@ @dirrmtry %%SITE_PERL%%/Business @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/UPS @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business -%%PORTDOCS%%@unexec rmdir %D/share/examples/Business-UPS 2>/dev/null || true +%%PORTDOCS%%@dirrmtry share/examples/Business-UPS diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index d0f0b594cc05..c671dc7ba0fd 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -207,7 +207,7 @@ PLIST_FILES= include/gstreamer-0.8/gst/gconf/gconf.h \ lib/libgstgconf-0.8.so \ lib/libgstgconf-0.8.so.1 \ libdata/pkgconfig/gstreamer-gconf-0.8.pc \ - '@unexec rmdir %D/include/gstreamer-0.8/gst/gconf 2>/dev/null || true' + '@dirrmtry include/gstreamer-0.8/gst/gconf' .endif # gdkpixbuf diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common index d0f0b594cc05..c671dc7ba0fd 100644 --- a/multimedia/gstreamer-plugins80/Makefile.common +++ b/multimedia/gstreamer-plugins80/Makefile.common @@ -207,7 +207,7 @@ PLIST_FILES= include/gstreamer-0.8/gst/gconf/gconf.h \ lib/libgstgconf-0.8.so \ lib/libgstgconf-0.8.so.1 \ libdata/pkgconfig/gstreamer-gconf-0.8.pc \ - '@unexec rmdir %D/include/gstreamer-0.8/gst/gconf 2>/dev/null || true' + '@dirrmtry include/gstreamer-0.8/gst/gconf' .endif # gdkpixbuf diff --git a/multimedia/kplayer-kde4/pkg-plist b/multimedia/kplayer-kde4/pkg-plist index 3a615e0bb54d..e90607dcac0f 100644 --- a/multimedia/kplayer-kde4/pkg-plist +++ b/multimedia/kplayer-kde4/pkg-plist @@ -239,8 +239,8 @@ share/services/mmst.protocol share/services/mmsu.protocol share/services/pnm.protocol share/services/rtsp.protocol -@unexec rmdir %D/lib/kde3 >/dev/null 2>&1 || true -@unexec rmdir %D/share/services >/dev/null 2>&1 || true +@dirrmtry lib/kde3 +@dirrmtry share/services @dirrm share/doc/HTML/en/kplayer @dirrm share/apps/kplayer/icons/hicolor/32x32/actions @dirrm share/apps/kplayer/icons/hicolor/32x32 diff --git a/multimedia/kplayer/pkg-plist b/multimedia/kplayer/pkg-plist index 3a615e0bb54d..e90607dcac0f 100644 --- a/multimedia/kplayer/pkg-plist +++ b/multimedia/kplayer/pkg-plist @@ -239,8 +239,8 @@ share/services/mmst.protocol share/services/mmsu.protocol share/services/pnm.protocol share/services/rtsp.protocol -@unexec rmdir %D/lib/kde3 >/dev/null 2>&1 || true -@unexec rmdir %D/share/services >/dev/null 2>&1 || true +@dirrmtry lib/kde3 +@dirrmtry share/services @dirrm share/doc/HTML/en/kplayer @dirrm share/apps/kplayer/icons/hicolor/32x32/actions @dirrm share/apps/kplayer/icons/hicolor/32x32 diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist index 04d8ad37bc11..373ac43a74f7 100644 --- a/multimedia/linux-realplayer/pkg-plist +++ b/multimedia/linux-realplayer/pkg-plist @@ -231,14 +231,14 @@ lib/linux-mozilla/plugins/nphelix.xpt %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-ogg_48x48.png %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-rv_48x48.png %%ICONS%%share/icons/hicolor/48x48/mimetypes/mime-video-swf_48x48.png -%%GNOME%%@unexec rmdir %D/share/gnome/application-registry 2>/dev/null || true -%%GNOME%%@unexec rmdir %D/share/gnome/applications 2>/dev/null || true -%%GNOME%%@unexec rmdir %D/share/gnome/mime-info 2>/dev/null || true -%%GNOME%%@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor/192x192/apps 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor/192x192/mimetypes 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor/192x192 2>/dev/null || true -%%ICONS%%@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true +%%GNOME%%@dirrmtry share/gnome/application-registry +%%GNOME%%@dirrmtry share/gnome/applications +%%GNOME%%@dirrmtry share/gnome/mime-info +%%GNOME%%@dirrmtry share/gnome/pixmaps +%%ICONS%%@dirrmtry share/icons/hicolor/48x48/apps +%%ICONS%%@dirrmtry share/icons/hicolor/48x48/mimetypes +%%ICONS%%@dirrmtry share/icons/hicolor/48x48 +%%ICONS%%@dirrmtry share/icons/hicolor/192x192/apps +%%ICONS%%@dirrmtry share/icons/hicolor/192x192/mimetypes +%%ICONS%%@dirrmtry share/icons/hicolor/192x192 +%%ICONS%%@dirrmtry share/icons/hicolor diff --git a/ports-mgmt/porttools/files/patch-cmd_test.in b/ports-mgmt/porttools/files/patch-cmd_test.in index c73b616f58bc..f5c918f27544 100644 --- a/ports-mgmt/porttools/files/patch-cmd_test.in +++ b/ports-mgmt/porttools/files/patch-cmd_test.in @@ -15,7 +15,7 @@ sed -e "s,^${PREFIX}/,," + sudo find ${LOCALBASE}/ -type d | sed "s,^${LOCALBASE}/,," | sort > ${PREFIX}.PLIST_DIRS.before + sudo find ${PREFIX}/ -type d | sed "s,^${PREFIX}/,," | sort > ${PREFIX}.PLIST_DIRS.after -+ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@unexec rmdir %D/"$1" 2>/dev/null || true"}' ++ comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@dirrmtry "$1}' fi # Finish with a clean workspace |