aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2008-10-16 20:30:24 +0800
committermaho <maho@FreeBSD.org>2008-10-16 20:30:24 +0800
commit7c64d0f239f540a310ecd9f06e137dbc2d131873 (patch)
treea3dcead321a737f1bc58423b58e6ba5876940fe9 /editors
parent5daed456d0a502c0bcf650c3fa99b5bec20baeaf (diff)
downloadfreebsd-ports-gnome-7c64d0f239f540a310ecd9f06e137dbc2d131873.tar.gz
freebsd-ports-gnome-7c64d0f239f540a310ecd9f06e137dbc2d131873.tar.zst
freebsd-ports-gnome-7c64d0f239f540a310ecd9f06e137dbc2d131873.zip
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 .
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-3-devel/Makefile3
-rw-r--r--editors/openoffice-3-devel/files/Makefile.knobs18
-rw-r--r--editors/openoffice-3-devel/files/optpatch-freetype38
-rw-r--r--editors/openoffice-3/Makefile3
-rw-r--r--editors/openoffice-3/files/Makefile.knobs18
-rw-r--r--editors/openoffice-3/files/optpatch-freetype38
-rw-r--r--editors/openoffice.org-3-RC/Makefile3
-rw-r--r--editors/openoffice.org-3-RC/files/Makefile.knobs18
-rw-r--r--editors/openoffice.org-3-RC/files/optpatch-freetype38
-rw-r--r--editors/openoffice.org-3-devel/Makefile3
-rw-r--r--editors/openoffice.org-3-devel/files/Makefile.knobs18
-rw-r--r--editors/openoffice.org-3-devel/files/optpatch-freetype38
-rw-r--r--editors/openoffice.org-3/Makefile3
-rw-r--r--editors/openoffice.org-3/files/Makefile.knobs18
-rw-r--r--editors/openoffice.org-3/files/optpatch-freetype38
15 files changed, 0 insertions, 295 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 2318c51c2955..873801b88fd8 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -155,9 +155,6 @@ EXTRA_PATCHES+= ${FILESDIR}/amd64-gcc42-workaround
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
-.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
-EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
-.endif
ICONS= ${WRKSRC}/sysui/desktop/icons
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index b20b1f848303..c116580c79ac 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -38,12 +38,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
@@ -101,20 +97,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-devel/files/optpatch-freetype b/editors/openoffice-3-devel/files/optpatch-freetype
deleted file mode 100644
index 59a849064ce7..000000000000
--- a/editors/openoffice-3-devel/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
-+
-+
-+ /*************************************************************************/
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 070fbdadc39a..cc5501b0db03 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -156,9 +156,6 @@ EXTRA_PATCHES+= ${FILESDIR}/amd64-gcc42-workaround
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
-.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
-EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
-.endif
ICONS= ${WRKSRC}/sysui/desktop/icons
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
-+
-+
-+ /*************************************************************************/
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index c601d8090a07..963e8c5ee91e 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -158,9 +158,6 @@ EXTRA_PATCHES+= ${FILESDIR}/amd64-gcc42-workaround
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
-.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
-EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
-.endif
ICONS= ${WRKSRC}/sysui/desktop/icons
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index 686099bd3274..fde58d2ff5c6 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/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.org-3-RC/files/optpatch-freetype b/editors/openoffice.org-3-RC/files/optpatch-freetype
deleted file mode 100644
index 59a849064ce7..000000000000
--- a/editors/openoffice.org-3-RC/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
-+
-+
-+ /*************************************************************************/
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 2318c51c2955..873801b88fd8 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -155,9 +155,6 @@ EXTRA_PATCHES+= ${FILESDIR}/amd64-gcc42-workaround
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
-.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
-EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
-.endif
ICONS= ${WRKSRC}/sysui/desktop/icons
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index b20b1f848303..c116580c79ac 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -38,12 +38,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
@@ -101,20 +97,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.org-3-devel/files/optpatch-freetype b/editors/openoffice.org-3-devel/files/optpatch-freetype
deleted file mode 100644
index 59a849064ce7..000000000000
--- a/editors/openoffice.org-3-devel/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
-+
-+
-+ /*************************************************************************/
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 070fbdadc39a..cc5501b0db03 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -156,9 +156,6 @@ EXTRA_PATCHES+= ${FILESDIR}/amd64-gcc42-workaround
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
.endif
-.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
-EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
-.endif
ICONS= ${WRKSRC}/sysui/desktop/icons
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 686099bd3274..fde58d2ff5c6 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-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.org-3/files/optpatch-freetype b/editors/openoffice.org-3/files/optpatch-freetype
deleted file mode 100644
index 59a849064ce7..000000000000
--- a/editors/openoffice.org-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
-+
-+
-+ /*************************************************************************/