Module Name: src
Committed By: christos
Date: Mon May 16 22:19:10 UTC 2016
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile shlib_version
src/external/mit/xorg/lib/freetype/freetype: Makefile
src/external/mit/xorg/lib/freetype/freetype/cache: Makefile
src/external/mit/xorg/lib/freetype/freetype/config: Makefile
Log Message:
Adjust to 2.6.3.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.21 -r1.22 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/freetype/freetype/cache/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/freetype/freetype/config/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/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.16 src/external/mit/xorg/lib/freetype/Makefile:1.17
--- src/external/mit/xorg/lib/freetype/Makefile:1.16 Mon Jul 20 00:10:40 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Mon May 16 18:19:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2016/05/16 22:19:10 christos Exp $
.include <bsd.own.mk>
@@ -8,6 +8,12 @@ FREETYPE= ${X11SRCDIR.${LIB}}
SUBDIR= freetype
+.PATH: ${X11SRCDIR.freetype}/include/
+
+INCSDIR=${X11INCDIR}/freetype2
+
+INCS= ft2build.h
+
.PATH: ${FREETYPE}/src/base
SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfntfmt.c ftfstype.c \
ftglyph.c ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
@@ -83,7 +89,7 @@ CPPFLAGS+= -DFT_CONFIG_OPTION_SYSTEM_ZLI
-DFT2_BUILD_LIBRARY \
-DFT_CONFIG_MODULES_H="<ftmodule.h>"
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
- -I${DESTDIR}${X11INCDIR}/freetype2/config \
+ -I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
-I${X11SRCDIR.${LIB}}/include
.if !defined(MKSUBPIXEL) || ${MKSUBPIXEL} != "no"
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.9 src/external/mit/xorg/lib/freetype/shlib_version:1.10
--- src/external/mit/xorg/lib/freetype/shlib_version:1.9 Mon Jul 20 00:10:40 2015
+++ src/external/mit/xorg/lib/freetype/shlib_version Mon May 16 18:19:10 2016
@@ -1,6 +1,6 @@
-# $NetBSD: shlib_version,v 1.9 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: shlib_version,v 1.10 2016/05/16 22:19:10 christos Exp $
#
# try to keep this in sync with builds/unix/configure.ac:version_info=
major=18
minor=0
-teeny=12
+teeny=13
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.21 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.22
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.21 Mon Mar 21 01:23:39 2016
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Mon May 16 18:19:10 2016
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2016/03/21 05:23:39 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2016/05/16 22:19:10 christos Exp $
.include <bsd.own.mk>
SUBDIR= config
-.PATH: ${X11SRCDIR.freetype}/include
+.PATH: ${X11SRCDIR.freetype}/include/freetype
-INCSDIR=${X11INCDIR}/freetype2
+INCSDIR=${X11INCDIR}/freetype2/freetype
INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
ftchapters.h ftcid.h fterrdef.h fterrors.h ftfntfmt.h ftgasp.h \
@@ -15,7 +15,7 @@ INCS= freetype.h ftadvanc.h ftbbox.h ftb
ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h \
t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
- ftautoh.h ftcffdrv.h ft2build.h
+ ftautoh.h ftcffdrv.h
SCRIPTS= freetype-config
Index: src/external/mit/xorg/lib/freetype/freetype/cache/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.2 src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.3
--- src/external/mit/xorg/lib/freetype/freetype/cache/Makefile:1.2 Thu Mar 20 04:57:48 2014
+++ src/external/mit/xorg/lib/freetype/freetype/cache/Makefile Mon May 16 18:19:10 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
.include <bsd.own.mk>
-.PATH: ${X11SRCDIR.freetype}/include/cache
+.PATH: ${X11SRCDIR.freetype}/include/freetype/cache
-INCSDIR=${X11INCDIR}/freetype2/cache
+INCSDIR=${X11INCDIR}/freetype2/freetype/cache
INCS= ftcimage.h ftcmanag.h \
ftcsbits.h ftcmru.h
Index: src/external/mit/xorg/lib/freetype/freetype/config/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.2 src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.3
--- src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.2 Thu Mar 20 04:57:48 2014
+++ src/external/mit/xorg/lib/freetype/freetype/config/Makefile Mon May 16 18:19:10 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
.include <bsd.own.mk>
-.PATH: ${X11SRCDIR.freetype}/include/config
+.PATH: ${X11SRCDIR.freetype}/include/freetype/config
-INCSDIR=${X11INCDIR}/freetype2/config
+INCSDIR=${X11INCDIR}/freetype2/freetype/config
INCS= ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h
