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, 22 insertions, 22 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index b3b2acc8c712..727fd2acd325 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	1.112.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
@@ -24,8 +24,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	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}
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 560838b14b7c..036d639935ca 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/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/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/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,14 +56,14 @@ 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/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 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/gnome/fonts
 @dirrm lib/gnome-print-2.0/transports
 @dirrm lib/gnome-print-2.0/drivers
 @dirrm lib/gnome-print-2.0