Update to 2.6.0.6.

Is the config/locale.alias patch still necessary? Is its existence
a manifestation of some upwards breakage?


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

4 files changed, 16 insertions, 18 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index fe3dac0d6..a14d0f9ba 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.6.0.5
-PORTREVISION=	1
+PORTVERSION=	2.6.0.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 918166a0a..ff06b0d61 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gdm-2.6.0.5.tar.bz2) = 8fad6d36c0c9b8f83fceb947b3de1c31
-SIZE (gnome2/gdm-2.6.0.5.tar.bz2) = 3218079
+MD5 (gnome2/gdm-2.6.0.6.tar.bz2) = 8dca7cb1f28d81f60f6e07b3c24288c5
+SIZE (gnome2/gdm-2.6.0.6.tar.bz2) = 3216098
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 0bc57e468..35cd08f89 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- config/gdm.conf.in.orig	Tue Oct 26 23:18:21 2004
++++ config/gdm.conf.in	Tue Oct 26 23:20:49 2004
+@@ -76,7 +76,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.
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,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,23 +18,22 @@
  #SuspendCommand=
  # Probably should not touch the below this is the standard setup
  ServAuthDir=@EXPANDED_AUTHDIR@
-@@ -132,11 +132,10 @@
+@@ -131,11 +131,11 @@
  #FlexiReapDelayMinutes=5
  # the X nest command
- Xnest=@X_SERVER_PATH@/Xnest -audit 0 -name Xnest
+ Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
 -# 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.
++# Automatic VT allocation.  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)
+ # vts on linux and freebsd systems for console logins)
  #DoubleLoginWarning=true
-@@ -241,7 +240,7 @@
+@@ -240,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
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index de8e5ea8d..27ffdec94 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -57,7 +57,7 @@
 -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)	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
@@ -120,7 +120,7 @@
 +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
++Norwegian(bokmal)      nb_NO.UTF-8,nb_NO.ISO8859-1,nb_NO.ISO8859-15,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