diff options
author | Maho Nakata <maho@FreeBSD.org> | 2008-04-26 08:01:13 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2008-04-26 08:01:13 +0000 |
commit | 998fed784b4e2985891cf7cd467b01417bf57063 (patch) | |
tree | 77b566a46330ee6ddd8dfeb7397f68727d3cd52b /editors/openoffice-3-devel | |
parent | Adding missing dependencies and bump port revision. (diff) |
Add WITH_SYSTEM_ICU knob. Activate when devel/icu is installed.
Fix build -CURRENT diablo-jdk breakage
PR: 121787
Submitted by: Michael Moll
Patch submitted by: Marcin Cieslak <saper@system.pl>
Notes
Notes:
svn path=/head/; revision=211999
Diffstat (limited to 'editors/openoffice-3-devel')
-rw-r--r-- | editors/openoffice-3-devel/Makefile | 4 | ||||
-rw-r--r-- | editors/openoffice-3-devel/files/Makefile.knobs | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index cf2a95783797..993d0c2caa62 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -55,7 +55,11 @@ WITHOUT_CPU_CFLAGS= true USE_JAVA= yes JAVA_BUILD= jdk +.if (${OSVERSION} >= 800000) +JAVA_VENDOR= bsdjava +.else JAVA_VENDOR= freebsd bsdjava +.endif .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 .else diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 31759389815f..b20b1f848303 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -57,6 +57,13 @@ CONFIGURE_ARGS+= --enable-debug --enable-symbols=TRUE --enable-dbgutil CONFIGURE_ARGS+= --enable-symbols=SMALL .endif +.if defined(WITH_SYSTEM_ICU) +LIB_DEPENDS+= icule:${PORTSDIR}/devel/icu +CONFIGURE_ARGS+= --with-system-icu=yes +.else +CONFIGURE_ARGS+= --with-system-icu=no +.endif + pre-fetch: .if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} < 492000) @${ECHO} @@ -89,6 +96,11 @@ pre-fetch: @${ECHO} "You can compile OOo without gnome VFS support with" @${ECHO} "make -DWITHOUT_GNOMEVFS" .endif +.if !defined(WITH_SYSTEM_ICU) + @${ECHO} + @${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" |