Update to 2.2.5.2.

14 files changed, 100 insertions, 108 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index de5bdcde3ec9..3d7bd2147481 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.2.5.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		stable/sources/gdm
@@ -17,9 +16,10 @@ MAINTAINER=	gnome@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 GDMDIR?=	${PREFIX}/etc/gdm
 
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index dfdf0ceb0491..4b1c9d1bb4e9 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1 +1 @@
-MD5 (gdm-2.2.4.2.tar.gz) = 5027f44eb3831e036a75d49269905620
+MD5 (gdm-2.2.5.2.tar.gz) = 6b1a5ee6b69955346b8356948504f9d0
diff --git a/x11/gdm/files/patch-ab b/x11/gdm/files/patch-ab
index 17c3e8c3aa16..6a18c1cae12b 100644
--- a/x11/gdm/files/patch-ab
+++ b/x11/gdm/files/patch-ab
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- config/gdm.conf.in.orig	Sat Sep  1 13:03:45 2001
-+++ config/gdm.conf.in	Tue Oct  2 15:10:39 2001
-@@ -3,7 +3,7 @@
- AutomaticLogin=
+--- config/gdm.conf.in.orig	Fri Nov 16 13:42:13 2001
++++ config/gdm.conf.in	Mon Nov 26 17:53:18 2001
+@@ -5,7 +5,7 @@
+ # want gdm to kill/restart the server, turn this on
  AlwaysRestartServer=false
  Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog
 -GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
@@ -12,7 +12,7 @@ $FreeBSD$
  Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
  DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
  DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
  Group=gdm
  HaltCommand=/sbin/shutdown -h now
  KillInitClients=true
@@ -21,16 +21,16 @@ $FreeBSD$
  PidFile=/var/run/gdm.pid
  PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
  PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -19,7 +19,7 @@
+@@ -22,7 +22,7 @@
+ FailsafeXServer=
  XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
- XKeepsCrashingConfigurators=/usr/bin/X11/XF86Setup /usr/bin/X11/Xconfigurator
  RebootCommand=/sbin/shutdown -r now
 -RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
 +RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
  ServAuthDir=@EXPANDED_AUTHDIR@
  SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
  SuspendCommand=
-@@ -30,9 +30,9 @@
+@@ -33,9 +33,9 @@
  TimedLoginEnable=false
  TimedLogin=
  TimedLoginDelay=30
@@ -41,8 +41,8 @@ $FreeBSD$
 +Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
  
  [security]
- AllowRoot=true
-@@ -57,7 +57,7 @@
+ # If any distributions ship with this one off, they should be shot
+@@ -68,7 +68,7 @@
  Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
  
  [gui]
@@ -51,10 +51,10 @@ $FreeBSD$
  MaxIconWidth=128
  MaxIconHeight=128
  
-@@ -68,11 +68,11 @@
- DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
+@@ -80,11 +80,11 @@
  DefaultLocale=en_US
- Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm
+ # These are things excluded from the face browser, not from logging in
+ Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
 -Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
 +Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
  GlobalFaceDir=@EXPANDED_DATADIR@/faces/
@@ -65,7 +65,7 @@ $FreeBSD$
  Quiver=true
  SystemMenu=true
  Welcome=Welcome to %n
-@@ -117,5 +117,5 @@
+@@ -137,5 +137,5 @@
  
  [server-Standard]
  name=Standard server
diff --git a/x11/gdm/files/patch-ar b/x11/gdm/files/patch-ar
deleted file mode 100644
index b0b8c0315d67..000000000000
--- a/x11/gdm/files/patch-ar
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-
---- daemon/gdm-net.c.orig	Sun Aug 26 04:56:37 2001
-+++ daemon/gdm-net.c	Tue Oct 16 09:35:36 2001
-@@ -238,11 +243,11 @@
- 		return NULL;
- 	}
- 
-+	bzero(&addr, sizeof(addr));
- 	strcpy (addr.sun_path, sockname);
- 	addr.sun_family = AF_UNIX;
- 	if (bind (fd,
--		  (struct sockaddr *) &addr, strlen (addr.sun_path) +
--		  sizeof (addr.sun_family)) < 0) {
-+		  (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- 		gdm_error (_("%s: Could not bind socket"),
- 			   "gdm_connection_open_unix");
- 		close (fd);
diff --git a/x11/gdm/files/patch-daemon::slave.c b/x11/gdm/files/patch-daemon::slave.c
deleted file mode 100644
index d2eda7d4f4ed..000000000000
--- a/x11/gdm/files/patch-daemon::slave.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- daemon/slave.c	2001/10/16 06:36:10	1.1
-+++ daemon/slave.c	2001/10/16 06:38:57
-@@ -1088,7 +1088,10 @@
- 	/* this is again informal only, if the greeter does time out it will
- 	 * not actually login a user if it's not enabled for this display */
- 	if (d->timed_login_ok) {
--		ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
-+		if (ParsedTimedLogin == NULL)
-+			ve_setenv ("GDM_TIMED_LOGIN_OK", "", TRUE);
-+		else
-+			ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
- 	} else {
- 		ve_unsetenv ("GDM_TIMED_LOGIN_OK");
- 	}
diff --git a/x11/gdm/files/patch-ltmain.sh b/x11/gdm/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/x11/gdm/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 71e99f849bed..92de87d089f5 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -4,6 +4,7 @@ bin/gdmchooser
 bin/gdmconfig
 bin/gdmflexiserver
 bin/gdmlogin
+bin/gdmmktemp
 bin/gdmphotosetup
 etc/gdm/Init/Default
 etc/gdm/PostSession/Default
@@ -76,17 +77,20 @@ share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
+share/locale/lv/LC_MESSAGES/gdm.mo
 share/locale/ms/LC_MESSAGES/gdm.mo
 share/locale/nl/LC_MESSAGES/gdm.mo
 share/locale/nn/LC_MESSAGES/gdm.mo
 share/locale/no/LC_MESSAGES/gdm.mo
 share/locale/pl/LC_MESSAGES/gdm.mo
+share/locale/pt/LC_MESSAGES/gdm.mo
 share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
 share/locale/ru/LC_MESSAGES/gdm.mo
 share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sv/LC_MESSAGES/gdm.mo
+share/locale/ta/LC_MESSAGES/gdm.mo
 share/locale/tr/LC_MESSAGES/gdm.mo
 share/locale/uk/LC_MESSAGES/gdm.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index de5bdcde3ec9..3d7bd2147481 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.2.5.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		stable/sources/gdm
@@ -17,9 +16,10 @@ MAINTAINER=	gnome@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 GDMDIR?=	${PREFIX}/etc/gdm
 
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index dfdf0ceb0491..4b1c9d1bb4e9 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gdm-2.2.4.2.tar.gz) = 5027f44eb3831e036a75d49269905620
+MD5 (gdm-2.2.5.2.tar.gz) = 6b1a5ee6b69955346b8356948504f9d0
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 17c3e8c3aa16..6a18c1cae12b 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,10 +1,10 @@
 
 $FreeBSD$
 
---- config/gdm.conf.in.orig	Sat Sep  1 13:03:45 2001
-+++ config/gdm.conf.in	Tue Oct  2 15:10:39 2001
-@@ -3,7 +3,7 @@
- AutomaticLogin=
+--- config/gdm.conf.in.orig	Fri Nov 16 13:42:13 2001
++++ config/gdm.conf.in	Mon Nov 26 17:53:18 2001
+@@ -5,7 +5,7 @@
+ # want gdm to kill/restart the server, turn this on
  AlwaysRestartServer=false
  Configurator=@EXPANDED_GDMCONFIGDIR@/gdmconfig --disable-sound --disable-crash-dialog
 -GnomeDefaultSession=@EXPANDED_DATADIR@/gnome/default.session
@@ -12,7 +12,7 @@ $FreeBSD$
  Chooser=@EXPANDED_BINDIR@/gdmchooser --disable-sound --disable-crash-dialog
  DefaultPath=/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
  DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm/Init
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
  Group=gdm
  HaltCommand=/sbin/shutdown -h now
  KillInitClients=true
@@ -21,16 +21,16 @@ $FreeBSD$
  PidFile=/var/run/gdm.pid
  PostSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PostSession/
  PreSessionScriptDir=@EXPANDED_SYSCONFDIR@/gdm/PreSession/
-@@ -19,7 +19,7 @@
+@@ -22,7 +22,7 @@
+ FailsafeXServer=
  XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing
- XKeepsCrashingConfigurators=/usr/bin/X11/XF86Setup /usr/bin/X11/Xconfigurator
  RebootCommand=/sbin/shutdown -r now
 -RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:@EXPANDED_BINDIR@
 +RootPath=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:@EXPANDED_BINDIR@
  ServAuthDir=@EXPANDED_AUTHDIR@
  SessionDir=@EXPANDED_SYSCONFDIR@/gdm/Sessions/
  SuspendCommand=
-@@ -30,9 +30,9 @@
+@@ -33,9 +33,9 @@
  TimedLoginEnable=false
  TimedLogin=
  TimedLoginDelay=30
@@ -41,8 +41,8 @@ $FreeBSD$
 +Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
  
  [security]
- AllowRoot=true
-@@ -57,7 +57,7 @@
+ # If any distributions ship with this one off, they should be shot
+@@ -68,7 +68,7 @@
  Willing=@EXPANDED_SYSCONFDIR@/gdm/Xwilling
  
  [gui]
@@ -51,10 +51,10 @@ $FreeBSD$
  MaxIconWidth=128
  MaxIconHeight=128
  
-@@ -68,11 +68,11 @@
- DefaultFace=@EXPANDED_PIXMAPDIR@/nobody.png
+@@ -80,11 +80,11 @@
  DefaultLocale=en_US
- Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm
+ # These are things excluded from the face browser, not from logging in
+ Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
 -Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*
 +Font=-*-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*,*-r-*,*
  GlobalFaceDir=@EXPANDED_DATADIR@/faces/
@@ -65,7 +65,7 @@ $FreeBSD$
  Quiver=true
  SystemMenu=true
  Welcome=Welcome to %n
-@@ -117,5 +117,5 @@
+@@ -137,5 +137,5 @@
  
  [server-Standard]
  name=Standard server
diff --git a/x11/gdm2/files/patch-ar b/x11/gdm2/files/patch-ar
deleted file mode 100644
index b0b8c0315d67..000000000000
--- a/x11/gdm2/files/patch-ar
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$FreeBSD$
-
---- daemon/gdm-net.c.orig	Sun Aug 26 04:56:37 2001
-+++ daemon/gdm-net.c	Tue Oct 16 09:35:36 2001
-@@ -238,11 +243,11 @@
- 		return NULL;
- 	}
- 
-+	bzero(&addr, sizeof(addr));
- 	strcpy (addr.sun_path, sockname);
- 	addr.sun_family = AF_UNIX;
- 	if (bind (fd,
--		  (struct sockaddr *) &addr, strlen (addr.sun_path) +
--		  sizeof (addr.sun_family)) < 0) {
-+		  (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- 		gdm_error (_("%s: Could not bind socket"),
- 			   "gdm_connection_open_unix");
- 		close (fd);
diff --git a/x11/gdm2/files/patch-daemon::slave.c b/x11/gdm2/files/patch-daemon::slave.c
deleted file mode 100644
index d2eda7d4f4ed..000000000000
--- a/x11/gdm2/files/patch-daemon::slave.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- daemon/slave.c	2001/10/16 06:36:10	1.1
-+++ daemon/slave.c	2001/10/16 06:38:57
-@@ -1088,7 +1088,10 @@
- 	/* this is again informal only, if the greeter does time out it will
- 	 * not actually login a user if it's not enabled for this display */
- 	if (d->timed_login_ok) {
--		ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
-+		if (ParsedTimedLogin == NULL)
-+			ve_setenv ("GDM_TIMED_LOGIN_OK", "", TRUE);
-+		else
-+			ve_setenv ("GDM_TIMED_LOGIN_OK", ParsedTimedLogin, TRUE);
- 	} else {
- 		ve_unsetenv ("GDM_TIMED_LOGIN_OK");
- 	}
diff --git a/x11/gdm2/files/patch-ltmain.sh b/x11/gdm2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/x11/gdm2/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 71e99f849bed..92de87d089f5 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -4,6 +4,7 @@ bin/gdmchooser
 bin/gdmconfig
 bin/gdmflexiserver
 bin/gdmlogin
+bin/gdmmktemp
 bin/gdmphotosetup
 etc/gdm/Init/Default
 etc/gdm/PostSession/Default
@@ -76,17 +77,20 @@ share/locale/it/LC_MESSAGES/gdm.mo
 share/locale/ja/LC_MESSAGES/gdm.mo
 share/locale/ko/LC_MESSAGES/gdm.mo
 share/locale/lt/LC_MESSAGES/gdm.mo
+share/locale/lv/LC_MESSAGES/gdm.mo
 share/locale/ms/LC_MESSAGES/gdm.mo
 share/locale/nl/LC_MESSAGES/gdm.mo
 share/locale/nn/LC_MESSAGES/gdm.mo
 share/locale/no/LC_MESSAGES/gdm.mo
 share/locale/pl/LC_MESSAGES/gdm.mo
+share/locale/pt/LC_MESSAGES/gdm.mo
 share/locale/pt_BR/LC_MESSAGES/gdm.mo
 share/locale/ro/LC_MESSAGES/gdm.mo
 share/locale/ru/LC_MESSAGES/gdm.mo
 share/locale/sk/LC_MESSAGES/gdm.mo
 share/locale/sl/LC_MESSAGES/gdm.mo
 share/locale/sv/LC_MESSAGES/gdm.mo
+share/locale/ta/LC_MESSAGES/gdm.mo
 share/locale/tr/LC_MESSAGES/gdm.mo
 share/locale/uk/LC_MESSAGES/gdm.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gdm.mo