Reactivate WITH_TTF_BYTECODE_ENABLED knob.

3 files changed, 36 insertions, 96 deletions

diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 6a344450ba04..c72cbfa468a5 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -172,9 +172,9 @@ EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
 
-#.if defined(WITH_TTF_BYTECODE_ENABLED)
-#EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
-#.endif
+.if defined(WITH_TTF_BYTECODE_ENABLED)
+EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
+.endif
 
 ICONS=	${WRKSRC}/sysui/desktop/icons
 
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 9ce1258cdf1c..87843d8a66bc 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -85,15 +85,15 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
-#.if !defined(WITH_TTF_BYTECODE_ENABLED)
-#	@${ECHO}
-#	@${ECHO} "You may get better quality of glyphs"
-#	@${ECHO} "at small bitmap sizes if you have"
-#	@${ECHO} "licensed the Apple patents"
-#	@${ECHO} "US05155805 US05159668 and US05325479, with"
-#	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
-#	@${ECHO} "See http://www.freetype.org/patents.html for details"
-#.endif
+.if !defined(WITH_TTF_BYTECODE_ENABLED)
+	@${ECHO}
+	@${ECHO} "You may get better quality of glyphs"
+	@${ECHO} "at small bitmap sizes if you have"
+	@${ECHO} "licensed the Apple patents"
+	@${ECHO} "US05155805 US05159668 and US05325479, with"
+	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
+	@${ECHO} "See http://www.freetype.org/patents.html for details"
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
diff --git a/editors/openoffice.org-2/files/optpatch-freetype b/editors/openoffice.org-2/files/optpatch-freetype
index 775caad705c2..36a8a8abb62f 100644
--- a/editors/openoffice.org-2/files/optpatch-freetype
+++ b/editors/openoffice.org-2/files/optpatch-freetype
@@ -1,98 +1,38 @@
-Index: freetype/freetype-2.1.4.patch
+Index: freetype/freetype-2.2.1.patch
 ===================================================================
-RCS file: /cvs/external/freetype/freetype-2.1.4.patch,v
-retrieving revision 1.3
-diff -u -r1.3 freetype-2.1.4.patch
---- freetype/freetype-2.1.4.patch	16 Dec 2003 11:47:32 -0000	1.3
-+++ freetype/freetype-2.1.4.patch	16 Jan 2005 09:01:28 -0000
+RCS file: /cvs/external/freetype/freetype-2.2.1.patch,v
+retrieving revision 1.2
+diff -u -r1.2 freetype-2.2.1.patch
+--- freetype/freetype-2.2.1.patch	3 Aug 2006 14:58:26 -0000	1.2
++++ freetype/freetype-2.2.1.patch	18 Nov 2006 07:15:21 -0000
 @@ -1,5 +1,5 @@
--*** misc/freetype-2.1.4/builds/compiler/visualc.mk	2000-12-14 00:44:33.000000000 +0100
----- misc/build/freetype-2.1.4/builds/compiler/visualc.mk	2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/builds/compiler/visualc.mk	Thu Dec 14 08:44:33 2000
-+--- misc/build/freetype-2.1.4/builds/compiler/visualc.mk	Mon Jan 10 11:32:16 2005
+-*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Mon Jan 30 17:49:42 2006
+---- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Thu Jul 13 16:04:27 2006
++*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h	Tue Jan 31 01:49:42 2006
++--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h	Sat Nov 18 16:06:09 2006
  ***************
