Module Name: src
Committed By: snj
Date: Thu Mar 12 07:58:05 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/freetype: Makefile shlib_version
Log Message:
update for freetype 2.5.5
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/freetype/shlib_version
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.59 src/distrib/sets/lists/xbase/shl.mi:1.60
--- src/distrib/sets/lists/xbase/shl.mi:1.59 Mon Feb 23 00:09:30 2015
+++ src/distrib/sets/lists/xbase/shl.mi Thu Mar 12 07:58:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.59 2015/02/23 00:09:30 jmcneill Exp $
+# $NetBSD: shl.mi,v 1.60 2015/03/12 07:58:05 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -323,7 +323,7 @@
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
./usr/X11R7/lib/libfreetype.so -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
-./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg
+./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg
./usr/X11R7/lib/libgbm.so -unknown- xorg
./usr/X11R7/lib/libgbm.so.1 -unknown- xorg
./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.20 src/distrib/sets/lists/xdebug/shl.mi:1.21
--- src/distrib/sets/lists/xdebug/shl.mi:1.20 Mon Feb 23 13:01:35 2015
+++ src/distrib/sets/lists/xdebug/shl.mi Thu Mar 12 07:58:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.20 2015/02/23 13:01:35 martin Exp $
+# $NetBSD: shl.mi,v 1.21 2015/03/12 07:58:05 snj Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -104,7 +104,7 @@
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.2.11.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.14 src/external/mit/xorg/lib/freetype/Makefile:1.15
--- src/external/mit/xorg/lib/freetype/Makefile:1.14 Mon Feb 9 16:27:29 2015
+++ src/external/mit/xorg/lib/freetype/Makefile Thu Mar 12 07:58:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/02/09 16:27:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2015/03/12 07:58:04 snj Exp $
.include <bsd.own.mk>
@@ -96,7 +96,7 @@ LIBDPLIBS= \
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
-PKGCONFIG_VERSION.freetype2= 17.2.11
+PKGCONFIG_VERSION.freetype2= 17.4.11
.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.7 src/external/mit/xorg/lib/freetype/shlib_version:1.8
--- src/external/mit/xorg/lib/freetype/shlib_version:1.7 Thu Mar 20 08:57:48 2014
+++ src/external/mit/xorg/lib/freetype/shlib_version Thu Mar 12 07:58:04 2015
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.7 2014/03/20 08:57:48 mrg Exp $
+# $NetBSD: shlib_version,v 1.8 2015/03/12 07:58:04 snj Exp $
#
major=17
-minor=2
+minor=4
teeny=11
