[src/trunk]: src/external/mit/xorg/bin/xdm fix build

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

details:   https://anonhg.NetBSD.org/src/rev/9c06851b332c
branches:  trunk
changeset: 449412:9c06851b332c
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 06 01:13:38 2019 +0000

description:
fix build

diffstat:

 external/mit/xorg/bin/xdm/Makefile         |  16 ++++++++--------
 external/mit/xorg/bin/xdm/chooser/Makefile |   5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r e710b31a757c -r 9c06851b332c external/mit/xorg/bin/xdm/Makefile
--- a/external/mit/xorg/bin/xdm/Makefile        Tue Mar 05 22:51:36 2019 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile        Wed Mar 06 01:13:38 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2019/03/05 08:35:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2019/03/06 01:13:38 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -13,12 +13,12 @@
 CPPFLAGS+=     -DSTATIC_GREETER_LIB
 .endif
 
-CPPFLAGS+=             -DRETSIGTYPE=void
-CPPFLAGS.auth.c=       -DBSD44SOCKETS
-CPPFLAGS.socket.c=     -DBSD44SOCKETS
-CPPFLAGS.xdmcp.c=      -DBSD44SOCKETS
-CPPFLAGS.xdmshell.c=   -DHAS_VFORK
-CPPFLAGS.resource.c=   \
+CPPFLAGS+=             -DRETSIGTYPE=void -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
+CPPFLAGS.auth.c+=      -DBSD44SOCKETS
+CPPFLAGS.socket.c+=    -DBSD44SOCKETS
+CPPFLAGS.xdmcp.c+=     -DBSD44SOCKETS
+CPPFLAGS.xdmshell.c+=  -DHAS_VFORK
+CPPFLAGS.resource.c+=  \
        -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
        -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
        -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
@@ -28,7 +28,7 @@
        -DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
        -DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
        -DDEF_AUTH_DIR=\"${XDMVARDIR}\" \
-       -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\"
+       -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" \
 
 LDADD+=                -lXau -lXdmcp -lXft -lXinerama -lXpm
 LDADD+=                -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
diff -r e710b31a757c -r 9c06851b332c external/mit/xorg/bin/xdm/chooser/Makefile
--- a/external/mit/xorg/bin/xdm/chooser/Makefile        Tue Mar 05 22:51:36 2019 +0000
+++ b/external/mit/xorg/bin/xdm/chooser/Makefile        Wed Mar 06 01:13:38 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 23:50:35 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2019/03/06 01:13:39 christos Exp $
 
 NOMAN= 1
 
@@ -6,7 +6,8 @@
 
 PROG=  chooser
 
-CPPFLAGS.chooser.c=    -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS.chooser.c+=   -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS.chooser.c+=   -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
 
 APPDEFS=Chooser