* Update to 2.5.90.2

* Cleanup the locale support, and some new locales


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

5 files changed, 64 insertions, 53 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 3a5d176bb..e429a51b9 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.5.90.1
+PORTVERSION=	2.5.90.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.5
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 26151a28a..0447db0dc 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.5.90.1.tar.bz2) = d3f117e42cc1ebe052a656d42373611a
-SIZE (gnome2/gdm-2.5.90.1.tar.bz2) = 2604636
+MD5 (gnome2/gdm-2.5.90.2.tar.bz2) = e2054ab6aa9fe5c6e62235b879774074
+SIZE (gnome2/gdm-2.5.90.2.tar.bz2) = 2659961
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 11f4da7ee..cc11b86e6 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,6 +1,6 @@
---- config/gdm.conf.in.orig	Fri Oct 10 16:57:25 2003
-+++ config/gdm.conf.in	Thu Oct 16 14:33:28 2003
-@@ -73,7 +73,7 @@
+--- config/gdm.conf.in.orig	Thu Feb 12 14:22:36 2004
++++ config/gdm.conf.in	Sat Mar  6 17:22:29 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
@@ -9,7 +9,7 @@
  # 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.
-@@ -93,7 +93,7 @@
+@@ -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
@@ -18,7 +18,7 @@
  #SuspendCommand=
  # Probably should not touch the below this is the standard setup
  ServAuthDir=@EXPANDED_AUTHDIR@
-@@ -127,7 +127,7 @@
+@@ -136,7 +136,7 @@
  # we force X to use specific vts.  turn VTAllocation to false if this
  # is causing problems.
  #FirstVT=7
@@ -27,16 +27,16 @@
  # Should double login be treated with a warning (and possibility to change
  # vts on linux systems for console logins)
  #DoubleLoginWarning=true
-@@ -211,7 +211,7 @@
- # The 'theme'.  By default we're using the default gtk theme
- # Of course assuming that gtk got installed in the same prefix,
- # if not change this.
+@@ -232,7 +232,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
- # Maximum size of an icon, larger icons are scaled down
- #MaxIconWidth=128
- #MaxIconHeight=128
-@@ -364,7 +364,7 @@
+ 
+ # The GTK+ theme to use for the gui
+ #GtkTheme=Default
+@@ -415,7 +415,7 @@
  # Definition of the standard X server.
  [server-Standard]
  name=Standard server
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index 8ac5400b0..7e944b8d2 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,6 +1,6 @@
---- config/locale.alias.orig	Thu May 15 22:56:46 2003
-+++ config/locale.alias	Mon Sep 15 23:41:05 2003
-@@ -14,76 +14,36 @@
+--- config/locale.alias.orig	Sun Feb 29 12:56:10 2004
++++ config/locale.alias	Sat Mar  6 17:45:16 2004
+@@ -14,79 +14,43 @@
  #
  #		- George
  
@@ -25,6 +25,7 @@
 -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(Canadian)	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
@@ -61,7 +62,9 @@
 -Portuguese		pt_PT.UTF-8,pt_PT
 -Romanian		ro_RO.UTF-8,ro_RO
 -Russian			ru_RU.UTF-8,ru_RU
--Serbian			sr_YU.UTF-8,sr_YU
+-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
@@ -77,36 +80,43 @@
 -Walloon			wa_BE.UTF-8,wa_BE
 -Welsh			cy_GB.UTF-8,cy_GB
 -Yiddish			yi.UTF-8,yi
-+Bulgarian              bg_BG.UTF-8,bg_BG.CP1251
-+Chinese(simplified)    zh_CN.UTF-8,zh_CN.EUC
-+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-1
-+Dutch                  nl_NL.UTF-8,nl_NL.ISO8859-15
-+Estonian               et_EE.UTF-8,et_EE.ISO8859-15
-+English(American)      en_US.UTF-8,en_US.ISO8859-1
-+English(Australian)    en_AU.UTF-8,en_AU.ISO8859-1
-+English(British)       en_GB.UTF-8,en_GB.ISO8859-1
-+Finnish                        fi_FI.UTF-8,fi_FI.ISO8859-15
-+French                 fr_FR.UTF-8,fr_FR.ISO8859-15
-+German                 de_DE.UTF-8,de_DE.ISO8859-15
-+Greek                  el_GR.UTF-8,el_GR.ISO8859-7
-+Hungarian              hu_HU.UTF-8,hu_HU.ISO8859-2
-+Icelandic              is_IS.UTF-8,is_IS.ISO8859-1
-+Italian                        it_IT.UTF-8,it_IT.ISO8859-15
-+Japanese               ja_JP.UTF-8,ja_JP.EUC
-+Korean                 ko_KR.UTF-8,ko_KR.EUC
-+Lithuanian             lt_LT.UTF-8,lt_LT.ISO8859-4
-+Norwegian(bokmal)      no_NO.UTF-8,no_NO.ISO8859-1
-+Polish                 pl_PL.UTF-8,pl_PL.ISO8859-2
-+Portuguese             pt_PT.UTF-8,pt_PT.ISO8859-15
-+Portuguese(Brazilian)  pt_BR.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
-+Swedish                        sv_SE.UTF-8,sv_SE.ISO8859-1
-+Turkish                        tr_TR.UTF-8,tr_TR.ISO8859-9
-+Ukrainian              uk_UA.UTF-8,uk_UA.ISO8859-5
++Afrikaans              af_ZA.ISO8859-15,af_ZA.ISO8859-1
++Amharic                am_ET.UTF-8
++Byelorussian           be_BY.CP1131,be_BY.CP1251,be_BY.ISO8859-5
++Bulgarian              bg_BG.CP1251
++Catalan                ca_ES.ISO8859-15,ca_ES.ISO8859-1
++Chinese(simplified)    zh_CN.EUC,zh_CN.eucCN
++Chinese(traditional)   zh_TW.Big5
++Croatian               hr_HR.ISO8859-2
++Czech                  cs_CZ.ISO8859-2
++Danish                 da_DK.ISO8859-15,da_DK.ISO8859-1
++Dutch                  nl_NL.ISO8859-15,nl_NL.ISO8859-1
++English(American)      en_US.ISO8859-1,en_US.ISO8859-15
++English(Australian)    en_AU.ISO8859-1,en_AU.ISO8859-15
++English(British)       en_GB.ISO8859-1,en_GB.ISO8859-15
++English(Canadian)      en_CA.ISO8859-1,en_CA.ISO8859-15
++Estonian               et_EE.ISO8859-15
++Finnish                fi_FI.ISO8859-15,fi_FI.ISO8859-1
++French                 fr_FR.ISO8859-15,fr_FR.ISO8859-1
++German                 de_DE.ISO8859-15,de_DE.ISO8859-1
++Greek                  el_GR.ISO8859-7
++Hindi                  hi_IN.ISCII-DEV
++Hungarian              hu_HU.ISO8859-2
++Icelandic              is_IS.ISO8859-1,is_IS.ISO8859-15
++Italian                it_IT.ISO8859-15,it_IT.ISO8859-1
++Italian(Swiss)         it_CH.ISO8859-15,it_CH.ISO8859-1
++Japanese               ja_JP.EUC,ja_JP.eucJP
++Korean                 ko_KR.EUC,ko_KR.eucKR
++Lithuanian             lt_LT.ISO8859-4,lt_LT.ISO8859-13
++Norwegian(bokmal)      no_NO.ISO8859-1,no_NO.ISO8859-15
++Polish                 pl_PL.ISO8859-2
++Portuguese             pt_PT.ISO8859-15,pt_PT.ISO8859-1
++Portuguese(Brazilian)  pt_BR.ISO8859-1
++Romanian               ro_RO.ISO8859-2
++Russian                ru_RU.ISO8859-5
++Slovak                 sk_SK.ISO8859-2
++Slovenian              sl_SI.ISO8859-2
++Spanish                es_ES.ISO8859-15,es_ES.ISO8859-1
++Swedish                sv_SE.ISO8859-1
++Turkish                tr_TR.ISO8859-9
++Ukrainian              uk_UA.ISO8859-5
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 19078ed10..f6d531206 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -88,6 +88,7 @@ share/locale/cy/LC_MESSAGES/gdm-2.4.mo
 share/locale/da/LC_MESSAGES/gdm-2.4.mo
 share/locale/de/LC_MESSAGES/gdm-2.4.mo
 share/locale/el/LC_MESSAGES/gdm-2.4.mo
+share/locale/en_CA/LC_MESSAGES/gdm-2.4.mo
 share/locale/es/LC_MESSAGES/gdm-2.4.mo
 share/locale/et/LC_MESSAGES/gdm-2.4.mo
 share/locale/eu/LC_MESSAGES/gdm-2.4.mo