Module Name: src
Committed By: nakayama
Date: Wed Mar 6 12:40:23 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
src/external/mit/xorg/bin/xdm/chooser: Makefile
src/external/mit/xorg/lib/libXdmGreet: Makefile
Log Message:
Centralize pam definitions and tabify.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xdm/Makefile.xdm
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/chooser/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXdmGreet/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.16 src/external/mit/xorg/bin/xdm/Makefile:1.17
--- src/external/mit/xorg/bin/xdm/Makefile:1.16 Wed Mar 6 03:38:30 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/03/06 03:38:30 christos Exp $
+# $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $
.include <bsd.own.mk>
@@ -13,7 +13,7 @@ SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
.endif
-CPPFLAGS+= -DRETSIGTYPE=void -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
+CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c+= -DBSD44SOCKETS
CPPFLAGS.socket.c+= -DBSD44SOCKETS
CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.9 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.10
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.9 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.9 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.10 2019/03/06 12:40:23 nakayama Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -39,11 +39,12 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
LDFLAGS+= -Wl,--export-dynamic
.if (${USE_PAM} != "no")
-CPPFLAGS+= -DUSE_PAM
+CPPFLAGS+= -DUSE_PAM
+CPPFLAGS+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
.endif
.if (${USE_INET6} != "no")
-CPPFLAGS+= -DIPv6
+CPPFLAGS+= -DIPv6
.endif
.PATH: ${X11SRCDIR.xdm}
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.4 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.4 Wed Mar 6 01:13:39 2019
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/03/06 01:13:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $
NOMAN= 1
@@ -7,7 +7,6 @@ NOMAN= 1
PROG= chooser
CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void
-CPPFLAGS.chooser.c+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
APPDEFS=Chooser
Index: src/external/mit/xorg/lib/libXdmGreet/Makefile
diff -u src/external/mit/xorg/lib/libXdmGreet/Makefile:1.6 src/external/mit/xorg/lib/libXdmGreet/Makefile:1.7
--- src/external/mit/xorg/lib/libXdmGreet/Makefile:1.6 Wed Mar 6 02:44:05 2019
+++ src/external/mit/xorg/lib/libXdmGreet/Makefile Wed Mar 6 12:40:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/03/06 02:44:05 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/03/06 12:40:23 nakayama Exp $
.include <bsd.own.mk>
@@ -11,7 +11,6 @@ SRCS= \
verify.c
CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
-CPPFLAGS+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
# XXX: Enabling this, which should allow --export-dynamic to
# be elided, causes xdm to fail to accept password input and
# then crash at login "failure".
