Update to 2.4.1.4.

7 files changed, 55 insertions, 20 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 0ab83718b4cd..a1b0ae3038b3 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm2
-PORTVERSION=	2.4.1.3
-PORTREVISION=	1
+PORTVERSION=	2.4.1.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.4
@@ -52,8 +51,6 @@ 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(PACKAGE_BUILDING)
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 07f6ddaaa9b5..d394c768b168 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.4.1.3.tar.bz2) = 448769257c5bda3cda48e63869825173
+MD5 (gnome2/gdm-2.4.1.4.tar.bz2) = f1c0272f879abb8d8d412b1d45be5b6c
diff --git a/x11/gdm2/files/patch-config_Makefile.in b/x11/gdm2/files/patch-config_Makefile.in
index cd45ba7f3a66..0f65061f2425 100644
--- a/x11/gdm2/files/patch-config_Makefile.in
+++ b/x11/gdm2/files/patch-config_Makefile.in
@@ -45,7 +45,7 @@
 +		if test '!' -f $(DESTDIR)$(sessdir)/Default; then \
 +		    	$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
  		fi; \
--		$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
+-		$(LN_S) -f Xsession $(DESTDIR)$(sessdir)/Default; \
  	fi
  
  	if test '!' -d $(DESTDIR)$(initdir); then \
diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias
index 48d7d1b0004d..c29dfa7f5bcb 100644
--- a/x11/gdm2/files/patch-config_locale.alias
+++ b/x11/gdm2/files/patch-config_locale.alias
@@ -1,14 +1,19 @@
---- config/locale.alias.orig	Wed Jan  8 13:31:44 2003
-+++ config/locale.alias	Tue Jan 14 16:51:29 2003
-@@ -14,55 +14,36 @@
+--- config/locale.alias.orig	Sat Mar 15 05:31:02 2003
++++ config/locale.alias	Mon May  5 21:44:02 2003
+@@ -14,76 +14,36 @@
  #
  #		- George
  
--Azerbaijani		az_AZ.UTF-8,az_AZ
+-Albanian			sq_AL.UTF-8,sq_AL
+-Amharic			am_ET.UTF-8,am_ET
 -Arabic(Egypt)		ar_EG.UTF-8,ar_EG
 -Arabic(Lebanon)		ar_LB.UTF-8,ar_LB
--Amharic			am_ET.UTF-8,am_ET
+-Azerbaijani		az_AZ.UTF-8,az_AZ
 -Basque			eu_ES.UTF-8,eu_ES
+-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
 -Chinese(simplified)	zh_CN.UTF-8,zh_CN
@@ -17,45 +22,61 @@
 -Czech			cs_CZ.UTF-8,cs_CZ
 -Danish			da_DK.UTF-8,da_DK
 -Dutch			nl_NL.UTF-8,nl_NL
--Estonian		et_EE.UTF-8,et_EE
 -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(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
+-Gujarati			gu_IN.UTF-8,gu_IN
 -Hebrew			he_IL.UTF-8,he_IL
+-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
+-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
+-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
 -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(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
--Portuguese		pt_PT.UTF-8,pt_PT
 -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
+-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
 -Spanish(Mexico)		es_MX.UTF-8,es_MX
--Swedish			sv_SE.UTF-8,sv_SE
 -Swedish(Finland)	sv_FI.UTF-8,sv_FI
+-Swedish			sv_SE.UTF-8,sv_SE
 -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
 -Vietnamese		vi_VN.UTF-8,vi_VN
 -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
diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure
index c7e1c3d22e11..e6e122ab8c2d 100644
--- a/x11/gdm2/files/patch-configure
+++ b/x11/gdm2/files/patch-configure
@@ -1,9 +1,9 @@
---- configure.orig	Wed Jul 17 17:49:15 2002
-+++ configure	Wed Jul 17 17:51:03 2002
-@@ -8531,6 +8532,8 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #line 8532 "configure"
- #include "confdefs.h"
+--- configure.orig	Mon May  5 12:32:19 2003
++++ configure	Mon May  5 21:45:38 2003
+@@ -9772,6 +9772,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <sys/socket.h>
  $ac_includes_default
diff --git a/x11/gdm2/files/patch-gui_gdmphotosetup.c b/x11/gdm2/files/patch-gui_gdmphotosetup.c
new file mode 100644
index 000000000000..6121bdf93f9f
--- /dev/null
+++ b/x11/gdm2/files/patch-gui_gdmphotosetup.c
@@ -0,0 +1,10 @@
+--- gui/gdmphotosetup.c.orig	Mon May  5 21:47:14 2003
++++ gui/gdmphotosetup.c	Mon May  5 21:47:39 2003
+@@ -22,6 +22,7 @@
+ #include <libgnome/libgnome.h>
+ #include <libgnomeui/libgnomeui.h>
+ #include <sys/types.h>
++#include <signal.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 08275bfb95ac..128d03595b26 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -75,6 +75,7 @@ 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
 share/locale/bg/LC_MESSAGES/gdm-2.4.mo
+share/locale/bn/LC_MESSAGES/gdm-2.4.mo
 share/locale/ca/LC_MESSAGES/gdm-2.4.mo
 share/locale/cs/LC_MESSAGES/gdm-2.4.mo
 share/locale/da/LC_MESSAGES/gdm-2.4.mo
@@ -83,6 +84,7 @@ share/locale/el/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
+share/locale/fa/LC_MESSAGES/gdm-2.4.mo
 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
@@ -95,6 +97,7 @@ share/locale/ko/LC_MESSAGES/gdm-2.4.mo
 share/locale/lt/LC_MESSAGES/gdm-2.4.mo
 share/locale/lv/LC_MESSAGES/gdm-2.4.mo
 share/locale/mk/LC_MESSAGES/gdm-2.4.mo
+share/locale/ml/LC_MESSAGES/gdm-2.4.mo
 share/locale/mn/LC_MESSAGES/gdm-2.4.mo
 share/locale/ms/LC_MESSAGES/gdm-2.4.mo
 share/locale/nl/LC_MESSAGES/gdm-2.4.mo
@@ -107,11 +110,15 @@ share/locale/ro/LC_MESSAGES/gdm-2.4.mo
 share/locale/ru/LC_MESSAGES/gdm-2.4.mo
 share/locale/sk/LC_MESSAGES/gdm-2.4.mo
 share/locale/sl/LC_MESSAGES/gdm-2.4.mo
+share/locale/sr/LC_MESSAGES/gdm-2.4.mo
+share/locale/sr@Latn/LC_MESSAGES/gdm-2.4.mo
 share/locale/sv/LC_MESSAGES/gdm-2.4.mo
 share/locale/ta/LC_MESSAGES/gdm-2.4.mo
+share/locale/th/LC_MESSAGES/gdm-2.4.mo
 share/locale/tr/LC_MESSAGES/gdm-2.4.mo
 share/locale/uk/LC_MESSAGES/gdm-2.4.mo
 share/locale/vi/LC_MESSAGES/gdm-2.4.mo
+share/locale/wa/LC_MESSAGES/gdm-2.4.mo
 share/locale/zh_CN/LC_MESSAGES/gdm-2.4.mo
 share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo
 @dirrm share/gnome/gdm/themes/happygnome