Module Name: src
Committed By: mrg
Date: Sat Jul 23 23:30:20 UTC 2011
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile shlib_version
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
updates for freetype 2.4.5. build bzip2.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/freetype/freetype/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.8 src/external/mit/xorg/lib/freetype/Makefile:1.9
--- src/external/mit/xorg/lib/freetype/Makefile:1.8 Sat Apr 23 15:26:05 2011
+++ src/external/mit/xorg/lib/freetype/Makefile Sat Jul 23 23:30:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/04/23 15:26:05 rjs Exp $
+# $NetBSD: Makefile,v 1.9 2011/07/23 23:30:19 mrg Exp $
.include <bsd.own.mk>
@@ -34,6 +34,9 @@
.PATH: ${FREETYPE}/src/gzip
SRCS+= ftgzip.c
+.PATH: ${FREETYPE}/src/bzip2
+SRCS+= ftbzip2.c
+
.PATH: ${FREETYPE}/src/lzw
SRCS+= ftlzw.c
Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.4 src/external/mit/xorg/lib/freetype/shlib_version:1.5
--- src/external/mit/xorg/lib/freetype/shlib_version:1.4 Mon Nov 22 08:34:56 2010
+++ src/external/mit/xorg/lib/freetype/shlib_version Sat Jul 23 23:30:19 2011
@@ -1,6 +1,6 @@
-# $NetBSD: shlib_version,v 1.4 2010/11/22 08:34:56 mrg Exp $
+# $NetBSD: shlib_version,v 1.5 2011/07/23 23:30:19 mrg Exp $
#
# XXX XXX XXX netbsd xsrc xfree 4.5 freetype used "major=9"!
#
major=7
-minor=2
+minor=3
Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.7 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.8
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.7 Sun Mar 6 00:59:18 2011
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Sat Jul 23 23:30:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/03/06 00:59:18 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2011/07/23 23:30:19 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@
INCSDIR=${X11INCDIR}/freetype2/freetype
-INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftcache.h \
+INCS= freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h ftcache.h \
ftchapters.h ftcid.h fterrdef.h fterrors.h ftgasp.h ftglyph.h \
ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
