From 5385338d26caf56f350889c6962df21366017bd8 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 2 Mar 2006 18:56:02 +0000 Subject: Use dirrmtry instead of the unexec rmdir... git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5828 df743ca5-7f9a-e211-a948-0013205c9059 --- audio/gstreamer-monkeysaudio/pkg-plist | 2 +- devel/ORBit2/pkg-plist | 6 ++--- devel/libbonobo/pkg-plist | 12 +++++----- graphics/poppler-gtk/pkg-plist | 4 ++-- multimedia/gnonlin/pkg-plist | 6 ++--- multimedia/gstreamer-editor/pkg-plist | 8 +++---- multimedia/gstreamer-plugins80/pkg-plist | 4 ++-- multimedia/gstreamer80/pkg-plist | 2 +- x11-fm/nautilus/pkg-plist | 4 ++-- x11-fm/nautilus2/pkg-plist | 4 ++-- x11-themes/gnome-backgrounds/pkg-plist | 2 +- x11-themes/gnome-themes/pkg-plist | 2 +- x11/gdm/pkg-plist | 10 ++++---- x11/gnome-panel/pkg-plist | 40 ++++++++++++++++---------------- x11/gnomepanel/pkg-plist | 40 ++++++++++++++++---------------- 15 files changed, 73 insertions(+), 73 deletions(-) diff --git a/audio/gstreamer-monkeysaudio/pkg-plist b/audio/gstreamer-monkeysaudio/pkg-plist index ca496033f..ff4e18f86 100644 --- a/audio/gstreamer-monkeysaudio/pkg-plist +++ b/audio/gstreamer-monkeysaudio/pkg-plist @@ -3,5 +3,5 @@ lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.la lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.so %%PORTDOCS%%%%DOCSDIR%%/GStreamer-monkeysaudio-permit @exec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true -%%PORTDOCS%%@unexec /bin/rmdir %D/%%DOCSDIR%% 2>/dev/null || true +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% @unexec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index ebfd16dc6..3a3bcb57e 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -81,10 +81,10 @@ share/aclocal/ORBit2.m4 share/idl/orbit-2.0/CosNaming.idl @dirrm share/idl/orbit-2.0 @exec /bin/mkdir -p %D/lib/orbit-2.0/idl-backends -@unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true +@dirrmtry share/idl @dirrm %%DOCSDIR%% -@unexec /bin/rmdir %D/lib/orbit-2.0/idl-backends 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/orbit-2.0 2>/dev/null || /usr/bin/true +@dirrmtry lib/orbit-2.0/idl-backends +@dirrmtry lib/orbit-2.0 @dirrm include/orbit-2.0/orbit/util @dirrm include/orbit-2.0/orbit/poa @dirrm include/orbit-2.0/orbit/orb-core diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index bf6bbf7a1..5eb2837f7 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -267,9 +267,9 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo @dirrm include/bonobo-activation-2.0/bonobo-activation @dirrm include/bonobo-activation-2.0 @dirrm etc/bonobo-activation -@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/li/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/li 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/ku/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/ku 2>/dev/null || /usr/bin/true +@dirrmtry lib/bonobo/monikers +@dirrmtry lib/bonobo +@dirrmtry share/locale/li/LC_MESSAGES +@dirrmtry share/locale/li +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist index 6a907291a..9f0f2f0a7 100644 --- a/graphics/poppler-gtk/pkg-plist +++ b/graphics/poppler-gtk/pkg-plist @@ -22,6 +22,6 @@ libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/right.png %%DOCSDIR%%/poppler/style.css %%DOCSDIR%%/poppler/up.png -@unexec rmdir %D/%%DOCSDIR%%/poppler 2>/dev/null || true -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || tru +@dirrmtry %%DOCSDIR%%/poppler +@dirrmtry %%DOCSDIR%% @dirrm include/poppler/glib diff --git a/multimedia/gnonlin/pkg-plist b/multimedia/gnonlin/pkg-plist index c5f6a639a..10841c907 100644 --- a/multimedia/gnonlin/pkg-plist +++ b/multimedia/gnonlin/pkg-plist @@ -14,6 +14,6 @@ lib/gstreamer-0.8/libgnl.so lib/gstreamer-0.8/libgnl.so.0 libdata/pkgconfig/gnonlin.pc @dirrm include/gnl -@unexec /bin/rmdir %D/share/gtk-doc/html/gnonlin 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/gtk-doc/html 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/gtk-doc 2>/dev/null || /usr/bin/true +@dirrmtry share/gtk-doc/html/gnonlin +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc diff --git a/multimedia/gstreamer-editor/pkg-plist b/multimedia/gstreamer-editor/pkg-plist index 098f63929..96702f51c 100644 --- a/multimedia/gstreamer-editor/pkg-plist +++ b/multimedia/gstreamer-editor/pkg-plist @@ -43,16 +43,16 @@ share/gnome/omf/gst-editor/gst-editor-manual-C.omf share/gnome/pixmaps/gst-editor.png share/gnome/pixmaps/gst-inspect.png share/gnome/pixmaps/gst-launch.png -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true +@dirrmtry share/gnome/pixmaps @dirrm share/gnome/omf/gst-editor -@unexec rmdir %D/share/gnome/omf 2>/dev/null || true +@dirrmtry share/gnome/omf @dirrm share/gnome/gst-editor/gnome/help/gst-editor/C @dirrm share/gnome/gst-editor/gnome/help/gst-editor @dirrm share/gnome/gst-editor/gnome/help @dirrm share/gnome/gst-editor/gnome @dirrm share/gnome/gst-editor -@unexec rmdir %D/share/gnome/applications 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +@dirrmtry share/gnome/applications +@dirrmtry share/gnome @dirrm include/gst-editor-%%VERSION%%/gst/element-ui @dirrm include/gst-editor-%%VERSION%%/gst/element-browser @dirrm include/gst-editor-%%VERSION%%/gst/editor diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index 1f0030180..b027df94c 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -391,7 +391,7 @@ share/locale/zh_TW/LC_MESSAGES/gst-plugins-%%VERSION%%.mo @dirrm include/gstreamer-%%VERSION%%/gst/floatcast @dirrm include/gstreamer-%%VERSION%%/gst/colorbalance @dirrm include/gstreamer-%%VERSION%%/gst/audio -@unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true -@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true +@dirrmtry include/gstreamer-%%VERSION%%/gst +@dirrmtry include/gstreamer-%%VERSION%% @exec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true @unexec %D/bin/gst-register-${VERSION} --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist index 8835a360d..638edaeef 100644 --- a/multimedia/gstreamer80/pkg-plist +++ b/multimedia/gstreamer80/pkg-plist @@ -144,7 +144,7 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo @unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true @dirrm share/gnome/cache/gstreamer-%%VERSION%% -@unexec rmdir %D/share/gnome/cache 2>/dev/null || true +@dirrmtry share/gnome/cache @dirrm lib/gstreamer-%%VERSION%% @dirrm include/gstreamer-%%VERSION%%/gst/getbits @dirrm include/gstreamer-%%VERSION%%/gst/dataprotocol diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 385f6a921..d4cfcdc8c 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -172,8 +172,8 @@ share/mime/packages/nautilus.xml @dirrm include/nautilus/libnautilus-extension @dirrm include/nautilus @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0 -@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true +@dirrmtry lib/nautilus/extensions-1.0 +@dirrmtry lib/nautilus @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 385f6a921..d4cfcdc8c 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -172,8 +172,8 @@ share/mime/packages/nautilus.xml @dirrm include/nautilus/libnautilus-extension @dirrm include/nautilus @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0 -@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true +@dirrmtry lib/nautilus/extensions-1.0 +@dirrmtry lib/nautilus @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index 829fee3c9..44c91ce24 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -83,4 +83,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo @dirrm share/gnome/pixmaps/backgrounds/gnome/branded @dirrm share/gnome/pixmaps/backgrounds/gnome @dirrm share/gnome/pixmaps/backgrounds -@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true +@dirrmtry share/gnome/gnome-background-properties diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 2c6347af9..0dff54a23 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -2036,4 +2036,4 @@ share/themes/Traditional/index.theme @dirrm share/gnome/themes/Glider @dirrm share/gnome/themes/Clearlooks/metacity-1 @dirrm share/gnome/themes/Clearlooks -@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true +@dirrmtry share/icons diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index e8299c65b..c31f53ff7 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -270,10 +270,10 @@ share/locale/zu/LC_MESSAGES/gdm.mo @dirrm etc/gdm/PostLogin @dirrm etc/gdm/Init @dirrm etc/gdm -@unexec /bin/rmdir %D/etc/dm/Sessions 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/etc/dm 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/gnome/log/gdm 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/gnome/log 2>/dev/null || /usr/bin/true +@dirrmtry etc/dm/Sessions +@dirrmtry etc/dm +@dirrmtry sbin +@dirrmtry share/gnome/log/gdm +@dirrmtry share/gnome/log @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true @unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index d0f849143..609b9a6b7 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -368,26 +368,26 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo -@unexec /bin/rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/zu 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/yi 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/sr@ije 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/nso 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mr 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mi 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/ky/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/ky 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@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/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade @dirrm share/gnome/omf/workspace-switcher diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index d0f849143..609b9a6b7 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -368,26 +368,26 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo -@unexec /bin/rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/zu 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/yi 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/sr@ije 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/nso 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mr 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/mi 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/ky/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/ky 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@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/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade @dirrm share/gnome/omf/workspace-switcher -- cgit v1.2.3