diff options
| author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2006-10-31 09:58:24 +0000 |
|---|---|---|
| committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2006-10-31 09:58:24 +0000 |
| commit | a567ed27367552cc0b7a34565d033c1432cbdcd8 (patch) | |
| tree | 76b723531fbbebb8a13f9df5ad0f8ec7ebd6e67c /x11/gdm | |
| parent | Start hald if gnome_enable is set to yes in /etc/rc.conf (diff) | |
- Allow to lift the annoying ~/.xsession-errors size limit
- Start gdm if gnome_enable is set to yes in /etc/rc.conf
Notes
Notes:
svn path=/head/; revision=175774
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 9 | ||||
| -rw-r--r-- | x11/gdm/files/extra-patch-daemon_slave.c | 26 | ||||
| -rw-r--r-- | x11/gdm/files/gdm.in | 5 |
3 files changed, 37 insertions, 3 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index fa33422a2d8e..1d1a87b8ac92 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -8,6 +8,7 @@ PORTNAME= gdm PORTVERSION= 2.16.2 +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 000000000000..81521bb3b85a --- /dev/null +++ b/x11/gdm/files/extra-patch-daemon_slave.c @@ -0,0 +1,26 @@ +--- daemon/slave.c.orig Wed Jun 1 20:49:30 2005 ++++ daemon/slave.c Wed Jun 1 20:50:45 2005 +@@ -344,8 +344,7 @@ + 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 */ +@@ -367,13 +366,6 @@ + } + + 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 6a680efd2c2d..8217bb283942 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -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` |