Update to 2.8.0.7.

4 files changed, 4 insertions, 88 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 13b5968da97d..a280c2f60e0c 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdm
-PORTVERSION=	2.8.0.6
-PORTREVISION=	1
+PORTVERSION=	2.8.0.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=		sources/${PORTNAME:S/2$//}/2.8
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index c419cf03afc7..722b409079fa 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.8.0.6.tar.bz2) = 6be27ec9f4783abaf1e087e3020e74fa
-SHA256 (gnome2/gdm-2.8.0.6.tar.bz2) = 4244787174b9bbab4916e12fed444ce5f612e367b9e2592105889b1146c1bbd2
-SIZE (gnome2/gdm-2.8.0.6.tar.bz2) = 2778293
+MD5 (gnome2/gdm-2.8.0.7.tar.bz2) = 566a1e3d656b6b536414f287ead2db7e
+SHA256 (gnome2/gdm-2.8.0.7.tar.bz2) = bd83a23cad86de545f57a7c38cb9b7fa52aedc5bd2f8103f1cc7a35b0bfc6a10
+SIZE (gnome2/gdm-2.8.0.7.tar.bz2) = 2777760
diff --git a/x11/gdm/files/patch-daemon_getvt.c b/x11/gdm/files/patch-daemon_getvt.c
deleted file mode 100644
index b5ab71be6550..000000000000
--- a/x11/gdm/files/patch-daemon_getvt.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- daemon/getvt.c.orig	Mon Nov 14 22:20:51 2005
-+++ daemon/getvt.c	Mon Nov 14 22:40:39 2005
-@@ -87,8 +87,10 @@ get_free_vt (int *vtfd)
- {
- 	int fd, fdv;
- 	int vtno;
-+#if defined(__linux__)
- 	unsigned short vtmask;
- 	struct vt_stat vtstat;
-+#endif
- 
- 	*vtfd = -1;
- 
-@@ -103,23 +105,50 @@ get_free_vt (int *vtfd)
- 	if (fd < 0)
- 		return -1;
- 
-+#if defined(__linux__)
- 	if (ioctl (fd, VT_GETSTATE, &vtstat) < 0) {
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
-+	if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) {
-+#endif
- 		VE_IGNORE_EINTR (close (fd));
- 		return -1;
- 	}
- 
-+#if defined(__linux__)
- 	for (vtno = GdmFirstVT, vtmask = 1 << (vtno-1);
- 			vtstat.v_state & vtmask; vtno++, vtmask <<= 1);
- 	if (!vtmask) {
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
-+	fdv = open_vt(vtno);
-+	if (fdv < 0) {
-+#endif
- 		VE_IGNORE_EINTR (close (fd));
- 		return -1;
- 	}
- 
-+#if defined(__linux__)
- 	fdv = open_vt (vtno);
- 	if (fdv < 0) {
- 		VE_IGNORE_EINTR (close (fd));
- 		return -1;
- 	}
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+	while (vtno < GdmFirstVT) {
-+		if (fdv > -1)
-+			VE_IGNORE_EINTR (close (fdv));
-+
-+		if (ioctl(fd, VT_OPENQRY, &vtno) == -1) {
-+			VE_IGNORE_EINTR (close (fd));
-+			return -1;
-+		}
-+
-+		fdv = open_vt (vtno);
-+		if (fdv < 0) {
-+			VE_IGNORE_EINTR (close (fd));
-+			return -1;
-+		}
-+	}
-+#endif
- 	*vtfd = fdv;
- 	return vtno;
- }
diff --git a/x11/gdm/files/patch-gui_gdmchooser.c b/x11/gdm/files/patch-gui_gdmchooser.c
deleted file mode 100644
index b78f9bf202df..000000000000
--- a/x11/gdm/files/patch-gui_gdmchooser.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gui/gdmchooser.c.orig	Sat Jun 11 16:04:13 2005
-+++ gui/gdmchooser.c	Sat Jun 11 16:04:35 2005
-@@ -2030,6 +2030,7 @@ main (int argc, char *argv[])
-     int nextopt;
-     const char *gdm_version;
-     int i;
-+    guint sid;
- 
-     stored_argv = g_new0 (char *, argc + 1);
-     for (i = 0; i < argc; i++)
-@@ -2124,7 +2125,7 @@ main (int argc, char *argv[])
-     gdm_chooser_xdmcp_init (hosts);
-     poptFreeContext (ctx);
- 
--    guint sid = g_signal_lookup ("event",
-+    sid = g_signal_lookup ("event",
- 				 GTK_TYPE_WIDGET);
-     g_signal_add_emission_hook (sid,
- 				0 /* detail */,