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

3 files changed, 73 insertions, 75 deletions

diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 118a60a4ecbe..a7023a8280ec 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	terraform
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,8 +32,6 @@ post-patch:
 		 s|#define  1|#define HAVE_LIB_TRIO 1|g ; \
 		 s|(HAVE_LIB_TRIO)||g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|g" ${WRKSRC}/src/xmlsupport.c
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@datadir@/gnome/|@datadir@/|g'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/misc/terraform/files/patch-desktop-links::Makefile.in b/misc/terraform/files/patch-desktop-links::Makefile.in
index a279be1d90cf..f2a285ae6141 100644
--- a/misc/terraform/files/patch-desktop-links::Makefile.in
+++ b/misc/terraform/files/patch-desktop-links::Makefile.in
@@ -8,8 +8,8 @@
 -		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
 -		$(mkinstalldirs) $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
 -		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
-+		$(mkinstalldirs) $(GNOME_DATADIR)/apps/Graphics; \
-+		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/apps/Graphics; \
++		$(mkinstalldirs) $(GNOME_DATADIR)/gnome/apps/Graphics; \
++		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
  		$(mkinstalldirs) $(GNOME_DATADIR)/pixmaps; \
  		$(INSTALL_DATA) terraform.png $(GNOME_DATADIR)/pixmaps; \
  	fi
diff --git a/misc/terraform/pkg-plist b/misc/terraform/pkg-plist
index 2ca313f9eaa1..a345881e718f 100644
--- a/misc/terraform/pkg-plist
+++ b/misc/terraform/pkg-plist
@@ -20,78 +20,78 @@ share/gnome/help/terraform/fr/index.html
 share/gnome/help/terraform/fr/templates.html
 share/gnome/help/terraform/fr/topic.dat
 share/gnome/help/terraform/fr/tutorial.html
