18 files changed, 117 insertions, 18 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 19d438bbcc88..79d7d90588f6 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -184,8 +184,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 694d0f79805d..64586582f8cb 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -183,8 +183,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.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-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index aeff49bdb1df..5f59df2e038f 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -185,8 +185,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.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-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 19d438bbcc88..79d7d90588f6 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -184,8 +184,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.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/Makefile b/editors/openoffice.org-2/Makefile
index 694d0f79805d..64586582f8cb 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -183,8 +183,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index aeff49bdb1df..5f59df2e038f 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -185,8 +185,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 19d438bbcc88..79d7d90588f6 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -184,8 +184,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 694d0f79805d..64586582f8cb 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -183,8 +183,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 19d438bbcc88..79d7d90588f6 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -184,8 +184,7 @@ EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
 .if defined(WITH_GNUGCJ)
 EXTRA_PATCHES+=	${FILESDIR}/gcj-fbsdworkaround
 .endif
-
-.if defined(WITH_TTF_BYTECODE_ENABLED)
+.if !defined(WITH_SYSTEM_FREETYPE) && defined(WITH_TTF_BYTECODE_ENABLED)
 EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 .endif
 
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index ee500e7afd16..231af9477271 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -37,6 +37,13 @@ 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
 .else
@@ -85,6 +92,10 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .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"
@@ -94,6 +105,7 @@ pre-fetch:
 	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
+.endif
 .if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"