44 files changed, 95 insertions, 90 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 6d93e7274664..fef292e9dd59 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomemedia2
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.6
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index e824ff31c257..4b4de1a7d70a 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -497,6 +497,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/None
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/omf/gnome-media
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 6d93e7274664..fef292e9dd59 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomemedia2
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/2.6
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index e824ff31c257..4b4de1a7d70a 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -497,6 +497,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
 @dirrm share/gnome/pixmaps/gnome-cd/themes/None
 @dirrm share/gnome/pixmaps/gnome-cd/themes
 @dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/omf/gnome-media
 @dirrm share/gnome/help/gstreamer-properties/C/figures
 @dirrm share/gnome/help/gstreamer-properties/C
 @dirrm share/gnome/help/gstreamer-properties
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 8a2fa236b64d..d91ca1e212f4 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeutils2
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 1c3576516b47..c687a6206f15 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -191,6 +191,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
+@dirrm share/gnome/omf/gnome-utils
 @dirrm share/gnome/help/gnome-system-log/zh_TW/figures
 @dirrm share/gnome/help/gnome-system-log/zh_TW
 @dirrm share/gnome/help/gnome-system-log/zh_CN/figures
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 8a2fa236b64d..d91ca1e212f4 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeutils2
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 1c3576516b47..c687a6206f15 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -191,6 +191,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
+@dirrm share/gnome/omf/gnome-utils
 @dirrm share/gnome/help/gnome-system-log/zh_TW/figures
 @dirrm share/gnome/help/gnome-system-log/zh_TW
 @dirrm share/gnome/help/gnome-system-log/zh_CN/figures
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 0a1f5b7a0289..4ac90354b518 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gedit2
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index b9b1efaac07a..0ec5bc0a3db5 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -240,6 +240,8 @@ share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
 @dirrm share/gnome/help/gedit/de/figures
 @dirrm share/gnome/help/gedit/de
 @dirrm share/gnome/help/gedit/C/figures
+@dirrm share/gnome/help/gedit/C
+@dirrm share/gnome/help/gedit
 @dirrm share/gnome/gedit-2/ui
 @dirrm share/gnome/gedit-2/taglist
 @dirrm share/gnome/gedit-2/glade
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 96197380c4ff..78ed7dc5f2cf 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.6
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index a6e3f7e7787f..1fad5c7fc5e3 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -725,6 +725,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/same-gnome
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
+@dirrm share/gnome/pixmaps/gnotravex
 @dirrm share/gnome/pixmaps/gnomine
 @dirrm share/gnome/pixmaps/gnometris/bg
 @dirrm share/gnome/pixmaps/gnometris
@@ -743,6 +744,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
 @dirrm share/gnome/pixmaps/blackjack
+@dirrm share/gnome/omf/gnome-games
 @dirrm share/gnome/help/same-gnome/C/figures
 @dirrm share/gnome/help/same-gnome/C
 @dirrm share/gnome/help/same-gnome
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 96197380c4ff..78ed7dc5f2cf 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomegames2
 PORTVERSION=	2.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.6
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index a6e3f7e7787f..1fad5c7fc5e3 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -725,6 +725,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/same-gnome
 @dirrm share/gnome/pixmaps/mahjongg
 @dirrm share/gnome/pixmaps/iagno
+@dirrm share/gnome/pixmaps/gnotravex
 @dirrm share/gnome/pixmaps/gnomine
 @dirrm share/gnome/pixmaps/gnometris/bg
 @dirrm share/gnome/pixmaps/gnometris
@@ -743,6 +744,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm share/gnome/pixmaps/cards/backs
 @dirrm share/gnome/pixmaps/cards
 @dirrm share/gnome/pixmaps/blackjack
+@dirrm share/gnome/omf/gnome-games
 @dirrm share/gnome/help/same-gnome/C/figures
 @dirrm share/gnome/help/same-gnome/C
 @dirrm share/gnome/help/same-gnome
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index ca502beffbad..471b5798d3c9 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	eog2
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index ad367ab44cba..8a782ad3b7b6 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -141,6 +141,7 @@ share/locale/vi/LC_MESSAGES/eog.mo
 share/locale/wa/LC_MESSAGES/eog.mo
 share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
+@dirrm share/gnome/pixmaps/eog
 @dirrm share/gnome/omf/eog
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 19e1e93f4419..e4488b638742 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomehier
 PORTVERSION=	1.0
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	misc gnome
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
index 3a3e15cb9c6f..aa3aa4a19fa2 100644
--- a/misc/gnomehier/files/dirlist
+++ b/misc/gnomehier/files/dirlist
@@ -7,27 +7,14 @@ etc/X11/sysconfig
 etc/gconf
 etc/gconf/gconf.xml.defaults
 etc/gconf/gconf.xml.defaults/apps
