[src/trunk]: src/external/mit/xorg Centralize pam definitions and tabify.

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

details:   https://anonhg.NetBSD.org/src/rev/e618232f862c
branches:  trunk
changeset: 449426:e618232f862c
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Wed Mar 06 12:40:23 2019 +0000

description:
Centralize pam definitions and tabify.

diffstat:

 external/mit/xorg/bin/xdm/Makefile         |  4 ++--
 external/mit/xorg/bin/xdm/Makefile.xdm     |  7 ++++---
 external/mit/xorg/bin/xdm/chooser/Makefile |  3 +--
 external/mit/xorg/lib/libXdmGreet/Makefile |  3 +--
 4 files changed, 8 insertions(+), 9 deletions(-)

diffs (76 lines):

diff -r 147c743f8649 -r e618232f862c external/mit/xorg/bin/xdm/Makefile
--- a/external/mit/xorg/bin/xdm/Makefile        Wed Mar 06 11:05:18 2019 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile        Wed Mar 06 12:40:23 2019 +0000
@@ -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 @@
 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
diff -r 147c743f8649 -r e618232f862c external/mit/xorg/bin/xdm/Makefile.xdm
--- a/external/mit/xorg/bin/xdm/Makefile.xdm    Wed Mar 06 11:05:18 2019 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile.xdm    Wed Mar 06 12:40:23 2019 +0000
@@ -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 @@
 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}
diff -r 147c743f8649 -r e618232f862c external/mit/xorg/bin/xdm/chooser/Makefile
--- a/external/mit/xorg/bin/xdm/chooser/Makefile        Wed Mar 06 11:05:18 2019 +0000
+++ b/external/mit/xorg/bin/xdm/chooser/Makefile        Wed Mar 06 12:40:23 2019 +0000
@@ -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 @@
 PROG=  chooser
 
 CPPFLAGS.chooser.c+=   -DBSD44SOCKETS -DRETSIGTYPE=void
-CPPFLAGS.chooser.c+=   -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
 
 APPDEFS=Chooser
 
diff -r 147c743f8649 -r e618232f862c external/mit/xorg/lib/libXdmGreet/Makefile
--- a/external/mit/xorg/lib/libXdmGreet/Makefile        Wed Mar 06 11:05:18 2019 +0000
+++ b/external/mit/xorg/lib/libXdmGreet/Makefile        Wed Mar 06 12:40:23 2019 +0000
@@ -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 @@
        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".