[src/netbsd-7]: src Pull up following revision(s) (requested by snj in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/b5ed8d36bd9f
branches:  netbsd-7
changeset: 799145:b5ed8d36bd9f
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Mar 26 10:01:02 2015 +0000

description:
Pull up following revision(s) (requested by snj in ticket #619):
        external/mit/xorg/lib/freetype/Makefile: revision 1.15
        distrib/sets/lists/xdebug/shl.mi: revision 1.21 (patch)
        distrib/sets/lists/xbase/shl.mi: revision 1.60 (patch)
        external/mit/xorg/lib/freetype/shlib_version: revision 1.8
        external/mit/xorg/lib/freetype/freetype/Makefile: revision 1.19
Update for freetype 2.5.5.
Bring back rpath fixup that was lost in revision 1.11

diffstat:

 distrib/sets/lists/xbase/shl.mi                  |  4 ++--
 distrib/sets/lists/xdebug/shl.mi                 |  4 ++--
 external/mit/xorg/lib/freetype/Makefile          |  4 ++--
 external/mit/xorg/lib/freetype/freetype/Makefile |  3 ++-
 external/mit/xorg/lib/freetype/shlib_version     |  4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diffs (82 lines):

diff -r 6f4892024057 -r b5ed8d36bd9f distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Thu Mar 26 08:55:16 2015 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Thu Mar 26 10:01:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55.4.2 2015/01/05 21:23:52 martin Exp $
+# $NetBSD: shl.mi,v 1.55.4.3 2015/03/26 10:01:03 martin 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/libglut.so                     -unknown-               xorg
 ./usr/X11R7/lib/libglut.so.4                   -unknown-               xorg
 ./usr/X11R7/lib/libglut.so.4.0                 -unknown-               xorg
diff -r 6f4892024057 -r b5ed8d36bd9f distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi  Thu Mar 26 08:55:16 2015 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi  Thu Mar 26 10:01:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.14.4.3 2015/03/03 08:28:12 snj Exp $
+# $NetBSD: shl.mi,v 1.14.4.4 2015/03/26 10:01:02 martin 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
@@ -105,7 +105,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/libglut.so.4.0.debug -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug    -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug     -unknown-               xorg,debug
diff -r 6f4892024057 -r b5ed8d36bd9f external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Thu Mar 26 08:55:16 2015 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Thu Mar 26 10:01:02 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12.4.2 2015/02/11 09:43:58 martin Exp $
+#      $NetBSD: Makefile,v 1.12.4.3 2015/03/26 10:01:02 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -96,7 +96,7 @@
 
 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>
diff -r 6f4892024057 -r b5ed8d36bd9f external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile  Thu Mar 26 08:55:16 2015 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile  Thu Mar 26 10:01:02 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17.4.1 2015/02/11 09:43:58 martin Exp $
+#      $NetBSD: Makefile,v 1.17.4.2 2015/03/26 10:01:03 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -33,6 +33,7 @@
                -e 's,%LIBS_CONFIG%,-lfreetype -lz -lbz2,' \
                -e 's,%LIBSSTATIC_CONFIG%,-lfreetype -lz -lbz2,' \
                -e 's,%build_libtool_libs%,yes,' \
+               -e 's@%hardcode_libdir_flag_spec%@-Wl,-rpath,${X11USRLIBDIR}@' \
                -e 's,%FT2_EXTRA_LIBS%,,' \
                -e 's,%LIBZ%,-lz,' \
                -e 's,%LIBBZ2%,-lbz2,' \
diff -r 6f4892024057 -r b5ed8d36bd9f external/mit/xorg/lib/freetype/shlib_version
--- a/external/mit/xorg/lib/freetype/shlib_version      Thu Mar 26 08:55:16 2015 +0000
+++ b/external/mit/xorg/lib/freetype/shlib_version      Thu Mar 26 10:01:02 2015 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: shlib_version,v 1.7 2014/03/20 08:57:48 mrg Exp $
+#      $NetBSD: shlib_version,v 1.7.4.1 2015/03/26 10:01:02 martin Exp $
 #
 major=17
-minor=2
+minor=4
 teeny=11