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, 20 insertions, 17 deletions

diff --git a/deskutils/evolution-jescs/Makefile b/deskutils/evolution-jescs/Makefile
index 874d9a3b45d1..d9ae146db0a7 100644
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.17 2007/03/12 04:55:09 marcus Exp $
+#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.23 2007/09/17 12:31:53 ahze Exp $
 #
 
 PORTNAME=	jescs
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,8 +17,8 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sun Java Enterprise System Calendar Server provider for Evolution
 
-BUILD_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
-RUN_DEPENDS=	evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
 
 USE_XLIB=	yes
 USE_BZIP2=	yes
@@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-EVO_VERSION=	2.10
-PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.10"
+EVO_VERSION=	2.12
+PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.12"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
diff --git a/deskutils/evolution-jescs/distinfo b/deskutils/evolution-jescs/distinfo
index 5f42c195d43c..afe88af55eba 100644
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.10.0.tar.bz2) = 954812c93a412162f773370b6fd4ec06
-SHA256 (evolution-jescs-2.10.0.tar.bz2) = f97518d07345b8729fe96d8f04bcfcf9d3326ecfa603328c9e7a270d606435b5
-SIZE (evolution-jescs-2.10.0.tar.bz2) = 523942
+MD5 (evolution-jescs-2.12.0.tar.bz2) = cbfb1eff0c72a608e9865c965ec33680
+SHA256 (evolution-jescs-2.12.0.tar.bz2) = 00f869ec7634168813ccea7bbc0bbefcddb25c0c94bc8e90387ff16984ccb7a5
+SIZE (evolution-jescs-2.12.0.tar.bz2) = 529290
diff --git a/deskutils/evolution-jescs/pkg-plist b/deskutils/evolution-jescs/pkg-plist
index c32edfe77471..3dc6ccd58a07 100644
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@@ -3,12 +3,12 @@ lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.so
 lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelsunone.urls
 libdata/bonobo/servers/GNOME_Evolution_SunOne_Storage.server
 libexec/evolution/%%EVO_VERSION%%/evolution-jescs
-share/gnome/evolution/%%EVO_VERSION%%/images/sun-connector.png
-share/gnome/evolution/%%EVO_VERSION%%/images/sunone-invitations.png
-share/gnome/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png
-share/gnome/evolution-jescs/glade/sunone-add-permission-dialog.glade
-share/gnome/evolution-jescs/glade/sunone-permissions-dialog.glade
-share/gnome/evolution-jescs/glade/sunone-subscription-dialog.glade
+share/evolution/%%EVO_VERSION%%/images/sun-connector.png
+share/evolution/%%EVO_VERSION%%/images/sunone-invitations.png
+share/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png
+share/evolution-jescs/glade/sunone-add-permission-dialog.glade
+share/evolution-jescs/glade/sunone-permissions-dialog.glade
+share/evolution-jescs/glade/sunone-subscription-dialog.glade
 share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -24,6 +24,7 @@ share/locale/ja/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
@@ -37,11 +38,13 @@ share/locale/vi/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
-@dirrm share/gnome/evolution-jescs/glade
-@dirrm share/gnome/evolution-jescs
+@dirrm share/evolution-jescs/glade
+@dirrm share/evolution-jescs
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz