diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-04-09 16:14:28 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-04-09 16:14:28 +0000 |
| commit | c32f21340a89c0cb67419e7b5c4578a2fd541adb (patch) | |
| tree | beb5cb3b874c98d43cbbb924666c79b072b01a1a /editors/openoffice.org-3-RC | |
| parent | * Update to 2.0.4. Changes in this release: (diff) | |
Allow OpenOffice.org to be built with system freetype2 library instead of
bundled one. The knob is WITH_SYSTEM_FREETYPE. The most notable advantage
of using the latest freetype library from ports is it has CJK emboldening
feature (i.e., it makes fake bold fonts from non-bold ones) and
OpenOffice.org already makes use of it when the feature is available.
Approved by: maho
Notes
Notes:
svn path=/head/; revision=189574
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/Makefile.knobs | 12 |
2 files changed, 13 insertions, 2 deletions
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:" |