Module Name: src
Committed By: mrg
Date: Sat Mar 3 03:34:17 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/bin/xset: Makefile
Log Message:
xfs and xset don't need libXfontcache.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xset/Makefile
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/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.12 src/external/mit/xorg/bin/xfs/Makefile:1.13
--- src/external/mit/xorg/bin/xfs/Makefile:1.12 Fri Jul 17 17:57:11 2015
+++ src/external/mit/xorg/bin/xfs/Makefile Sat Mar 3 03:34:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $
.include <bsd.own.mk>
@@ -59,8 +59,8 @@ FILESNAME= config
FILESDIR= ${XFSCONFIGDIR}
-LDADD+= -lXfont -lfontenc -lXfontcache -lXext -lX11 -lfreetype -lm -lz
-DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
+LDADD+= -lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz
+DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
${LIBFREETYPE} ${LIBM} ${LIBZ}
.PATH: ${XFSDIR}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.5 src/external/mit/xorg/bin/xset/Makefile:1.6
--- src/external/mit/xorg/bin/xset/Makefile:1.5 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/xset/Makefile Sat Mar 3 03:34:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/03 03:34:17 mrg Exp $
.include <bsd.own.mk>
@@ -6,8 +6,8 @@ PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
-LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
+LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
+DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}
DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
