diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 03:01:03 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 03:01:03 +0000 |
| commit | 508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch) | |
| tree | f7810d4887e5297c7b7788225e906b99c81d709b /sysutils | |
| parent | 4008c7e23fe847e2c8ade0ecb5d86f943d84c917 (diff) | |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Notes
Notes:
svn path=/head/; revision=154116
Diffstat (limited to 'sysutils')
90 files changed, 449 insertions, 449 deletions
diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist index da1eec1f87fd..287e3f1517ef 100644 --- a/sysutils/3dm/pkg-plist +++ b/sysutils/3dm/pkg-plist @@ -139,4 +139,4 @@ share/3dm2/en/scripts/seealso.js @unexec unlink /etc/3dm2/3dm2.conf @unexec unlink /etc/3dm2/3dm2.pem @unexec unlink /etc/3dm2/msg -@unexec rmdir %D/share/3dm2/en/scripts %D/share/3dm2/en/images %D/share/3dm2/en %D/share/3dm2 /etc/3dm2 %D/etc/3dm2/msg %D/etc/3dm2 2>/dev/null || true +@dirrmtry share/3dm2/en/scripts %D/share/3dm2/en/images %D/share/3dm2/en %D/share/3dm2 /etc/3dm2 %D/etc/3dm2/msg %D/etc/3dm2 diff --git a/sysutils/LPRngTool/pkg-plist b/sysutils/LPRngTool/pkg-plist index a494e02f367f..30e26f5543d4 100644 --- a/sysutils/LPRngTool/pkg-plist +++ b/sysutils/LPRngTool/pkg-plist @@ -6,7 +6,7 @@ libexec/filters/printerdb libexec/filters/testpage.asc libexec/filters/testpage.ps libexec/filters/testpage-a4.ps -@unexec rmdir %D/libexec/filters 2> /dev/null || true +@dirrmtry libexec/filters %%CWD%%@cwd / @unexec if cmp -s %D/%%SYSCONFDIR%%/lprngtool.conf %D/%%SYSCONFDIR%%/lprngtool.conf.sample; then rm -f %D/%%SYSCONFDIR%%/lprngtool.conf; fi %%SYSCONFDIR%%/lprngtool.conf.sample diff --git a/sysutils/bbsmount/pkg-plist b/sysutils/bbsmount/pkg-plist index 42144aefae3d..359c45ac8959 100644 --- a/sysutils/bbsmount/pkg-plist +++ b/sysutils/bbsmount/pkg-plist @@ -15,7 +15,7 @@ share/bbtools/README.bbsmount %%DATADIR%%/images/unmounteddisk.xpm %%DATADIR%%/images/unmounted.xpm %%DATADIR%%/images/unmountedzip.xpm -@unexec rmdir %D/share/bbtools 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/examples 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/images 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry share/bbtools +@dirrmtry %%DATADIR%%/examples +@dirrmtry %%DATADIR%%/images +@dirrmtry %%DATADIR%% diff --git a/sysutils/bubblemon2/pkg-plist b/sysutils/bubblemon2/pkg-plist index 4c94b6a3643a..8f14b612d8ec 100644 --- a/sysutils/bubblemon2/pkg-plist +++ b/sysutils/bubblemon2/pkg-plist @@ -27,6 +27,6 @@ share/locale/ro/LC_MESSAGES/bubblemon.mo share/locale/ru/LC_MESSAGES/bubblemon.mo share/locale/sh/LC_MESSAGES/bubblemon.mo share/locale/sv/LC_MESSAGES/bubblemon.mo -@unexec rmdir %D/share/locale/sh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sh 2> /dev/null || true +@dirrmtry share/locale/sh/LC_MESSAGES +@dirrmtry share/locale/sh %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/sysutils/ccze/pkg-plist b/sysutils/ccze/pkg-plist index 7d1fe308383a..5f51e7205f6c 100644 --- a/sysutils/ccze/pkg-plist +++ b/sysutils/ccze/pkg-plist @@ -21,6 +21,6 @@ lib/ccze/syslog.so lib/ccze/ulogd.so lib/ccze/vsftpd.so lib/ccze/xferlog.so -@unexec rmdir %D/lib/ccze 2>/dev/null || true +@dirrmtry lib/ccze %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%@dirrm share/doc/ccze diff --git a/sysutils/cdbakeoven/pkg-plist b/sysutils/cdbakeoven/pkg-plist index 7c726684cdae..81bf6de0d402 100644 --- a/sysutils/cdbakeoven/pkg-plist +++ b/sysutils/cdbakeoven/pkg-plist @@ -60,26 +60,26 @@ share/icons/hicolor/48x48/apps/cdbakeoven.png share/icons/hicolor/48x48/mimetypes/cdimage.png share/mimelnk/application/cdbo-file-list.desktop share/mimelnk/inode/ISO-image.desktop -@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/apps/cdbakeoven/toolbar 2>/dev/null || true +@dirrmtry share/mimelnk/inode +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/hicolor/48x48/mimetypes +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/mimetypes +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/mimetypes +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/apps/cdbakeoven/toolbar @dirrm share/apps/cdbakeoven/info @dirrm share/apps/cdbakeoven -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Utilities @dirrm share/applnk/Settings/CDBakeOven -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true -@unexec rmdir %D/lib/kde3 2>/dev/null || true +@dirrmtry share/applnk/Settings +@dirrmtry share/applnk +@dirrmtry lib/kde3 diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist index c23bf6ebf0d2..accff98e7356 100644 --- a/sysutils/di/pkg-plist +++ b/sysutils/di/pkg-plist @@ -2,7 +2,7 @@ bin/di bin/mi share/locale/de_DE/LC_MESSAGES/di.mo share/locale/en_US/LC_MESSAGES/di.mo -@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US 2> /dev/null || true +@dirrmtry share/locale/de_DE/LC_MESSAGES +@dirrmtry share/locale/de_DE +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US diff --git a/sysutils/dirvish/pkg-plist b/sysutils/dirvish/pkg-plist index ba956e789a54..3a0d07fb776b 100644 --- a/sysutils/dirvish/pkg-plist +++ b/sysutils/dirvish/pkg-plist @@ -4,4 +4,4 @@ sbin/dirvish-locate sbin/dirvish-runall etc/dirvish/default.conf.dist etc/dirvish/master.conf.dist -@unexec rmdir %D/etc/dirvish 2>/dev/null || true +@dirrmtry etc/dirvish diff --git a/sysutils/epylog/pkg-plist b/sysutils/epylog/pkg-plist index cb95229fdc89..b7dcb5260e02 100644 --- a/sysutils/epylog/pkg-plist +++ b/sysutils/epylog/pkg-plist @@ -62,5 +62,5 @@ share/epylog/modules/weeder_mod.pyc @dirrm share/doc/epylog-1.0.3/doc @dirrm share/doc/epylog-1.0.3 @dirrm %%PYTHON_SITELIBDIR%%/epylog -@unexec rmdir %D/etc/epylog/modules.d 2>/dev/null || true -@unexec rmdir %D/etc/epylog 2>/dev/null || true +@dirrmtry etc/epylog/modules.d +@dirrmtry etc/epylog diff --git a/sysutils/filelight-kde4/pkg-plist b/sysutils/filelight-kde4/pkg-plist index 7790585fffca..64f3c5e8f986 100644 --- a/sysutils/filelight-kde4/pkg-plist +++ b/sysutils/filelight-kde4/pkg-plist @@ -12,28 +12,28 @@ share/locale/cy/LC_MESSAGES/filelight.mo share/locale/de/LC_MESSAGES/filelight.mo share/locale/nl/LC_MESSAGES/filelight.mo share/locale/ru/LC_MESSAGES/filelight.mo -@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ru 2>/dev/null || true -@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nl 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cy/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cy 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cy/LC_MESSAGES +@dirrmtry share/locale/cy +@dirrmtry share/locale +@dirrmtry share/icons/crystalsvg/64x64/apps +@dirrmtry share/icons/crystalsvg/64x64 +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg/22x22/apps +@dirrmtry share/icons/crystalsvg/22x22 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons @dirrm share/doc/HTML/en/filelight -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/en +@dirrmtry share/doc/HTML +@dirrmtry share/config @dirrm share/apps/filelight -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Utilities +@dirrmtry share/applnk diff --git a/sysutils/filelight/pkg-plist b/sysutils/filelight/pkg-plist index 7790585fffca..64f3c5e8f986 100644 --- a/sysutils/filelight/pkg-plist +++ b/sysutils/filelight/pkg-plist @@ -12,28 +12,28 @@ share/locale/cy/LC_MESSAGES/filelight.mo share/locale/de/LC_MESSAGES/filelight.mo share/locale/nl/LC_MESSAGES/filelight.mo share/locale/ru/LC_MESSAGES/filelight.mo -@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ru 2>/dev/null || true -@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nl 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cy/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cy 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cy/LC_MESSAGES +@dirrmtry share/locale/cy +@dirrmtry share/locale +@dirrmtry share/icons/crystalsvg/64x64/apps +@dirrmtry share/icons/crystalsvg/64x64 +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg/22x22/apps +@dirrmtry share/icons/crystalsvg/22x22 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons @dirrm share/doc/HTML/en/filelight -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/en +@dirrmtry share/doc/HTML +@dirrmtry share/config @dirrm share/apps/filelight -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Utilities +@dirrmtry share/applnk diff --git a/sysutils/fusefs-kmod/pkg-plist b/sysutils/fusefs-kmod/pkg-plist index dfdf9aaf7b16..305e6c5b8ac3 100644 --- a/sysutils/fusefs-kmod/pkg-plist +++ b/sysutils/fusefs-kmod/pkg-plist @@ -2,7 +2,7 @@ etc/rc.d/fuse.sh modules/fuse.ko sbin/mount_fusefs @unexec kldxref %D/modules -@unexec rmdir %D/modules 2>/dev/null || true +@dirrmtry modules %%PORTDOCS%%%%DOCSDIR%%/kmod/doc.txt %%PORTDOCS%%%%DOCSDIR%%/kmod/html/Faq.html %%PORTDOCS%%%%DOCSDIR%%/kmod/html/Implementation.html @@ -21,4 +21,4 @@ sbin/mount_fusefs %%PORTDOCS%%%%DOCSDIR%%/kmod/html/tabbar-right.css %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@dirrmtry %%DOCSDIR%% diff --git a/sysutils/fusefs-libs/pkg-plist b/sysutils/fusefs-libs/pkg-plist index e8b632a1264e..dbaaae9a7bf6 100644 --- a/sysutils/fusefs-libs/pkg-plist +++ b/sysutils/fusefs-libs/pkg-plist @@ -14,4 +14,4 @@ libdata/pkgconfig/fuse.pc %%PORTDOCS%%%%DOCSDIR%%/libs/how-fuse-works %%PORTDOCS%%%%DOCSDIR%%/libs/kernel.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/libs -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@dirrmtry %%DOCSDIR%% diff --git a/sysutils/ganglia-monitor-core/pkg-plist b/sysutils/ganglia-monitor-core/pkg-plist index 64836c856217..e7bf683f2f34 100644 --- a/sysutils/ganglia-monitor-core/pkg-plist +++ b/sysutils/ganglia-monitor-core/pkg-plist @@ -15,5 +15,5 @@ etc/gmond.conf.sample %%GMETAD%%sbin/gmetad %%GMETAD%%sbin/gmetasnap sbin/gmond -@unexec rmdir %D/var/db/ganglia/rrds 2>/dev/null || true -@unexec rmdir %D/var/db/ganglia 2>/dev/null || true +@dirrmtry var/db/ganglia/rrds +@dirrmtry var/db/ganglia diff --git a/sysutils/gcombust/pkg-plist b/sysutils/gcombust/pkg-plist index de2a30354896..4d673562a89c 100644 --- a/sysutils/gcombust/pkg-plist +++ b/sysutils/gcombust/pkg-plist @@ -19,5 +19,5 @@ share/locale/ru/LC_MESSAGES/gcombust.mo share/locale/sk/LC_MESSAGES/gcombust.mo share/locale/sv/LC_MESSAGES/gcombust.mo share/pixmaps/gcombust.xpm -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications @dirrm share/doc/gcombust diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 6c197f89bf05..de48244c72be 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -99,12 +99,12 @@ share/locale/vi/LC_MESSAGES/gconf-editor.mo share/locale/xh/LC_MESSAGES/gconf-editor.mo share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te @dirrm share/gnome/pixmaps/gconf-editor @dirrm share/gnome/omf/gconf-editor @dirrm share/gnome/help/gconf-editor/uk/figures diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist index 268eb63fd978..8636b7a4b045 100644 --- a/sysutils/gkrellm/pkg-plist +++ b/sysutils/gkrellm/pkg-plist @@ -11,7 +11,7 @@ share/locale/sv/LC_MESSAGES/gkrellm.mo @dirrm include/gkrellm @exec mkdir -p %D/libexec/gkrellm/plugins @exec mkdir -p %D/share/gkrellm/themes -@unexec rmdir %D/libexec/gkrellm/plugins 2>/dev/null || true -@unexec rmdir %D/libexec/gkrellm 2>/dev/null || true -@unexec rmdir %D/share/gkrellm/themes 2>/dev/null || true -@unexec rmdir %D/share/gkrellm 2>/dev/null || true +@dirrmtry libexec/gkrellm/plugins +@dirrmtry libexec/gkrellm +@dirrmtry share/gkrellm/themes +@dirrmtry share/gkrellm diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index 2960740ab608..76eb7e40a054 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -3,8 +3,8 @@ include/gkrellm2/gkrellmd.h libdata/pkgconfig/gkrellmd.pc sbin/gkrellmd @exec mkdir -p %D/libexec/gkrellm2/plugins-gkrellmd -@unexec rmdir %D/libexec/gkrellm2/plugins-gkrellmd 2>/dev/null || true -@unexec rmdir %D/libexec/gkrellm2 2>/dev/null || true +@dirrmtry libexec/gkrellm2/plugins-gkrellmd +@dirrmtry libexec/gkrellm2 @unexec if cmp -s %D/etc/gkrellmd.conf %D/%%EXAMPLESDIR%%/gkrellmd.conf; then rm -f %D/etc/gkrellmd.conf; fi %%EXAMPLESDIR%%/gkrellmd.conf @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index b43391f76cfb..a8b3cb1f22ee 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -212,14 +212,14 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso @dirrm share/gnome/omf/control-center @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @@ -228,7 +228,7 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces -@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true +@dirrmtry share/gnome/control-center-2.0/icons @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index e7455e4cedcb..419ddc095099 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -80,8 +80,8 @@ share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index ab659acf1b79..131f4edef34e 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -163,8 +163,8 @@ share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index b43391f76cfb..a8b3cb1f22ee 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -212,14 +212,14 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso @dirrm share/gnome/omf/control-center @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @@ -228,7 +228,7 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces -@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true +@dirrmtry share/gnome/control-center-2.0/icons @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index e7455e4cedcb..419ddc095099 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -80,8 +80,8 @@ share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist index ab659acf1b79..131f4edef34e 100644 --- a/sysutils/gnomesystemtools/pkg-plist +++ b/sysutils/gnomesystemtools/pkg-plist @@ -163,8 +163,8 @@ share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C diff --git a/sysutils/hdup/pkg-plist b/sysutils/hdup/pkg-plist index 76d52c19c6b4..4def8e8664e1 100644 --- a/sysutils/hdup/pkg-plist +++ b/sysutils/hdup/pkg-plist @@ -5,6 +5,6 @@ sbin/hdup %%DOCSDIR%%/FAQ.html %%EXAMPLESDIR%%/hdup.cron %%EXAMPLESDIR%%/no-history-post-run.sh -@unexec rmdir %D/etc/hdup 2> /dev/null || true +@dirrmtry etc/hdup @dirrm %%DOCSDIR%% @dirrm %%EXAMPLESDIR%% diff --git a/sysutils/heartbeat/pkg-plist b/sysutils/heartbeat/pkg-plist index 4b582ecf3b30..943185cb92a9 100644 --- a/sysutils/heartbeat/pkg-plist +++ b/sysutils/heartbeat/pkg-plist @@ -261,9 +261,9 @@ share/doc/heartbeat-1.2.3/startstop @dirrm include/clplumbing @dirrm etc/ha.d/resource.d @dirrm etc/ha.d/rc.d -@unexec rmdir %D/etc/ha.d/conf 2>/dev/null || true -@unexec rmdir %D/etc/ha.d 2>/dev/null || true +@dirrmtry etc/ha.d/conf +@dirrmtry etc/ha.d @cwd / -@unexec rmdir %D/var/lib/heartbeat/ckpt 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat/ccm 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat 2>/dev/null || true +@dirrmtry var/lib/heartbeat/ckpt +@dirrmtry var/lib/heartbeat/ccm +@dirrmtry var/lib/heartbeat diff --git a/sysutils/heartbeat2/pkg-plist b/sysutils/heartbeat2/pkg-plist index 4b582ecf3b30..943185cb92a9 100644 --- a/sysutils/heartbeat2/pkg-plist +++ b/sysutils/heartbeat2/pkg-plist @@ -261,9 +261,9 @@ share/doc/heartbeat-1.2.3/startstop @dirrm include/clplumbing @dirrm etc/ha.d/resource.d @dirrm etc/ha.d/rc.d -@unexec rmdir %D/etc/ha.d/conf 2>/dev/null || true -@unexec rmdir %D/etc/ha.d 2>/dev/null || true +@dirrmtry etc/ha.d/conf +@dirrmtry etc/ha.d @cwd / -@unexec rmdir %D/var/lib/heartbeat/ckpt 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat/ccm 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat 2>/dev/null || true +@dirrmtry var/lib/heartbeat/ckpt +@dirrmtry var/lib/heartbeat/ccm +@dirrmtry var/lib/heartbeat diff --git a/sysutils/heirloom/pkg-plist b/sysutils/heirloom/pkg-plist index eaada1734617..f6f6daaed1d7 100644 --- a/sysutils/heirloom/pkg-plist +++ b/sysutils/heirloom/pkg-plist @@ -270,11 +270,11 @@ @dirrm %%DATADIR%%/usr/ucb @dirrm %%DATADIR%%/usr/share/man/5man/man8 @dirrm %%DATADIR%%/usr/share/man/5man/man7 -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man6 2>/dev/null || true +@dirrmtry %%DATADIR%%/usr/share/man/5man/man6 @dirrm %%DATADIR%%/usr/share/man/5man/man5 -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man4 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man3 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man2 2>/dev/null || true +@dirrmtry %%DATADIR%%/usr/share/man/5man/man4 +@dirrmtry %%DATADIR%%/usr/share/man/5man/man3 +@dirrmtry %%DATADIR%%/usr/share/man/5man/man2 @dirrm %%DATADIR%%/usr/share/man/5man/man1m @dirrm %%DATADIR%%/usr/share/man/5man/man1b @dirrm %%DATADIR%%/usr/share/man/5man/man1 diff --git a/sysutils/kcpuload/pkg-plist b/sysutils/kcpuload/pkg-plist index 4e2e9dcce7c8..e49fcab45bd2 100644 --- a/sysutils/kcpuload/pkg-plist +++ b/sysutils/kcpuload/pkg-plist @@ -34,17 +34,17 @@ share/icons/locolor/32x32/apps/kcpuload.png @dirrm share/apps/kcpuload @dirrm share/doc/HTML/en/kcpuload/common @dirrm share/doc/HTML/en/kcpuload -@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/applnk/System 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true +@dirrmtry share/icons/crystalsvg/16x16/apps +@dirrmtry share/icons/crystalsvg/16x16 +@dirrmtry share/icons/crystalsvg/32x32/apps +@dirrmtry share/icons/crystalsvg/32x32 +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/applnk/System +@dirrmtry share/applnk +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor diff --git a/sysutils/kcube/pkg-plist b/sysutils/kcube/pkg-plist index 773231ec5c34..6e95ed323447 100644 --- a/sysutils/kcube/pkg-plist +++ b/sysutils/kcube/pkg-plist @@ -2,4 +2,4 @@ lib/libkcube.la lib/libkcube.so lib/libkcube.so.1 share/apps/kicker/applets/kcube.desktop -@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true +@dirrmtry share/apps/kicker/applets diff --git a/sysutils/kdirstat/pkg-plist b/sysutils/kdirstat/pkg-plist index 144529215c51..ab336eb3cc6d 100644 --- a/sysutils/kdirstat/pkg-plist +++ b/sysutils/kdirstat/pkg-plist @@ -36,4 +36,4 @@ share/locale/ja/LC_MESSAGES/kdirstat.mo @dirrm share/apps/kdirstat/icons/hicolor @dirrm share/apps/kdirstat/icons @dirrm share/apps/kdirstat -@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true +@dirrmtry share/apps/kconf_update diff --git a/sysutils/kkbswitch/pkg-plist b/sysutils/kkbswitch/pkg-plist index bccbe71c8ebd..1c9bca5337ca 100644 --- a/sysutils/kkbswitch/pkg-plist +++ b/sysutils/kkbswitch/pkg-plist @@ -23,5 +23,5 @@ share/locale/bg/LC_MESSAGES/kkbswitch.mo @dirrm share/apps/kkbswitch @dirrm %%DOCSDIR%%/common @dirrm %%DOCSDIR%% -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/applnk/Utilities +@dirrmtry share/applnk diff --git a/sysutils/kkeyled/pkg-plist b/sysutils/kkeyled/pkg-plist index 46181ce53050..9ce863e870eb 100644 --- a/sysutils/kkeyled/pkg-plist +++ b/sysutils/kkeyled/pkg-plist @@ -96,34 +96,34 @@ share/icons/locolor/22x22/apps/kkeyled.png share/icons/locolor/32x32/apps/kkeyled.png share/icons/locolor/48x48/apps/kkeyled.png share/locale/de/LC_MESSAGES/kkeyled.mo -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale +@dirrmtry share/icons/locolor/48x48/apps +@dirrmtry share/icons/locolor/48x48 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/22x22/apps +@dirrmtry share/icons/locolor/22x22 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/en/kkeyled -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/de/kkeyled -@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/de +@dirrmtry share/doc/HTML +@dirrmtry share/config @dirrm share/apps/kkeyled/pics/theme/round @dirrm share/apps/kkeyled/pics/theme/red @dirrm share/apps/kkeyled/pics/theme/lock @@ -134,6 +134,6 @@ share/locale/de/LC_MESSAGES/kkeyled.mo @dirrm share/apps/kkeyled/pics/theme @dirrm share/apps/kkeyled/pics @dirrm share/apps/kkeyled -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Utilities +@dirrmtry share/applnk diff --git a/sysutils/knutclient-kde4/pkg-plist b/sysutils/knutclient-kde4/pkg-plist index 0fe2be5c883c..ca32ff142af4 100644 --- a/sysutils/knutclient-kde4/pkg-plist +++ b/sysutils/knutclient-kde4/pkg-plist @@ -30,34 +30,34 @@ share/locale/cs/LC_MESSAGES/knutclient.mo share/locale/de/LC_MESSAGES/knutclient.mo share/locale/fr/LC_MESSAGES/knutclient.mo share/locale/it/LC_MESSAGES/knutclient.mo -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/en/knutclient -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/cs/knutclient -@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/cs +@dirrmtry share/doc/HTML @dirrm share/apps/knutclient -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/sysutils/knutclient/pkg-plist b/sysutils/knutclient/pkg-plist index 0fe2be5c883c..ca32ff142af4 100644 --- a/sysutils/knutclient/pkg-plist +++ b/sysutils/knutclient/pkg-plist @@ -30,34 +30,34 @@ share/locale/cs/LC_MESSAGES/knutclient.mo share/locale/de/LC_MESSAGES/knutclient.mo share/locale/fr/LC_MESSAGES/knutclient.mo share/locale/it/LC_MESSAGES/knutclient.mo -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/en/knutclient -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/cs/knutclient -@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/cs +@dirrmtry share/doc/HTML @dirrm share/apps/knutclient -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/sysutils/krename-kde4/pkg-plist b/sysutils/krename-kde4/pkg-plist index 6d8e8183b17f..fd8bbd1422c2 100644 --- a/sysutils/krename-kde4/pkg-plist +++ b/sysutils/krename-kde4/pkg-plist @@ -25,9 +25,9 @@ share/locale/sl/LC_MESSAGES/krename.mo share/locale/sv/LC_MESSAGES/krename.mo share/locale/zh_CN.GB2312/LC_MESSAGES/krename.mo share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrm share/doc/HTML/en/krename @dirrm share/apps/krename diff --git a/sysutils/krename/pkg-plist b/sysutils/krename/pkg-plist index 6d8e8183b17f..fd8bbd1422c2 100644 --- a/sysutils/krename/pkg-plist +++ b/sysutils/krename/pkg-plist @@ -25,9 +25,9 @@ share/locale/sl/LC_MESSAGES/krename.mo share/locale/sv/LC_MESSAGES/krename.mo share/locale/zh_CN.GB2312/LC_MESSAGES/krename.mo share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrm share/doc/HTML/en/krename @dirrm share/apps/krename diff --git a/sysutils/kshutdown-kde4/pkg-plist b/sysutils/kshutdown-kde4/pkg-plist index b3f68034ba36..6a4b2257631f 100644 --- a/sysutils/kshutdown-kde4/pkg-plist +++ b/sysutils/kshutdown-kde4/pkg-plist @@ -50,14 +50,14 @@ share/locale/ru/LC_MESSAGES/kshutdown.mo share/locale/sk/LC_MESSAGES/kshutdown.mo share/locale/sv/LC_MESSAGES/kshutdown.mo share/locale/zh_CN/LC_MESSAGES/kshutdown.mo -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/doc/HTML/en/kshutdown @dirrm share/doc/HTML/de/kshutdown @dirrm share/apps/kshutdown/sounds @@ -67,4 +67,4 @@ share/locale/zh_CN/LC_MESSAGES/kshutdown.mo @dirrm share/apps/kshutdown/extras/multimedia @dirrm share/apps/kshutdown/extras @dirrm share/apps/kshutdown -@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true +@dirrmtry share/apps/kconf_update diff --git a/sysutils/kshutdown/pkg-plist b/sysutils/kshutdown/pkg-plist index b3f68034ba36..6a4b2257631f 100644 --- a/sysutils/kshutdown/pkg-plist +++ b/sysutils/kshutdown/pkg-plist @@ -50,14 +50,14 @@ share/locale/ru/LC_MESSAGES/kshutdown.mo share/locale/sk/LC_MESSAGES/kshutdown.mo share/locale/sv/LC_MESSAGES/kshutdown.mo share/locale/zh_CN/LC_MESSAGES/kshutdown.mo -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/doc/HTML/en/kshutdown @dirrm share/doc/HTML/de/kshutdown @dirrm share/apps/kshutdown/sounds @@ -67,4 +67,4 @@ share/locale/zh_CN/LC_MESSAGES/kshutdown.mo @dirrm share/apps/kshutdown/extras/multimedia @dirrm share/apps/kshutdown/extras @dirrm share/apps/kshutdown -@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true +@dirrmtry share/apps/kconf_update diff --git a/sysutils/lire/pkg-plist b/sysutils/lire/pkg-plist index d21b724faaf5..1a543d488bd7 100644 --- a/sysutils/lire/pkg-plist +++ b/sysutils/lire/pkg-plist @@ -818,4 +818,4 @@ share/perl5/LocaleData/nl/LC_MESSAGES/lire.mo @dirrm etc/lire/config @dirrm etc/lire -@unexec rmdir %D/share/perl5 2>/dev/null || true +@dirrmtry share/perl5 diff --git a/sysutils/lmon/pkg-plist b/sysutils/lmon/pkg-plist index 6892ed5494b6..72f76698adfc 100644 --- a/sysutils/lmon/pkg-plist +++ b/sysutils/lmon/pkg-plist @@ -7,7 +7,7 @@ lmon/lmon.pl %%EXAMPLESDIR%%/jboss.rules %%EXAMPLESDIR%%/messages.rules @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/lmon 2>/dev/null || true +@dirrmtry lmon %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO diff --git a/sysutils/mapchan/pkg-plist b/sysutils/mapchan/pkg-plist index eff61dc4cace..15a7efc602f8 100644 --- a/sysutils/mapchan/pkg-plist +++ b/sysutils/mapchan/pkg-plist @@ -12,4 +12,4 @@ etc/mapchan/msm.map etc/mapchan/trivial.map etc/mapchan/sm7238.map etc/mapchan/win2koi.map -@unexec rmdir %D/etc/mapchan 2>/dev/null || true +@dirrmtry etc/mapchan diff --git a/sysutils/mcron/pkg-plist b/sysutils/mcron/pkg-plist index 770004a48cf3..102f0486a814 100644 --- a/sysutils/mcron/pkg-plist +++ b/sysutils/mcron/pkg-plist @@ -9,4 +9,4 @@ share/guile/site/mcron/redirect.scm share/guile/site/mcron/vixie-specification.scm share/guile/site/mcron/vixie-time.scm @dirrm share/guile/site/mcron -@unexec rmdir %D/share/guile/site 2>/dev/null || true +@dirrmtry share/guile/site diff --git a/sysutils/munin-main/pkg-plist b/sysutils/munin-main/pkg-plist index 243f13168ab5..91507cadc4bc 100644 --- a/sysutils/munin-main/pkg-plist +++ b/sysutils/munin-main/pkg-plist @@ -27,13 +27,13 @@ www/cgi-bin/munin-cgi-graph @unexec rm -f /var/run/munin/munin-*.lock @unexec rmdir /var/run/munin 2>/dev/null || true @unexec rmdir /var/log/munin-main 2>/dev/null || true -@unexec rmdir %D/www/data/munin 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/share/munin 2>/dev/null || true -@unexec rmdir %D/etc/munin/templates 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true +@dirrmtry www/data/munin +@dirrmtry www/data +@dirrmtry www/cgi-bin +@dirrmtry var/munin +@dirrmtry share/munin +@dirrmtry etc/munin/templates +@dirrmtry etc/munin @unexec echo @unexec echo '********************************************************************' @unexec echo "If you want to *completely* remove munin-main, you have to" diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist index 243f13168ab5..91507cadc4bc 100644 --- a/sysutils/munin-master/pkg-plist +++ b/sysutils/munin-master/pkg-plist @@ -27,13 +27,13 @@ www/cgi-bin/munin-cgi-graph @unexec rm -f /var/run/munin/munin-*.lock @unexec rmdir /var/run/munin 2>/dev/null || true @unexec rmdir /var/log/munin-main 2>/dev/null || true -@unexec rmdir %D/www/data/munin 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/share/munin 2>/dev/null || true -@unexec rmdir %D/etc/munin/templates 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true +@dirrmtry www/data/munin +@dirrmtry www/data +@dirrmtry www/cgi-bin +@dirrmtry var/munin +@dirrmtry share/munin +@dirrmtry etc/munin/templates +@dirrmtry etc/munin @unexec echo @unexec echo '********************************************************************' @unexec echo "If you want to *completely* remove munin-main, you have to" diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist index b02ef7a2437d..62a14c300c96 100644 --- a/sysutils/munin-node/pkg-plist +++ b/sysutils/munin-node/pkg-plist @@ -108,12 +108,12 @@ sbin/munin-run %%DATADIR%%/plugins/vmstat @unexec rm -f /var/run/munin/munin-node.pid @unexec rmdir /var/run/munin 2>/dev/null || true -@unexec rmdir %D/var/munin/plugin-state 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/plugins 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/etc/munin/plugin-conf.d 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true +@dirrmtry var/munin/plugin-state +@dirrmtry var/munin +@dirrmtry %%DATADIR%%/plugins +@dirrmtry %%DATADIR%% +@dirrmtry etc/munin/plugin-conf.d +@dirrmtry etc/munin @unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin 2>/dev/null || true @unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin 2>/dev/null || true @unexec echo diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index f58bdd6772fe..d899785780a9 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -85,7 +85,7 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/nautilus-cd-burner @dirrm include/libnautilus-burn diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index e98706c5c707..9a13cce0a3c8 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -10,7 +10,7 @@ etc/nut/upsd.conf.sample etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample -@unexec rmdir %D/etc/nut 2>/dev/null || true +@dirrmtry etc/nut etc/rc.d/nut.sh libexec/nut/apcsmart libexec/nut/bcmxcp @@ -98,6 +98,6 @@ sbin/upssched %%PORTDOCS%%@dirrm %%DOCSDIR%%/cables %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/libexec/nut 2>/dev/null || true +@dirrmtry libexec/nut @unexec rmdir /var/db/nut 2>/dev/null || true %%CGIDIRRM%% diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist index e98706c5c707..9a13cce0a3c8 100644 --- a/sysutils/nut22/pkg-plist +++ b/sysutils/nut22/pkg-plist @@ -10,7 +10,7 @@ etc/nut/upsd.conf.sample etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample -@unexec rmdir %D/etc/nut 2>/dev/null || true +@dirrmtry etc/nut etc/rc.d/nut.sh libexec/nut/apcsmart libexec/nut/bcmxcp @@ -98,6 +98,6 @@ sbin/upssched %%PORTDOCS%%@dirrm %%DOCSDIR%%/cables %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/libexec/nut 2>/dev/null || true +@dirrmtry libexec/nut @unexec rmdir /var/db/nut 2>/dev/null || true %%CGIDIRRM%% diff --git a/sysutils/p5-File-Stat-Bits/pkg-plist b/sysutils/p5-File-Stat-Bits/pkg-plist index e67176d0f800..593d8b0322df 100644 --- a/sysutils/p5-File-Stat-Bits/pkg-plist +++ b/sysutils/p5-File-Stat-Bits/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/Bits/.packlist @dirrm %%SITE_PERL%%/File/Stat/Bits @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/Bits -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File/Stat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File +@dirrmtry %%SITE_PERL%%/File/Stat +@dirrmtry %%SITE_PERL%%/File diff --git a/sysutils/p5-FreeBSD-Portindex/pkg-plist b/sysutils/p5-FreeBSD-Portindex/pkg-plist index 3e2d25069968..49c2158a11ab 100644 --- a/sysutils/p5-FreeBSD-Portindex/pkg-plist +++ b/sysutils/p5-FreeBSD-Portindex/pkg-plist @@ -11,5 +11,5 @@ etc/portindex.cfg.sample %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex/.packlist @dirrm %%SITE_PERL%%/FreeBSD/Portindex @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex -@unexec rmdir %D/%%SITE_PERL%%/FreeBSD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/FreeBSD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD diff --git a/sysutils/p5-LJ-Cache/pkg-plist b/sysutils/p5-LJ-Cache/pkg-plist index b3f6973cd97f..2ab9932d8701 100644 --- a/sysutils/p5-LJ-Cache/pkg-plist +++ b/sysutils/p5-LJ-Cache/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/LJ/Cache.pm @dirrm %%SITE_PERL%%/auto/LJ/Cache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/Cache -@unexec rmdir %D/%%SITE_PERL%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/LJ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ +@dirrmtry %%SITE_PERL%%/LJ diff --git a/sysutils/p5-LJ-TextMessage/pkg-plist b/sysutils/p5-LJ-TextMessage/pkg-plist index c28736151691..9e1e8fedfe22 100644 --- a/sysutils/p5-LJ-TextMessage/pkg-plist +++ b/sysutils/p5-LJ-TextMessage/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/LJ/send-test.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/TextMessage/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/TextMessage -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ +@dirrmtry %%SITE_PERL%%/LJ diff --git a/sysutils/p5-Schedule-At/pkg-plist b/sysutils/p5-Schedule-At/pkg-plist index ff379856ab8c..848ee1900afb 100644 --- a/sysutils/p5-Schedule-At/pkg-plist +++ b/sysutils/p5-Schedule-At/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Schedule/At.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Schedule +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule diff --git a/sysutils/p5-Schedule-Cron/pkg-plist b/sysutils/p5-Schedule-Cron/pkg-plist index 529d5ca38929..55921f411ab3 100644 --- a/sysutils/p5-Schedule-Cron/pkg-plist +++ b/sysutils/p5-Schedule-Cron/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron/.packlist %%SITE_PERL%%/Schedule/Cron.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule +@dirrmtry %%SITE_PERL%%/Schedule diff --git a/sysutils/p5-Schedule-Load/pkg-plist b/sysutils/p5-Schedule-Load/pkg-plist index 29f701f27cb0..6d64685a554d 100644 --- a/sysutils/p5-Schedule-Load/pkg-plist +++ b/sysutils/p5-Schedule-Load/pkg-plist @@ -20,13 +20,13 @@ bin/slrsh @dirrm %%SITE_PERL%%/Schedule/Load @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load @dirrm lib/rschedule -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Schedule +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule @dirrm %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host @dirrm %%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc @dirrm %%SITE_PERL%%/auto/Schedule/Load/Hosts @dirrm %%SITE_PERL%%/auto/Schedule/Load -@unexec rmdir %D/%%SITE_PERL%%/auto/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Schedule %%PORTDOCS%%%%EXAMPLESDIR%%/init.d/slchoosed %%PORTDOCS%%%%EXAMPLESDIR%%/init.d/slreportd %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/init.d diff --git a/sysutils/p5-Schedule-Match/pkg-plist b/sysutils/p5-Schedule-Match/pkg-plist index c04b1dda5ad2..5425d693b355 100644 --- a/sysutils/p5-Schedule-Match/pkg-plist +++ b/sysutils/p5-Schedule-Match/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match/.packlist %%SITE_PERL%%/Schedule/Match.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule +@dirrmtry %%SITE_PERL%%/Schedule diff --git a/sysutils/p5-Stat-lsMode/pkg-plist b/sysutils/p5-Stat-lsMode/pkg-plist index 81786c09e006..8753bc4aa102 100644 --- a/sysutils/p5-Stat-lsMode/pkg-plist +++ b/sysutils/p5-Stat-lsMode/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode/.packlist %%SITE_PERL%%/Stat/lsMode.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Stat 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat +@dirrmtry %%SITE_PERL%%/Stat diff --git a/sysutils/p5-Sys-CpuLoad/pkg-plist b/sysutils/p5-Sys-CpuLoad/pkg-plist index 52863016c303..f8b46eeaf715 100644 --- a/sysutils/p5-Sys-CpuLoad/pkg-plist +++ b/sysutils/p5-Sys-CpuLoad/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys diff --git a/sysutils/p5-Sys-Hostname-Long/pkg-plist b/sysutils/p5-Sys-Hostname-Long/pkg-plist index c4a4b75b68f2..38e39b156387 100644 --- a/sysutils/p5-Sys-Hostname-Long/pkg-plist +++ b/sysutils/p5-Sys-Hostname-Long/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Sys/Hostname/testall.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/Long/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/Long -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sys/Hostname 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/Sys/Hostname +@dirrmtry %%SITE_PERL%%/Sys diff --git a/sysutils/p5-Sys-Utmp/pkg-plist b/sysutils/p5-Sys-Utmp/pkg-plist index ef61108e3208..bee93d47d033 100644 --- a/sysutils/p5-Sys-Utmp/pkg-plist +++ b/sysutils/p5-Sys-Utmp/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Utmp/Utmp.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Utmp/Utmp.bs @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Utmp -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys diff --git a/sysutils/p5-Tie-Syslog/pkg-plist b/sysutils/p5-Tie-Syslog/pkg-plist index 04c6e4f437d0..f7d15ae6db59 100644 --- a/sysutils/p5-Tie-Syslog/pkg-plist +++ b/sysutils/p5-Tie-Syslog/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist %%SITE_PERL%%/Tie/Syslog.pm -@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Tie +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie diff --git a/sysutils/p5-UPS-Nut/pkg-plist b/sysutils/p5-UPS-Nut/pkg-plist index 09b299f80594..a9528c8806a7 100644 --- a/sysutils/p5-UPS-Nut/pkg-plist +++ b/sysutils/p5-UPS-Nut/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS/Nut/.packlist %%SITE_PERL%%/UPS/Nut.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS/Nut -@unexec rmdir %D/%%SITE_PERL%%/UPS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/UPS +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS diff --git a/sysutils/p5-Unix-ConfigFile/pkg-plist b/sysutils/p5-Unix-ConfigFile/pkg-plist index 185dd77b86b8..e0a9ed608dae 100644 --- a/sysutils/p5-Unix-ConfigFile/pkg-plist +++ b/sysutils/p5-Unix-ConfigFile/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/Unix/PasswdFile.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix +@dirrmtry %%SITE_PERL%%/Unix diff --git a/sysutils/p5-Unix-Mknod/pkg-plist b/sysutils/p5-Unix-Mknod/pkg-plist index 916d32bc8f0e..87c4c715d60b 100644 --- a/sysutils/p5-Unix-Mknod/pkg-plist +++ b/sysutils/p5-Unix-Mknod/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod/Mknod.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix diff --git a/sysutils/p5-Unix-Processors/pkg-plist b/sysutils/p5-Unix-Processors/pkg-plist index df2794d71476..76f757a4df8b 100644 --- a/sysutils/p5-Unix-Processors/pkg-plist +++ b/sysutils/p5-Unix-Processors/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors/Processors.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix diff --git a/sysutils/p5-Unix-Syslog/pkg-plist b/sysutils/p5-Unix-Syslog/pkg-plist index 161d9d310ad9..23fa21a5b549 100644 --- a/sysutils/p5-Unix-Syslog/pkg-plist +++ b/sysutils/p5-Unix-Syslog/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix diff --git a/sysutils/portmanager/pkg-plist b/sysutils/portmanager/pkg-plist index a59e63569925..dac7ae1fd888 100644 --- a/sysutils/portmanager/pkg-plist +++ b/sysutils/portmanager/pkg-plist @@ -24,5 +24,5 @@ lib/libMG.so lib/libMG.so.2 lib/libMGPM.so lib/libMGPM.so.1 -@unexec rmdir %D/etc/portmanager 2>/dev/null || true -@unexec rmdir %D/share/portmanager 2>/dev/null || true +@dirrmtry etc/portmanager +@dirrmtry share/portmanager diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist index 03dffce2b2fa..3892dddc2c3d 100644 --- a/sysutils/portupgrade-devel/pkg-plist +++ b/sysutils/portupgrade-devel/pkg-plist @@ -30,7 +30,7 @@ etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true -@unexec rmdir %D/share/zsh 2>/dev/null || true +@dirrmtry share/zsh %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist index 03dffce2b2fa..3892dddc2c3d 100644 --- a/sysutils/portupgrade/pkg-plist +++ b/sysutils/portupgrade/pkg-plist @@ -30,7 +30,7 @@ etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true -@unexec rmdir %D/share/zsh 2>/dev/null || true +@dirrmtry share/zsh %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample diff --git a/sysutils/psgconf/pkg-plist b/sysutils/psgconf/pkg-plist index 10d7dcb245b5..ffd4cc915290 100644 --- a/sysutils/psgconf/pkg-plist +++ b/sysutils/psgconf/pkg-plist @@ -158,18 +158,18 @@ share/psgconf/files/rc.shutdown %%SITE_PERL%%/PSGConf/DataStore/ConfigFile.pm %%SITE_PERL%%/PSGConf/Util.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGConf -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/PackageManager/FreeBSD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/PackageManager 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/GenerateFile 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/svcs 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Control/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Control/Library 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Control 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/DataStore 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf 2>/dev/null || true -@unexec rmdir %D/share/psgconf/config 2>/dev/null || true -@unexec rmdir %D/share/psgconf/files 2>/dev/null || true -@unexec rmdir %D/share/psgconf 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat +@dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/FreeBSD +@dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager +@dirrmtry %%SITE_PERL%%/PSGConf/Action/GenerateFile +@dirrmtry %%SITE_PERL%%/PSGConf/Action/svcs +@dirrmtry %%SITE_PERL%%/PSGConf/Action +@dirrmtry %%SITE_PERL%%/PSGConf/Control/Apache +@dirrmtry %%SITE_PERL%%/PSGConf/Control/Library +@dirrmtry %%SITE_PERL%%/PSGConf/Control +@dirrmtry %%SITE_PERL%%/PSGConf/Data +@dirrmtry %%SITE_PERL%%/PSGConf/DataStore +@dirrmtry %%SITE_PERL%%/PSGConf +@dirrmtry share/psgconf/config +@dirrmtry share/psgconf/files +@dirrmtry share/psgconf diff --git a/sysutils/pwg/pkg-plist b/sysutils/pwg/pkg-plist index 0dbdae976dca..b27ffe64c437 100644 --- a/sysutils/pwg/pkg-plist +++ b/sysutils/pwg/pkg-plist @@ -12,13 +12,13 @@ share/icons/locolor/16x16/apps/pwg.png share/icons/locolor/32x32/apps/pwg.png @dirrm share/apps/pwg/pics @dirrm share/apps/pwg -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/sysutils/radeontool/pkg-plist b/sysutils/radeontool/pkg-plist index 57f8a9fe81ce..9c4ac903b8ca 100644 --- a/sysutils/radeontool/pkg-plist +++ b/sysutils/radeontool/pkg-plist @@ -1 +1 @@ -bin/radeontool
\ No newline at end of file +bin/radeontool diff --git a/sysutils/rtty/pkg-plist b/sysutils/rtty/pkg-plist index 4a6dbb4fc634..9b30766703fd 100644 --- a/sysutils/rtty/pkg-plist +++ b/sysutils/rtty/pkg-plist @@ -12,11 +12,11 @@ rtty/bin/ttysrv @exec mkdir -p %D/rtty/out @exec mkdir -p %D/rtty/pid @exec mkdir -p %D/rtty/sock -@unexec rmdir %D/rtty/sock 2>/dev/null || true -@unexec rmdir %D/rtty/pid 2>/dev/null || true -@unexec rmdir %D/rtty/out 2>/dev/null || true -@unexec rmdir %D/rtty/opt 2>/dev/null || true -@unexec rmdir %D/rtty/log 2>/dev/null || true -@unexec rmdir %D/rtty/dev 2>/dev/null || true +@dirrmtry rtty/sock +@dirrmtry rtty/pid +@dirrmtry rtty/out +@dirrmtry rtty/opt +@dirrmtry rtty/log +@dirrmtry rtty/dev @dirrm rtty/bin @dirrm rtty diff --git a/sysutils/serpentine/pkg-plist b/sysutils/serpentine/pkg-plist index 7c6b4d70b780..1a7d46465988 100644 --- a/sysutils/serpentine/pkg-plist +++ b/sysutils/serpentine/pkg-plist @@ -81,9 +81,9 @@ bin/serpentine share/applications/serpentine.desktop %%DATADIR%%/serpentine.glade @dirrm %%DATADIR%% -@unexec rmdir %D/share/applications 2> /dev/null || true +@dirrmtry share/applications @dirrm %%PYTHON_SITELIBDIR%%/serpentine/plugins @dirrm %%PYTHON_SITELIBDIR%%/serpentine %%MUINE%%@unexec rmdir %D/lib/muine/plugins 2> /dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index 02ed2d8a7879..92fa9e5ef655 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -97,7 +97,7 @@ share/setup-tool-backends/scripts/xml.pl @dirrm share/setup-tool-backends/scripts @dirrm share/setup-tool-backends/files @dirrm share/setup-tool-backends -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw diff --git a/sysutils/uptimed/pkg-plist b/sysutils/uptimed/pkg-plist index 6d1d68831c1e..8eb01412d8c2 100644 --- a/sysutils/uptimed/pkg-plist +++ b/sysutils/uptimed/pkg-plist @@ -9,4 +9,4 @@ www/cgi-bin/uprecords.cgi www/cgi-bin/uprecords.conf www/cgi-bin/uprecords.footer www/cgi-bin/uprecords.header -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin diff --git a/sysutils/virtualmin/pkg-plist b/sysutils/virtualmin/pkg-plist index 9a94502f60d9..52233d117923 100644 --- a/sysutils/virtualmin/pkg-plist +++ b/sysutils/virtualmin/pkg-plist @@ -218,5 +218,5 @@ lib/webmin/virtual-server/warnbw-template @dirrm lib/webmin/virtual-server/help @dirrm lib/webmin/virtual-server @exec [ -e %D/etc/webmin/virtual-server ] || mkdir %D/etc/webmin/virtual-server -@unexec rmdir %D/etc/webmin/virtual-server 2>/dev/null || true -@unexec rmdir %D/etc/webmin 2>/dev/null || true +@dirrmtry etc/webmin/virtual-server +@dirrmtry etc/webmin diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist index 3315792f42fb..065a38bb619d 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -1,4 +1,4 @@ @comment Insert PLIST.lib-webmin here @comment -=[ begin PLIST.lib-webmin ]=- @comment -=[ end PLIST.lib-webmin ]=- -@unexec rmdir %D/lib/webmin 2>/dev/null || true +@dirrmtry lib/webmin diff --git a/sysutils/xfce4-battery-plugin/pkg-plist b/sysutils/xfce4-battery-plugin/pkg-plist index d9f565c24181..83a053c2a982 100644 --- a/sysutils/xfce4-battery-plugin/pkg-plist +++ b/sysutils/xfce4-battery-plugin/pkg-plist @@ -1,3 +1,3 @@ lib/xfce4/panel-plugins/libbattmon.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 diff --git a/sysutils/xfce4-cpugraph-plugin/pkg-plist b/sysutils/xfce4-cpugraph-plugin/pkg-plist index 8040bee1e23e..29101aaeca09 100644 --- a/sysutils/xfce4-cpugraph-plugin/pkg-plist +++ b/sysutils/xfce4-cpugraph-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libcpugraph.so lib/xfce4/panel-plugins/libcpugraph.la lib/xfce4/panel-plugins/libcpugraph.a -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist index 197be7ddfc55..f2d4c6d0a6b7 100644 --- a/sysutils/xfce4-fsguard-plugin/pkg-plist +++ b/sysutils/xfce4-fsguard-plugin/pkg-plist @@ -2,4 +2,4 @@ lib/xfce4/panel-plugins/libfsguard.so lib/xfce4/panel-plugins/libfsguard.la lib/xfce4/panel-plugins/libfsguard.a -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist index 25673a9b2fde..2a1e9bc6df49 100644 --- a/sysutils/xfce4-genmon-plugin/pkg-plist +++ b/sysutils/xfce4-genmon-plugin/pkg-plist @@ -1,2 +1,2 @@ lib/xfce4/panel-plugins/libgenmon.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist index 8c90028ae4c1..cd1e82880aa6 100644 --- a/sysutils/xfce4-mcs-manager/pkg-plist +++ b/sysutils/xfce4-mcs-manager/pkg-plist @@ -66,20 +66,20 @@ share/xfce4/doc/he/images/smgr_from_root_menu.png share/xfce4/doc/he/images/smgr_from_setup_button.png share/xfce4/doc/he/xfce-mcs-manager.html @dirrm include/xfce4/xfce-mcs-manager -@unexec rmdir %D/include/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry include/xfce4 +@dirrmtry share/applications +@dirrmtry share/icons/hicolor +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist index ada2a194b4e8..f1786b3bd9c5 100644 --- a/sysutils/xfce4-mcs-plugins/pkg-plist +++ b/sysutils/xfce4-mcs-plugins/pkg-plist @@ -81,17 +81,17 @@ share/xfce4/doc/he/images/keyboard_settings.png share/xfce4/doc/he/images/mouse_settings.png share/xfce4/doc/he/images/user_interface_settings.png share/xfce4/doc/he/xfce-mcs-plugins.html -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist index 6999985c500e..a8ecf2867b71 100644 --- a/sysutils/xfce4-netload-plugin/pkg-plist +++ b/sysutils/xfce4-netload-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libnetload.a lib/xfce4/panel-plugins/libnetload.la lib/xfce4/panel-plugins/libnetload.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-showdesktop-plugin/pkg-plist b/sysutils/xfce4-showdesktop-plugin/pkg-plist index 93c4b49fbe14..7d7e239bc815 100644 --- a/sysutils/xfce4-showdesktop-plugin/pkg-plist +++ b/sysutils/xfce4-showdesktop-plugin/pkg-plist @@ -1,3 +1,3 @@ lib/xfce4/panel-plugins/libshowdesktop.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 diff --git a/sysutils/xfce4-systemload-plugin/pkg-plist b/sysutils/xfce4-systemload-plugin/pkg-plist index 0a208fc70653..bb54a79ca642 100644 --- a/sysutils/xfce4-systemload-plugin/pkg-plist +++ b/sysutils/xfce4-systemload-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libsystemload.a lib/xfce4/panel-plugins/libsystemload.la lib/xfce4/panel-plugins/libsystemload.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist index 3e06d532150e..1fefd82c7642 100644 --- a/sysutils/xfce4-utils/pkg-plist +++ b/sysutils/xfce4-utils/pkg-plist @@ -177,21 +177,21 @@ share/xfce4/doc/he/xfce-utils.html share/xfce4/doc/xfce.css share/xfce4/doc/xfce-mouse.png share/xfce4/doc/xfce-rtl.css -@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true -@unexec rmdir %D/etc/xdg 2>/dev/null || true -@unexec rmdir %D/etc/xfce4 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry etc/xdg/xfce4 +@dirrmtry etc/xdg +@dirrmtry etc/xfce4 +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/applications +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/sysutils/xfce4-wavelan-plugin/pkg-plist b/sysutils/xfce4-wavelan-plugin/pkg-plist index fcca7e5e925f..9ac1c58e71a7 100644 --- a/sysutils/xfce4-wavelan-plugin/pkg-plist +++ b/sysutils/xfce4-wavelan-plugin/pkg-plist @@ -1,2 +1,2 @@ lib/xfce4/panel-plugins/libwavelan.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins |