From 06b588fa3e4c802c4b3ff5c36bf48bebc0cae29f Mon Sep 17 00:00:00 2001 From: mrg Date: Mon, 22 Nov 2010 08:34:56 +0000 Subject: [PATCH] updates for freetype 2.4.3: remove MKTTINTERP option, it is enabled by default now. bump minor. --- external/mit/xorg/lib/freetype/Makefile | 6 +----- external/mit/xorg/lib/freetype/shlib_version | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/external/mit/xorg/lib/freetype/Makefile b/external/mit/xorg/lib/freetype/Makefile index 667c18145fc4..b27a66a6921d 100644 --- a/external/mit/xorg/lib/freetype/Makefile +++ b/external/mit/xorg/lib/freetype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/07/25 02:25:29 mrg Exp $ +# $NetBSD: Makefile,v 1.7 2010/11/22 08:34:56 mrg Exp $ .include @@ -87,10 +87,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \ CPPFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING .endif -.if !defined(MKTTINTERP) || ${MKTTINTERP} != "no" -CPPFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER -.endif - LIBDPLIBS= \ z ${.CURDIR}/../../../../../lib/libz diff --git a/external/mit/xorg/lib/freetype/shlib_version b/external/mit/xorg/lib/freetype/shlib_version index efa58e159cd3..57e336b54cbe 100644 --- a/external/mit/xorg/lib/freetype/shlib_version +++ b/external/mit/xorg/lib/freetype/shlib_version @@ -1,6 +1,6 @@ -# $NetBSD: shlib_version,v 1.3 2009/04/13 18:58:08 snj Exp $ +# $NetBSD: shlib_version,v 1.4 2010/11/22 08:34:56 mrg Exp $ # # XXX XXX XXX netbsd xsrc xfree 4.5 freetype used "major=9"! # major=7 -minor=1 +minor=2