Update to 2.15.2.

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

7 files changed, 10 insertions, 67 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index e8a3ecc59..23d2dcf7a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.31 2006/05/04 05:49:19 marcus Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.32 2006/05/04 18:14:02 marcus Exp $
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.15.0
-PORTREVISION=	1
+PORTVERSION=	2.15.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 7fb965a9a..3356a006c 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.15.0.tar.bz2) = ee8f3c6dd761f14e7e21303baa8d5427
-SHA256 (gnome2/gdm-2.15.0.tar.bz2) = a24c853dd3c50c93fabe8c0f8170507c9a11abe0967bc6135321da6593469213
-SIZE (gnome2/gdm-2.15.0.tar.bz2) = 3051279
+MD5 (gnome2/gdm-2.15.2.tar.bz2) = a05047c2cee0f7d22ada8b158190f59b
+SHA256 (gnome2/gdm-2.15.2.tar.bz2) = 074bdcd80d7a38ffbee23333ebaff56f5ab9b6d56d04e2d67b5e9f0e9fae9206
+SIZE (gnome2/gdm-2.15.2.tar.bz2) = 3049505
diff --git a/x11/gdm/files/patch-config_Makefile.in b/x11/gdm/files/patch-config_Makefile.in
index 9678f710c..822b8c74b 100644
--- a/x11/gdm/files/patch-config_Makefile.in
+++ b/x11/gdm/files/patch-config_Makefile.in
@@ -1,11 +1,11 @@
---- config/Makefile.in.orig	Fri Jun 11 15:40:03 2004
-+++ config/Makefile.in	Fri Jun 11 15:41:30 2004
-@@ -400,7 +400,7 @@
- 
+--- config/Makefile.in.orig	Fri May 12 14:27:47 2006
++++ config/Makefile.in	Fri May 12 14:28:13 2006
+@@ -681,7 +681,7 @@ install-data-hook: gdm.conf gdm.conf-cus
  	if test '!' -d $(DESTDIR)$(logdir); then \
  		$(mkinstalldirs) $(DESTDIR)$(logdir); \
+ 		chmod 755 $(DESTDIR)$(logdir); \
 -		chown root:root $(DESTDIR)$(logdir); \
 +		chown root:wheel $(DESTDIR)$(logdir); \
- 		chmod 755 $(DESTDIR)$(logdir); \
  	fi
  
+ 	if test '!' -d $(DESTDIR)$(authdir); then \
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
deleted file mode 100644
index ae54f1460..000000000
--- a/x11/gdm/files/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig	Wed Mar 29 13:51:40 2006
-+++ configure	Wed Mar 29 14:15:56 2006
-@@ -22965,6 +22965,8 @@ _ACEOF
- 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
- #include <$ac_header>
- _ACEOF
-@@ -32415,6 +32417,13 @@ case "$host" in
-         XSESSION_SHELL=/bin/ksh
-         SOUND_PROGRAM=/usr/bin/audioplay
-         ;;
-+*freebsd*)
-+	GDM_USER_PATH="/bin:/usr/bin"
-+	HALT_COMMAND="/sbin/shutdown -p now;/usr/sbin/shutdown -p now"
-+	REBOOT_COMMAND="/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
-+	SUSPEND_COMMAND="/usr/sbin/zzz"
-+	XSESSION_SHELL=/bin/sh
-+	;;
- *)
-         GDM_USER_PATH="/bin:/usr/bin"
-         HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
diff --git a/x11/gdm/files/patch-daemon_gdmconfig.c b/x11/gdm/files/patch-daemon_gdmconfig.c
deleted file mode 100644
index 9ebf10c99..000000000
--- a/x11/gdm/files/patch-daemon_gdmconfig.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/gdmconfig.c.orig	Thu Jan  5 16:57:06 2006
-+++ daemon/gdmconfig.c	Thu Jan  5 16:57:44 2006
-@@ -39,6 +39,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/resource.h>
- #include <signal.h>
- #include <pwd.h>
- #include <grp.h>
diff --git a/x11/gdm/files/patch-daemon_server.c b/x11/gdm/files/patch-daemon_server.c
deleted file mode 100644
index 57f028bfd..000000000
--- a/x11/gdm/files/patch-daemon_server.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon/server.c.orig	Thu Jan  5 16:58:37 2006
-+++ daemon/server.c	Thu Jan  5 16:58:46 2006
-@@ -29,6 +29,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
-+#include <sys/resource.h>
- #include <strings.h>
- #include <signal.h>
- #include <syslog.h>
diff --git a/x11/gdm/files/patch-gui_greeter_greeter_parser.c b/x11/gdm/files/patch-gui_greeter_greeter_parser.c
deleted file mode 100644
index 13489e814..000000000
--- a/x11/gdm/files/patch-gui_greeter_greeter_parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/greeter/greeter_parser.c.orig	Thu May  4 14:11:25 2006
-+++ gui/greeter/greeter_parser.c	Thu May  4 14:11:33 2006
-@@ -506,6 +506,8 @@ parse_gtkbutton (xmlNodePtr node,
- 		
-   child = node->children;
- 
-+  translated_text = NULL;
-+
-   while (child)
-     {
-       if (strcmp ((char *) child->name, "pos") == 0)