Module Name: src
Committed By: mrg
Date: Wed May 9 08:39:55 UTC 2018
Modified Files:
src/external/mit/xorg/bin/fonttosfnt: Makefile
src/external/mit/xorg/bin/mkfontscale: Makefile
src/external/mit/xorg/bin/x11perf: Makefile
src/external/mit/xorg/bin/xclock: Makefile
src/external/mit/xorg/bin/xditview: Makefile
src/external/mit/xorg/bin/xdm: Makefile.xdm
src/external/mit/xorg/bin/xfd: Makefile
src/external/mit/xorg/bin/xlogo: Makefile
src/external/mit/xorg/bin/xterm: Makefile
src/external/mit/xorg/lib/fontconfig/src: Makefile.fcarch
src/external/mit/xorg/lib/libXdmGreet: Makefile
src/external/mit/xorg/lib/libXfont: Makefile
src/external/mit/xorg/lib/libXfont2: Makefile
src/external/mit/xorg/lib/libXft: Makefile
Log Message:
add freetype2/freetype to the include path.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fonttosfnt/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/mkfontscale/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/x11perf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xclock/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xditview/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xdm/Makefile.xdm
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xfd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xlogo/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/bin/xterm/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXdmGreet/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXfont/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXfont2/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXft/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/fonttosfnt/Makefile
diff -u src/external/mit/xorg/bin/fonttosfnt/Makefile:1.2 src/external/mit/xorg/bin/fonttosfnt/Makefile:1.3
--- src/external/mit/xorg/bin/fonttosfnt/Makefile:1.2 Thu Aug 11 23:15:35 2011
+++ src/external/mit/xorg/bin/fonttosfnt/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/08/11 23:15:35 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -7,10 +7,10 @@ SRCS= fonttosfnt.c read.c write.c struct
# XXX XVENDORNAME and XVENDORNAMESHORT should live in a common location
CPPFLAGS+= -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 \
+ -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DXVENDORNAMESHORT=${XVENDORNAMESHORT} \
-DXVENDORNAME=${XVENDORNAME}
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts \
- -I${X11SRCDIR.xc}/extras/freetype2/include
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
LDADD+= -lfreetype -lfontenc -lz -lm
Index: src/external/mit/xorg/bin/mkfontscale/Makefile
diff -u src/external/mit/xorg/bin/mkfontscale/Makefile:1.5 src/external/mit/xorg/bin/mkfontscale/Makefile:1.6
--- src/external/mit/xorg/bin/mkfontscale/Makefile:1.5 Mon Jul 20 23:50:23 2015
+++ src/external/mit/xorg/bin/mkfontscale/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/07/20 23:50:23 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ PROG= mkfontscale
SRCS= mkfontscale.c list.c hash.c ident.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LDADD+= -lfontenc -lfreetype -lz -lbz2
DPADD+= ${LIBFONTENC} ${LIBFREETYPE} ${LIBZ} ${LIBBZ2}
Index: src/external/mit/xorg/bin/x11perf/Makefile
diff -u src/external/mit/xorg/bin/x11perf/Makefile:1.3 src/external/mit/xorg/bin/x11perf/Makefile:1.4
--- src/external/mit/xorg/bin/x11perf/Makefile:1.3 Sun Nov 20 21:02:23 2011
+++ src/external/mit/xorg/bin/x11perf/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/11/20 21:02:23 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ SRCS= x11perf.c bitmaps.c do_tests.c do_
CPPFLAGS+= -DMITSHM -DXRENDER
CPPFLAGS+= -DXFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
MAN= Xmark.1 x11perf.1 x11perfcomp.1
Index: src/external/mit/xorg/bin/xclock/Makefile
diff -u src/external/mit/xorg/bin/xclock/Makefile:1.3 src/external/mit/xorg/bin/xclock/Makefile:1.4
--- src/external/mit/xorg/bin/xclock/Makefile:1.3 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xclock/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ PROG= xclock
SRCS= xclock.c Clock.c
CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=XClock XClock-color
Index: src/external/mit/xorg/bin/xditview/Makefile
diff -u src/external/mit/xorg/bin/xditview/Makefile:1.3 src/external/mit/xorg/bin/xditview/Makefile:1.4
--- src/external/mit/xorg/bin/xditview/Makefile:1.3 Fri May 31 06:50:45 2013
+++ src/external/mit/xorg/bin/xditview/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 06:50:45 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -8,6 +8,7 @@ SRCS= xditview.c Dvi.c draw.c font.c lex
CPPFLAGS+= -DHAS_MKSTEMP
CPPFLAGS+= -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=Xditview Xditview-chrtr
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.8 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.9
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.8 Wed Jun 5 00:01:16 2013
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.8 2013/06/05 00:01:16 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.9 2018/05/09 08:39:55 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -33,6 +33,7 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
-I${X11SRCDIR.xdm} \
-I${X11SRCDIR.xdm}/include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
+ -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
${X11FLAGS.VERSION}
LDFLAGS+= -Wl,--export-dynamic
Index: src/external/mit/xorg/bin/xfd/Makefile
diff -u src/external/mit/xorg/bin/xfd/Makefile:1.3 src/external/mit/xorg/bin/xfd/Makefile:1.4
--- src/external/mit/xorg/bin/xfd/Makefile:1.3 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xfd/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ PROG= xfd
SRCS= xfd.c grid.c
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=Xfd
Index: src/external/mit/xorg/bin/xlogo/Makefile
diff -u src/external/mit/xorg/bin/xlogo/Makefile:1.3 src/external/mit/xorg/bin/xlogo/Makefile:1.4
--- src/external/mit/xorg/bin/xlogo/Makefile:1.3 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xlogo/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ PROG= xlogo
SRCS= xlogo.c Logo.c RenderLogo.c
CPPFLAGS+= -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=XLogo XLogo-color
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.16 src/external/mit/xorg/bin/xterm/Makefile:1.17
--- src/external/mit/xorg/bin/xterm/Makefile:1.16 Wed Mar 14 06:06:40 2018
+++ src/external/mit/xorg/bin/xterm/Makefile Wed May 9 08:39:55 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/03/14 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2018/05/09 08:39:55 mrg Exp $
.include <bsd.own.mk>
@@ -16,6 +16,7 @@ CPPFLAGS+= -I. \
-I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
+ -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DPROJECTROOT=${X11ROOTDIR} \
-DHAVE_CONFIG_H \
-D_REENTRANT \
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.3 src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.4
--- src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch:1.3 Mon Jun 3 06:46:54 2013
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch Wed May 9 08:39:54 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.fcarch,v 1.3 2013/06/03 06:46:54 mrg Exp $
+# $NetBSD: Makefile.fcarch,v 1.4 2018/05/09 08:39:54 mrg Exp $
.ifndef _FONTCONFIG_FCARCH_MK_
_FONTCONFIG_FCARCH_MK_=1
CPPFLAGS+= -DFC_ARCHITECTURE="\"${MACHINE_ARCH}\""
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
.endif
Index: src/external/mit/xorg/lib/libXdmGreet/Makefile
diff -u src/external/mit/xorg/lib/libXdmGreet/Makefile:1.4 src/external/mit/xorg/lib/libXdmGreet/Makefile:1.5
--- src/external/mit/xorg/lib/libXdmGreet/Makefile:1.4 Thu Sep 12 04:42:49 2013
+++ src/external/mit/xorg/lib/libXdmGreet/Makefile Wed May 9 08:39:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/09/12 04:42:49 dholland Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@@ -15,6 +15,7 @@ CPPFLAGS+= -I${X11SRCDIR.xdm}/include -D
# be elided, causes xdm to fail to accept password input and
# then crash at login "failure".
#CPPFLAGS+= -DGREET_LIB
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS=\
Xext ${.CURDIR}/../libXext \
Index: src/external/mit/xorg/lib/libXfont/Makefile
diff -u src/external/mit/xorg/lib/libXfont/Makefile:1.10 src/external/mit/xorg/lib/libXfont/Makefile:1.11
--- src/external/mit/xorg/lib/libXfont/Makefile:1.10 Wed Feb 25 20:01:39 2015
+++ src/external/mit/xorg/lib/libXfont/Makefile Wed May 9 08:39:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/02/25 20:01:39 snj Exp $
+# $NetBSD: Makefile,v 1.11 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@@ -45,6 +45,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -I${XFONTDIR}/src/stubs
CPPFLAGS+= -I${XFONTDIR}/../include
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS=\
Xt ${.CURDIR}/../libXt \
Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.3 src/external/mit/xorg/lib/libXfont2/Makefile:1.4
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.3 Tue Mar 13 02:23:28 2018
+++ src/external/mit/xorg/lib/libXfont2/Makefile Wed May 9 08:39:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/03/13 02:23:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@@ -109,6 +109,7 @@ CPPFLAGS+= -I${XFONT2DIR}/../include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS=\
Xt ${.CURDIR}/../libXt \
Index: src/external/mit/xorg/lib/libXft/Makefile
diff -u src/external/mit/xorg/lib/libXft/Makefile:1.8 src/external/mit/xorg/lib/libXft/Makefile:1.9
--- src/external/mit/xorg/lib/libXft/Makefile:1.8 Fri Feb 2 01:02:40 2018
+++ src/external/mit/xorg/lib/libXft/Makefile Wed May 9 08:39:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/02/02 01:02:40 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/09 08:39:54 mrg Exp $
.include <bsd.own.mk>
@@ -19,6 +19,7 @@ MAN= Xft.3
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 -DXFREE86_FT2
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xft
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype
LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic \
fontconfig ${.CURDIR}/../fontconfig/src \
