Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

6 files changed, 56 insertions, 28 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index adbe16e487a1..fe1b390f608c 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.44 2006/10/03 13:36:08 ahze Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.58 2007/03/12 16:56:06 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.16.5
+PORTVERSION=	2.18.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -31,7 +31,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 		gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man \
+		--with-console-kit=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 787d2d8ec241..3caa1e92dbfa 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.16.5.tar.bz2) = 8f223458b0e957650f6d865a06a271e4
-SHA256 (gnome2/gdm-2.16.5.tar.bz2) = 9347f06782da70352eb7e236613599362aff5b319d23be178b36a0a4424ba010
-SIZE (gnome2/gdm-2.16.5.tar.bz2) = 3136620
+MD5 (gnome2/gdm-2.18.0.tar.bz2) = a569a8275f0e0396e6ef5f63c5f56ad5
+SHA256 (gnome2/gdm-2.18.0.tar.bz2) = 6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053
+SIZE (gnome2/gdm-2.18.0.tar.bz2) = 3461709
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
index 81521bb3b85a..2d609cf2faec 100644
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -1,6 +1,6 @@
---- daemon/slave.c.orig	Wed Jun  1 20:49:30 2005
-+++ daemon/slave.c	Wed Jun  1 20:50:45 2005
-@@ -344,8 +344,7 @@
+--- daemon/slave.c.orig	Sat Oct 28 22:38:51 2006
++++ daemon/slave.c	Tue Oct 31 12:33:41 2006
+@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
  			break;
  		}
  
@@ -10,7 +10,7 @@
  			continue;
  
  		/* write until we succeed in writing something */
-@@ -367,13 +366,6 @@
+@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
  		}
  
  		d->xsession_errors_bytes += r;
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 8217bb283942..21b493a0595b 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.8 2006/10/10 20:22:24 mezz Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.12 2007/02/16 18:14:26 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 8de8f08b0e29..8f264dbe4812 100644
--- a/x11/gdm/files/patch-config_locale.alias
+++ b/x11/gdm/files/patch-config_locale.alias
@@ -1,26 +1,29 @@
 --- config/locale.alias.orig	Sat Jun 11 02:01:45 2005
 +++ config/locale.alias	Sat Jun 11 03:34:22 2005
-@@ -14,104 +14,56 @@
+@@ -14,132 +14,57 @@
  #
  #		- George
  
--Afrikaans			af_ZA.UTF-8,af_ZA
--Albanian			sq_AL.UTF-8,sq_AL
+-C(POSIX)		C,POSIX
+-Afrikaans		af_ZA.UTF-8,af_ZA
+-Albanian		sq_AL.UTF-8,sq_AL
 -Amharic			am_ET.UTF-8,am_ET
 -Arabic(Egypt)		ar_EG.UTF-8,ar_EG
 -Arabic(Lebanon)		ar_LB.UTF-8,ar_LB
+-Arabic(SaudiArabia)	ar_SA.UTF-8,ar_SA
 -Armenian		hy_AM.UTF-8,hy_AM
 -Azerbaijani		az_AZ.UTF-8,az_AZ
 -Azerbaijani(Iran)	az_IR.UTF-8,az_IR
 -Basque			eu_ES.UTF-8,eu_ES
--Belarusian			be_BY.UTF-8,be_BY
+-Belarusian		be_BY.UTF-8,be_BY
 -Bengali			bn_BD.UTF-8,bn_BD
--Bengali(India)			bn_IN.UTF-8,bn_IN
+-Bengali(India)		bn_IN.UTF-8,bn_IN
 -Bosnian			bs_BA.UTF-8,bs_BA
 -Breton			br_FR.UTF-8,br_FR
 -Bulgarian		bg_BG.UTF-8,bg_BG
 -Catalan			ca_ES.UTF-8,ca_ES
 -Chinese(ChinaMainland)	zh_CN.UTF-8,zh_CN
+-Chinese(GB18030)	zh_CN.GB18030
 -Chinese(Hong-Kong)	zh_HK.UTF-8,zh_HK
 -Chinese(Singapore)	zh_SG.UTF-8,zh_SG
 -Chinese(Taiwan)		zh_TW.UTF-8,zh_TW
