The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

5 files changed, 19 insertions, 24 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index dc38e97a1d69..ba3c67339180 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,38 +3,41 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/x11/gdm/Makefile,v 1.6 2007/12/02 01:41:20 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.117 2008/03/22 04:21:52 mezz Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.20.3
+PORTVERSION=	2.20.4
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 version of xdm display manager
 
 BUILD_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
-RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+		ck-connector.0:${PORTSDIR}/sysutils/consolekit
+RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity \
+		xrdb:${PORTSDIR}/x11/xrdb
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 USE_XORG=	dmx dmxproto
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
 USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
+USE_GNOME=	gnomehack intlhack gnomehier librsvg2 gnomedocutils \
 		gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
+CONFIGURE_ARGS=--with-console-kit=yes
 
 GDMDIR?=	${PREFIX}/etc/gdm
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -44,8 +47,7 @@ GNOME_LOCALSTATEDIR=	/var
 MAN1=		gdm.1
 
 OPTIONS=	IPV6 "Enable IPv6 support" on \
-		LOG_LIMIT "Limit ~/.xsession-errors size" on \
-		CONSOLEKIT "Enable ConsoleKit support" off
+		LOG_LIMIT "Limit ~/.xsession-errors size" on
 
 .include <bsd.port.pre.mk>
 
@@ -65,13 +67,6 @@ CONFIGURE_ARGS+=	--disable-ipv6
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-daemon_slave.c
 .endif
 
-.if defined(WITH_CONSOLEKIT)
-CONFIGURE_ARGS+=--with-console-kit=yes
-LIB_DEPENDS+=	ck-connector.0:${PORTSDIR}/sysutils/consolekit
-.else
-CONFIGURE_ARGS+=--with-console-kit=no
-.endif
-
 post-patch:
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index bda84c0948a5..d72e4a4bf86a 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.20.3.tar.bz2) = 0074b163986cfe48d3998518084c4d00
-SHA256 (gnome2/gdm-2.20.3.tar.bz2) = 0d1c8e76fbebb2ba2b71c3adac3e7f6193971f75739978f81447e4127b898500
-SIZE (gnome2/gdm-2.20.3.tar.bz2) = 3891861
+MD5 (gnome2/gdm-2.20.4.tar.bz2) = 53a75133cadf1de5fea2be49483b9ce3
+SHA256 (gnome2/gdm-2.20.4.tar.bz2) = adb64d70d9c2bf87a2f67520f40bba29bd76726baee21440f8b24cf3f6336061
+SIZE (gnome2/gdm-2.20.4.tar.bz2) = 3906797
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index d938b64f4dad..272deae4b017 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports-stable/x11/gdm/files/gdm.in,v 1.1 2007/12/02 01:41:21 marcus Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.28 2008/03/11 04:21:47 mezz Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_locale.alias b/x11/gdm/files/patch-config_locale.alias
index 8f264dbe4812..3b159499d3a5 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -1,6 +1,6 @@
---- config/locale.alias.orig	Sat Jun 11 02:01:45 2005
-+++ config/locale.alias	Sat Jun 11 03:34:22 2005
-@@ -14,132 +14,57 @@
+--- config/locale.alias.orig	2008-03-10 21:53:02.000000000 -0500
++++ config/locale.alias	2008-03-10 21:53:37.000000000 -0500
+@@ -14,133 +14,57 @@
  #
  #		- George
  
@@ -16,6 +16,7 @@
 -Azerbaijani(Iran)	az_IR.UTF-8,az_IR
 -Basque			eu_ES.UTF-8,eu_ES
 -Belarusian		be_BY.UTF-8,be_BY
+-Belarusian(Latin)	be_BY.UTF-8@latin,be_BY@latin
 -Bengali			bn_BD.UTF-8,bn_BD
 -Bengali(India)		bn_IN.UTF-8,bn_IN
 -Bosnian			bs_BA.UTF-8,bs_BA
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index c0790daa476f..1d9b4eddd8ec 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -238,7 +238,6 @@ share/xsessions/gnome.desktop
 @dirrm etc/gdm
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
-@dirrmtry sbin
 @dirrmtry share/log/gdm
 @dirrmtry share/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true