diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-04-02 15:17:43 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-04-02 15:17:43 +0000 |
| commit | 36d1560a27ac9c8ea339b2d56c9f34e47601e1ef (patch) | |
| tree | 321930416322ce6dc65e2f43aa4c2717d1fb3369 /x11 | |
| parent | 25d5d1d6c1efbb6ecff93224708e4ebb40a0b608 (diff) | |
| download | pkgsrc-36d1560a27ac9c8ea339b2d56c9f34e47601e1ef.tar.gz | |
Explicitly start the X server in the fifth virtual terminal (vt05) when we
are running under NetBSD (I guess other OSes don't need the fix, or need
different defaults). This avoids the X server starting in the first virtual
console, together with getty, causing annoying keyboard problems.
Bump PKGREVISION to 1. Closes PR pkg/19434.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 7 | ||||
| -rw-r--r-- | x11/gdm/distinfo | 4 | ||||
| -rw-r--r-- | x11/gdm/patches/patch-aa | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 1aee2b981c3..2aa54feb334 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.58 2004/04/01 22:13:35 xtraeme Exp $ +# $NetBSD: Makefile,v 1.59 2004/04/02 15:17:43 jmmv Exp $ # DISTNAME= gdm-2.6.0.0 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/} EXTRACT_SUFX= .tar.bz2 @@ -79,6 +80,10 @@ GDMOWN= daemon GDMGRP= daemon .endif +.if ${OPSYS} == "NetBSD" +CONFIGURE_ARGS+= X_SERVER_ARGS="vt05" +.endif + BUILD_DEFS+= USE_PAM .if defined(USE_PAM) diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index bfb2f42faaf..19643d39d2e 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/04/01 18:49:37 jmmv Exp $ +$NetBSD: distinfo,v 1.11 2004/04/02 15:17:43 jmmv Exp $ SHA1 (gdm-2.6.0.0.tar.bz2) = d91e9c48f02830dc1af6a45f66a835904143c3c1 Size (gdm-2.6.0.0.tar.bz2) = 2850702 bytes @@ -6,7 +6,7 @@ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes -SHA1 (patch-aa) = 238a7cd766eea2f0e7d5877eb59965c66f88aff1 +SHA1 (patch-aa) = f505afd68df33ecdcbb56c3619f58bec045a6cea SHA1 (patch-ab) = 049d4fe8b6e71239392e7a8bae00006103dff309 SHA1 (patch-ac) = d810e16076aa69070f238900198a0050eaf12516 SHA1 (patch-ae) = 1df52914ead2f8aa5b69f60213ebd26e8d2202a4 diff --git a/x11/gdm/patches/patch-aa b/x11/gdm/patches/patch-aa index 54dc4b3b968..577f947c930 100644 --- a/x11/gdm/patches/patch-aa +++ b/x11/gdm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2004/04/01 18:49:37 jmmv Exp $ +$NetBSD: patch-aa,v 1.7 2004/04/02 15:17:43 jmmv Exp $ --- configure.orig 2004-03-15 19:38:10.000000000 +0100 +++ configure @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.6 2004/04/01 18:49:37 jmmv Exp $ fi +X_PATH="${X11BASE}/bin" +X_SERVER_PATH="${X11BASE}/bin" -+X_SERVER="${X11BASE}/bin/X" ++X_SERVER="${X11BASE}/bin/X ${X_SERVER_ARGS}" +X_CONF_PATH="${X11BASE}/bin" |