Convert all core GNOME1 components and some of the most popular GNOME1

apps to bsd.gnomeng.mk. The goal is to make GNOME1 framework more modular,
which will allow to use GNOME1 apps with GNOME2 desktop as well as considerably
reduce langht of dependency chains for GNOME1 ports (for example after this
commit AbiWord's dependency chain was reduced by 7 ports from 57 to only
50, while Gnumeric's - from 60 to 53 and so on).

The most of the GNOME1 apps are still not converted, so that lot of work is
still ahead.

Please report any unusual problems to gnome@FreeBSD.org.

Discussed with:	marcus
Reviewed by:	marcus

3 files changed, 15 insertions, 18 deletions

diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 611d36d7725a..509894ea82ae 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomehier
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc gnome
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -17,6 +17,8 @@ MAINTAINER=	sobomax@FreeBSD.org
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+USE_X_PREFIX=	yes
+
 do-fetch:
 	@${DO_NADA}
 
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
index df6ed94ea6fe..7ea4200f623e 100644
--- a/misc/gnomehier/files/dirlist
+++ b/misc/gnomehier/files/dirlist
@@ -17,6 +17,7 @@ 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.mandatory
 etc/gconf/schemas
 etc/gdm
 etc/gdm/Init
@@ -24,6 +25,7 @@ etc/gdm/PostSession
 etc/gdm/PreSession
 etc/gdm/Sessions
 etc/gnome
+etc/gnome/config
 etc/gnome-vfs-2.0
 etc/gnome-vfs-2.0/modules
 etc/sound
@@ -31,8 +33,6 @@ etc/sound/events
 etc/vfs
 etc/vfs/modules
 include/gconf
-include/gdk-pixbuf-1.0
-include/gdk-pixbuf-1.0/gdk-pixbuf
 include/gdkcardimage
 include/gnome-1.0
 include/libnautilus
@@ -51,7 +51,6 @@ lib/vfs
 lib/vfs/modules
 libdata/bonobo
 libdata/bonobo/servers
-libexec/rep
 libexec/sawfish
 share/doc/libgda
 share/gnome
@@ -243,3 +242,5 @@ share/gnome/xbill/cursors
 share/gnome/xbill/pixmaps
 share/gnome/xmodmap
 share/sawfish
+share/sawfish/sounds
+share/sawfish/themes
diff --git a/misc/gnomehier/pkg-plist b/misc/gnomehier/pkg-plist
index 35747d37c684..97a6aba28942 100644
--- a/misc/gnomehier/pkg-plist
+++ b/misc/gnomehier/pkg-plist
@@ -17,6 +17,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/eog/.keep_me
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/.keep_me
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/.keep_me
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/.keep_me
+etc/gconf/gconf.xml.mandatory/.keep_me
 etc/gconf/schemas/.keep_me
 etc/gdm/.keep_me
 etc/gdm/Init/.keep_me
@@ -26,13 +27,12 @@ etc/gdm/Sessions/.keep_me
 etc/gnome-vfs-2.0/.keep_me
 etc/gnome-vfs-2.0/modules/.keep_me
 etc/gnome/.keep_me
+etc/gnome/config/.keep_me
 etc/sound/.keep_me
 etc/sound/events/.keep_me
 etc/vfs/.keep_me
 etc/vfs/modules/.keep_me
 include/gconf/.keep_me
-include/gdk-pixbuf-1.0/.keep_me
-include/gdk-pixbuf-1.0/gdk-pixbuf/.keep_me
 include/gdkcardimage/.keep_me
 include/gnome-1.0/.keep_me
 include/libnautilus/.keep_me
@@ -51,7 +51,6 @@ lib/vfs/.keep_me
 lib/vfs/modules/.keep_me
 libdata/bonobo/.keep_me
 libdata/bonobo/servers/.keep_me
-libexec/rep/.keep_me
 libexec/sawfish/.keep_me
 share/doc/libgda/.keep_me
 share/gnome/.keep_me
@@ -243,14 +242,10 @@ share/gnome/xbill/cursors/.keep_me
 share/gnome/xbill/pixmaps/.keep_me
 share/gnome/xmodmap/.keep_me
 share/sawfish/.keep_me
-share/themes/.keep_me
-share/themes/Default/.keep_me
-share/themes/Metal/.keep_me
-share/themes/Redmond95/.keep_me
-@dirrm share/themes/Redmond95
-@dirrm share/themes/Metal
-@dirrm share/themes/Default
-@dirrm share/themes
+share/sawfish/sounds/.keep_me
+share/sawfish/themes/.keep_me
+@dirrm share/sawfish/themes
+@dirrm share/sawfish/sounds
 @dirrm share/sawfish
 @dirrm share/gnome/xmodmap
 @dirrm share/gnome/xbill/pixmaps
@@ -442,7 +437,6 @@ share/themes/Redmond95/.keep_me
 @dirrm share/gnome
 @dirrm share/doc/libgda
 @dirrm libexec/sawfish
-@dirrm libexec/rep
 @dirrm libdata/bonobo/servers
 @dirrm libdata/bonobo
 @dirrm lib/vfs/modules
@@ -461,8 +455,6 @@ share/themes/Redmond95/.keep_me
 @dirrm include/libnautilus
 @dirrm include/gnome-1.0
 @dirrm include/gdkcardimage
-@dirrm include/gdk-pixbuf-1.0/gdk-pixbuf
-@dirrm include/gdk-pixbuf-1.0
 @dirrm include/gconf
 @dirrm etc/vfs/modules
 @dirrm etc/vfs
@@ -470,6 +462,7 @@ share/themes/Redmond95/.keep_me
 @dirrm etc/sound
 @dirrm etc/gnome-vfs-2.0/modules
 @dirrm etc/gnome-vfs-2.0
+@dirrm etc/gnome/config
 @dirrm etc/gnome
 @dirrm etc/gdm/Sessions
 @dirrm etc/gdm/PreSession
@@ -477,6 +470,7 @@ share/themes/Redmond95/.keep_me
 @dirrm etc/gdm/Init
 @dirrm etc/gdm
 @dirrm etc/gconf/schemas
+@dirrm etc/gconf/gconf.xml.mandatory
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen