Module Name: src
Committed By: mrg
Date: Wed Jun 5 22:38:45 UTC 2013
Modified Files:
src/external/mit/xorg/lib/freetype/freetype: Makefile
Log Message:
handle changed freetype-config generation; also move the hardcoded
version into a generator.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
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/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.10 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.11
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.10 Wed Jun 5 08:42:56 2013
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile Wed Jun 5 22:38:44 2013
@@ -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 @@ SCRIPTS= freetype-config
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