-etc/gconf/gconf.xml.defaults/apps/eog
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen
-etc/gconf/gconf.xml.defaults/apps/eog/view
-etc/gconf/gconf.xml.defaults/apps/eog/window
 etc/gconf/gconf.xml.defaults/desktop
 etc/gconf/gconf.xml.defaults/desktop/gnome
 etc/gconf/gconf.xml.defaults/schemas
 etc/gconf/gconf.xml.defaults/schemas/apps
-etc/gconf/gconf.xml.defaults/schemas/apps/eog
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
 etc/gconf/gconf.xml.defaults/schemas/desktop
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
 etc/gconf/gconf.xml.mandatory
 etc/gconf/schemas
-etc/gdm
-etc/gdm/Init
-etc/gdm/PostSession
-etc/gdm/PreSession
-etc/gdm/Sessions
 etc/gnome
 etc/gnome/config
 etc/gnome-vfs-2.0
@@ -39,13 +26,10 @@ etc/vfs/modules
 include/gconf
 include/gdkcardimage
 include/gnome-1.0
-include/libnautilus
 lib/GConf
 lib/bonobo
 lib/bonobo/monikers
 lib/bonobo/plugin
-lib/gnome-pilot
-lib/gnome-pilot/conduits
 lib/gnome-vfs-2.0
 lib/gnome-vfs-2.0/modules
 lib/gtk-2.0
@@ -55,7 +39,6 @@ lib/vfs
 lib/vfs/modules
 libdata/bonobo
 libdata/bonobo/servers
-libexec/sawfish
 share/doc/libgda
 share/gnome
 share/gnome/applets
@@ -82,10 +65,6 @@ share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/Session
 share/gnome/apps/System
 share/gnome/apps/Utilities
-share/gnome/bug-buddy
-share/gnome/bug-buddy/bugzilla
-share/gnome/bug-buddy/bugzilla/gnome
-share/gnome/bug-buddy/bugzilla/ximian
 share/gnome/capplets
 share/gnome/control-center
 share/gnome/control-center-2.0
@@ -97,33 +76,12 @@ share/gnome/control-center/Session
 share/gnome/control-center/capplets
 share/gnome/fonts
 share/gnome/games
-share/gnome/gdm
-share/gnome/geyes
-share/gnome/geyes/Bizarre
-share/gnome/geyes/Bloodshot
-share/gnome/geyes/Default
-share/gnome/geyes/Default-tiny
-share/gnome/geyes/Horrid
-share/gnome/gkb
 share/gnome/gnome-2.0
 share/gnome/gnome-2.0/ui
 share/gnome/gnome-about
-share/gnome/gnome-pilot
-share/gnome/gnome-pilot/conduits
-share/gnome/gnome-terminal
-share/gnome/gnome-terminal/glade
-share/gnome/gweather
 share/gnome/help
-share/gnome/help/bug-buddy
-share/gnome/help/bug-buddy/C
-share/gnome/help/eog
-share/gnome/help/eog/C
 share/gnome/help/fdl
 share/gnome/help/fdl/C
-share/gnome/help/gedit
-share/gnome/help/gedit/C
-share/gnome/help/gnome-terminal
-share/gnome/help/gnome-terminal/C
 share/gnome/help/gpl
 share/gnome/help/gpl/C
 share/gnome/help/lgpl
@@ -134,43 +92,11 @@ share/gnome/images
 share/gnome/mc
 share/gnome/mc/templates
 share/gnome/mime-info
-share/gnome/nautilus
-share/gnome/nautilus/emblems
-share/gnome/nautilus/patterns
-share/gnome/nautilus/services
-share/gnome/nautilus/services/text
 share/gnome/oaf
 share/gnome/omf
-share/gnome/omf/gnome-applets
-share/gnome/omf/gnome-games
-share/gnome/omf/gnome-media
-share/gnome/omf/gnome-utils
 share/gnome/panel
 share/gnome/pixmaps
 share/gnome/pixmaps/document-icons
-share/gnome/pixmaps/eog
-share/gnome/pixmaps/fish
-share/gnome/pixmaps/gkb
-share/gnome/pixmaps/gnotravex
-share/gnome/pixmaps/gweather
-share/gnome/pixmaps/mailcheck
-share/gnome/pixmaps/mini-commander
-share/gnome/pixmaps/nautilus
-share/gnome/pixmaps/nautilus/crux_eggplant
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
-share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber
-share/gnome/pixmaps/nautilus/crux_teal
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds
-share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/crux_teal/throbber
-share/gnome/pixmaps/nautilus/gnome
-share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/gnome/throbber
-share/gnome/pixmaps/nautilus/sidebar_tab_pieces
-share/gnome/pixmaps/nautilus/sierra
-share/gnome/pixmaps/nautilus/tahoe
-share/gnome/pixmaps/nautilus/throbber
 share/gnome/pixmaps/splash
 share/gnome/sgml
 share/gnome/sgml/docbook