@@ -28,35 +31,42 @@
 -Czech			cs_CZ.UTF-8,cs_CZ
 -Danish			da_DK.UTF-8,da_DK
 -Dutch			nl_NL.UTF-8,nl_NL
--English(USA)		en_US.UTF-8,en_US
+-Dutch(Belgium)		nl_BE.UTF-8,nl_BE
 -English(Australia)	en_AU.UTF-8,en_AU
--English(UK)		en_GB.UTF-8,en_GB
 -English(Canada)		en_CA.UTF-8,en_CA
 -English(Ireland)	en_IE.UTF-8,en_IE
+-English(Malta)		en_MT.UTF-8,en_MT
+-English(NewZealand)	en_NZ.UTF-8,en_NZ
 -English(SouthAfrica)	en_ZA.UTF-8,en_ZA
+-English(UK)		en_GB.UTF-8,en_GB
+-English(USA)		en_US.UTF-8,en_US
 -Esperanto		eo.UTF-8,eo
 -Estonian		et_EE.UTF-8,et_EE
 -Finnish			fi_FI.UTF-8,fi_FI
 -French			fr_FR.UTF-8,fr_FR
 -French(Belgium)		fr_BE.UTF-8,fr_BE
+-French(Canada)		fr_CA.UTF-8,fr_CA
+-French(Luxembourg)	fr_LU.UTF-8,fr_LU
 -French(Switzerland)	fr_CH.UTF-8,fr_CH
 -Galician		gl_ES.UTF-8,gl_ES
 -German			de_DE.UTF-8,de_DE
 -German(Austria)		de_AT.UTF-8,de_AT
 -German(Switzerland)	de_CH.UTF-8,de_CH
+-German(Luxembourg)	de_LU.UTF-8,de_LU
 -Greek			el_GR.UTF-8,el_GR
--Gujarati			gu_IN.UTF-8,gu_IN
+-Greek(Cyprus)		el_CY.UTF-8,el_CY
+-Gujarati		gu_IN.UTF-8,gu_IN
 -Hebrew			he_IL.UTF-8,he_IL
 -Hindi			hi_IN.UTF-8,hi_IN
 -Hungarian		hu_HU.UTF-8,hu_HU
 -Icelandic		is_IS.UTF-8,is_IS
--Indonesian			id_ID.UTF-8,id_ID
--Interlingua			ia.UTF-8,ia
+-Indonesian		id_ID.UTF-8,id_ID
+-Interlingua		ia.UTF-8,ia
 -Irish			ga_IE.UTF-8,ga_IE
 -Italian			it_IT.UTF-8,it_IT
 -Japanese		ja_JP.UTF-8,ja_JP
 -Kannada			kn_IN.UTF-8,kn_IN
--Kinyarwanda             rw_RW.UTF-8,rw_RW
+-Kinyarwanda		rw_RW.UTF-8,rw_RW
 -Korean			ko_KR.UTF-8,ko_KR
 -Latvian			lv_LV.UTF-8,lv_LV
 -Limburgish		li_NL.UTF-8,li_NL
@@ -64,30 +74,48 @@
 -Limburgish(Germany)	li_DE.UTF-8,li_DE
 -Lithuanian		lt_LT.UTF-8,lt_LT
 -Macedonian		mk_MK.UTF-8,mk_MK
--Malayalam			ml_IN.UTF-8,ml_IN
+-Malayalam		ml_IN.UTF-8,ml_IN
 -Malay			ms_MY.UTF-8,ms_MY
+-Maltese			mt_MT.UTF-8,mt_MT
 -Maori			mi_NZ.UTF-8,mi_NZ	
 -Marathi			mr_IN.UTF-8,mr_IN
 -Mongolian		mn_MN.UTF-8,mn_MN
 -Nepali			ne_NP.UTF-8,ne_NP
