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.).

2 files changed, 26 insertions, 25 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 36402702a452..4d980d383ba5 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/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/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 9f6e13fc5666..7c038ce97b40 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/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