aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2008-08-23 05:07:40 +0000
committerMaho Nakata <maho@FreeBSD.org>2008-08-23 05:07:40 +0000
commitc13302903110ab1952284e055508b16ea3d9985a (patch)
tree1035935ff596324aead859f8296a7e399a6cdf5e /editors
parent0f60c9ed8fea985fd07a0aa310965e9569b708f5 (diff)
downloadports-c13302903110ab1952284e055508b16ea3d9985a.tar.gz
ports-c13302903110ab1952284e055508b16ea3d9985a.zip
JDK 1.6 support. Builds were verified on FBSD6/i386.
Notes
Notes: svn path=/head/; revision=219028
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-3-devel/Makefile4
-rw-r--r--editors/openoffice-3/Makefile4
-rw-r--r--editors/openoffice.org-3-RC/Makefile4
-rw-r--r--editors/openoffice.org-3-devel/Makefile4
-rw-r--r--editors/openoffice.org-3/Makefile4
5 files changed, 10 insertions, 10 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index c690924fe1a5..2d5c2180eddc 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -60,9 +60,9 @@ JAVA_VENDOR= bsdjava
JAVA_VENDOR= freebsd bsdjava
.endif
.if (${OSVERSION} >= 700000)
-JAVA_VERSION= 1.5
+JAVA_VERSION= 1.5 1.6
.else
-JAVA_VERSION= 1.4 1.5
+JAVA_VERSION= 1.4 1.5 1.6
.endif
.include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index d8157084a0bf..4cfc5fdde43b 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -62,9 +62,9 @@ JAVA_VENDOR= bsdjava
JAVA_VENDOR= freebsd bsdjava
.endif
.if (${OSVERSION} >= 700000)
-JAVA_VERSION= 1.5
+JAVA_VERSION= 1.5 1.6
.else
-JAVA_VERSION= 1.4 1.5
+JAVA_VERSION= 1.4 1.5 1.6
.endif
.include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 9ffe4402e774..25097cce56c8 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -61,9 +61,9 @@ JAVA_VENDOR= bsdjava
JAVA_VENDOR= freebsd bsdjava
.endif
.if (${OSVERSION} >= 700000)
-JAVA_VERSION= 1.5
+JAVA_VERSION= 1.5 1.6
.else
-JAVA_VERSION= 1.4 1.5
+JAVA_VERSION= 1.4 1.5 1.6
.endif
.include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index c690924fe1a5..2d5c2180eddc 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -60,9 +60,9 @@ JAVA_VENDOR= bsdjava
JAVA_VENDOR= freebsd bsdjava
.endif
.if (${OSVERSION} >= 700000)
-JAVA_VERSION= 1.5
+JAVA_VERSION= 1.5 1.6
.else
-JAVA_VERSION= 1.4 1.5
+JAVA_VERSION= 1.4 1.5 1.6
.endif
.include <${FILESDIR}/Makefile.localized>
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index d8157084a0bf..4cfc5fdde43b 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -62,9 +62,9 @@ JAVA_VENDOR= bsdjava
JAVA_VENDOR= freebsd bsdjava
.endif
.if (${OSVERSION} >= 700000)
-JAVA_VERSION= 1.5
+JAVA_VERSION= 1.5 1.6
.else
-JAVA_VERSION= 1.4 1.5
+JAVA_VERSION= 1.4 1.5 1.6
.endif
.include <${FILESDIR}/Makefile.localized>