diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-09-28 03:28:46 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-09-28 03:28:46 +0000 |
| commit | b17b17fc284b0bec51560ae2462345b8f074f50e (patch) | |
| tree | 77f31d7c9f141b056fb87d7cde789d12863a3921 /editors/openoffice.org-2-RC | |
| parent | new port: math/scilab-toolbox-sivp (diff) | |
Unbreak for 7-CURRENT.
Truckman was able to successfully build the port on
a September 22nd copy of 7.0-CURRENT on an i386 machine
with jdk-1.5.0.12p6_2,1, also use only 1.4 and 1.5, as JDK 1.6 has
problem. See PR 116607.
PR: 116607
Submitted by: truckman
Notes
Notes:
svn path=/head/; revision=200251
Diffstat (limited to 'editors/openoffice.org-2-RC')
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 7c12ce830b22..5aa811464951 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -50,17 +50,19 @@ USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true USE_JAVA= yes -JAVA_VERSION= 1.4+ JAVA_BUILD= jdk JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> -.include <${FILESDIR}/Makefile.localized> .if (${OSVERSION} >= 700000) -BROKEN= Build broken with JDK internal error +JAVA_VERSION= 1.5 +.else +JAVA_VERSION= 1.4 1.5 .endif +.include <${FILESDIR}/Makefile.localized> + ONLY_FOR_ARCHS= i386 amd64 .if ${ARCH} == amd64 |