diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-10-16 12:30:24 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-10-16 12:30:24 +0000 |
| commit | aa535013fa5ddd2388118fbf6274ecea9f326d2e (patch) | |
| tree | e80a7c123e25a22a6d084af3b60793878e5b728a /editors/openoffice-3/files | |
| parent | Update to 14.2.1 (diff) | |
Remove two knobs WITH_SYSTEM_FREETYPE and WITH_TTF_BYTECODE_ENABLED.
Since OOO300_m1 and DEV300_m30, OOo no longer ship a
private copy of libfreetype.so (CWS rmfreetype).
See also http://www.openoffice.org/issues/show_bug.cgi?id=52025 ,
http://www.openoffice.org/issues/show_bug.cgi?id=52026
and http://external.openoffice.org/source/browse/external/freetype/makefile.mk?hideattic=0&rev=1.28&view=log
.
Notes
Notes:
svn path=/head/; revision=221641
Diffstat (limited to 'editors/openoffice-3/files')
| -rw-r--r-- | editors/openoffice-3/files/Makefile.knobs | 18 | ||||
| -rw-r--r-- | editors/openoffice-3/files/optpatch-freetype | 38 |
2 files changed, 0 insertions, 56 deletions
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs index 686099bd3274..fde58d2ff5c6 100644 --- a/editors/openoffice-3/files/Makefile.knobs +++ b/editors/openoffice-3/files/Makefile.knobs @@ -35,12 +35,8 @@ CONFIGURE_ARGS+= --enable-evolution2=yes USE_GNOME+= glib20 .endif -.if defined(WITH_SYSTEM_FREETYPE) LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --with-system-freetype=yes -.else -CONFIGURE_ARGS+= --with-system-freetype=no -.endif .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL @@ -98,20 +94,6 @@ pre-fetch: @${ECHO} "You can compile OOo with devel/icu from ports with" @${ECHO} "make -DWITH_SYSTEM_ICU" .endif -.if !defined(WITH_SYSTEM_FREETYPE) - @${ECHO} - @${ECHO} "You can compile OOo with freetype2 from ports with" - @${ECHO} "make -DWITH_SYSTEM_FREETYPE" -.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 -.endif .if !defined(WITHOUT_CUPS) @${ECHO} @${ECHO} "You can compile OOo without CUPS support with" diff --git a/editors/openoffice-3/files/optpatch-freetype b/editors/openoffice-3/files/optpatch-freetype deleted file mode 100644 index 59a849064ce7..000000000000 --- a/editors/openoffice-3/files/optpatch-freetype +++ /dev/null @@ -1,38 +0,0 @@ -Index: freetype/freetype-2.2.1.patch -=================================================================== -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 -@@ -71,5 +71,5 @@ --*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon Jan 30 11:49:42 2006 ----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Wed Apr 4 20:04:02 2007 -+*** 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 - *************** - *** 17,24 **** - --- 17,26 ---- -@@ -94,3 +94,22 @@ - + #endif - - /* 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 -+*************** -+*** 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 */ -+ -+ -+ /*************************************************************************/ -+--- 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 -+ -+ -+ /*************************************************************************/ |