Module Name: src Committed By: tsutsui Date: Sun Oct 10 07:03:28 UTC 2010
Modified Files: src/x11/bin/xinit: Makefile Log Message: Disable USE_PAM on ports which have legacy non-XFree86 servers. With this change, xinit(1) can properly quit Xserver after xinitrc script exits. Tested on dreamcast (-current) and hpcmips (netbsd-5). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/x11/bin/xinit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/x11/bin/xinit/Makefile diff -u src/x11/bin/xinit/Makefile:1.7 src/x11/bin/xinit/Makefile:1.8 --- src/x11/bin/xinit/Makefile:1.7 Wed Mar 2 01:06:15 2005 +++ src/x11/bin/xinit/Makefile Sun Oct 10 07:03:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/03/02 01:06:15 christos Exp $ +# $NetBSD: Makefile,v 1.8 2010/10/10 07:03:28 tsutsui Exp $ .include <bsd.own.mk> @@ -13,8 +13,23 @@ CPPFLAGS+= -DXFREE86 .if (${USE_PAM} != "no") +# XXX: Legacy non-XFree86 servers don't handle PAM +.if \ + ${MACHINE} != "alpha" && \ + ${MACHINE} != "amiga" && \ + ${MACHINE} != "dreamcast" && \ + ${MACHINE} != "ews4800mips" && \ + ${MACHINE} != "hpcarm" && \ + ${MACHINE} != "hpcmips" && \ + ${MACHINE} != "hpcsh" && \ + ${MACHINE} != "newsmips" && \ + ${MACHINE} != "pmax" && \ + ${MACHINE} != "sun3" && \ + ${MACHINE} != "x68k" && \ + 1 CPPFLAGS+= -DUSE_PAM .endif +.endif CPPSCRIPTS= startx xinitrc CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR}