update for xdm 1.1.12:

- streams.c is gone (hello 2019!)
- man pages other file convert from cpp to sed processing

external/mit/xorg/bin/xdm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2013/06/17 15:58:40 christos Exp $
+#	$NetBSD: Makefile,v 1.14 2019/03/05 08:35:35 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@ PROG=		xdm
 SRCS=		access.c auth.c choose.c daemon.c dm.c dpylist.c \
 		error.c file.c genauth.c mitauth.c netaddr.c policy.c \
 		protodpy.c reset.c resource.c server.c session.c socket.c \
-		streams.c util.c xdmauth.c xdmcp.c prngc.c
+		util.c xdmauth.c xdmcp.c prngc.c
 
 .if ${MKPIC} == "no"
 SRCS+=		Login.c greet.c verify.c
@@ -49,14 +49,17 @@ TARGETS+=	configinstall
 
 CPPFLAGS.resource.c+=	-DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
 
-X11MANCPP=	yes
-X11EXTRAMANDEFS+=	-DARC4_RANDOM \
-			-DCHOOSERPATH=${XDMCHOOSERPATH} \
-			-DGREETERLIBPATH=${XDMGREETERLIB} \
-			-DXDMDIR=${XDMDIR} \
-			-DXDMXAUTHDIR=${XDMVARDIR} \
-			-DXDMLOGDIR=${XDMLOGDIR} \
-			-DXDMPIDDIR=${XDMPIDDIR}
+.include "../../xorg-pkg-ver.mk"
+
+X11EXTRAMANDEFS+= \
+		-e 's,ARC4_RANDOM,1,' \
+		-e 's,BINDIR,$(X11BINDIR),' \
+		-e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
+		-e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \
+		-e 's,XDMDIR,$(XDMDIR),' \
+		-e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
+		-e 's,XDMLOGDIR,$(XDMLOGDIR),' \
+		-e 's,XDMPIDDIR,$(XDMPIDDIR),'
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>

external/mit/xorg/bin/xdm/config/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2014/02/24 07:23:40 skrll Exp $
+#	$NetBSD: Makefile,v 1.15 2019/03/05 08:35:35 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -22,29 +22,41 @@ DEFAULTVT=	# defined empty
 .endif
 
 UUDECODE_FILES=	NetBSD-flag.png
-CPPSCRIPTS=	Xresources Xreset Xservers.ws Xsession Xstartup xdm-config 
+SEDSCRIPTS=	Xresources Xreset Xservers.ws Xsession Xstartup xdm-config 
 
-CPPSCRIPTFLAGS_Xresources=	-DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
-				-DXDM_PIXMAP=NetBSD.xpm \
-				-DXDM_BWPIXMAP=NetBSD-bw.xpm
-CPPSCRIPTFLAGS_Xreset=		-DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
-CPPSCRIPTFLAGS_Xservers.ws=	-DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
-CPPSCRIPTFLAGS_Xsession=	-DBINDIR=${X11BINDIR} \
-				-DMKTEMP_COMMAND=/usr/bin/mktemp \
-				-DSHELL_CMD=/bin/sh
-CPPSCRIPTFLAGS_Xstartup=	-DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR} \
-				-DUTMP_FILE=${XDMPIDDIR}/utmp \
-				-DWTMP_FILE=${XDMLOGDIR}/wtmp
-CPPSCRIPTFLAGS_xdm-config=	-DXDMDIR=${XDMDIR} \
-				-DXDMXAUTHDIR=${XDMVARDIR} \
-				-DXDMLOGDIR=${XDMLOGDIR} \
-				-DXDMPIDDIR=${XDMPIDDIR} \
-				-DXPM \
-				-DSU="su -m"
+SUFFIXES = .in
+
+.in:
+	$(TOOL_SED) \
+		-e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
+		-e 's,BITMAPDIR,${X11INCDIR}/X11/pixmaps,' \
+		-e 's,XDM_PIXMAP,NetBSD.xpm,' \
+		-e 's,XDM_BWPIXMAP,NetBSD-bw.xpm,' \
+		-e 's,BINDIR,$(X11BINDIR),' \
+		-e 's,DEFAULTVT,$(DEFAULTVT),' \
+		-e 's,XDMDIR,$(XDMDIR),'
+		-e 's,XDMLOGDIR,$(XDMLOGDIR),' \
+		-e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
+		-e 's,XDMPIDDIR,$(XDMPIDDIR),' \
+		-e 's,XDMCONFIGDIR,$(XDMDIR),' \
+		-e 's,XDMSCRIPTDIR,$(XDMDIR),' \
+		-e 's,SU,su -m,' \
+		-e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
+		-e 's,SHELL_CMD,/bin/sh,' \
+		-e 's,UTMP_FILE,$(XDMPIDDIR)/utmp,' \
+		-e 's,UTMP_FLAG,-u $(XDMPIDDIR)/utmp,' \
+		-e 's,WTMP_FILE,$(XDMLOGDIR)/wtmp,' \
+		-e 's,WTMP_FLAG,-w $(XDMLOGDIR)/wtmp,' \
+		-e 's,MKTEMP_COMMAND,/usr/bin/mktemp,' \
+		-e 's,XCOMM,\#,' \
+		-e 's,XHASH,\#,' \
+		-e 's,NLBS,\\n\\,' \
+		-e 's,BS,\\,' \
+		-e 's,/\*\*/,,g'
 
 CONFIGFILES=		GiveConsole TakeConsole \
 			Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
-			${CPPSCRIPTS} 
+			${SEDSCRIPTS} 
 FILES=			xorg-bw.xpm xorg.xpm \
 			NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm	\
 			NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm
@@ -71,7 +83,5 @@ CONFIGSYMLINKS=		Xservers.ws ${XDMDIR}/Xservers
 
 .include "../Makefile.xdm"
 
-CPPSCRIPTFLAGS_xdm-config+=	-DCHOOSERPATH=${XDMCHOOSERPATH}
-
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>