Move back to share/gnome as a datadir.

The GNOME 2.0 APIs can be installed right along with the GNOME 1.4 APIs, but
the desktops will be mutually independent.  That is, you will not be
able to install gnomedesktop, for example, on the same machine as gnomecore.
However, you will be able to install the GNOME 2.0 desktop, and use all your
favorite GNOME 1.4 applications (like gaim, AbiWord, Evolution, etc.).

9 files changed, 51 insertions, 47 deletions

diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 36402702a45..4d980d383ba 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -22,8 +23,8 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
 		--enable-static
diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist
index 9f6e13fc566..7c038ce97b4 100644
--- a/x11-toolkits/at-spi/pkg-plist
+++ b/x11-toolkits/at-spi/pkg-plist
@@ -68,29 +68,29 @@ share/doc/at-spi-cspi/spi-accessible.html
 share/doc/at-spi-cspi/spi-application.html
 share/doc/at-spi-cspi/spi-component.html
 share/doc/at-spi-cspi/spi-main.html
-share/gnome2/idl/Magnifier.idl
-share/gnome2/idl/at-spi-1.0/Accessibility.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Accessible.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Action.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Application.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Component.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Desktop.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_EditableText.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Event.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Hyperlink.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Hypertext.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Image.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Registry.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Relation.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Role.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Selection.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_State.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_StreamableContent.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Table.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Text.idl
-share/gnome2/idl/at-spi-1.0/Accessibility_Value.idl
-@dirrm share/gnome2/idl/at-spi-1.0
-@dirrm share/gnome2/idl
+share/gnome/idl/Magnifier.idl
+share/gnome/idl/at-spi-1.0/Accessibility.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Accessible.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Action.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Application.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Component.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/gnome/idl/at-spi-1.0/Accessibility_EditableText.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Event.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Hyperlink.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Hypertext.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Image.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Registry.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Relation.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Role.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Selection.idl
+share/gnome/idl/at-spi-1.0/Accessibility_State.idl
+share/gnome/idl/at-spi-1.0/Accessibility_StreamableContent.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Table.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Text.idl
+share/gnome/idl/at-spi-1.0/Accessibility_Value.idl
+@dirrm share/gnome/idl/at-spi-1.0
+@dirrm share/gnome/idl
 @dirrm share/doc/at-spi-cspi
 @dirrm lib/orbit-2.0
 @dirrm include/at-spi-1.0/libspi
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index f71ae7c2189..3f741bd7a86 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libbonoboui
 PORTVERSION=	1.115.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -22,8 +23,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index a2a7f1139b2..64e394a3eb2 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -39,7 +39,7 @@ lib/libbonoboui-2.so.0
 lib/libglade/2.0/libbonobo.so
 libdata/bonobo/servers/Bonobo_Sample_Controls.server
 libdata/pkgconfig/libbonoboui-2.0.pc
-share/gnome2/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
 share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
@@ -66,7 +66,7 @@ share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
-@dirrm share/gnome2/gnome-2.0/ui
-@dirrm share/gnome2/gnome-2.0
+@dirrm share/gnome/gnome-2.0/ui
+@dirrm share/gnome/gnome-2.0
 @dirrm include/libbonoboui-2.0/bonobo
 @dirrm include/libbonoboui-2.0
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 25e7346b104..09804204460 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgail-gnome
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
 		--enable-static
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 996fb40e7ec..6f00d876f4b 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeprintui
 PORTVERSION=	1.112.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -25,8 +25,8 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index eb9ac45f2a7..fcb138f9cb8 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeui
 PORTVERSION=	1.115.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -23,8 +24,8 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_BISON=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 2d69de40e06..362d0a37607 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -117,12 +117,12 @@ share/doc/libgnomeui/libgnomeui-gnomepixmapentry.html
 share/doc/libgnomeui/libgnomeui-gnomepropertybox.html
 share/doc/libgnomeui/libgnomeui-gnomescores.html
 share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html
-share/gnome2/pixmaps/gnome-about-logo.png
-share/gnome2/pixmaps/gnome-default-dlg.png
-share/gnome2/pixmaps/gnome-error.png
-share/gnome2/pixmaps/gnome-info.png
-share/gnome2/pixmaps/gnome-question.png
-share/gnome2/pixmaps/gnome-warning.png
+share/gnome/pixmaps/gnome-about-logo.png
+share/gnome/pixmaps/gnome-default-dlg.png
+share/gnome/pixmaps/gnome-error.png
+share/gnome/pixmaps/gnome-info.png
+share/gnome/pixmaps/gnome-question.png
+share/gnome/pixmaps/gnome-warning.png
 share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
@@ -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/gnome2/pixmaps
+@dirrm share/gnome/pixmaps
 @dirrm share/doc/libgnomeui
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 1f6a0c23807..8af0cb65511 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libzvt
 PORTVERSION=	1.114.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -23,8 +24,8 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}