--NorthernSotho	nso_ZA.UTF-8,nso_ZA
+-NorthernSotho		nso_ZA.UTF-8,nso_ZA
 -Norwegian(bokmal)	nb_NO.UTF-8,nb_NO,no_NO.UTF-8,no_NO
 -Norwegian(nynorsk)	nn_NO.UTF-8,nn_NO
 -Oriya			or_IN.UTF-8,or_IN
--Panjabi			pa_IN.UTF-8,pa_IN
 -Persian			fa_IR.UTF-8,fa_IR
 -Polish			pl_PL.UTF-8,pl_PL
 -Portuguese(Brazilian)	pt_BR.UTF-8,pt_BR
 -Portuguese		pt_PT.UTF-8,pt_PT
+-Punjabi			pa_IN.UTF-8,pa_IN
 -Romanian		ro_RO.UTF-8,ro_RO
 -Russian			ru_RU.UTF-8,ru_RU
 -Serbian			sr_CS.UTF-8,sr_CS,sr_YU@cyrillic,sr_YU
+-Serbian(Montenegro)	sr_ME.UTF-8

+-Serbian(Serbia)		sr_RS.UTF-8

+-Serbian(Bosnia)		sh_BA.UTF-8,sh_BA
 -Serbian(Latin)		sr_CS.UTF-8@Latn,sr_CS@Latn,sr_YU@Latn
 -Serbian(Jekavian)	sr_CS.UTF-8@ije,sr_CS@ije,sr_YU@ije
 -Slovak			sk_SK.UTF-8,sk_SK
 -Slovenian		sl_SI.UTF-8,sl_SI
 -Spanish			es_ES.UTF-8,es_ES
+-Spanish(Argentina)	es_AR.UTF-8,es_AR
+-Spanish(Bolivia)	es_BO.UTF-8,es_BO
+-Spanish(Chile)		es_CL.UTF-8,es_CL
+-Spanish(Colombia)	es_CO.UTF-8,es_CO
+-Spanish(CostaRica)	es_CR.UTF-8,es_CR
+-Spanish(Ecuador)	es_EC.UTF-8,es_EC
+-Spanish(Guatemala)	es_GT.UTF-8,es_GT
 -Spanish(Mexico)		es_MX.UTF-8,es_MX
+-Spanish(Nicaragua)	es_NI.UTF-8,es_NI
+-Spanish(Panama)		es_PA.UTF-8,es_PA
+-Spanish(Peru)		es_PE.UTF-8,es_PE
+-Spanish(Paraguay)	es_PY.UTF-8,es_PY
+-Spanish(ElSalvador)	es_SV.UTF-8,es_SV
+-Spanish(Uruguay)	es_UY.UTF-8,es_UY
+-Spanish(Venezuela)	es_VE.UTF-8,es_VE
 -Swedish(Finland)	sv_FI.UTF-8,sv_FI
 -Swedish			sv_SE.UTF-8,sv_SE
 -Tagalog			tl_PH.UTF-8,tl_PH
@@ -105,6 +133,7 @@
 -Xhosa			xh_ZA.UTF-8,xh_ZA
 -Yiddish			yi.UTF-8,yi
 -Zulu			zu_ZA.UTF-8,zu_ZA
++C(POSIX)   C,POSIX
 +Afrikaans              af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1
 +Amharic                am_ET.UTF-8
 +Armenian               hy_AM.UTF-8
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index e889e924e9b9..4bcfd78dceac 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -206,7 +206,6 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
 share/locale/ru/LC_MESSAGES/gdm.mo
 share/locale/rw/LC_MESSAGES/gdm.mo
-share/locale/si/LC_MESSAGES/gdm.mo
 share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sq/LC_MESSAGES/gdm.mo
@@ -264,6 +263,7 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrm etc/gdm
 @dirrmtry etc/dm/Sessions
 @dirrmtry etc/dm
+@dirrmtry sbin
 @dirrmtry share/gnome/log/gdm
 @dirrmtry share/gnome/log
 @unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@@ -286,8 +286,6 @@ share/locale/zu/LC_MESSAGES/gdm.mo
 @dirrmtry share/locale/sl
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/ro/LC_MESSAGES