3 files changed, 110 insertions, 0 deletions

diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index e840beab739a..94c368a9b1c9 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -128,6 +128,9 @@ pre-everything::
 .endif
 
 post-extract:
+.if defined(WITH_TTF_BYTECODE_ENABLED)
+	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
+.endif
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
index 45d2ac960133..cf79dcec5397 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
@@ -57,6 +57,15 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without Mozilla connectivity by"
 	@${ECHO} "make -DWITHOUT_MOZILLA"
 .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, by"
+	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
+	@${ECHO} "See http://www.freetype.org/patents.html for details"
+.endif
 .if !defined(WITHOUT_JAVA)
 	@${ECHO}
 	@${ECHO} "You can compile OOo without Java support by"
diff --git a/editors/openoffice.org-2.0-devel/files/optpatch-freetype b/editors/openoffice.org-2.0-devel/files/optpatch-freetype
new file mode 100644
index 000000000000..b47f412488ec
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/optpatch-freetype
@@ -0,0 +1,98 @@
+Index: freetype/freetype-2.1.4.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
+@@ -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
+ ***************
+ *** 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)
+ + #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
++***************
++*** 378,384 ****
++    /*   do not #undef this macro here, since the build system might         */
++    /*   define for certain configurations                                   */
++    /*                                                                       */
++! /* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
++  
++  
++    /*************************************************************************/
++--- 378,384 ----
++    /*   do not #undef this macro here, since the build system might         */
++    /*   define for certain configurations                                   */
++    /*                                                                       */
++! #define  TT_CONFIG_OPTION_BYTECODEpwd_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 ****
+       {