Change the GNOME 2.0 library ports to use share/gnome2 instead of share/gnome

in preparation for the GNOME 2.0 desktop.

Reviewed by:	sobomax
Approved by:	sobomax

8 files changed, 46 insertions, 40 deletions

diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index cf7aa8b84d4..c3120ba0e1a 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -22,8 +23,8 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
+		--datadir=${PREFIX}/share/gnome2 \
 		--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 8645963799b..1340e76375f 100644
--- a/x11-toolkits/at-spi/pkg-plist
+++ b/x11-toolkits/at-spi/pkg-plist
@@ -68,28 +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/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
+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
 @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 852b1899cdb..a9341f85785 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libbonoboui
 PORTVERSION=	1.113.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -22,8 +23,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
+		--datadir=${PREFIX}/share/gnome2
 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 64e394a3eb2..1a5788bfe2e 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/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/gnome2/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
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 7c3efc48f87..31d2ee44f6f 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgail-gnome
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -22,8 +23,8 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
+		--datadir=${PREFIX}/share/gnome2 \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
 		--enable-static
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 80cedd10efb..e4e3433f7db 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeprintui
 PORTVERSION=	1.112.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -24,8 +25,8 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
+		--datadir=${PREFIX}/share/gnome2 \
 		--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 1d62b7a890c..f72fdd55e11 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeui
 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-beta3
@@ -23,8 +24,8 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
+		--datadir=${PREFIX}/share/gnome2 \
 		--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 f970a51c507..f7a08538dd3 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/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/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/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
@@ -149,7 +149,7 @@ share/locale/uk/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/doc/libgnomeui
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
-@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true