Module Name: src
Committed By: mrg
Date: Wed May 6 08:49:37 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
Log Message:
enable xft for xdm. from yorick hardy.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.2 -r1.3 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.4 src/external/mit/xorg/bin/xdm/Makefile:1.5
--- src/external/mit/xorg/bin/xdm/Makefile:1.4 Fri Jan 2 23:25:57 2009
+++ src/external/mit/xorg/bin/xdm/Makefile Wed May 6 08:49:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/01/02 23:25:57 spz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/06 08:49:37 mrg Exp $
.include <bsd.own.mk>
@@ -26,10 +26,12 @@
-DDEF_AUTH_DIR=\"${XDMVARDIR}\" \
-DDEF_GREETER_LIB=\"${XDMGREETERLIB}\"
-LDADD+= -lXau -lXdmcp -lXinerama -lXpm -lXmu
-LDADD+= -lXt -lSM -lICE -lXext -lX11 -lcrypt
-DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXINERAMA} ${LIBXPM} ${LIBXMU}
-DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBCRYPT}
+LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
+LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
+LDADD+= -lcrypt -lfreetype
+DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM}
+DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+DPADD+= ${LIBCRYPT} ${LIBFREETYPE}
.if (${USE_PAM} != "no")
LDADD+= -lpam ${PAM_STATIC_LDADD}
@@ -47,6 +49,7 @@
.include "Makefile.xdm"
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
X11MANCPP= yes
X11EXTRAMANDEFS+= -DARC4_RANDOM \
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.2 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.3
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.2 Fri Jan 2 23:25:57 2009
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Wed May 6 08:49:37 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.2 2009/01/02 23:25:57 spz Exp $
+# $NetBSD: Makefile.xdm,v 1.3 2009/05/06 08:49:37 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -10,7 +10,7 @@
CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
- -DXPM -DUSE_XINERAMA -DHAS_SETPROCTITLE \
+ -DXPM -DUSE_XFT -DUSE_XINERAMA -DHAS_SETPROCTITLE \
-DHAS_GETIFADDRS -UIPv6 -DHAS_MKSTEMP \
-I${X11SRCDIR.xdm} \
${X11FLAGS.VERSION}
