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, 21 insertions, 23 deletions

diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index fa1c147970d1..991cd436c123 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomeiconedit
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giconedit
diff --git a/graphics/gnomeiconedit/files/patch-aa b/graphics/gnomeiconedit/files/patch-aa
index bfc7352c9474..e5375dbc46b9 100644
--- a/graphics/gnomeiconedit/files/patch-aa
+++ b/graphics/gnomeiconedit/files/patch-aa
@@ -1,5 +1,3 @@
-$NetBSD$
-
 --- src/menus.c.orig	Thu Jun 22 19:31:59 2000
 +++ src/menus.c
 @@ -36,7 +36,6 @@
diff --git a/graphics/gnomeiconedit/files/patch-src::Makefile.in b/graphics/gnomeiconedit/files/patch-src::Makefile.in
index 98b99558f1b5..888dc4e4093c 100644
--- a/graphics/gnomeiconedit/files/patch-src::Makefile.in
+++ b/graphics/gnomeiconedit/files/patch-src::Makefile.in
@@ -7,8 +7,8 @@ $FreeBSD$
  
  bin_PROGRAMS = gnome-iconedit $(COMPONENT)
  
--INCLUDES =   -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
-+INCLUDES =   $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
+-INCLUDES =   -DGNOMELOCALEDIR=\""$(datadir)/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
++INCLUDES =   $(GDK_PIXBUF_CFLAGS) -DGNOMELOCALEDIR=\""$(datadir)/locale"\"  -DGNOMEDATADIR=\""$(datadir)"\"  -I$(includedir)  -I$(top_srcdir)  -I$(top_srcdir)/src/widgets  $(GNOME_INCLUDEDIR)
  
  
  CORBA_GENERATED =  	Iconedit.h			Iconedit-stubs.c		Iconedit-skels.c		Iconedit-common.c	
diff --git a/graphics/gnomeiconedit/pkg-plist b/graphics/gnomeiconedit/pkg-plist
index e05764d0b20f..8683782713d9 100644
--- a/graphics/gnomeiconedit/pkg-plist
+++ b/graphics/gnomeiconedit/pkg-plist
@@ -2,23 +2,23 @@ bin/gnome-iconedit
 etc/CORBA/servers/gnome-iconedit.gnorba
 share/gnome/apps/Graphics/gnome-iconedit.desktop
 share/gnome/help/gnome-iconedit/C/topic.dat
-share/gnome/idl/Iconedit.idl
-share/gnome/oaf/gnome-iconedit.oafinfo
-share/gnome/pixmaps/gnome-iconedit/cheques.png
-share/gnome/pixmaps/gnome-iconedit/dropper.png
-share/gnome/pixmaps/gnome-iconedit/empty-circle.png
-share/gnome/pixmaps/gnome-iconedit/empty-square.png
-share/gnome/pixmaps/gnome-iconedit/fill.png
-share/gnome/pixmaps/gnome-iconedit/filled-circle.png
-share/gnome/pixmaps/gnome-iconedit/filled-square.png
-share/gnome/pixmaps/gnome-iconedit/gnome-iconedit.png
-share/gnome/pixmaps/gnome-iconedit/gnome-tasklist.png
-share/gnome/pixmaps/gnome-iconedit/gridlines.png
-share/gnome/pixmaps/gnome-iconedit/line.png
-share/gnome/pixmaps/gnome-iconedit/paint.png
-share/gnome/pixmaps/gnome-iconedit/palette-edit.png
-share/gnome/pixmaps/gnome-iconedit/roller.png
-share/gnome/pixmaps/gnome-iconedit/selector.png
+share/idl/Iconedit.idl
+share/oaf/gnome-iconedit.oafinfo
+share/pixmaps/gnome-iconedit/cheques.png
+share/pixmaps/gnome-iconedit/dropper.png
+share/pixmaps/gnome-iconedit/empty-circle.png
+share/pixmaps/gnome-iconedit/empty-square.png
+share/pixmaps/gnome-iconedit/fill.png
+share/pixmaps/gnome-iconedit/filled-circle.png
+share/pixmaps/gnome-iconedit/filled-square.png
+share/pixmaps/gnome-iconedit/gnome-iconedit.png
+share/pixmaps/gnome-iconedit/gnome-tasklist.png
+share/pixmaps/gnome-iconedit/gridlines.png
+share/pixmaps/gnome-iconedit/line.png
+share/pixmaps/gnome-iconedit/paint.png
+share/pixmaps/gnome-iconedit/palette-edit.png
+share/pixmaps/gnome-iconedit/roller.png
+share/pixmaps/gnome-iconedit/selector.png
 share/locale/de/LC_MESSAGES/gnome-iconedit.mo
 share/locale/en_GB/LC_MESSAGES/gnome-iconedit.mo
 share/locale/fr/LC_MESSAGES/gnome-iconedit.mo
@@ -27,6 +27,6 @@ share/locale/ru/LC_MESSAGES/gnome-iconedit.mo
 share/locale/sv/LC_MESSAGES/gnome-iconedit.mo
 share/locale/tr/LC_MESSAGES/gnome-iconedit.mo
 share/locale/wa/LC_MESSAGES/gnome-iconedit.mo
-@dirrm share/gnome/pixmaps/gnome-iconedit
+@dirrm share/pixmaps/gnome-iconedit
 @dirrm share/gnome/help/gnome-iconedit/C
 @dirrm share/gnome/help/gnome-iconedit