[src/trunk]: src/external/mit/xorg/lib/freetype/freetype handle changed freet...

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

details:   https://anonhg.NetBSD.org/src/rev/e2ab5f6e419c
branches:  trunk
changeset: 787191:e2ab5f6e419c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 05 22:38:44 2013 +0000

description:
handle changed freetype-config generation; also move the hardcoded
version into a generator.

diffstat:

 external/mit/xorg/lib/freetype/freetype/Makefile |  24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diffs (39 lines):

diff -r bd71a06feeec -r e2ab5f6e419c external/mit/xorg/lib/freetype/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/freetype/Makefile  Wed Jun 05 21:59:59 2013 +0000
+++ b/external/mit/xorg/lib/freetype/freetype/Makefile  Wed Jun 05 22:38:44 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2013/06/05 08:42:56 mrg Exp $
+#      $NetBSD: Makefile,v 1.11 2013/06/05 22:38:44 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -21,17 +21,19 @@
 
 CLEANFILES+=   ${SCRIPTS}
 
+FT_VERSION!=   sed -n '/^version_info=/{s/version_info=.\([0-9]*\):\([0-9]*\):\([0-9]*\)./\1.\2.\3/;p;q;}' < ${X11SRCDIR.freetype}/builds/unix/configure.ac
+
 # XXX hijack config-subst from Xft
-CONFIG_SUBST=  ${TOOL_SED} -e 's%@prefix@%${X11ROOTDIR}%' \
-               -e 's%@exec_prefix@%${X11BINDIR}%' \
-               -e 's%@libdir@%${X11USRLIBDIR}%g' \
-               -e 's%@includedir@%${X11INCDIR}%' \
-               -e 's%@ft_version@%9.17.3%' \
-               -e 's%@FT2_EXTRA_LIBS@%%' \
-               -e 's%@build_libtool_libs@%yes%' \
-               -e 's%@hardcode_libdir_flag_spec@%-Wl,-rpath,${X11USRLIBDIR}%' \
-               -e 's%@LIBZ@%-lz%' \
-               -e 's%@LIBBZ2@%-lbz2%'
+CONFIG_SUBST=  ${TOOL_SED} \
+               -e 's,%prefix%,${X11ROOTDIR},' \
+               -e 's,%exec_prefix%,${X11BINDIR},' \
+               -e 's,%libdir%,${X11USRLIBDIR},g' \
+               -e 's,%includedir%,${X11INCDIR},' \
+               -e 's,%ft_version%,${FT_VERSION},' \
+               -e 's,%build_libtool_libs%,yes,' \
+               -e 's,%FT2_EXTRA_LIBS%,,' \
+               -e 's,%LIBZ%,-lz,' \
+               -e 's,%LIBBZ2%,-lbz2,'
 
 .PATH: ${X11SRCDIR.freetype}/builds/unix
 freetype-config: freetype-config.in