Module Name: src
Committed By: christos
Date: Tue Oct 25 16:56:23 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
Log Message:
Add all the missing HAS_ so that we get back login_cap functionality.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.4 -r1.5 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.7 src/external/mit/xorg/bin/xdm/Makefile:1.8
--- src/external/mit/xorg/bin/xdm/Makefile:1.7 Mon May 23 13:44:41 2011
+++ src/external/mit/xorg/bin/xdm/Makefile Tue Oct 25 12:56:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/05/23 17:44:41 dsl Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/25 16:56:23 christos Exp $
.include <bsd.own.mk>
@@ -28,10 +28,10 @@ CPPFLAGS.resource.c= \
LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
-LDADD+= -lcrypt -lfreetype
+LDADD+= -lcrypt -lfreetype -lutil
DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM}
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-DPADD+= ${LIBCRYPT} ${LIBFREETYPE}
+DPADD+= ${LIBCRYPT} ${LIBFREETYPE} ${LIBUTIL}
.if (${USE_PAM} != "no")
LDADD+= -lpam ${PAM_STATIC_LDADD}
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.4 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.4 Mon Nov 9 02:21:17 2009
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Tue Oct 25 12:56:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.4 2009/11/09 07:21:17 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.5 2011/10/25 16:56:23 christos Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -11,8 +11,17 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
-DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
-DHAVE_ASPRINTF \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
- -DXPM -DUSE_XFT -DUSE_XINERAMA -DHAS_SETPROCTITLE \
- -DHAS_GETIFADDRS -UIPv6 -DHAS_MKSTEMP \
+ -DXPM -DUSE_XFT -DUSE_XINERAMA \
+ -UIPv6 \
+ -DHAS_CRYPT \
+ -DHAS_DAEMON \
+ -DHAS_GETIFADDRS \
+ -DHAS_IFREQ \
+ -DHAS_MKSTEMP \
+ -DHAS_SETPROCTITLE \
+ -DHAS_SETSID \
+ -DHAS_SETUSERCONTEXT \
+ -DHAS_VFORK \
-I${X11SRCDIR.xdm} \
${X11FLAGS.VERSION}
