Module Name: src
Committed By: mrg
Date: Fri May 31 22:49:15 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
Log Message:
udpate for xdm 1.1.11:
- moved manuals
- moved sources
- renamed defines
- new sources
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/Makefile.xdm
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.8 src/external/mit/xorg/bin/xdm/Makefile:1.9
--- src/external/mit/xorg/bin/xdm/Makefile:1.8 Tue Oct 25 16:56:23 2011
+++ src/external/mit/xorg/bin/xdm/Makefile Fri May 31 22:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/10/25 16:56:23 christos Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/31 22:49:15 mrg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ SRCS= access.c auth.c choose.c daemon.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 \
- Login.c greet.c verify.c
+ Login.c greet.c verify.c prngc.c
CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c= -DBSD44SOCKETS
@@ -41,11 +41,6 @@ DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
SUBDIR= chooser config
TARGETS+= configinstall
-.PATH: ${X11SRCDIR.${PROG}}
-.PATH: ${X11SRCDIR.${PROG}}/greeter
-
-BUILDSYMLINKS+= xdm.man.cpp xdm.man
-
.include "Makefile.xdm"
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.6
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5 Tue Oct 25 16:56:23 2011
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Fri May 31 22:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.5 2011/10/25 16:56:23 christos Exp $
+# $NetBSD: Makefile.xdm,v 1.6 2013/05/31 22:49:15 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -13,16 +13,17 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
-DXPM -DUSE_XFT -DUSE_XINERAMA \
-UIPv6 \
- -DHAS_CRYPT \
- -DHAS_DAEMON \
- -DHAS_GETIFADDRS \
- -DHAS_IFREQ \
- -DHAS_MKSTEMP \
- -DHAS_SETPROCTITLE \
- -DHAS_SETSID \
- -DHAS_SETUSERCONTEXT \
- -DHAS_VFORK \
+ -DHAVE_SYS_PARAM_H \
+ -DHAVE_DAEMON \
+ -DHAVE_GETIFADDRS \
+ -DHAVE_MKSTEMP \
+ -DHAVE_SETPROCTITLE \
+ -DHAVE_SETUSERCONTEXT \
+ -DHAVE_ARC4RANDOM \
+ -DHAVE_SIGACTION \
+ -DHAVE_ASPRINTF \
-I${X11SRCDIR.xdm} \
+ -I${X11SRCDIR.xdm}/include \
${X11FLAGS.VERSION}
.if (${USE_PAM} != "no")
@@ -30,3 +31,8 @@ CPPFLAGS+= -DUSE_PAM
.endif
.PATH: ${X11SRCDIR.xdm}
+.PATH: ${X11SRCDIR.xdm}/xdm
+.PATH: ${X11SRCDIR.xdm}/man
+.PATH: ${X11SRCDIR.xdm}/chooser
+.PATH: ${X11SRCDIR.xdm}/greeter
+.PATH: ${X11SRCDIR.xdm}/app-defaults
