[src/trunk]: src/external/mit/xorg add freetype2/freetype to the...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg add freetype2/freetype to the...
From: mrg <mrg%NetBSD.org@localhost>
Date: Wed, 09 May 2018 11:12:47 +0000
details:   https://anonhg.NetBSD.org/src/rev/1c31a12c8216
branches:  trunk
changeset: 318912:1c31a12c8216
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed May 09 08:39:54 2018 +0000
description:
add freetype2/freetype to the include path.

diffstat:

 external/mit/xorg/bin/fonttosfnt/Makefile            |  6 +++---
 external/mit/xorg/bin/mkfontscale/Makefile           |  3 ++-
 external/mit/xorg/bin/x11perf/Makefile               |  3 ++-
 external/mit/xorg/bin/xclock/Makefile                |  3 ++-
 external/mit/xorg/bin/xditview/Makefile              |  3 ++-
 external/mit/xorg/bin/xdm/Makefile.xdm               |  3 ++-
 external/mit/xorg/bin/xfd/Makefile                   |  3 ++-
 external/mit/xorg/bin/xlogo/Makefile                 |  3 ++-
 external/mit/xorg/bin/xterm/Makefile                 |  3 ++-
 external/mit/xorg/lib/fontconfig/src/Makefile.fcarch |  3 ++-
 external/mit/xorg/lib/libXdmGreet/Makefile           |  3 ++-
 external/mit/xorg/lib/libXfont/Makefile              |  3 ++-
 external/mit/xorg/lib/libXfont2/Makefile             |  3 ++-
 external/mit/xorg/lib/libXft/Makefile                |  3 ++-
 14 files changed, 29 insertions(+), 16 deletions(-)

diffs (240 lines):

diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/fonttosfnt/Makefile
--- a/external/mit/xorg/bin/fonttosfnt/Makefile Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/fonttosfnt/Makefile Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 
 # 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
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/mkfontscale/Makefile
--- a/external/mit/xorg/bin/mkfontscale/Makefile        Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/mkfontscale/Makefile        Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 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}
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/x11perf/Makefile
--- a/external/mit/xorg/bin/x11perf/Makefile    Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/x11perf/Makefile    Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 
 CPPFLAGS+=     -DMITSHM -DXRENDER
 CPPFLAGS+=     -DXFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2/freetype
 
 MAN=   Xmark.1 x11perf.1 x11perfcomp.1
 
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/xclock/Makefile
--- a/external/mit/xorg/bin/xclock/Makefile     Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/xclock/Makefile     Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 SRCS=  xclock.c Clock.c
 
 CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/freetype2/freetype
 
 APPDEFS=XClock XClock-color
 
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/xditview/Makefile
--- a/external/mit/xorg/bin/xditview/Makefile   Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/xditview/Makefile   Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 
 CPPFLAGS+=     -DHAS_MKSTEMP
 CPPFLAGS+=     -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2/freetype
 
 APPDEFS=Xditview Xditview-chrtr
 
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/xdm/Makefile.xdm
--- a/external/mit/xorg/bin/xdm/Makefile.xdm    Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/xdm/Makefile.xdm    Wed May 09 08:39:54 2018 +0000
@@ -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 @@
                -I${X11SRCDIR.xdm} \
                -I${X11SRCDIR.xdm}/include \
                -I${DESTDIR}${X11INCDIR}/freetype2 \
+               -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
                ${X11FLAGS.VERSION}
 
 LDFLAGS+=      -Wl,--export-dynamic
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/xfd/Makefile
--- a/external/mit/xorg/bin/xfd/Makefile        Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/xfd/Makefile        Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 SRCS=  xfd.c grid.c
 
 CPPFLAGS+=     -DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2/freetype
 
 APPDEFS=Xfd
 
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/xlogo/Makefile
--- a/external/mit/xorg/bin/xlogo/Makefile      Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/xlogo/Makefile      Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 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
 
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/bin/xterm/Makefile
--- a/external/mit/xorg/bin/xterm/Makefile      Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/bin/xterm/Makefile      Wed May 09 08:39:54 2018 +0000
@@ -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 @@
                -I${X11SRCDIR.${PROG}} \
                -I${X11SRCDIR.${PROG}}/../include \
                -I${DESTDIR}${X11INCDIR}/freetype2 \
+               -I${DESTDIR}${X11INCDIR}/freetype2/freetype \
                -DPROJECTROOT=${X11ROOTDIR} \
                -DHAVE_CONFIG_H \
                -D_REENTRANT \
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/lib/fontconfig/src/Makefile.fcarch
--- a/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch      Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile.fcarch      Wed May 09 08:39:54 2018 +0000
@@ -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
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/lib/libXdmGreet/Makefile
--- a/external/mit/xorg/lib/libXdmGreet/Makefile        Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/lib/libXdmGreet/Makefile        Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 # 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 \
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/lib/libXfont/Makefile
--- a/external/mit/xorg/lib/libXfont/Makefile   Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/lib/libXfont/Makefile   Wed May 09 08:39:54 2018 +0000
@@ -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}/freetype2
 CPPFLAGS+=     -I${XFONTDIR}/src/stubs
 CPPFLAGS+=     -I${XFONTDIR}/../include
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2/freetype
 
 LIBDPLIBS=\
        Xt      ${.CURDIR}/../libXt \
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/lib/libXfont2/Makefile
--- a/external/mit/xorg/lib/libXfont2/Makefile  Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/lib/libXfont2/Makefile  Wed May 09 08:39:54 2018 +0000
@@ -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${DESTDIR}${X11INCDIR}
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/fonts
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2/freetype
 
 LIBDPLIBS=\
        Xt      ${.CURDIR}/../libXt \
diff -r 2505f97e8256 -r 1c31a12c8216 external/mit/xorg/lib/libXft/Makefile
--- a/external/mit/xorg/lib/libXft/Makefile     Wed May 09 08:22:53 2018 +0000
+++ b/external/mit/xorg/lib/libXft/Makefile     Wed May 09 08:39:54 2018 +0000
@@ -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 @@
 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 \
Prev by Date: [src/trunk]: src/tests/lib/libc/sys don't print "long" with "%zu".
Next by Date: [src/trunk]: src/tests/lib/libobjc Handle the GCC restriction li...
Previous by Thread: [src/trunk]: src/tests/lib/libc/sys don't print "long" with "%zu".
Next by Thread: [src/trunk]: src/tests/lib/libobjc Handle the GCC restriction li...
Indexes:
Home | Main Index | Thread Index | Old Index