6 files changed, 160 insertions, 24 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 3d7bd2147481..841f4932914f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	2.2.5.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		stable/sources/gdm
diff --git a/x11/gdm/files/patch-ab b/x11/gdm/files/patch-ab
index 6a18c1cae12b..cd7353010772 100644
--- a/x11/gdm/files/patch-ab
+++ b/x11/gdm/files/patch-ab
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- config/gdm.conf.in.orig	Fri Nov 16 13:42:13 2001
-+++ config/gdm.conf.in	Mon Nov 26 17:53:18 2001
++++ config/gdm.conf.in	Thu Dec 20 11:35:10 2001
 @@ -5,7 +5,7 @@
  # want gdm to kill/restart the server, turn this on
  AlwaysRestartServer=false
@@ -51,8 +51,12 @@ $FreeBSD$
  MaxIconWidth=128
  MaxIconHeight=128
  
-@@ -80,11 +80,11 @@
- DefaultLocale=en_US
+@@ -77,14 +77,14 @@
+ ConfigAvailable=true
+ Browser=false
+ DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
+-DefaultLocale=en_US
++DefaultLocale=en_US.ISO_8859-1
  # These are things excluded from the face browser, not from logging in
  Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
 -Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
diff --git a/x11/gdm/files/patch-ap b/x11/gdm/files/patch-ap
index e0d2990df5c8..e971ac1a811b 100644
--- a/x11/gdm/files/patch-ap
+++ b/x11/gdm/files/patch-ap
@@ -1,14 +1,77 @@
---- config/locale.alias.orig	Fri Apr 20 20:46:35 2001
-+++ config/locale.alias	Fri Apr 20 20:47:30 2001
-@@ -43,9 +43,8 @@
- hungarian       hu_HU.ISO-8859-2
- icelandic       is_IS.ISO-8859-1
- italian         it_IT.ISO-8859-1
+
+$FreeBSD$
+
+--- config/locale.alias.orig	Thu Dec 20 11:40:42 2001
++++ config/locale.alias	Thu Dec 20 11:40:47 2001
+@@ -29,39 +29,38 @@
+ catalan		ca_ES.ISO-8859-1
+ chinese(simplified)	zh_CN.GB2312
+ chinese(traditional)	zh_TW
+-croatian	hr_HR.ISO-8859-2
+-czech		cs_CZ.ISO-8859-2
++croatian	hr_HR.ISO_8859-2
++czech		cs_CZ.ISO_8859-2
+ danish          da_DK.ISO-8859-1
+-dansk		da_DK.ISO-8859-1
+-deutsch		de_DE.ISO-8859-1
+-dutch		nl_NL.ISO-8859-1
+-english		en.ISO-8859-1
+-english.us	en_US.ISO-8859-1
+-english.gb	en_GB.ISO-8859-1
+-finnish         fi_FI.ISO-8859-1
+-french		fr_FR.ISO-8859-1
+-galician	gl_ES.ISO-8859-1
+-german		de_DE.ISO-8859-1
+-greek           el_GR.ISO-8859-7
+-hebrew          iw_IL.ISO-8859-8
+-hrvatski	hr_HR.ISO-8859-2
+-hungarian       hu_HU.ISO-8859-2
+-icelandic       is_IS.ISO-8859-1
+-italian         it_IT.ISO-8859-1
 -japanese	ja_JP.SJIS
 -japanese.euc	ja_JP.eucJP
 -korean          ko_KR.eucKR
+-lithuanian	lt_LT.ISO-8859-13
+-norwegian       no_NO.ISO-8859-1
+-nynorsk		nn_NO.ISO-8859-1
+-polish          pl_PL.ISO-8859-2
+-portuguese      pt_PT.ISO-8859-1
+-portuguese.br	pt_BR.ISO-8859-1
+-romanian        ro_RO.ISO-8859-2
++dansk		da_DK.ISO_8859-1
++deutsch		de_DE.ISO_8859-1
++dutch		nl_NL.ISO_8859-1
++english		en_US.ISO_8859-1
++english.us	en_US.ISO_8859-1
++english.gb	en_GB.ISO_8859-1
++finnish         fi_FI.ISO_8859-1
++french		fr_FR.ISO_8859-1
++galician	gl_ES.ISO_8859-1
++german		de_DE.ISO_8859-1
++greek           el_GR.ISO_8859-7
++hebrew          iw_IL.ISO_8859-8
++hrvatski	hr_HR.ISO_8859-2
++hungarian       hu_HU.ISO_8859-2
++icelandic       is_IS.ISO_8859-1
++italian         it_IT.ISO_8859-1
 +japanese	ja_JP.EUC
 +korean          ko_KR.EUC
- lithuanian	lt_LT.ISO-8859-13
- norwegian       no_NO.ISO-8859-1
- polish          pl_PL.ISO-8859-2
++lithuanian	lt_LT.ISO_8859-13
++norwegian       no_NO.ISO_8859-1
++nynorsk		nn_NO.ISO_8859-1
++polish          pl_PL.ISO_8859-2
++portuguese      pt_PT.ISO_8859-1
++portuguese.br	pt_BR.ISO_8859-1
++romanian        ro_RO.ISO_8859-2
+ russian         ru_RU.KOI8-R
+-slovak          sk_SK.ISO-8859-2
+-slovenian       sl_SI.ISO-8859-2
+-spanish         es_ES.ISO-8859-1
+-swedish         sv_SE.ISO-8859-1
+-turkish         tr_TR.ISO-8859-9
++slovak          sk_SK.ISO_8859-2
++slovenian       sl_SI.ISO_8859-2
++spanish         es_ES.ISO_8859-1
++swedish         sv_SE.ISO_8859-1
++turkish         tr_TR.ISO_8859-9
+ ukrainian	uk_UA.KOI8-U
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 3d7bd2147481..841f4932914f 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gdm
 PORTVERSION=	2.2.5.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		stable/sources/gdm
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 6a18c1cae12b..cd7353010772 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- config/gdm.conf.in.orig	Fri Nov 16 13:42:13 2001
-+++ config/gdm.conf.in	Mon Nov 26 17:53:18 2001
++++ config/gdm.conf.in	Thu Dec 20 11:35:10 2001
 @@ -5,7 +5,7 @@
  # want gdm to kill/restart the server, turn this on
  AlwaysRestartServer=false
