Module Name:    src
Committed By:   snj
Date:           Mon Apr 13 18:58:09 UTC 2009

Modified Files:
        src/distrib/sets/lists/xbase: shl.mi
        src/distrib/sets/lists/xcomp: mi
        src/external/mit/xorg/lib/freetype: Makefile shlib_version
        src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
Update for freetype-2.3.9.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/freetype/shlib_version
cvs rdiff -u -r1.5 -r1.6 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/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.26 src/distrib/sets/lists/xbase/shl.mi:1.27
--- src/distrib/sets/lists/xbase/shl.mi:1.26	Wed Jan 14 07:07:12 2009
+++ src/distrib/sets/lists/xbase/shl.mi	Mon Apr 13 18:58:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.26 2009/01/14 07:07:12 jnemeth Exp $
+# $NetBSD: shl.mi,v 1.27 2009/04/13 18:58:08 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -102,7 +102,7 @@
 ./usr/X11R7/lib/libexpat.so.2.0			-unknown-		xorg
 ./usr/X11R7/lib/libfontconfig.so.2.0		-unknown-		xorg
 ./usr/X11R7/lib/libfontenc.so.2.0		-unknown-		xorg
-./usr/X11R7/lib/libfreetype.so.7.0		-unknown-		xorg
+./usr/X11R7/lib/libfreetype.so.7.1		-unknown-		xorg
 ./usr/X11R7/lib/libglut.so.4.0			-unknown-		xorg
 ./usr/X11R7/lib/liblbxutil.so.2.0		-unknown-		xorg
 ./usr/X11R7/lib/libpixman-1.so.1.0		-unknown-		xorg

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.83 src/distrib/sets/lists/xcomp/mi:1.84
--- src/distrib/sets/lists/xcomp/mi:1.83	Thu Mar 12 08:04:49 2009
+++ src/distrib/sets/lists/xcomp/mi	Mon Apr 13 18:58:08 2009
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.83 2009/03/12 08:04:49 nakayama Exp $
+#	 $NetBSD: mi,v 1.84 2009/04/13 18:58:08 snj Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5637,6 +5637,7 @@
 ./usr/X11R7/include/freetype2/freetype/config/ftoption.h	-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h	-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/freetype.h	-unknown-	xorg
+./usr/X11R7/include/freetype2/freetype/fftadvanc.h	-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/ftbbox.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/ftbdf.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/freetype/ftbitmap.h	-unknown-	xorg

Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.3 src/external/mit/xorg/lib/freetype/Makefile:1.4
--- src/external/mit/xorg/lib/freetype/Makefile:1.3	Sat Oct 25 13:14:49 2008
+++ src/external/mit/xorg/lib/freetype/Makefile	Mon Apr 13 18:58:08 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/10/25 13:14:49 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.4 2009/04/13 18:58:08 snj Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 SUBDIR=	freetype
 
 .PATH:	${FREETYPE}/src/base
-SRCS=	ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
+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
 
@@ -92,7 +92,7 @@
 
 PKGCONFIG=	freetype2
 PKGDIST.freetype2=	${.CURDIR}
-PKGCONFIG_VERSION.freetype2=	9.17.3
+PKGCONFIG_VERSION.freetype2=	9.20.3
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>

Index: src/external/mit/xorg/lib/freetype/shlib_version
diff -u src/external/mit/xorg/lib/freetype/shlib_version:1.2 src/external/mit/xorg/lib/freetype/shlib_version:1.3
--- src/external/mit/xorg/lib/freetype/shlib_version:1.2	Sun Jan 11 03:10:10 2009
+++ src/external/mit/xorg/lib/freetype/shlib_version	Mon Apr 13 18:58:08 2009
@@ -1,6 +1,6 @@
-#	$NetBSD: shlib_version,v 1.2 2009/01/11 03:10:10 christos Exp $
+#	$NetBSD: shlib_version,v 1.3 2009/04/13 18:58:08 snj Exp $
 #
 # XXX XXX XXX netbsd xsrc xfree 4.5 freetype used "major=9"!
 #
 major=7
-minor=0
+minor=1

Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.5 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.6
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.5	Sat Oct  4 02:29:15 2008
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile	Mon Apr 13 18:58:08 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2008/10/04 02:29:15 cube Exp $
+#	$NetBSD: Makefile,v 1.6 2009/04/13 18:58:08 snj Exp $
 
 .include <bsd.own.mk>
 
@@ -8,12 +8,12 @@
 
 INCSDIR=${X11INCDIR}/freetype2/freetype
 
-INCS=	freetype.h ftbbox.h ftbdf.h ftbitmap.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 ftpfr.h ftrender.h ftsizes.h \
-	ftsnames.h ftstroke.h ftsynth.h ftsystem.h fttrigon.h fttypes.h \
-	ftwinfnt.h ftxf86.h \
+INCS=	freetype.h ftadvanc.h ftbbox.h ftbdf.h ftbitmap.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 \
+	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
 
 SCRIPTS=	freetype-config

Reply via email to