@@ -181,6 +107,3 @@ share/gnome/ui
 share/gnome/vfolders
 share/gnome/wm-properties
 share/gnome/xmodmap
-share/sawfish
-share/sawfish/sounds
-share/sawfish/themes
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index c8b1201dcae7..86c055dad29f 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot-conduits2
 PORTVERSION=	2.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
diff --git a/palm/gnome-pilot-conduits/pkg-plist b/palm/gnome-pilot-conduits/pkg-plist
index f2aab9dd5ccc..3794c796d941 100644
--- a/palm/gnome-pilot-conduits/pkg-plist
+++ b/palm/gnome-pilot-conduits/pkg-plist
@@ -39,3 +39,5 @@ share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/vi/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
+@dirrm share/gnome/gnome-pilot/conduits
+@dirrm lib/gnome-pilot/conduits
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 67ff100be790..824ed8bbfa37 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot2
 PORTVERSION=	2.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 9076d6b9de68..febaf67ebb6e 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -86,6 +86,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/help/gnome-pilot/C
 @dirrm share/gnome/help/gnome-pilot
 @dirrm share/gnome/gnome-pilot/glade
+@dirrm share/gnome/gnome-pilot
+@dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-pilot/gnome-pilot-C.omf 2>/dev/null || /usr/bin/true
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index c8b1201dcae7..86c055dad29f 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot-conduits2
 PORTVERSION=	2.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot-conduits/2.0
diff --git a/palm/gnomepilot-conduits2/pkg-plist b/palm/gnomepilot-conduits2/pkg-plist
index f2aab9dd5ccc..3794c796d941 100644
--- a/palm/gnomepilot-conduits2/pkg-plist
+++ b/palm/gnomepilot-conduits2/pkg-plist
@@ -39,3 +39,5 @@ share/locale/uk/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/vi/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/wa/LC_MESSAGES/gnome-pilot-conduits.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pilot-conduits.mo
+@dirrm share/gnome/gnome-pilot/conduits
+@dirrm lib/gnome-pilot/conduits
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 67ff100be790..824ed8bbfa37 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomepilot2
 PORTVERSION=	2.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-pilot/2.0
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index 9076d6b9de68..febaf67ebb6e 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -86,6 +86,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/help/gnome-pilot/C
 @dirrm share/gnome/help/gnome-pilot
 @dirrm share/gnome/gnome-pilot/glade
+@dirrm share/gnome/gnome-pilot
+@dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
 @dirrm include/gpilotd
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-pilot/gnome-pilot-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index a3a6e393044a..f5d7fa48239f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nautilus2
 PORTVERSION=	2.6.3
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index b690ad973257..0cf60a1b7466 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -213,10 +213,32 @@ share/locale/wa/LC_MESSAGES/nautilus.mo
 share/locale/yi/LC_MESSAGES/nautilus.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus.mo
+@dirrm share/gnome/pixmaps/nautilus/throbber
+@dirrm share/gnome/pixmaps/nautilus/tahoe
+@dirrm share/gnome/pixmaps/nautilus/sierra
+@dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
+@dirrm share/gnome/pixmaps/nautilus/gnome/throbber
+@dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
+@dirrm share/gnome/pixmaps/nautilus/gnome
 @dirrm share/gnome/pixmaps/nautilus/default
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
+@dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds
+@dirrm share/gnome/pixmaps/nautilus/crux_teal
+@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber
+@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
+@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
+@dirrm share/gnome/pixmaps/nautilus/crux_eggplant
+@dirrm share/gnome/pixmaps/nautilus
+@dirrm share/gnome/nautilus/services/text
+@dirrm share/gnome/nautilus/services
+@dirrm share/gnome/nautilus/patterns
 @dirrm share/gnome/nautilus/glade
+@dirrm share/gnome/nautilus/emblems
+@dirrm share/gnome/nautilus
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
+@dirrm include/libnautilus
 @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
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index dfda4275e152..5da854b41a5b 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sawfish2
 PORTVERSION=	1.3
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index b3fa3e357433..8a994edded55 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -639,6 +639,8 @@ share/sawfish/%%VERSION%%/themes/smaker/close_inv.png
 share/sawfish/%%VERSION%%/themes/smaker/min.png
 share/sawfish/%%VERSION%%/themes/smaker/min_inv.png
 share/sawfish/%%VERSION%%/themes/smaker/theme.jl
+@dirrm share/sawfish/themes
+@dirrm share/sawfish/sounds
 @dirrm share/sawfish/%%VERSION%%/themes/smaker
 @dirrm share/sawfish/%%VERSION%%/themes/simple
 @dirrm share/sawfish/%%VERSION%%/themes/mono
