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

5 files changed, 43 insertions, 51 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index f2e11dfacbe6..ca5af031b52b 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.110 2007/03/18 20:55:55 marcus Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.126 2007/10/19 08:41:21 bland Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.marcuscom.com/downloads/:local
@@ -23,7 +24,8 @@ COMMENT=	Session component for the GNOME 2 desktop
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
+RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center \
+		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
 
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
@@ -48,12 +50,12 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
-		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+		${PREFIX}/share/pixmaps/splash/original-gnome-splash.png
 #	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
-#		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+#		${PREFIX}/share/pixmaps/splash/gnome-splash.png
 .for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
 	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
-		${PREFIX}/share/gnome/pixmaps/splash
+		${PREFIX}/share/pixmaps/splash
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 749f1b40a18e..edb41056bac1 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.18.3.tar.bz2) = 59b6809ed1d8e39c1550217e665c75df
-SHA256 (gnome2/gnome-session-2.18.3.tar.bz2) = 87f8dd9b89953e6bfaad98d1b50fd48517334588d0da9d038218751943dfc10a
-SIZE (gnome2/gnome-session-2.18.3.tar.bz2) = 716092
+MD5 (gnome2/gnome-session-2.20.1.tar.bz2) = 8c9c2940957dc0140a23ef638d23fb35
+SHA256 (gnome2/gnome-session-2.20.1.tar.bz2) = 134d102f7f6dc889158c262488b98c843616fa8aef23ce3aaa923366076a6a29
+SIZE (gnome2/gnome-session-2.20.1.tar.bz2) = 759126
 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
index 17d12d395c3b..8fcdd3e2c5e7 100644
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ b/x11/gnome-session/files/patch-data_Makefile.in
@@ -1,14 +1,5 @@
 --- data/Makefile.in.orig	Sun Jan 28 20:39:50 2007
 +++ data/Makefile.in	Sun Jan 28 20:41:03 2007
-@@ -253,7 +253,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = icons
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
- default_in_files = default.session.in
- default_DATA = $(default_in_files:.session.in=.session)
- settingsdir = $(datadir)/applications
 @@ -271,7 +271,7 @@ EXTRA_DIST = \
  	session-properties.desktop.in
  
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
deleted file mode 100644
index b07ad029e3dd..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-session/Makefile.in.orig	Sun Apr 23 23:01:30 2006
-+++ gnome-session/Makefile.in	Sun Apr 23 23:06:41 2006
-@@ -310,7 +310,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- NULL = 
--defaultdir = $(datadir)/gnome
-+defaultdir = $(datadir)
- INCLUDES = \
- 	$(GNOME_SESSION_CFLAGS)				\
- 	$(STANDARD_PROPERTIES_CFLAGS)			\
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 7e58bdc56660..d90630fed19f 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -3,29 +3,8 @@ bin/gnome-session-properties
 bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-wm
-share/gnome/applications/session-properties.desktop
+share/applications/session-properties.desktop
 share/gnome/default.session
-share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png
-share/gnome/pixmaps/splash/adamw-bat-2.18.jpg
-share/gnome/pixmaps/splash/adamw-conky-2.18.png
-share/gnome/pixmaps/splash/adamw-cow-2.18.png
-share/gnome/pixmaps/splash/adamw-mouth-2.18.png
-share/gnome/pixmaps/splash/adamw-piggy-2.12.png
-share/gnome/pixmaps/splash/adamw-swing-2.18.png
-share/gnome/pixmaps/splash/adamw-trophy-2.12.png
-share/gnome/pixmaps/splash/andreas-slogan-2.12.png
-share/gnome/pixmaps/splash/andreas-splash-2.12.png
-share/gnome/pixmaps/splash/domix-splash-2.12.png
-share/gnome/pixmaps/splash/domix-splash2-2.12.png
-share/gnome/pixmaps/splash/franz-splash_218.png
-share/gnome/pixmaps/splash/gnome-splash.png
-share/gnome/pixmaps/splash/mumija-2.12.png
-share/gnome/pixmaps/splash/mumija2-2.12.png
-share/gnome/pixmaps/splash/mumija3-2.12.png
-share/gnome/pixmaps/splash/original-gnome-splash.png
-share/gnome/pixmaps/splash/tremulant-2.12.png
-share/gnome/pixmaps/splash/tremulant-blood-2.12.png
-share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
 share/icons/hicolor/24x24/apps/session-properties.png
@@ -36,6 +15,7 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
@@ -95,6 +75,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
@@ -102,6 +83,7 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
@@ -113,12 +95,37 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+share/pixmaps/splash/MaMBaNgGaoX-2.12.png
+share/pixmaps/splash/adamw-bat-2.18.jpg
+share/pixmaps/splash/adamw-conky-2.18.png
+share/pixmaps/splash/adamw-cow-2.18.png
+share/pixmaps/splash/adamw-mouth-2.18.png
+share/pixmaps/splash/adamw-piggy-2.12.png
+share/pixmaps/splash/adamw-swing-2.18.png
+share/pixmaps/splash/adamw-trophy-2.12.png
+share/pixmaps/splash/andreas-slogan-2.12.png
+share/pixmaps/splash/andreas-splash-2.12.png
+share/pixmaps/splash/domix-splash-2.12.png
+share/pixmaps/splash/domix-splash2-2.12.png
+share/pixmaps/splash/franz-splash_218.png
+share/pixmaps/splash/gnome-splash.png
+share/pixmaps/splash/mumija-2.12.png
+share/pixmaps/splash/mumija2-2.12.png
+share/pixmaps/splash/mumija3-2.12.png
+share/pixmaps/splash/original-gnome-splash.png
+share/pixmaps/splash/tremulant-2.12.png
+share/pixmaps/splash/tremulant-blood-2.12.png
+share/pixmaps/splash/tremulant-brushed-metal-2.12.png
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -139,3 +146,6 @@ share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/applications