[src/trunk]: src/x11/bin/xinit Disable USE_PAM on ports which have legacy non...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/027ed6d7fed8
branches:  trunk
changeset: 757980:027ed6d7fed8
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Oct 10 07:03:28 2010 +0000

description:
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).

diffstat:

 x11/bin/xinit/Makefile |  17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 953a89a4d61a -r 027ed6d7fed8 x11/bin/xinit/Makefile
--- a/x11/bin/xinit/Makefile    Sun Oct 10 05:19:35 2010 +0000
+++ b/x11/bin/xinit/Makefile    Sun Oct 10 07:03:28 2010 +0000
@@ -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}