14 files changed, 104 insertions, 94 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index cf7aa8b84d42..c3120ba0e1ad 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/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/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
index 8645963799b4..1340e76375f8 100644
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/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/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 03fbac0c70f7..364940c90388 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	1.112.0
+PORTREVISION=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -23,8 +24,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	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
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 1dac997f26df..560838b14b7c 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -24,17 +24,17 @@ lib/libgnomeprint-2.a
 lib/libgnomeprint-2.so
 lib/libgnomeprint-2.so.0
 libdata/pkgconfig/libgnomeprint-2.0.pc
-share/gnome/fonts/README.installer
-share/gnome/gnome-print-2.0/media/media.xml
-share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome/gnome-print-2.0/printers/GENERIC.printer
-share/gnome/gnome-print-2.0/vendors/EPSON.vendor
-share/gnome/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome/gnome-print-2.0/vendors/HP.vendor
-share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
+share/gnome2/fonts/README.installer
+share/gnome2/gnome-print-2.0/media/media.xml
+share/gnome2/gnome-print-2.0/models/GNOME-GENERIC-PS.model
+share/gnome2/gnome-print-2.0/models/HP-LASERJET-4ML.model
+share/gnome2/gnome-print-2.0/models/STYLUS-COLOR-740.model
+share/gnome2/gnome-print-2.0/printers/GENERIC.printer
+share/gnome2/gnome-print-2.0/vendors/EPSON.vendor
+share/gnome2/gnome-print-2.0/vendors/GNOME.vendor
+share/gnome2/gnome-print-2.0/vendors/HP.vendor
+share/gnome2/libgnomeprint-2.0/fonts/adobe-urw.font
+share/gnome2/libgnomeprint-2.0/fonts/defaults.fontmap
 share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -56,16 +56,16 @@ share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@dirrm share/gnome/libgnomeprint-2.0/fonts
-@dirrm share/gnome/libgnomeprint-2.0
-@dirrm share/gnome/gnome-print-2.0/vendors
-@dirrm share/gnome/gnome-print-2.0/printers
-@dirrm share/gnome/gnome-print-2.0/models
-@dirrm share/gnome/gnome-print-2.0/media
-@dirrm share/gnome/gnome-print-2.0
+@dirrm share/gnome2/libgnomeprint-2.0/fonts
+@dirrm share/gnome2/libgnomeprint-2.0
+@dirrm share/gnome2/gnome-print-2.0/vendors
+@dirrm share/gnome2/gnome-print-2.0/printers
+@dirrm share/gnome2/gnome-print-2.0/models
+@dirrm share/gnome2/gnome-print-2.0/media
+@dirrm share/gnome2/gnome-print-2.0
+@dirrm share/gnome2/fonts
 @dirrm lib/gnome-print-2.0/transports
 @dirrm lib/gnome-print-2.0/drivers
 @dirrm lib/gnome-print-2.0
 @dirrm include/libgnomeprint-2.0/libgnomeprint
 @dirrm include/libgnomeprint-2.0
-@unexec /bin/rmdir %D/share/gnome/fonts 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index cf7aa8b84d42..c3120ba0e1ad 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 8645963799b4..1340e76375f8 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 852b1899cdbb..a9341f85785c 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 64e394a3eb2e..1a5788bfe2ef 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 7c3efc48f874..31d2ee44f6f0 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 80cedd10efbf..e4e3433f7dbc 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 1d62b7a890c8..f72fdd55e117 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 f970a51c5076..f7a08538dd3a 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
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 978fb24ac0c1..4545ede74030 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnome
 PORTVERSION=	1.114.0
+PORTREVISION=	1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
@@ -25,8 +26,8 @@ USE_ESOUND=	yes
 USE_BISON=	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
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index a9185c9d2375..c2110a41fc80 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -90,9 +90,9 @@ share/doc/libgnome/x2848.html
 share/doc/libgnome/x3212.html
 share/doc/libgnome/x4054.html
 share/doc/libgnome/x9.html
-share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
-share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
-share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
+share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
+share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
+share/gnome2/sgml/docbook/gnome-customization-0.1/l10n.xml
 share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/da/LC_MESSAGES/libgnome-2.0.mo
 share/locale/de/LC_MESSAGES/libgnome-2.0.mo
@@ -118,10 +118,10 @@ share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
-@dirrm share/gnome/sgml/docbook/gnome-customization-0.1
-@dirrm share/gnome/sgml/docbook
-@dirrm share/gnome/sgml
-@dirrm share/gnome
+@dirrm share/gnome2/sgml/docbook/gnome-customization-0.1
+@dirrm share/gnome2/sgml/docbook
+@dirrm share/gnome2/sgml
+@dirrm share/gnome2
 @dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0