- Allow to lift the annoying ~/.xsession-errors size limit

- Start gdm if gnome_enable is set to yes in /etc/rc.conf

Obtained from:	FreeBSD ports tree


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

3 files changed, 39 insertions, 5 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a877483bc..8627f63a2 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11/gdm/Makefile,v 1.47 2006/10/24 05:28:04 marcus Exp $
+#    $MCom: ports/x11/gdm/Makefile,v 1.48 2006/10/31 05:34:55 marcus Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.17.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -26,6 +27,7 @@ USE_XLIB=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_RC_SUBR=	gdm
+USE_GNOME_SUBR=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 		gnomeprefix
@@ -42,7 +44,8 @@ GNOME_LOCALSTATEDIR=	/var
 
 MAN1=		gdm.1
 
-OPTIONS=	IPV6 "Enable IPv6 support" on
+OPTIONS=	IPV6 "Enable IPv6 support" on \
+		LOG_LIMIT "Limit ~/.xsession-errors size" on
 
 .include <bsd.port.pre.mk>
 
@@ -64,6 +67,10 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+.if defined(WITHOUT_LOG_LIMIT)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-daemon_slave.c
+.endif
+
 post-patch:
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
new file mode 100644
index 000000000..2d609cf2f
--- /dev/null
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -0,0 +1,26 @@
+--- daemon/slave.c.orig	Sat Oct 28 22:38:51 2006
++++ daemon/slave.c	Tue Oct 31 12:33:41 2006
+@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
+ 			break;
+ 		}
+ 
+-		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES ||
+-			       got_xfsz_signal)
++		if G_UNLIKELY (got_xfsz_signal)
+ 			continue;
+ 
+ 		/* write until we succeed in writing something */
+@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
+ 		}
+ 
+ 		d->xsession_errors_bytes += r;
+-
+-		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
+-			       ! got_xfsz_signal) {
+-			VE_IGNORE_EINTR (write (d->xsession_errors_fd,
+-					     "\n...Too much output, ignoring rest...\n",
+-					     strlen ("\n...Too much output, ignoring rest...\n")));
+-		}
+ 
+ 		/* there wasn't more then buf available, so no need to try reading
+ 		 * again, unless we really want to */
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 6dab74433..a28fdf6b9 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $FreeBSD: ports/x11/gdm/files/gdm.in,v 1.2 2006/10/14 08:35:24 marcus Exp $
-#    $MCom: ports/x11/gdm/files/gdm.in,v 1.8 2006/10/10 20:22:24 mezz Exp $
+#    $MCom: ports/x11/gdm/files/gdm.in,v 1.10 2006/10/19 01:23:27 marcus Exp $
 
 # PROVIDE: gdm
 # REQUIRE: LOGIN cleanvar moused
@@ -10,9 +10,10 @@
 # gdm_enable="YES"
 #
 
-gdm_enable=${gdm_enable-"NO"}
-
 . %%RC_SUBR%%
+. %%GNOME_SUBR%%
+
+gdm_enable=${gdm_enable-${gnome_enable}}
 
 name=gdm
 rcvar=`set_rcvar`