Update to 2.6.0.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2852 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 233 insertions, 0 deletions

diff --git a/x11/gdm2/files/gdm.sh.sample b/x11/gdm2/files/gdm.sh.sample
new file mode 100644
index 000000000..7b1e4fef7
--- /dev/null
+++ b/x11/gdm2/files/gdm.sh.sample
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/x11/gdm2/files/gdm.sh.sample,v 1.5 2004/04/05 03:11:31 marcus Exp $
+
+PREFIX=%%PREFIX%%
+
+case "$1" in
+start)
+	${PREFIX}/bin/gdm
+	;;
+stop)
+	/usr/bin/killall -m gdm 2>/dev/null
+	;;
+*)
+	echo "Usage: `basename $0` start | stop"
+	exit 64
+	;;
+
+esac
+
+exit 0
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
new file mode 100644
index 000000000..0bc57e468
--- /dev/null
+++ b/x11/gdm2/files/patch-ab
@@ -0,0 +1,45 @@
+--- config/gdm.conf.in.orig	Mon Aug  2 18:20:59 2004
++++ config/gdm.conf.in	Thu Aug 19 12:54:26 2004
+@@ -77,7 +77,7 @@
+ # To try to kill all clients started at greeter time or in the Init script.
+ # doesn't always work, only if those clients have a window of their own
+ #KillInitClients=true
+-LogDir=@EXPANDED_LOGDIR@
++LogDir=/var/log
+ # You should probably never change this value unless you have a weird setup
+ PidFile=/var/run/gdm.pid
+ # Note that a post login script is run before a PreSession script.
+@@ -97,7 +97,7 @@
+ # Reboot, Halt and suspend commands, you can add different commands
+ # separated by a semicolon and gdm will use the first one it can find
+ #RebootCommand=/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now
+-#HaltCommand=/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now
++HaltCommand=/sbin/shutdown -p now;/usr/sbin/shutdown -p now
+ #SuspendCommand=
+ # Probably should not touch the below this is the standard setup
+ ServAuthDir=@EXPANDED_AUTHDIR@
+@@ -132,11 +132,10 @@
+ #FlexiReapDelayMinutes=5
+ # the X nest command
+ Xnest=@X_SERVER_PATH@/Xnest -audit 0 -name Xnest
+-# Automatic VT allocation.  Right now only works on Linux.  This way
+-# we force X to use specific vts.  turn VTAllocation to false if this
+-# is causing problems.
+-#FirstVT=7
+-#VTAllocation=true
++# Automatic VT allocation. This way we force X to use specific vts.
++# Turn VTAllocation to false if this is causing problems.
++#FirstVT=9
++VTAllocation=false
+ # Should double login be treated with a warning (and possibility to change
+ # vts on linux systems for console logins)
+ #DoubleLoginWarning=true
+@@ -241,7 +240,7 @@
+ # The specific gtkrc file we use.  It should be the full path to the gtkrc
+ # that we need.  Unless you need a specific gtkrc that doesn't correspond to
+ # a specific theme, then just use the GtkTheme key
+-#GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk/gtkrc
++GtkRC=@EXPANDED_DATADIR@/../themes/Default/gtk-2.0/gtkrc
+ 
+ # The GTK+ theme to use for the gui
+ #GtkTheme=Default
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in
new file mode 100644
index 000000000..9678f710c
--- /dev/null
+++ b/x11/gdm2/files/patch-config_Makefile.in
@@ -0,0 +1,11 @@
+--- config/Makefile.in.orig	Fri Jun 11 15:40:03 2004
++++ config/Makefile.in	Fri Jun 11 15:41:30 2004
+@@ -400,7 +400,7 @@
+ 
+ 	if test '!' -d $(DESTDIR)$(logdir); then \
+ 		$(mkinstalldirs) $(DESTDIR)$(logdir); \
+-		chown root:root $(DESTDIR)$(logdir); \
++		chown root:wheel $(DESTDIR)$(logdir); \
+ 		chmod 755 $(DESTDIR)$(logdir); \
+ 	fi
+ 
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
new file mode 100644
index 000000000..de8e5ea8d
--- /dev/null
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -0,0 +1,134 @@
+--- config/locale.alias.orig	Tue Aug  3 19:38:53 2004
++++ config/locale.alias	Thu Aug 19 13:11:27 2004
+@@ -14,84 +14,50 @@
+ #
+ #		- George
+ 
+-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
+-Armenian		hy_AM.UTF-8,hy_AM
+-Azerbaijani		az_AZ.UTF-8,az_AZ
+-Basque			eu_ES.UTF-8,eu_ES
+-Belarusian			be_BY.UTF-8,be_BY
+-Bengali			bn_BD.UTF-8,bn_BD
+-Bengali(India)			bn_IN.UTF-8,bn_IN
+-Bosnian			bs_BA.UTF-8,bs_BA
+-Bulgarian		bg_BG.UTF-8,bg_BG
+-Catalan			ca_ES.UTF-8,ca_ES
+-Chinese(simplified)	zh_CN.UTF-8,zh_CN
+-Chinese(traditional)	zh_TW.UTF-8,zh_TW
+-Croatian		hr_HR.UTF-8,hr_HR
+-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
+-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
+-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(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
+-Greek			el_GR.UTF-8,el_GR
+-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
+-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
+-Korean			ko_KR.UTF-8,ko_KR
+-Latvian			lv_LV.UTF-8,lv_LV
+-Lithuanian		lt_LT.UTF-8,lt_LT
+-Macedonian		mk_MK.UTF-8,mk_MK
+-Malayalam			ml_IN.UTF-8,ml_IN
+-Malay			ms_MY.UTF-8,ms_MY
+-Marathi			mr_IN.UTF-8,mr_IN
+-Mongolian		mn_MN.UTF-8,mn_MN
+-Norwegian(bokmal)	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
+-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(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(Mexico)		es_MX.UTF-8,es_MX
+-Swedish(Finland)	sv_FI.UTF-8,sv_FI
+-Swedish			sv_SE.UTF-8,sv_SE
+-Tamil			ta_IN.UTF-8,ta_IN
+-Telugu			te_IN.UTF-8,te_IN
+-Thai			th_TH.UTF-8,th_TH
+-Turkish			tr_TR.UTF-8,tr_TR
+-Ukrainian		uk_UA.UTF-8,uk_UA
+-Vietnamese		vi_VN.UTF-8,vi_VN
+-Walloon			wa_BE.UTF-8,wa_BE
+-Welsh			cy_GB.UTF-8,cy_GB
+-Yiddish			yi.UTF-8,yi
++Afrikaans              af_ZA.UTF-8,af_ZA.ISO8859-15,af_ZA.ISO8859-1
++Amharic                am_ET.UTF-8
++Armenian               hy_AM.UTF-8
++Byelorussian           be_BY.UTF-8,be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5
++Bulgarian              bg_BG.UTF-8,bg_BG.CP1251
++Catalan                ca_ES.UTF-8,ca_ES.ISO8859-15,ca_ES.ISO8859-1
++Chinese(simplified)    zh_CN.UTF-8,zh_CN.EUC,zh_CN.eucCN
++Chinese(traditional)   zh_TW.UTF-8,zh_TW.Big5
++Croatian               hr_HR.UTF-8,hr_HR.ISO8859-2
++Czech                  cs_CZ.UTF-8,cs_CZ.ISO8859-2
++Danish                 da_DK.UTF-8,da_DK.ISO8859-15,da_DK.ISO8859-1
++Dutch                  nl_NL.UTF-8,nl_NL.ISO8859-15,nl_NL.ISO8859-1
++Dutch(Belgian)         nl_BE.UTF-8,nl_BE.ISO8859-15,nl_BE.ISO8859-1
++English(American)      en_US.UTF-8,en_US.ISO8859-1,en_US.ISO8859-15
++English(Australian)    en_AU.UTF-8,en_AU.ISO8859-1,en_AU.ISO8859-15
++English(British)       en_GB.UTF-8,en_GB.ISO8859-1,en_GB.ISO8859-15
++English(Canadian)      en_CA.UTF-8,en_CA.ISO8859-1,en_CA.ISO8859-15
++English(Irish)         en_IE.UTF-8,en_IE.ISO8859-1,en_IE.ISO8859-15
++English(New Zealand)   en_NZ.UTF-8,en_NZ.ISO8859-1,en_NZ.ISO8859-15
++Estonian               et_EE.UTF-8,et_EE.ISO8859-15
++Finnish                fi_FI.UTF-8,fi_FI.ISO8859-15,fi_FI.ISO8859-1
++French                 fr_FR.UTF-8,fr_FR.ISO8859-15,fr_FR.ISO8859-1
++French(Canadian)       fr_CA.UTF-8,fr_CA.ISO8859-1,fr_CA.ISO8859-15
++French(Swiss)          fr_CH.UTF-8,fr_CH.ISO8859-15,fr_CH.ISO8859-1
++German                 de_DE.UTF-8,de_DE.ISO8859-15,de_DE.ISO8859-1
++Greek                  el_GR.UTF-8,el_GR.ISO8859-7
++Hebrew                 he_IL.UTF-8
++Hindi                  hi_IN.ISCII-DEV
++Hungarian              hu_HU.UTF-8,hu_HU.ISO8859-2
++Icelandic              is_IS.UTF-8,is_IS.ISO8859-1,is_IS.ISO8859-15
++Italian                it_IT.UTF-8,it_IT.ISO8859-15,it_IT.ISO8859-1
++Italian(Swiss)         it_CH.UTF-8,it_CH.ISO8859-15,it_CH.ISO8859-1
++Japanese               ja_JP.UTF-8,ja_JP.EUC,ja_JP.eucJP
++Korean                 ko_KR.UTF-8,ko_KR.EUC,ko_KR.eucKR
++Lithuanian             lt_LT.UTF-8,lt_LT.ISO8859-4,lt_LT.ISO8859-13
++Norwegian(bokmal)      no_NO.UTF-8,no_NO.ISO8859-1,no_NO.ISO8859-15
++Polish                 pl_PL.UTF-8,pl_PL.ISO8859-2
++Portuguese             pt_PT.UTF-8,pt_PT.ISO8859-15,pt_PT.ISO8859-1
++Portuguese(Brazilian)  pt_PT.UTF-8,pt_BR.ISO8859-1
++Romanian               ro_RO.UTF-8,ro_RO.ISO8859-2
++Russian                ru_RU.UTF-8,ru_RU.ISO8859-5
++Slovak                 sk_SK.UTF-8,sk_SK.ISO8859-2
++Slovenian              sl_SI.UTF-8,sl_SI.ISO8859-2
++Spanish                es_ES.UTF-8,es_ES.ISO8859-15,es_ES.ISO8859-1
++Swedish                sv_SV.UTF-8,sv_SE.ISO8859-1
++Turkish                tr_TR.UTF-8,tr_TR.ISO8859-9
++Ukrainian              uk_UA.UTF-8,uk_UA.ISO8859-5
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure
new file mode 100644
index 000000000..cbbc44334
--- /dev/null
+++ b/x11/gdm2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Jun 28 18:15:07 2003
++++ configure	Sat Jun 28 18:15:08 2003
+@@ -20222,6 +20222,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
+ $ac_includes_default
+ int
+ main ()
diff --git a/x11/gdm2/files/patch-gui_gdmsetup.c b/x11/gdm2/files/patch-gui_gdmsetup.c
new file mode 100644
index 000000000..c1eedd5cb
--- /dev/null
+++ b/x11/gdm2/files/patch-gui_gdmsetup.c
@@ -0,0 +1,11 @@
+--- gui/gdmsetup.c.orig	Fri Jun  4 14:37:17 2004
++++ gui/gdmsetup.c	Fri Jun 11 15:42:28 2004
+@@ -1983,7 +1983,7 @@
+ 		/* HACK! */
+ 		argv[0] = chown;
+ 		argv[1] = "-R";
+-		argv[2] = "root:root";
++		argv[2] = "root:wheel";
+ 		argv[3] = quoted;
+ 		argv[4] = NULL;
+ 		simple_spawn_sync (argv);