Clean up the plists some.

* "Share" directories such as share/gnome, share/gnome/pixmaps, and etc/sound
  between both GNOME 1.4 and GNOME 2.0.

* Remove some @dirrm's from gtm that were already in dependency ports.

5 files changed, 9 insertions, 11 deletions

diff --git a/ftp/gtm/pkg-plist b/ftp/gtm/pkg-plist
index 59b36144be1e..85c6f89fd43a 100644
--- a/ftp/gtm/pkg-plist
+++ b/ftp/gtm/pkg-plist
@@ -70,5 +70,3 @@ share/locale/zh_TW/LC_MESSAGES/gtm.mo
 @dirrm share/gnome/help/gtm/C/images
 @dirrm share/gnome/help/gtm/C
 @dirrm share/gnome/help/gtm
-@dirrm etc/sound/events
-@dirrm etc/CORBA/servers
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 362d0a376072..168bb009cbfc 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -152,7 +152,7 @@ share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
-@dirrm share/gnome/pixmaps
 @dirrm share/doc/libgnomeui
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
+@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index b051270f5085..07e9c0f4db07 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -540,7 +540,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @exec mkdir -p %D/share/gnome/games
 @dirrm share/gnome/type-convert
-@dirrm share/gnome/pixmaps
 @dirrm share/gnome/mime-info
 @dirrm share/gnome/idl
 @dirrm share/gnome/html/zvt
@@ -563,5 +562,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gnome-1.0/libart_lgpl
 @dirrm include/gnome-1.0/gtk-xmhtml
 @dirrm include/gnome-1.0
-@dirrm etc/sound/events
-@dirrm etc/sound
+@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/etc/sound/events 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/etc/sound 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index b051270f5085..07e9c0f4db07 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -540,7 +540,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @exec mkdir -p %D/share/gnome/games
 @dirrm share/gnome/type-convert
-@dirrm share/gnome/pixmaps
 @dirrm share/gnome/mime-info
 @dirrm share/gnome/idl
 @dirrm share/gnome/html/zvt
@@ -563,5 +562,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gnome-1.0/libart_lgpl
 @dirrm include/gnome-1.0/gtk-xmhtml
 @dirrm include/gnome-1.0
-@dirrm etc/sound/events
-@dirrm etc/sound
+@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/etc/sound/events 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/etc/sound 2>/dev/null || /usr/bin/true
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index e1676446683f..9ce4366dfcaf 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -142,8 +142,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
-@dirrm etc/sound/events
-@dirrm etc/sound
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
@@ -192,3 +190,5 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
 @dirrm etc/gconf/gconf.xml.defaults/desktop
+@unexec /bin/rmdir %D/etc/sound/events 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/etc/sound 2>/dev/null || /usr/bin/true