[src/trunk]: src/external/mit/xorg update properly for xdm 1.1.11:

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

details:   https://anonhg.NetBSD.org/src/rev/61c4e3231b71
branches:  trunk
changeset: 787162:61c4e3231b71
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 05 00:01:16 2013 +0000

description:
update properly for xdm 1.1.11:
- link libXdmGreet against the same libs that modular does
- copy all the config.h defines we need (could do the copy config.h
  thing here, but we use a bunch of non-standard paths)
- support ipv6 properly
- move freetype include to Makefile.xdm so the greeter can find it

diffstat:

 external/mit/xorg/bin/xdm/Makefile         |   3 +--
 external/mit/xorg/bin/xdm/Makefile.xdm     |  27 ++++++++++++++++++++-------
 external/mit/xorg/lib/libXdmGreet/Makefile |  23 +++++++++++++++--------
 3 files changed, 36 insertions(+), 17 deletions(-)

diffs (113 lines):

diff -r 2030ec6d3465 -r 61c4e3231b71 external/mit/xorg/bin/xdm/Makefile
--- a/external/mit/xorg/bin/xdm/Makefile        Tue Jun 04 22:47:37 2013 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile        Wed Jun 05 00:01:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2013/05/31 22:49:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2013/06/05 00:01:16 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -44,7 +44,6 @@
 .include "Makefile.xdm"
 
 CPPFLAGS.resource.c+=  -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
-CPPFLAGS+=             -I${DESTDIR}${X11INCDIR}/freetype2
 
 X11MANCPP=     yes
 X11EXTRAMANDEFS+=      -DARC4_RANDOM \
diff -r 2030ec6d3465 -r 61c4e3231b71 external/mit/xorg/bin/xdm/Makefile.xdm
--- a/external/mit/xorg/bin/xdm/Makefile.xdm    Tue Jun 04 22:47:37 2013 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile.xdm    Wed Jun 05 00:01:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xdm,v 1.7 2013/06/03 23:25:43 mrg Exp $
+#      $NetBSD: Makefile.xdm,v 1.8 2013/06/05 00:01:16 mrg Exp $
 
 XDMVARDIR=     /var/db/xdm
 XDMDIR=                ${X11ETCDIR}/xdm
@@ -8,22 +8,31 @@
 XDMPIDDIR=     /var/run
 
 CPPFLAGS+=     -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-               -DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
-               -DHAVE_ASPRINTF \
+               -DHASXDMAUTH ${X11FLAGS.CONNECTION} \
+               -DBSD44SOCKETS \
                -DFRAGILE_DEV_MEM -DARC4_RANDOM \
-               -DXPM -DUSE_XFT -DUSE_XINERAMA \
-               -UIPv6 \
-               -DHAVE_SYS_PARAM_H \
-               -DHAVE_DAEMON \
+               -DDEV_RANDOM=\"dev/urandom\" \
+               -DXPM -DUSE_XFT \
                -DHAVE_GETIFADDRS \
                -DHAVE_MKSTEMP \
                -DHAVE_SETPROCTITLE \
                -DHAVE_SETUSERCONTEXT \
                -DHAVE_ARC4RANDOM \
+               -DHAVE_DAEMON \
                -DHAVE_SIGACTION \
                -DHAVE_ASPRINTF \
+               -DHAVE_OPENLOG \
+               -DUNIXCONN \
+               -DTCPCONN \
+               -DHAVE_WORKING_VFORK \
+               -DHAVE_VFORK_H \
+               -DHAVE_VFORK \
+               -DHAVE_INTTYPES_H \
+               -DHAVE_SYS_PARAM_H \
+               -DHAVE_GRP_H \
                -I${X11SRCDIR.xdm} \
                -I${X11SRCDIR.xdm}/include \
+               -I${DESTDIR}${X11INCDIR}/freetype2 \
                ${X11FLAGS.VERSION}
 
 LDFLAGS+=      -Wl,--export-dynamic
@@ -32,6 +41,10 @@
 CPPFLAGS+=      -DUSE_PAM
 .endif
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=      -DIPv6
+.endif
+
 .PATH:         ${X11SRCDIR.xdm}
 .PATH:         ${X11SRCDIR.xdm}/xdm
 .PATH:         ${X11SRCDIR.xdm}/man
diff -r 2030ec6d3465 -r 61c4e3231b71 external/mit/xorg/lib/libXdmGreet/Makefile
--- a/external/mit/xorg/lib/libXdmGreet/Makefile        Tue Jun 04 22:47:37 2013 +0000
+++ b/external/mit/xorg/lib/libXdmGreet/Makefile        Wed Jun 05 00:01:16 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2013/06/03 23:25:43 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2013/06/05 00:01:16 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,14 +11,21 @@
        verify.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
+CPPFLAGS+=     -DGREET_LIB
 
-.if 0
-CPPFLAGS+=     ${X11FLAGS.THREADLIB} \
-               -DHAVE_XEXTPROTO_71 \
-               -DXSERVER_LIBPCIACCESS \
-               -DTRUE=1 -DFALSE=0 \
-               -I${DESTDIR}${X11INCDIR}/xorg 
-.endif
+LIBDPLIBS=\
+       Xext    ${.CURDIR}/../libXext \
+       Xt      ${.CURDIR}/../libXt \
+       Xdmcp   ${.CURDIR}/../libXdmcp \
+       Xinerama        ${.CURDIR}/../libXinerama \
+       Xft     ${.CURDIR}/../libXft \
+       Xpm     ${.CURDIR}/../libXpm \
+       X11     ${.CURDIR}/../libX11/dynamic \
+       pam     ${.CURDIR}/../../../../../lib/libpam/libpam \
+       crypt   ${.CURDIR}/../../../../../lib/libcrypt \
+       util    ${.CURDIR}/../../../../../lib/libutil
+
+.include "../../bin/xdm/Makefile.xdm"
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>