Module Name: src
Committed By: mrg
Date: Wed Jun 5 08:42:56 UTC 2013
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile shlib_version
src/external/mit/xorg/lib/freetype/freetype: Makefile
Removed Files:
src/external/mit/xorg/lib/freetype/freetype/internal: Makefile
src/external/mit/xorg/lib/freetype/freetype/internal/services: Makefile
Log Message:
updates for freetype 2.4.12. stop installing internal headers.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/lib/freetype/freetype/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/lib/freetype/freetype/internal/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/lib/freetype/freetype/internal/services/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.10 src/external/mit/xorg/lib/freetype/Makefile:1.11
--- src/external/mit/xorg/lib/freetype/Makefile:1.10 Sat Jul 23 23:38:19 2011
+++ src/external/mit/xorg/lib/freetype/Makefile Wed Jun 5 08:42:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/07/23 23:38:19 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/05 08:42:56 mrg Exp $
.include <bsd.own.mk>
@@ -11,7 +11,8 @@ SUBDIR= freetype
.PATH: ${FREETYPE}/src/base
SRCS= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftfstype.c ftglyph.c \
ftinit.c ftlcdfil.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
- ftsystem.c fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c
+ ftsystem.c fttype1.c ftwinfnt.c ftxf86.c ftbitmap.c ftcid.c \
+ ftgasp.c ftgxval.c ftotval.c ftpatent.c ftpfr.c
.PATH: ${FREETYPE}/src/autofit
SRCS+= autofit.c
@@ -53,7 +54,7 @@ SRCS+= psaux.c
SRCS+= pshinter.c
.PATH: ${FREETYPE}/src/psnames
-SRCS+= psnames.c
+SRCS+= psmodule.c
.PATH: ${FREETYPE}/src/raster
SRCS+= raster.c
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.5 src/external/mit/xorg/lib/freetype/shlib_version:1.6
--- src/external/mit/xorg/lib/freetype/shlib_version:1.5 Sat Jul 23 23:30:19 2011
+++ src/external/mit/xorg/lib/freetype/shlib_version Wed Jun 5 08:42:56 2013
@@ -1,6 +1,6 @@
-# $NetBSD: shlib_version,v 1.5 2011/07/23 23:30:19 mrg Exp $
+# $NetBSD: shlib_version,v 1.6 2013/06/05 08:42:56 mrg Exp $
#
# XXX XXX XXX netbsd xsrc xfree 4.5 freetype used "major=9"!
#
major=7
-minor=3
+minor=4
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.9 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.10
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.9 Mon Jul 25 18:23:14 2011
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Wed Jun 5 08:42:56 2013
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/07/25 18:23:14 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/05 08:42:56 mrg Exp $
.include <bsd.own.mk>
-SUBDIR= config internal
+SUBDIR= config
.PATH: ${X11SRCDIR.freetype}/include/freetype
@@ -14,7 +14,8 @@ INCS= freetype.h ftadvanc.h ftbbox.h ftb
ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \
- t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h
+ t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
+ ftautoh.h ftcffdrv.h
SCRIPTS= freetype-config