diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-05-28 10:03:53 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-05-28 10:03:53 +0000 |
| commit | 59fb453cd6db6ea3a7fa8c858dedba27ae60e9f1 (patch) | |
| tree | cca88f8713882b23fe86dd68d9da88beca6b3885 /editors/openoffice.org-1.1 | |
| parent | - Enable build for 5.x (diff) | |
Remove WITHOUT_JAVA knob.
PR: 94046
Submitted by: Nicolas Rachinsky <nicolas-0@ml.turing-complete.org>
Notes
Notes:
svn path=/head/; revision=163681
Diffstat (limited to 'editors/openoffice.org-1.1')
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 10 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/files/Makefile.knobs | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 108e45e46ec0..7ac32bdd8c38 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -55,12 +55,12 @@ WITHOUT_CPU_CFLAGS= true ONLY_FOR_ARCHS= i386 -.if !defined(WITHOUT_JAVA) +#.if !defined(WITHOUT_JAVA) USE_JAVA= yes JAVA_VERSION= 1.4 JAVA_BUILD= jdk JAVA_VENDOR= bsdjava -.endif +#.endif .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> @@ -125,9 +125,9 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ imake:${X_IMAKE_PORT} -.if defined(WITHOUT_JAVA) -LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt -.endif +#.if defined(WITHOUT_JAVA) +#LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt +#.endif .if !defined(WITH_GPC) LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2 .endif diff --git a/editors/openoffice.org-1.1/files/Makefile.knobs b/editors/openoffice.org-1.1/files/Makefile.knobs index c33a2a9d7f47..0d25b5a75cfb 100644 --- a/editors/openoffice.org-1.1/files/Makefile.knobs +++ b/editors/openoffice.org-1.1/files/Makefile.knobs @@ -2,11 +2,11 @@ # Whom: Maho Nakata <maho@FreeBSD.org> # $FreeBSD$ -.if defined(WITHOUT_JAVA) -CONFIGURE_ARGS+= --disable-java -.else +#.if defined(WITHOUT_JAVA) +#CONFIGURE_ARGS+= --disable-java +#.else CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" -.endif +#.endif .if !defined(WITH_GPC) CONFIGURE_ARGS+= --enable-libart @@ -77,11 +77,11 @@ pre-fetch: @${ECHO} "sl-SI sv th tn tr we zh-CN zh-TW zu" @${ECHO} .endif -.if !defined(WITHOUT_JAVA) - @${ECHO} - @${ECHO} "You can compile OOo without Java support by" - @${ECHO} "make -DWITHOUT_JAVA" -.endif +#.if !defined(WITHOUT_JAVA) +# @${ECHO} +# @${ECHO} "You can compile OOo without Java support by" +# @${ECHO} "make -DWITHOUT_JAVA" +#.endif .if !defined(WITH_GPC) @${ECHO} @${ECHO} "You can compile OOo with gpc instead of libart by" |