Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

4 files changed, 17 insertions, 12 deletions

diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 8826512e6f9..905f002c111 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -3,9 +3,11 @@
 # Whom:				Pav Lucistnik <pav@oook.cz>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	gchempaint
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.8
@@ -26,7 +28,7 @@ USE_GNOME=	gnomehack intlhack libgnomeprintui libgnomeui
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help --with-omf-dir=${PREFIX}/share/gnome/omf
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help --with-omf-dir=${PREFIX}/share/omf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-release $$(VERSION)|-version @GCP_VERSION_INFO@|' \
diff --git a/science/gchempaint/pkg-plist b/science/gchempaint/pkg-plist
index 84a89dc6bd6..b787725939a 100644
--- a/science/gchempaint/pkg-plist
+++ b/science/gchempaint/pkg-plist
@@ -108,7 +108,7 @@ share/gnome/help/gchempaint/C/figures/templates.png
 share/gnome/help/gchempaint/C/figures/text.png
 share/gnome/help/gchempaint/C/figures/texttools-bar.png
 share/gnome/help/gchempaint/C/figures/toolbox.png
-share/gnome/omf/gchempaint/gchempaint-C.omf
+share/omf/gchempaint/gchempaint-C.omf
 share/icons/hicolor/32x32/apps/gchempaint.png
 share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-gchempaint.png
 share/icons/hicolor/48x48/apps/gchempaint.png
@@ -137,9 +137,10 @@ share/mimelnk/application/x-gchempaint.desktop
 @dirrm share/gnome/help/gchempaint/C/figures
 @dirrm share/gnome/help/gchempaint/C
 @dirrm share/gnome/help/gchempaint
-@dirrm share/gnome/omf/gchempaint
+@dirrm share/omf/gchempaint
 @dirrm lib/goffice/0.4.3/plugins/gchempaint
 @dirrm lib/gchempaint/plugins
 @dirrm lib/gchempaint
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/applications
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index aef708773ee..6860a345056 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -3,9 +3,11 @@
 # Whom:				Pav Lucistnik <pav@oook.cz>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	gchemutils
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/0.8
@@ -29,7 +31,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/gnome/omf
+CONFIGURE_ARGS=	--with-omf-dir=${PREFIX}/share/omf
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	gcrystal.schemas
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index dbc5faa298d..709589be28f 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -301,10 +301,10 @@ share/gnome/help/gcrystal/C/figures/size-dlg.png
 share/gnome/help/gcrystal/C/figures/view-settings.png
 share/gnome/help/gcrystal/C/gcrystal.xml
 share/gnome/help/gcrystal/C/legal.xml
-share/gnome/omf/gchem3d-viewer/gchem3d-viewer-C.omf
-share/gnome/omf/gchemcalc/gchemcalc-C.omf
-share/gnome/omf/gcrystal/gcrystal-C.omf
-share/gnome/omf/gchemtable/gchemtable-C.omf
+share/omf/gchem3d-viewer/gchem3d-viewer-C.omf
+share/omf/gchemcalc/gchemcalc-C.omf
+share/omf/gcrystal/gcrystal-C.omf
+share/omf/gchemtable/gchemtable-C.omf
 share/mimelnk/application/x-gcrystal.desktop
 share/icons/hicolor/32x32/mimetypes/gnome-mime-application-x-gcrystal.png
 share/icons/hicolor/32x32/apps/gchem3d-viewer.png
@@ -344,10 +344,10 @@ share/mime/packages/gchemutils.xml
 @dirrm share/gchemutils/glade/table
 @dirrm share/gchemutils/glade
 @dirrm share/gchemutils
-@dirrm share/gnome/omf/gchem3d-viewer
-@dirrm share/gnome/omf/gchemcalc
-@dirrm share/gnome/omf/gcrystal
-@dirrm share/gnome/omf/gchemtable
+@dirrm share/omf/gchem3d-viewer
+@dirrm share/omf/gchemcalc
+@dirrm share/omf/gcrystal
+@dirrm share/omf/gchemtable
 @dirrm share/gnome/help/gchem3d-viewer/C/figures
 @dirrm share/gnome/help/gchem3d-viewer/C
 @dirrm share/gnome/help/gchem3d-viewer