Update to 2.4.1.0.

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

5 files changed, 50 insertions, 47 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index e349dd60a..f96209aad 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.0.12
-PORTREVISION=	2
+PORTVERSION=	2.4.1.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.4
@@ -56,6 +55,8 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 post-install:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 9e9c3533a..d96ecf4c3 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.0.12.tar.bz2) = 8aa6e503d4f74de8df32dee28df9a0de
+MD5 (gnome2/gdm-2.4.1.0.tar.bz2) = 086a43286828f886a3737a8c7f977e13
diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al
index 731d036cf..6458c9e46 100644
--- a/x11/gdm2/files/patch-al
+++ b/x11/gdm2/files/patch-al
@@ -1,10 +1,9 @@
---- config/gnomerc.in.orig	Wed Jul 24 15:52:07 2002
-+++ config/gnomerc.in	Wed Jul 24 15:52:26 2002
-@@ -2,6 +2,7 @@
+--- config/gnomerc.in.orig	Mon Nov 11 10:54:52 2002
++++ config/gnomerc.in	Fri Jan  3 12:09:49 2003
+@@ -9,5 +9,6 @@
+ #fi
  
- # Do we have gnome-volume-control?
- # If so we should run it to load the gnome-volume-control settings
+ # path takes precedence
 +LC_CTYPE= ; export LC_CTYPE
- if command -v gnome-volume-control > /dev/null 2>&1; then
- 	gnome-volume-control -i
- else if [ -x @EXPANDED_BINDIR@/gnome-volume-control > /dev/null 2>&1; then
+ exec gnome-session
+ exec @EXPANDED_BINDIR@/gnome-session
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index a162ae142..8e786b162 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,12 +1,13 @@
---- config/locale.alias.orig	Thu Aug 22 18:47:35 2002
-+++ config/locale.alias	Wed Sep 18 22:18:10 2002
-@@ -14,54 +14,36 @@
+--- config/locale.alias.orig	Fri Dec 20 17:49:11 2002
++++ config/locale.alias	Fri Jan  3 12:11:35 2003
+@@ -14,55 +14,36 @@
  #
  #		- George
  
 -Azerbaijani		az_AZ.utf8,az_AZ
 -Arabic(Egypt)		ar_EG.utf8,ar_EG
 -Arabic(Lebanon)		ar_LB.utf8,ar_LB
+-Amharic			am_ET.utf8,am_ET
 -Basque			eu_ES.utf8,eu_ES
 -Bulgarian		bg_BG.utf8,bg_BG
 -Catalan			ca_ES.utf8,ca_ES
@@ -55,36 +56,36 @@
 -Ukrainian		uk_UA.utf8,uk_UA
 -Vietnamese		vi_VN.utf8,vi_VN
 -Walloon			wa_BE.utf8,wa_BE
-+Bulgarian		bg_BG.utf8,bg_BG.CP1251
-+Chinese(simplified)	zh_CN.utf8,zh_CN.EUC
-+Chinese(traditional)	zh_TW.utf8,zh_TW.Big5
-+Croatian		hr_HR.utf8,hr_HR.ISO_8859-2
-+Czech			cs_CZ.utf8,cs_CZ.ISO_8859-2
-+Danish			da_DK.utf8,da_DK.ISO_8859-1
-+Dutch			nl_NL.utf8,nl_NL.ISO_8859-1
-+Estonian		et_EE.utf8,et_EE.ISO_8859-15
-+English(American)	en_US.utf8,en_US.ISO_8859-1
-+English(Australian)	en_AU.utf8,en_AU.ISO_8859-1
-+English(British)	en_GB.utf8,en_GB.ISO_8859-1
-+Finnish			fi_FI.utf8,fi_FI.ISO_8859-1
-+French			fr_FR.utf8,fr_FR.ISO_8859-1
-+German			de_DE.utf8,de_DE.ISO_8859-1
-+Greek			el_GR.utf8,el_GR.ISO_8859-7
-+Hungarian		hu_HU.utf8,hu_HU.ISO_8859-2
-+Icelandic		is_IS.utf8,is_IS.ISO_8859-1
-+Italian			it_IT.utf8,it_IT.ISO_8859-1
-+Japanese		ja_JP.utf8,ja_JP.EUC
-+Korean			ko_KR.utf8,ko_KR.EUC
-+Lithuanian		lt_LT.utf8,lt_LT.ISO_8859-4
-+Norwegian(bokmal)	no_NO.utf8,no_NO.ISO_8859-1
-+Polish			pl_PL.utf8,pl_PL.ISO_8859-2
-+Portuguese		pt_PT.utf8,pt_PT.ISO_8859-1
-+Portuguese(Brazilian)	pt_BR.utf8,pt_BR.ISO8859-1
-+Romanian		ro_RO.utf8,ro_RO.ISO8859-2
-+Russian			ru_RU.utf8,ru_RU.ISO_8859-5
-+Slovak			sk_SK.utf8,sk_SK.ISO_8859-2
-+Slovenian		sl_SI.utf8,sl_SI.ISO_8859-2
-+Spanish			es_ES.utf8,es_ES.ISO_8859-1
-+Swedish			sv_SE.utf8,sv_SE.ISO_8859-1
-+Turkish			tr_TR.utf8,tr_TR.ISO_8859-9
-+Ukrainian		uk_UA.utf8,uk_UA.ISO8859-5
++Bulgarian              bg_BG.utf8,bg_BG.CP1251
++Chinese(simplified)    zh_CN.utf8,zh_CN.EUC
++Chinese(traditional)   zh_TW.utf8,zh_TW.Big5
++Croatian               hr_HR.utf8,hr_HR.ISO_8859-2
++Czech                  cs_CZ.utf8,cs_CZ.ISO_8859-2
++Danish                 da_DK.utf8,da_DK.ISO_8859-1
++Dutch                  nl_NL.utf8,nl_NL.ISO_8859-1
++Estonian               et_EE.utf8,et_EE.ISO_8859-15
++English(American)      en_US.utf8,en_US.ISO_8859-1
++English(Australian)    en_AU.utf8,en_AU.ISO_8859-1
++English(British)       en_GB.utf8,en_GB.ISO_8859-1
++Finnish                        fi_FI.utf8,fi_FI.ISO_8859-1
++French                 fr_FR.utf8,fr_FR.ISO_8859-1
++German                 de_DE.utf8,de_DE.ISO_8859-1
++Greek                  el_GR.utf8,el_GR.ISO_8859-7
++Hungarian              hu_HU.utf8,hu_HU.ISO_8859-2
++Icelandic              is_IS.utf8,is_IS.ISO_8859-1
++Italian                        it_IT.utf8,it_IT.ISO_8859-1
++Japanese               ja_JP.utf8,ja_JP.EUC
++Korean                 ko_KR.utf8,ko_KR.EUC
++Lithuanian             lt_LT.utf8,lt_LT.ISO_8859-4
++Norwegian(bokmal)      no_NO.utf8,no_NO.ISO_8859-1
++Polish                 pl_PL.utf8,pl_PL.ISO_8859-2
++Portuguese             pt_PT.utf8,pt_PT.ISO_8859-1
++Portuguese(Brazilian)  pt_BR.utf8,pt_BR.ISO8859-1
++Romanian               ro_RO.utf8,ro_RO.ISO8859-2
++Russian                        ru_RU.utf8,ru_RU.ISO_8859-5
++Slovak                 sk_SK.utf8,sk_SK.ISO_8859-2
++Slovenian              sl_SI.utf8,sl_SI.ISO_8859-2
++Spanish                        es_ES.utf8,es_ES.ISO_8859-1
++Swedish                        sv_SE.utf8,sv_SE.ISO_8859-1
++Turkish                        tr_TR.utf8,tr_TR.ISO_8859-9
++Ukrainian              uk_UA.utf8,uk_UA.ISO8859-5
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 3ebf8e671..a89a0c9c3 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -61,6 +61,7 @@ share/gnome/pixmaps/gdm.png
 share/gnome/pixmaps/login-photo.png
 share/gnome/pixmaps/nobody.png
 share/gnome/pixmaps/nohost.png
+share/locale/am/LC_MESSAGES/gdm-2.4.mo
 share/locale/ar/LC_MESSAGES/gdm-2.4.mo
 share/locale/az/LC_MESSAGES/gdm-2.4.mo
 share/locale/be/LC_MESSAGES/gdm-2.4.mo
@@ -77,6 +78,7 @@ share/locale/fi/LC_MESSAGES/gdm-2.4.mo
 share/locale/fr/LC_MESSAGES/gdm-2.4.mo
 share/locale/ga/LC_MESSAGES/gdm-2.4.mo
 share/locale/gl/LC_MESSAGES/gdm-2.4.mo
+share/locale/he/LC_MESSAGES/gdm-2.4.mo
 share/locale/hu/LC_MESSAGES/gdm-2.4.mo
 share/locale/it/LC_MESSAGES/gdm-2.4.mo
 share/locale/ja/LC_MESSAGES/gdm-2.4.mo