@@ -51,8 +51,12 @@ $FreeBSD$
  MaxIconWidth=128
  MaxIconHeight=128
  
-@@ -80,11 +80,11 @@
- DefaultLocale=en_US
+@@ -77,14 +77,14 @@
+ ConfigAvailable=true
+ Browser=false
+ DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
+-DefaultLocale=en_US
++DefaultLocale=en_US.ISO_8859-1
  # These are things excluded from the face browser, not from logging in
  Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
 -Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
diff --git a/x11/gdm2/files/patch-ap b/x11/gdm2/files/patch-ap
index e0d2990df5c8..e971ac1a811b 100644
--- a/x11/gdm2/files/patch-ap
+++ b/x11/gdm2/files/patch-ap
@@ -1,14 +1,77 @@
---- config/locale.alias.orig	Fri Apr 20 20:46:35 2001
-+++ config/locale.alias	Fri Apr 20 20:47:30 2001
-@@ -43,9 +43,8 @@
- hungarian       hu_HU.ISO-8859-2
- icelandic       is_IS.ISO-8859-1
- italian         it_IT.ISO-8859-1
+
+$FreeBSD$
+
+--- config/locale.alias.orig	Thu Dec 20 11:40:42 2001
++++ config/locale.alias	Thu Dec 20 11:40:47 2001
+@@ -29,39 +29,38 @@
+ catalan		ca_ES.ISO-8859-1
+ chinese(simplified)	zh_CN.GB2312
+ chinese(traditional)	zh_TW
+-croatian	hr_HR.ISO-8859-2
+-czech		cs_CZ.ISO-8859-2
++croatian	hr_HR.ISO_8859-2
++czech		cs_CZ.ISO_8859-2
+ danish          da_DK.ISO-8859-1
+-dansk		da_DK.ISO-8859-1
+-deutsch		de_DE.ISO-8859-1
+-dutch		nl_NL.ISO-8859-1
+-english		en.ISO-8859-1
+-english.us	en_US.ISO-8859-1
+-english.gb	en_GB.ISO-8859-1
+-finnish         fi_FI.ISO-8859-1
+-french		fr_FR.ISO-8859-1
+-galician	gl_ES.ISO-8859-1
+-german		de_DE.ISO-8859-1
+-greek           el_GR.ISO-8859-7
+-hebrew          iw_IL.ISO-8859-8
+-hrvatski	hr_HR.ISO-8859-2
+-hungarian       hu_HU.ISO-8859-2
+-icelandic       is_IS.ISO-8859-1
+-italian         it_IT.ISO-8859-1
 -japanese	ja_JP.SJIS
 -japanese.euc	ja_JP.eucJP
 -korean          ko_KR.eucKR
+-lithuanian	lt_LT.ISO-8859-13
+-norwegian       no_NO.ISO-8859-1
+-nynorsk		nn_NO.ISO-8859-1
+-polish          pl_PL.ISO-8859-2
+-portuguese      pt_PT.ISO-8859-1
+-portuguese.br	pt_BR.ISO-8859-1
+-romanian        ro_RO.ISO-8859-2
++dansk		da_DK.ISO_8859-1
++deutsch		de_DE.ISO_8859-1
++dutch		nl_NL.ISO_8859-1
++english		en_US.ISO_8859-1
++english.us	en_US.ISO_8859-1
++english.gb	en_GB.ISO_8859-1
++finnish         fi_FI.ISO_8859-1
++french		fr_FR.ISO_8859-1
++galician	gl_ES.ISO_8859-1
++german		de_DE.ISO_8859-1
++greek           el_GR.ISO_8859-7
++hebrew          iw_IL.ISO_8859-8
++hrvatski	hr_HR.ISO_8859-2
++hungarian       hu_HU.ISO_8859-2
++icelandic       is_IS.ISO_8859-1
++italian         it_IT.ISO_8859-1
 +japanese	ja_JP.EUC
 +korean          ko_KR.EUC
- lithuanian	lt_LT.ISO-8859-13
- norwegian       no_NO.ISO-8859-1
- polish          pl_PL.ISO-8859-2
++lithuanian	lt_LT.ISO_8859-13
++norwegian       no_NO.ISO_8859-1
++nynorsk		nn_NO.ISO_8859-1
++polish          pl_PL.ISO_8859-2
++portuguese      pt_PT.ISO_8859-1
++portuguese.br	pt_BR.ISO_8859-1
++romanian        ro_RO.ISO_8859-2
+ russian         ru_RU.KOI8-R
+-slovak          sk_SK.ISO-8859-2
+-slovenian       sl_SI.ISO-8859-2
+-spanish         es_ES.ISO-8859-1
+-swedish         sv_SE.ISO-8859-1
+-turkish         tr_TR.ISO-8859-9
++slovak          sk_SK.ISO_8859-2
++slovenian       sl_SI.ISO_8859-2
++spanish         es_ES.ISO_8859-1
++swedish         sv_SE.ISO_8859-1
++turkish         tr_TR.ISO_8859-9
+ ukrainian	uk_UA.KOI8-U