- *** 63,69 ****
-   #   ANSI compliance.
-@@ -17,8 +17,8 @@
-   endif
-   
-   # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
--*** misc/freetype-2.1.4/builds/unix/freetype-config.in	2002-12-16 22:51:23.000000000 +0100
----- misc/build/freetype-2.1.4/builds/unix/freetype-config.in	2003-08-14 20:07:20.000000000 +0200
-+*** misc/freetype-2.1.4/builds/unix/freetype-config.in	Tue Dec 17 06:51:23 2002
-+--- misc/build/freetype-2.1.4/builds/unix/freetype-config.in	Mon Jan 10 11:32:16 2005
- ***************
- *** 92,98 ****
-    if test "@libdir@" != "/usr/lib" ; then
-@@ -36,8 +36,8 @@
-    fi
-   fi
-   
--*** misc/freetype-2.1.4/builds/unix/ltmain.sh	2003-01-18 17:39:18.000000000 +0100
----- misc/build/freetype-2.1.4/builds/unix/ltmain.sh	2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/builds/unix/ltmain.sh	Sun Jan 19 01:39:18 2003
-+--- misc/build/freetype-2.1.4/builds/unix/ltmain.sh	Mon Jan 10 11:32:16 2005
- ***************
- *** 2296,2302 ****
-   	  ;;
-@@ -55,8 +55,8 @@
-   
-   	  case $version_type in
-   	    nonstopux) verstring_prefix=nonstopux ;;
--*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp	2003-01-31 00:24:18.000000000 +0100
----- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp	2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Fri Jan 31 08:24:18 2003
-+--- misc/build/freetype-2.1.4/builds/win32/visualc/freetype.dsp	Mon Jan 10 11:32:16 2005
- ***************
- *** 44,51 ****
-   # PROP Output_Dir "..\..\..\objs\release"
-@@ -76,8 +76,8 @@
-   # SUBTRACT CPP /nologo /YX
-   # ADD BASE RSC /l 0x409 /d "NDEBUG"
-   # ADD RSC /l 0x409 /d "NDEBUG"
--*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h	2002-10-31 09:29:31.000000000 +0100
----- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h	2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/include/freetype/config/ftmodule.h	Thu Oct 31 17:29:31 2002
-+--- misc/build/freetype-2.1.4/include/freetype/config/ftmodule.h	Mon Jan 10 11:32:16 2005
- ***************
- *** 1,8 ****
-   FT_USE_MODULE(autohint_module_class)
-@@ -111,8 +111,8 @@
-   FT_USE_MODULE(winfnt_driver_class)
+ *** 17,24 ****
+ --- 17,26 ----
+@@ -24,3 +24,22 @@
  + #endif
    
--*** misc/freetype-2.1.4/include/freetype/config/ftoption.h	2003-01-31 00:24:18.000000000 +0100
----- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h	2003-08-14 17:55:53.000000000 +0200
-+*** misc/freetype-2.1.4/include/freetype/config/ftoption.h	Fri Jan 31 08:24:18 2003
-+--- misc/build/freetype-2.1.4/include/freetype/config/ftoption.h	Sun Jan 16 18:00:10 2005
- ***************
- *** 108,114 ****
-     /*   this will however force you to link the zlib to any program that    */
-@@ -130,8 +130,25 @@
-   
-   
-     /*************************************************************************/
--*** misc/freetype-2.1.4/src/base/ftobjs.c	2003-03-27 22:35:43.000000000 +0100
----- misc/build/freetype-2.1.4/src/base/ftobjs.c	2003-08-14 17:55:53.000000000 +0200
+   /* EOF */
++*** misc/freetype-2.2.1/include/freetype/config/ftoption.h	Fri May 12 03:05:49 2006
++--- misc/build/freetype-2.2.1/include/freetype/config/ftoption.h	Sat Nov 18 16:07:55 2006
 +***************
-+*** 378,384 ****
-+    /*   do not #undef this macro here, since the build system might         */
-+    /*   define for certain configurations                                   */
++*** 436,442 ****
++    /*   Do not #undef this macro here, since the build system might         */
++    /*   define it for certain configurations only.                          */
 +    /*                                                                       */
-+! /* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
++! /* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
 +  
 +  
 +    /*************************************************************************/
-+--- 378,384 ----
-+    /*   do not #undef this macro here, since the build system might         */
-+    /*   define for certain configurations                                   */
++--- 436,442 ----
++    /*   Do not #undef this macro here, since the build system might         */
++    /*   define it for certain configurations only.                          */
 +    /*                                                                       */
-+! #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
++! #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 +  
 +  
 +    /*************************************************************************/
-+*** misc/freetype-2.1.4/src/base/ftobjs.c	Fri Mar 28 06:35:43 2003
-+--- misc/build/freetype-2.1.4/src/base/ftobjs.c	Mon Jan 10 11:32:16 2005
- ***************
- *** 804,810 ****
-       {