Module Name: src Committed By: mrg Date: Sun Mar 11 10:17:10 UTC 2018
Modified Files: src/external/mit/xorg/bin/xfs: Makefile src/external/mit/xorg/lib/libXfont2: Makefile Log Message: fix libXfont2 sources list. update for xfs 1.2.0. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/bin/xfs/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXfont2/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.13 src/external/mit/xorg/bin/xfs/Makefile:1.14 --- src/external/mit/xorg/bin/xfs/Makefile:1.13 Sat Mar 3 03:34:17 2018 +++ src/external/mit/xorg/bin/xfs/Makefile Sun Mar 11 10:17:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2018/03/11 10:17:10 mrg Exp $ .include <bsd.own.mk> @@ -19,8 +19,6 @@ SRCS+= access.c config.c connection.c da CPPFLAGS+= -I${XFSDIR}/include \ -I${DESTDIR}${X11INCDIR}/X11/FS \ - -I${X11SRCDIR.libXfont}/include \ - -I${X11SRCDIR.libXfont}/bitmap \ -I${XFSDIR}/../include \ -DHAVE_DAEMON @@ -59,7 +57,7 @@ FILESNAME= config FILESDIR= ${XFSCONFIGDIR} -LDADD+= -lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz +LDADD+= -lXfont2 -lfontenc -lXext -lX11 -lfreetype -lm -lz DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \ ${LIBFREETYPE} ${LIBM} ${LIBZ} Index: src/external/mit/xorg/lib/libXfont2/Makefile diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.1 src/external/mit/xorg/lib/libXfont2/Makefile:1.2 --- src/external/mit/xorg/lib/libXfont2/Makefile:1.1 Sun Mar 11 09:43:38 2018 +++ src/external/mit/xorg/lib/libXfont2/Makefile Sun Mar 11 10:17:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/03/11 09:43:38 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2018/03/11 10:17:10 mrg Exp $ .include <bsd.own.mk> @@ -55,15 +55,24 @@ SRCS.FreeType= \ .PATH: ${XFONT2DIR}/src/FreeType SRCS.bitmap= \ - ftenc.c \ - ftfuncs.c \ - fttools.c \ - xttcap.c \ + bitmap.c \ + bitmapfunc.c \ + bitmaputil.c \ + bitscale.c \ + fontink.c \ + bitmap.c \ + bitmapfunc.c \ + bitmaputil.c \ + bitscale.c \ + fontink.c \ bdfread.c \ bdfutils.c \ - pcfread.c \ + pcfread.c +.if 0 +SRCS.bitmap+= \ pcfwrite.c \ snfread.c +.endif .PATH: ${XFONT2DIR}/src/bitmap SRCS.builtins= \