-share/gnome/pixmaps/terraform.png
-share/gnome/pixmaps/terraform/add.xpm
-share/gnome/pixmaps/terraform/arrow.xpm
-share/gnome/pixmaps/terraform/circle.xpm
-share/gnome/pixmaps/terraform/crop.xpm
-share/gnome/pixmaps/terraform/die.xpm
-share/gnome/pixmaps/terraform/gnome-question.png
-share/gnome/pixmaps/terraform/rectangle.xpm
-share/gnome/pixmaps/terraform/replace.xpm
-share/gnome/pixmaps/terraform/seed.xpm
-share/gnome/pixmaps/terraform/subtract.xpm
-share/gnome/pixmaps/terraform/terraform_logo.xpm
-share/gnome/pixmaps/terraform/zoom.xpm
-share/gnome/terraform/image_maps/moon_moon.png
-share/gnome/terraform/image_maps/sky_test_320x180.tga
-share/gnome/terraform/include/atmospheres/earth_fog.inc
-share/gnome/terraform/include/atmospheres/earth_haze_fast.inc
-share/gnome/terraform/include/atmospheres/earth_haze_slow.inc
-share/gnome/terraform/include/atmospheres/fog_ground.inc
-share/gnome/terraform/include/atmospheres/rainbow.inc
-share/gnome/terraform/include/defaults.inc
-share/gnome/terraform/include/earth_textures/earth_canyon_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_desert_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_green_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_mountain_landscape.inc
-share/gnome/terraform/include/generic_land.inc
-share/gnome/terraform/include/generic_river.inc
-share/gnome/terraform/include/river_texture.inc
-share/gnome/terraform/include/skies/earth_regular_sky.inc
-share/gnome/terraform/include/skies/earth_static_sky.inc
-share/gnome/terraform/include/skies/include/clouds_01.inc
-share/gnome/terraform/include/skies/include/clouds_02.inc
-share/gnome/terraform/include/skies/include/clouds_03.inc
-share/gnome/terraform/include/skies/include/clouds_04.inc
-share/gnome/terraform/include/skies/include/clouds_05.inc
-share/gnome/terraform/include/skies/include/clouds_06.inc
-share/gnome/terraform/include/skies/include/clouds_07.inc
-share/gnome/terraform/include/skies/include/lights_standard.inc
-share/gnome/terraform/include/skies/include/lights_toymodel.inc
-share/gnome/terraform/include/skies/include/skycolor_earth.inc
-share/gnome/terraform/include/skies/include/stars_01.inc
-share/gnome/terraform/include/skies/include/stars_02.inc
-share/gnome/terraform/include/skies/include/stars_03.inc
-share/gnome/terraform/include/skies/include/stars_04.inc
-share/gnome/terraform/include/skies/include/stars_05.inc
-share/gnome/terraform/include/skies/include/stars_06.inc
-share/gnome/terraform/include/skies/mapped_sky.inc
-share/gnome/terraform/include/water/earth_water.inc
-share/gnome/terraform/objects/fern.gif
-share/gnome/terraform/objects/fern.inc
-share/gnome/terraform/objects/monolith.inc
-share/gnome/terraform/objects/tree_1.inc
-share/gnome/terraform/objects/tree_2.inc
-share/gnome/terraform/objects/tree_3.inc
-share/gnome/terraform/objects/tree_4.gif
-share/gnome/terraform/objects/tree_4.inc
-share/gnome/terraform/objects/tree_5.gif
-share/gnome/terraform/objects/tree_5.inc
-share/gnome/terraform/objects/tree_6.gif
-share/gnome/terraform/objects/tree_6.inc
+share/pixmaps/terraform.png
+share/pixmaps/terraform/add.xpm
+share/pixmaps/terraform/arrow.xpm
+share/pixmaps/terraform/circle.xpm
+share/pixmaps/terraform/crop.xpm
+share/pixmaps/terraform/die.xpm
+share/pixmaps/terraform/gnome-question.png
+share/pixmaps/terraform/rectangle.xpm
+share/pixmaps/terraform/replace.xpm
+share/pixmaps/terraform/seed.xpm
+share/pixmaps/terraform/subtract.xpm
+share/pixmaps/terraform/terraform_logo.xpm
+share/pixmaps/terraform/zoom.xpm
+share/terraform/image_maps/moon_moon.png
+share/terraform/image_maps/sky_test_320x180.tga
+share/terraform/include/atmospheres/earth_fog.inc
+share/terraform/include/atmospheres/earth_haze_fast.inc
+share/terraform/include/atmospheres/earth_haze_slow.inc
+share/terraform/include/atmospheres/fog_ground.inc
+share/terraform/include/atmospheres/rainbow.inc
+share/terraform/include/defaults.inc
+share/terraform/include/earth_textures/earth_canyon_landscape.inc
+share/terraform/include/earth_textures/earth_desert_landscape.inc
+share/terraform/include/earth_textures/earth_green_landscape.inc
+share/terraform/include/earth_textures/earth_mountain_landscape.inc
+share/terraform/include/generic_land.inc
+share/terraform/include/generic_river.inc
+share/terraform/include/river_texture.inc
+share/terraform/include/skies/earth_regular_sky.inc
+share/terraform/include/skies/earth_static_sky.inc
+share/terraform/include/skies/include/clouds_01.inc
+share/terraform/include/skies/include/clouds_02.inc
+share/terraform/include/skies/include/clouds_03.inc
+share/terraform/include/skies/include/clouds_04.inc
+share/terraform/include/skies/include/clouds_05.inc
+share/terraform/include/skies/include/clouds_06.inc
+share/terraform/include/skies/include/clouds_07.inc
+share/terraform/include/skies/include/lights_standard.inc
+share/terraform/include/skies/include/lights_toymodel.inc
+share/terraform/include/skies/include/skycolor_earth.inc
+share/terraform/include/skies/include/stars_01.inc
+share/terraform/include/skies/include/stars_02.inc
+share/terraform/include/skies/include/stars_03.inc
+share/terraform/include/skies/include/stars_04.inc
+share/terraform/include/skies/include/stars_05.inc
+share/terraform/include/skies/include/stars_06.inc
+share/terraform/include/skies/mapped_sky.inc
+share/terraform/include/water/earth_water.inc
+share/terraform/objects/fern.gif
+share/terraform/objects/fern.inc
+share/terraform/objects/monolith.inc
+share/terraform/objects/tree_1.inc
+share/terraform/objects/tree_2.inc
+share/terraform/objects/tree_3.inc
+share/terraform/objects/tree_4.gif
+share/terraform/objects/tree_4.inc
+share/terraform/objects/tree_5.gif
+share/terraform/objects/tree_5.inc
+share/terraform/objects/tree_6.gif
+share/terraform/objects/tree_6.inc
 share/locale/fr/LC_MESSAGES/terraform.mo
 share/locale/nl/LC_MESSAGES/terraform.mo
-@dirrm share/gnome/terraform/objects
-@dirrm share/gnome/terraform/include/water
-@dirrm share/gnome/terraform/include/skies/include
-@dirrm share/gnome/terraform/include/skies
-@dirrm share/gnome/terraform/include/earth_textures
-@dirrm share/gnome/terraform/include/atmospheres
-@dirrm share/gnome/terraform/include
-@dirrm share/gnome/terraform/image_maps
-@dirrm share/gnome/terraform
-@dirrm share/gnome/pixmaps/terraform
+@dirrm share/terraform/objects
+@dirrm share/terraform/include/water
+@dirrm share/terraform/include/skies/include
+@dirrm share/terraform/include/skies
+@dirrm share/terraform/include/earth_textures
+@dirrm share/terraform/include/atmospheres
+@dirrm share/terraform/include
+@dirrm share/terraform/image_maps
+@dirrm share/terraform
+@dirrm share/pixmaps/terraform
 @dirrm share/gnome/help/terraform/fr
 @dirrm share/gnome/help/terraform/C
 @dirrm share/gnome/help/terraform