@@ -668,9 +670,11 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
 @dirrm share/sawfish/%%VERSION%%/lisp/sawfish
 @dirrm share/sawfish/%%VERSION%%/lisp
 @dirrm share/sawfish/%%VERSION%%
+@dirrm share/sawfish
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%
 @dirrm libexec/sawfish/%%VERSION%%
+@dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index f99a61b6aeb4..75f57425dd1f 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdm2
 PORTVERSION=	2.6.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 1d16a3f45747..67afedffbbef 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -224,9 +224,15 @@ share/locale/zh_TW/LC_MESSAGES/gdm-%%VERSION%%.mo
 @dirrm share/gnome/gdm/themes/circles
 @dirrm share/gnome/gdm/themes
 @dirrm share/gnome/gdm/BuiltInSessions
+@dirrm share/gnome/gdm
 @dirrm etc/pam.d
 @dirrm etc/gdm/modules
+@dirrm etc/gdm/Sessions
+@dirrm etc/gdm/PreSession
+@dirrm etc/gdm/PostSession
 @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/share/gnome/log/gdm 2>/dev/null || /usr/bin/true
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 324025b80abe..2751304ea8c6 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeapplets2
 PORTVERSION=	2.6.2.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.6
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 80fa17277ba1..3e2a7b1f48c6 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1824,7 +1824,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/pixmaps/wireless-applet
 @dirrm share/gnome/pixmaps/stickynotes
 @dirrm share/gnome/pixmaps/mixer
+@dirrm share/gnome/pixmaps/mini-commander
+@dirrm share/gnome/pixmaps/mailcheck
+@dirrm share/gnome/pixmaps/gweather
+@dirrm share/gnome/pixmaps/gkb
 @dirrm share/gnome/pixmaps/accessx-status-applet
+@dirrm share/gnome/omf/gnome-applets
 @dirrm share/gnome/help/wireless/zh_TW/figures
 @dirrm share/gnome/help/wireless/zh_TW
 @dirrm share/gnome/help/wireless/zh_HK/figures
@@ -2184,6 +2189,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/accessx-status
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gswitchit
+@dirrm share/gnome/gkb
 @dirrm share/gnome/geyes/Horrid
 @dirrm share/gnome/geyes/Default-tiny
 @dirrm share/gnome/geyes/Default
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 02f21d20f65e..65f532081d2d 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 4ab1170022c4..a8e8e95e3e4b 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -415,6 +415,7 @@ share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
+@dirrm share/gnome/pixmaps/fish
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index a543806cad38..a6905e02a207 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnometerminal
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.6
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 94a2c56928af..12dd4ed33afc 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -165,6 +165,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
 @dirrm share/gnome/help/gnome-terminal/C/figures
+@dirrm share/gnome/help/gnome-terminal/C
+@dirrm share/gnome/help/gnome-terminal
+@dirrm share/gnome/gnome-terminal/glade
+@dirrm share/gnome/gnome-terminal
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 324025b80abe..2751304ea8c6 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomeapplets2
 PORTVERSION=	2.6.2.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.6
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 80fa17277ba1..3e2a7b1f48c6 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1824,7 +1824,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/pixmaps/wireless-applet
 @dirrm share/gnome/pixmaps/stickynotes
 @dirrm share/gnome/pixmaps/mixer
+@dirrm share/gnome/pixmaps/mini-commander
+@dirrm share/gnome/pixmaps/mailcheck
+@dirrm share/gnome/pixmaps/gweather
+@dirrm share/gnome/pixmaps/gkb
 @dirrm share/gnome/pixmaps/accessx-status-applet
+@dirrm share/gnome/omf/gnome-applets
 @dirrm share/gnome/help/wireless/zh_TW/figures
 @dirrm share/gnome/help/wireless/zh_TW
 @dirrm share/gnome/help/wireless/zh_HK/figures
@@ -2184,6 +2189,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/accessx-status
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gswitchit
+@dirrm share/gnome/gkb
 @dirrm share/gnome/geyes/Horrid
 @dirrm share/gnome/geyes/Default-tiny
 @dirrm share/gnome/geyes/Default
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 02f21d20f65e..65f532081d2d 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 4ab1170022c4..a8e8e95e3e4b 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -415,6 +415,7 @@ share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
+@dirrm share/gnome/pixmaps/fish
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index a543806cad38..a6905e02a207 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnometerminal
 PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.6
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 94a2c56928af..12dd4ed33afc 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -165,6 +165,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
 @dirrm share/gnome/help/gnome-terminal/C/figures
+@dirrm share/gnome/help/gnome-terminal/C
+@dirrm share/gnome/help/gnome-terminal
+@dirrm share/gnome/gnome-terminal/glade
+@dirrm share/gnome/gnome-terminal
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true