[src/trunk]: src updates for freetype 2.4.5

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8e2ed99dcf57
branches:  trunk
changeset: 767603:8e2ed99dcf57
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 24 00:33:38 2011 +0000

description:
updates for freetype 2.4.5

diffstat:

 distrib/sets/lists/xbase/shl.mi |   4 ++--
 distrib/sets/lists/xcomp/mi     |   5 +++--
 distrib/sets/lists/xcomp/shl.mi |   4 ++--
 share/mk/bsd.x11.mk             |  11 +++++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r 14ab6c0745ed -r 8e2ed99dcf57 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Sat Jul 23 23:42:02 2011 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Sun Jul 24 00:33:38 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.43 2011/02/24 08:52:59 mrg Exp $
+# $NetBSD: shl.mi,v 1.44 2011/07/24 00:33:38 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -317,7 +317,7 @@
 ./usr/X11R7/lib/libfontenc.so.2.0              -unknown-               xorg
 ./usr/X11R7/lib/libfreetype.so                 -unknown-               xorg
 ./usr/X11R7/lib/libfreetype.so.7               -unknown-               xorg
-./usr/X11R7/lib/libfreetype.so.7.2             -unknown-               xorg
+./usr/X11R7/lib/libfreetype.so.7.3             -unknown-               xorg
 ./usr/X11R7/lib/libglut.so                     -unknown-               xorg
 ./usr/X11R7/lib/libglut.so.4                   -unknown-               xorg
 ./usr/X11R7/lib/libglut.so.4.0                 -unknown-               xorg
diff -r 14ab6c0745ed -r 8e2ed99dcf57 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Sat Jul 23 23:42:02 2011 +0000
+++ b/distrib/sets/lists/xcomp/mi       Sun Jul 24 00:33:38 2011 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.127 2011/07/23 12:27:40 mrg Exp $
+#       $NetBSD: mi,v 1.128 2011/07/24 00:33:38 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5712,6 +5712,7 @@
 ./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
+./usr/X11R7/include/freetype2/freetype/ftbzip2.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftcache.h       -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftchapters.h    -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/ftcid.h         -unknown-       xorg
@@ -5755,7 +5756,7 @@
 ./usr/X11R7/include/freetype2/freetype/internal/ftstream.h     -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/internal/fttrace.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/internal/internal.h     -unknown-       xorg
-./usr/X11R7/include/freetype2/freetype/internal/pcftypes.h     -unknown-       xorg
+./usr/X11R7/include/freetype2/freetype/internal/pcftypes.h     -unknown-       obsolete
 ./usr/X11R7/include/freetype2/freetype/internal/psaux.h        -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/internal/pshints.h      -unknown-       xorg
 ./usr/X11R7/include/freetype2/freetype/internal/services/svbdf.h       -unknown-       xorg
diff -r 14ab6c0745ed -r 8e2ed99dcf57 distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi   Sat Jul 23 23:42:02 2011 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi   Sun Jul 24 00:33:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shl.mi,v 1.29 2011/02/24 08:52:59 mrg Exp $
+#      $NetBSD: shl.mi,v 1.30 2011/07/24 00:33:38 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -234,7 +234,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug        -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.0.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.7.2.debug     -unknown-               xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.3.debug     -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.2.debug    -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.1.debug     -unknown-               xorg,debug
diff -r 14ab6c0745ed -r 8e2ed99dcf57 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Sat Jul 23 23:42:02 2011 +0000
+++ b/share/mk/bsd.x11.mk       Sun Jul 24 00:33:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.98 2011/07/03 22:59:46 dholland Exp $
+#      $NetBSD: bsd.x11.mk,v 1.99 2011/07/24 00:33:38 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -285,12 +285,15 @@
                s,@RENDER_VERSION@,$${_pkg_version%.*}," \
                -e "s,@LIBS@,,; \
                s,@Z_LIBS@,-lz,; \
+               s,@LIBZ@,-lz,; \
+               s,@LIBBZ2@,-lbz2,; \
                s,@xkb_base@,\\$$\{libdir\}/X11/xkb,; \
                s,@xcbincludedir@,\\$$\{prefix\}/include/xcb,; \
                s,@fontrootdir@,\\$$\{libdir\}/X11/fonts,; \
                s,@LIBXML2_LIBS@,,; \
                s,@ICONV_LIBS@,,; \
-               s,@NEEDED@,," \
+               s,@NEEDED@,,; \
+               s,@FT2_EXTRA_LIBS@,," \
                -e "s,@moduledir@,\\$$\{libdir\}/modules,; \
                s,@sdkdir@,\\$$\{includedir\}/xorg,; \
                s,@PIXMAN_CFLAGS@,,; \
@@ -310,8 +313,8 @@
                s,@GL_LIB@,GL,; \
                s,@GL_PC_REQ_PRIV@,x11 xext,; \
                s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
-               s,@GL_PC_CFLAGS@,,; \
-               s,@GLU_LIB@,GLU,; \
+               s,@GL_PC_CFLAGS@,," \
+               -e "s,@GLU_LIB@,GLU,; \
                s,@GLU_PC_REQ@,gl,; \
                s,@GLU_PC_REQ_PRIV@,,; \
                s,@GLU_PC_LIB_PRIV@,-lGLU,; \