From 17434436862e256740b1f6afd16bb34861a323b4 Mon Sep 17 00:00:00 2001
From: perry <perry@NetBSD.org>
Date: Wed, 17 Mar 2004 23:15:30 +0000
Subject: [PATCH] Add a compile flag, MKTTINTERP, that turns on the bytecode
 interpreter when it is set to yes (typically in /etc/mk.conf)

The freetype bytecode interpreter is not on by default because it is
patented in some jurisdictions.
---
 x11/Xserver/Xfont/freetype/Makefile | 6 +++++-
 x11/lib/freetype2/Makefile          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/x11/Xserver/Xfont/freetype/Makefile b/x11/Xserver/Xfont/freetype/Makefile
index 0dee6b97faed..df482716e3f3 100644
--- a/x11/Xserver/Xfont/freetype/Makefile
+++ b/x11/Xserver/Xfont/freetype/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/03/16 17:40:53 matt Exp $
+#	$NetBSD: Makefile,v 1.5 2004/03/17 23:15:30 perry Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/fonts
 
@@ -81,6 +81,10 @@ CPPFLAGS+=	-DXFREE86_FT2
 
 .include <bsd.x11.mk>
 
+.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
+CPPFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+.endif
+
 .if !empty(X11FLAGS.LOADABLE)
 CPPFLAGS+=	-DFONTMODULE
 LIBDIR=	${XMODULEDIR}
diff --git a/x11/lib/freetype2/Makefile b/x11/lib/freetype2/Makefile
index 7c3f36fb9b51..2b62d9955cd4 100644
--- a/x11/lib/freetype2/Makefile
+++ b/x11/lib/freetype2/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/03/06 03:05:40 rtr Exp $
+#	$NetBSD: Makefile,v 1.5 2004/03/17 23:15:30 perry Exp $
 
 .include <bsd.own.mk>
 
@@ -22,6 +22,10 @@ INCSDIR=${X11INCDIR}/freetype2
 CPPFLAGS+=	${X11FLAGS.THREADLIB}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2
 
+.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
+CPPFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+.endif
+
 .PATH:	${FREETYPESRC}/autohint
 .PATH:	${FREETYPESRC}/base
 .PATH:	${FREETYPESRC}/bdf