Finishing previous commit.

2 files changed, 102 insertions, 19 deletions

diff --git a/x11/gdm/patches/patch-ad b/x11/gdm/patches/patch-ad
new file mode 100644
index 00000000000..fde6df14b0d
--- /dev/null
+++ b/x11/gdm/patches/patch-ad
@@ -0,0 +1,102 @@
+$NetBSD: patch-ad,v 1.3 2004/01/20 13:46:00 xtraeme Exp $
+
+--- config/locale.alias.orig	2003-03-15 04:31:02.000000000 -0600
++++ config/locale.alias
+@@ -24,65 +24,65 @@ 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
++Bulgarian		bg_BG.UTF-8,bg_BG.CP1251
++Catalan			ca_ES.UTF-8,ca_ES.ISO8859-15
+ 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
++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
++Dutch			nl_NL.UTF-8,nl_NL.ISO8859-15
+ English(American)	en_US.UTF-8,en_US
+-English(Australian)	en_AU.UTF-8,en_AU
+-English(British)	en_GB.UTF-8,en_GB
++English(Australian)	en_AU.UTF-8,en_AU.ISO8859-15
++English(British)	en_GB.UTF-8,en_GB.ISO8859-15
+ 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
+-Galician		gl_ES.UTF-8,gl_ES
+-German			de_DE.UTF-8,de_DE
+-Greek			el_GR.UTF-8,el_GR
++Estonian		et_EE.UTF-8,et
++Finnish			fi_FI.UTF-8,fi_FI.ISO8859-15
++French			fr_FR.UTF-8,fr_FR.ISO8859-15
++Galician		gl_ES.UTF-8,gl
++German			de_DE.UTF-8,de_DE.ISO8859-15
++Greek			el_GR.UTF-8,el_GR.ISO8859-7
+ Gujarati			gu_IN.UTF-8,gu_IN
+-Hebrew			he_IL.UTF-8,he_IL
++Hebrew			he_IL.UTF-8,he
+ 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
++Hungarian		hu_HU.UTF-8,hu_HU.ISO8859-2
++Icelandic		is_IS.UTF-8,is_IS.ISO8859-15
++Indonesian			id_ID.UTF-8,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
++Italian			it_IT.UTF-8,it_IT.ISO8859-15
++Japanese		ja_JP.UTF-8,ja_JP.eucJP
+ 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
++Lithuanian		lt_LT.UTF-8,lt_LT.ISO8859-4
+ 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(bokmal)	no_NO.UTF-8,no_NO.ISO8859-15
+ 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
++Polish			pl_PL.UTF-8,pl_PL.ISO8859-2
+ 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
++Portuguese		pt_PT.UTF-8,pt_PT.ISO8859-15
++Romanian		ro_RO.UTF-8,ro
++Russian			ru_RU.UTF-8,ru_RU.CP866
+ Serbian			sr_YU.UTF-8,sr_YU
+-Slovak			sk_SK.UTF-8,sk_SK
+-Slovenian		sl_SI.UTF-8,sl_SI
+-Spanish			es_ES.UTF-8,es_ES
++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
+ Spanish(Mexico)		es_MX.UTF-8,es_MX
+ Swedish(Finland)	sv_FI.UTF-8,sv_FI
+-Swedish			sv_SE.UTF-8,sv_SE
++Swedish			sv_SE.UTF-8,sv_SE.ISO8859-15
+ 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
++Turkish			tr_TR.UTF-8,tr
++Ukrainian		uk_UA.UTF-8,uk_UA.KOI8-U
+ Vietnamese		vi_VN.UTF-8,vi_VN
+ Walloon			wa_BE.UTF-8,wa_BE
+ Welsh			cy_GB.UTF-8,cy_GB
diff --git a/x11/gdm/patches/patch-ai b/x11/gdm/patches/patch-ai
deleted file mode 100644
index 94320cd73a4..00000000000
--- a/x11/gdm/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/10/26 19:51:08 bouyer Exp $
-
---- gui/gdmchooser.c	Tue Oct 22 20:48:21 2002
-+++ gui/gdmchooser.c.orig	Tue Oct 22 20:47:33 2002
-@@ -47,7 +47,14 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef SunOS
-+#define BSD_COMP
- #include <sys/ioctl.h>
-+#undef BSD_COMP
-+#else
-+#include <sys/ioctl.h>
-+#endif
-+
- #include <net/if.h>
- 
- #include "gdmchooser.h"