From 42a31c5f948e5f8384006f498aca47fe81ff3930 Mon Sep 17 00:00:00 2001
From: Martti Kuparinen <martti@NetBSD.org>
Date: Mon, 6 Nov 2006 12:19:41 +0000
Subject: [PATCH] More directory cleanups.

---
 xfce4-desktop/PLIST     | 3 ++-
 xfce4-exo/PLIST         | 9 ++++++++-
 xfce4-mcs-plugins/PLIST | 3 ++-
 xfce4-orage/PLIST       | 4 ++--
 xfce4-wm-themes/PLIST   | 4 ++--
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/xfce4-desktop/PLIST b/xfce4-desktop/PLIST
index 1b8318ab5b..af56bfbbad 100644
--- a/xfce4-desktop/PLIST
+++ b/xfce4-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/11/06 11:00:25 marttikuparinen Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/11/06 12:19:41 marttikuparinen Exp $
 bin/xfce4-menueditor
 bin/xfce4-popup-menu
 bin/xfdesktop
@@ -153,5 +153,6 @@ share/xfce4/panel-plugins/xfce4-menu.desktop
 @dirrm share/pixmaps/xfce4/xfdesktop
 @dirrm share/examples/xfce4/desktop
 @unexec ${RMDIR} %D/share/xfce4/backdrops 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/pixmaps/xfce4 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/xfce4/modules 2>/dev/null || ${TRUE}
diff --git a/xfce4-exo/PLIST b/xfce4-exo/PLIST
index 0cccbd1b22..116dd7a4cf 100644
--- a/xfce4-exo/PLIST
+++ b/xfce4-exo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/11/06 12:06:00 marttikuparinen Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/11/06 12:19:41 marttikuparinen Exp $
 bin/exo-csource
 bin/exo-desktop-item-edit
 bin/exo-open
@@ -112,5 +112,12 @@ share/xfce4/helpers/urxvt.desktop
 share/xfce4/helpers/w3m.desktop
 share/xfce4/helpers/xterm.desktop
 @dirrm share/xfce4/helpers
+@dirrm share/xfce4/doc/fr/images
+@dirrm share/xfce4/doc/fr
+@dirrm share/xfce4/doc/ja/images
+@dirrm share/xfce4/doc/ja
+@dirrm share/xfce4/doc/C/images
+@dirrm share/xfce4/doc/C
 @dirrm include/exo-0.3/exo
 @dirrm include/exo-0.3
+@unexec ${RMDIR} %D/share/xfce4/doc 2>/dev/null || ${TRUE}
diff --git a/xfce4-mcs-plugins/PLIST b/xfce4-mcs-plugins/PLIST
index 8cdcdf28d6..5e9605bb87 100644
--- a/xfce4-mcs-plugins/PLIST
+++ b/xfce4-mcs-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/11/06 11:00:26 marttikuparinen Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/11/06 12:19:41 marttikuparinen Exp $
 lib/xfce4/mcs-plugins/display_plugin.la
 lib/xfce4/mcs-plugins/fm_plugin.la
 lib/xfce4/mcs-plugins/keyboard_plugin.la
@@ -87,3 +87,4 @@ share/xfce4/doc/it/xfce-mcs-plugins.html
 @dirrm lib/xfce4/mcs-plugins
 @dirrm share/xfce-mcs-plugins/shortcuts
 @dirrm share/xfce-mcs-plugins
+@unexec ${RMDIR} %D/lib/xfce4 2>/dev/null || ${TRUE}
diff --git a/xfce4-orage/PLIST b/xfce4-orage/PLIST
index 3feabca34f..04c9ae971d 100644
--- a/xfce4-orage/PLIST
+++ b/xfce4-orage/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/11/06 11:00:26 marttikuparinen Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/11/06 12:19:41 marttikuparinen Exp $
 bin/orage
 lib/xfce4/mcs-plugins/orage_plugin.la
 libexec/xfce4/panel-plugins/orageclock
@@ -452,7 +452,6 @@ share/orage/zoneinfo/Pacific/Wallis.ics
 share/orage/zoneinfo/Pacific/Yap.ics
 share/orage/zoneinfo/zones.tab
 share/xfce4/panel-plugins/orageclock.desktop
-@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
 @dirrm share/orage/zoneinfo/Pacific
 @dirrm share/orage/zoneinfo/Indian
 @dirrm share/orage/zoneinfo/Europe
@@ -471,3 +470,4 @@ share/xfce4/panel-plugins/orageclock.desktop
 @dirrm share/orage/doc/C
 @dirrm share/orage/doc
 @dirrm share/orage
+@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
diff --git a/xfce4-wm-themes/PLIST b/xfce4-wm-themes/PLIST
index e6c1d09902..3be0babbb4 100644
--- a/xfce4-wm-themes/PLIST
+++ b/xfce4-wm-themes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/07/17 13:21:17 marttikuparinen Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/11/06 12:19:41 marttikuparinen Exp $
 share/themes/Adept/xfwm4/README
 share/themes/Adept/xfwm4/bottom-active.xpm
 share/themes/Adept/xfwm4/bottom-inactive.xpm
@@ -3979,7 +3979,6 @@ share/themes/Xfce/xfwm4/top-left-inactive.xpm
 share/themes/Xfce/xfwm4/top-right-active.xpm
 share/themes/Xfce/xfwm4/top-right-inactive.xpm
 @dirrm share/themes/Xfce/xfwm4
-@unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE}
 @dirrm share/themes/Wildbush/xfwm4
 @dirrm share/themes/Wildbush
 @dirrm share/themes/Waza/xfwm4
@@ -4144,3 +4143,4 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
 @dirrm share/themes/Agua
 @dirrm share/themes/Adept/xfwm4
 @dirrm share/themes/Adept
+@unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE}