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

2 files changed, 150 insertions, 150 deletions

diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index efc7643..da669f2 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -4,11 +4,11 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/ickle/Makefile,v 1.1 2006/10/04 15:40:14 ahze Exp $
+#
 
 PORTNAME=	ickle
 PORTVERSION=	0.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -38,11 +38,11 @@ post-patch:
 .if ${HAVE_GNOME:Mlibcapplet}!="" || defined(WITH_GNOME)
 USE_GNOME+=	libcapplet
 PKGNAMESUFFIX=	-gnome
-PLIST_SUB+=	ICKLEDATADIR="share/gnome/" GNOME="" NOGNOME="@comment "
+PLIST_SUB+=	GNOME="" NOGNOME="@comment "
 .else
 CONFIGURE_ARGS+=	--with-gnome=no
 
-PLIST_SUB+=	ICKLEDATADIR="share/" GNOME="@comment " NOGNOME=""
+PLIST_SUB+=	GNOME="@comment " NOGNOME=""
 .endif
 
 .if defined(WITH_ICKLE_CONTROL)
diff --git a/net-im/ickle/pkg-plist b/net-im/ickle/pkg-plist
index b7b1b48..8f7e0a3 100644
--- a/net-im/ickle/pkg-plist
+++ b/net-im/ickle/pkg-plist
@@ -2,151 +2,151 @@
 %%GNOME%%bin/ickle_applet
 %%ICKLECONTROL%%bin/ickle_control
 %%GNOME%%etc/CORBA/servers/ickle_applet.gnorba
-%%GNOME%%%%ICKLEDATADIR%%applets/Network/ickle_applet.desktop
-%%ICKLEDATADIR%%ickle/icons/doors/away.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/file.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/message.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/na.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/online.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/doors/url.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/away.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/file.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/message.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/na.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/online.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/eureka/url.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/away.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/file.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/message.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/na.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/online.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/gnomeicu/url.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/away.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/file.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/message.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/na.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/online.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/ickle/url.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/away.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/file.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/message.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/na.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/online.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/icq/url.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/away.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/file.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/message.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/na.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/online.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/kit/url.xpm
-%%ICKLEDATADIR%%ickle/icons/new/away.xpm
-%%ICKLEDATADIR%%ickle/icons/new/chat.xpm
-%%ICKLEDATADIR%%ickle/icons/new/dnd.xpm
-%%ICKLEDATADIR%%ickle/icons/new/ffc.xpm
-%%ICKLEDATADIR%%ickle/icons/new/file.xpm
-%%ICKLEDATADIR%%ickle/icons/new/invisible.xpm
-%%ICKLEDATADIR%%ickle/icons/new/message.xpm
-%%ICKLEDATADIR%%ickle/icons/new/na.xpm
-%%ICKLEDATADIR%%ickle/icons/new/occ.xpm
-%%ICKLEDATADIR%%ickle/icons/new/offline.xpm
-%%ICKLEDATADIR%%ickle/icons/new/online.xpm
-%%ICKLEDATADIR%%ickle/icons/new/sms.xpm
-%%ICKLEDATADIR%%ickle/icons/new/sysmsg.xpm
-%%ICKLEDATADIR%%ickle/icons/new/url.xpm
-%%ICKLEDATADIR%%ickle/translations/ASCII
-%%ICKLEDATADIR%%ickle/translations/CP437
-%%ICKLEDATADIR%%ickle/translations/CP850
-%%ICKLEDATADIR%%ickle/translations/DANISH
-%%ICKLEDATADIR%%ickle/translations/DEC_MCS
-%%ICKLEDATADIR%%ickle/translations/DG_MCS
-%%ICKLEDATADIR%%ickle/translations/DUTCH
-%%ICKLEDATADIR%%ickle/translations/FINNISH
-%%ICKLEDATADIR%%ickle/translations/FRENCH
-%%ICKLEDATADIR%%ickle/translations/FRENCH_CANADIAN
-%%ICKLEDATADIR%%ickle/translations/GERMAN
-%%ICKLEDATADIR%%ickle/translations/HP_MCS
-%%ICKLEDATADIR%%ickle/translations/IRV
-%%ICKLEDATADIR%%ickle/translations/ITALIAN
-%%ICKLEDATADIR%%ickle/translations/JIS
-%%ICKLEDATADIR%%ickle/translations/LATIN_2
-%%ICKLEDATADIR%%ickle/translations/MACINTOSH
-%%ICKLEDATADIR%%ickle/translations/NEXT
-%%ICKLEDATADIR%%ickle/translations/NORWEGIAN_1
-%%ICKLEDATADIR%%ickle/translations/NORWEGIAN_2
-%%ICKLEDATADIR%%ickle/translations/POLISH
-%%ICKLEDATADIR%%ickle/translations/POLISH_NOPL
-%%ICKLEDATADIR%%ickle/translations/PORTUGUESE
-%%ICKLEDATADIR%%ickle/translations/PORTUGUESE_COM
-%%ICKLEDATADIR%%ickle/translations/RUSSIAN
-%%ICKLEDATADIR%%ickle/translations/RUSSIAN_ALT
-%%ICKLEDATADIR%%ickle/translations/RUSSIAN_WIN
-%%ICKLEDATADIR%%ickle/translations/SPANISH
-%%ICKLEDATADIR%%ickle/translations/SWEDISH
-%%ICKLEDATADIR%%ickle/translations/SWEDISH_NAMES
-%%ICKLEDATADIR%%ickle/translations/SWEDISH_NAMES_COM
-%%ICKLEDATADIR%%ickle/translations/SWISS
-%%ICKLEDATADIR%%ickle/translations/UKRAINIAN_WIN
-%%ICKLEDATADIR%%ickle/translations/UNITED_KINGDOM
-%%ICKLEDATADIR%%ickle/translations/UNITED_KINGDOM_COM
-@dirrm %%ICKLEDATADIR%%ickle/translations
-@dirrm %%ICKLEDATADIR%%ickle/icons/new
-@dirrm %%ICKLEDATADIR%%ickle/icons/kit
-@dirrm %%ICKLEDATADIR%%ickle/icons/icq
-@dirrm %%ICKLEDATADIR%%ickle/icons/ickle
-@dirrm %%ICKLEDATADIR%%ickle/icons/gnomeicu
-@dirrm %%ICKLEDATADIR%%ickle/icons/eureka
-@dirrm %%ICKLEDATADIR%%ickle/icons/doors
-@dirrm %%ICKLEDATADIR%%ickle/icons
-@dirrm %%ICKLEDATADIR%%ickle
-@dirrmtry %%ICKLEDATADIR%%applets/Network
-@dirrmtry %%ICKLEDATADIR%%applets
+%%GNOME%%share/applets/Network/ickle_applet.desktop
+%%DATADIR%%/icons/doors/away.xpm
+%%DATADIR%%/icons/doors/chat.xpm
+%%DATADIR%%/icons/doors/dnd.xpm
+%%DATADIR%%/icons/doors/ffc.xpm
+%%DATADIR%%/icons/doors/file.xpm
+%%DATADIR%%/icons/doors/invisible.xpm
+%%DATADIR%%/icons/doors/message.xpm
+%%DATADIR%%/icons/doors/na.xpm
+%%DATADIR%%/icons/doors/occ.xpm
+%%DATADIR%%/icons/doors/offline.xpm
+%%DATADIR%%/icons/doors/online.xpm
+%%DATADIR%%/icons/doors/sms.xpm
+%%DATADIR%%/icons/doors/sysmsg.xpm
+%%DATADIR%%/icons/doors/url.xpm
+%%DATADIR%%/icons/eureka/away.xpm
+%%DATADIR%%/icons/eureka/chat.xpm
+%%DATADIR%%/icons/eureka/dnd.xpm
+%%DATADIR%%/icons/eureka/ffc.xpm
+%%DATADIR%%/icons/eureka/file.xpm
+%%DATADIR%%/icons/eureka/invisible.xpm
+%%DATADIR%%/icons/eureka/message.xpm
+%%DATADIR%%/icons/eureka/na.xpm
+%%DATADIR%%/icons/eureka/occ.xpm
+%%DATADIR%%/icons/eureka/offline.xpm
+%%DATADIR%%/icons/eureka/online.xpm
+%%DATADIR%%/icons/eureka/sms.xpm
+%%DATADIR%%/icons/eureka/sysmsg.xpm
+%%DATADIR%%/icons/eureka/url.xpm
+%%DATADIR%%/icons/gnomeicu/away.xpm
+%%DATADIR%%/icons/gnomeicu/chat.xpm
+%%DATADIR%%/icons/gnomeicu/dnd.xpm
+%%DATADIR%%/icons/gnomeicu/ffc.xpm
+%%DATADIR%%/icons/gnomeicu/file.xpm
+%%DATADIR%%/icons/gnomeicu/invisible.xpm
+%%DATADIR%%/icons/gnomeicu/message.xpm
+%%DATADIR%%/icons/gnomeicu/na.xpm
+%%DATADIR%%/icons/gnomeicu/occ.xpm
+%%DATADIR%%/icons/gnomeicu/offline.xpm
+%%DATADIR%%/icons/gnomeicu/online.xpm
+%%DATADIR%%/icons/gnomeicu/sms.xpm
+%%DATADIR%%/icons/gnomeicu/sysmsg.xpm
+%%DATADIR%%/icons/gnomeicu/url.xpm
+%%DATADIR%%/icons/ickle/away.xpm
+%%DATADIR%%/icons/ickle/chat.xpm
+%%DATADIR%%/icons/ickle/dnd.xpm
+%%DATADIR%%/icons/ickle/ffc.xpm
+%%DATADIR%%/icons/ickle/file.xpm
+%%DATADIR%%/icons/ickle/invisible.xpm
+%%DATADIR%%/icons/ickle/message.xpm
+%%DATADIR%%/icons/ickle/na.xpm
+%%DATADIR%%/icons/ickle/occ.xpm
+%%DATADIR%%/icons/ickle/offline.xpm
+%%DATADIR%%/icons/ickle/online.xpm
+%%DATADIR%%/icons/ickle/sms.xpm
+%%DATADIR%%/icons/ickle/sysmsg.xpm
+%%DATADIR%%/icons/ickle/url.xpm
+%%DATADIR%%/icons/icq/away.xpm
+%%DATADIR%%/icons/icq/chat.xpm
+%%DATADIR%%/icons/icq/dnd.xpm
+%%DATADIR%%/icons/icq/ffc.xpm
+%%DATADIR%%/icons/icq/file.xpm
+%%DATADIR%%/icons/icq/invisible.xpm
+%%DATADIR%%/icons/icq/message.xpm
+%%DATADIR%%/icons/icq/na.xpm
+%%DATADIR%%/icons/icq/occ.xpm
+%%DATADIR%%/icons/icq/offline.xpm
+%%DATADIR%%/icons/icq/online.xpm
+%%DATADIR%%/icons/icq/sms.xpm
+%%DATADIR%%/icons/icq/sysmsg.xpm
+%%DATADIR%%/icons/icq/url.xpm
+%%DATADIR%%/icons/kit/away.xpm
+%%DATADIR%%/icons/kit/chat.xpm
+%%DATADIR%%/icons/kit/dnd.xpm
+%%DATADIR%%/icons/kit/ffc.xpm
+%%DATADIR%%/icons/kit/file.xpm
+%%DATADIR%%/icons/kit/invisible.xpm
+%%DATADIR%%/icons/kit/message.xpm
+%%DATADIR%%/icons/kit/na.xpm
+%%DATADIR%%/icons/kit/occ.xpm
+%%DATADIR%%/icons/kit/offline.xpm
+%%DATADIR%%/icons/kit/online.xpm
+%%DATADIR%%/icons/kit/sms.xpm
+%%DATADIR%%/icons/kit/sysmsg.xpm
+%%DATADIR%%/icons/kit/url.xpm
+%%DATADIR%%/icons/new/away.xpm
+%%DATADIR%%/icons/new/chat.xpm
+%%DATADIR%%/icons/new/dnd.xpm
+%%DATADIR%%/icons/new/ffc.xpm
+%%DATADIR%%/icons/new/file.xpm
+%%DATADIR%%/icons/new/invisible.xpm
+%%DATADIR%%/icons/new/message.xpm
+%%DATADIR%%/icons/new/na.xpm
+%%DATADIR%%/icons/new/occ.xpm
+%%DATADIR%%/icons/new/offline.xpm
+%%DATADIR%%/icons/new/online.xpm
+%%DATADIR%%/icons/new/sms.xpm
+%%DATADIR%%/icons/new/sysmsg.xpm
+%%DATADIR%%/icons/new/url.xpm
+%%DATADIR%%/translations/ASCII
+%%DATADIR%%/translations/CP437
+%%DATADIR%%/translations/CP850
+%%DATADIR%%/translations/DANISH
+%%DATADIR%%/translations/DEC_MCS
+%%DATADIR%%/translations/DG_MCS
+%%DATADIR%%/translations/DUTCH
+%%DATADIR%%/translations/FINNISH
+%%DATADIR%%/translations/FRENCH
+%%DATADIR%%/translations/FRENCH_CANADIAN
+%%DATADIR%%/translations/GERMAN
+%%DATADIR%%/translations/HP_MCS
+%%DATADIR%%/translations/IRV
+%%DATADIR%%/translations/ITALIAN
+%%DATADIR%%/translations/JIS
+%%DATADIR%%/translations/LATIN_2
+%%DATADIR%%/translations/MACINTOSH
+%%DATADIR%%/translations/NEXT
+%%DATADIR%%/translations/NORWEGIAN_1
+%%DATADIR%%/translations/NORWEGIAN_2
+%%DATADIR%%/translations/POLISH
+%%DATADIR%%/translations/POLISH_NOPL
+%%DATADIR%%/translations/PORTUGUESE
+%%DATADIR%%/translations/PORTUGUESE_COM
+%%DATADIR%%/translations/RUSSIAN
+%%DATADIR%%/translations/RUSSIAN_ALT
+%%DATADIR%%/translations/RUSSIAN_WIN
+%%DATADIR%%/translations/SPANISH
+%%DATADIR%%/translations/SWEDISH
+%%DATADIR%%/translations/SWEDISH_NAMES
+%%DATADIR%%/translations/SWEDISH_NAMES_COM
+%%DATADIR%%/translations/SWISS
+%%DATADIR%%/translations/UKRAINIAN_WIN
+%%DATADIR%%/translations/UNITED_KINGDOM
+%%DATADIR%%/translations/UNITED_KINGDOM_COM
+@dirrm %%DATADIR%%/translations
+@dirrm %%DATADIR%%/icons/new
+@dirrm %%DATADIR%%/icons/kit
+@dirrm %%DATADIR%%/icons/icq
+@dirrm %%DATADIR%%/icons/ickle
+@dirrm %%DATADIR%%/icons/gnomeicu
+@dirrm %%DATADIR%%/icons/eureka
+@dirrm %%DATADIR%%/icons/doors
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrmtry share/applets/Network
+@dirrmtry share/applets
 @dirrmtry etc/CORBA/servers
 @dirrmtry etc/CORBA