diff options
author | maho <maho@FreeBSD.org> | 2007-10-09 14:05:11 +0800 |
---|---|---|
committer | maho <maho@FreeBSD.org> | 2007-10-09 14:05:11 +0800 |
commit | 6dc794c693886fec1054961115f7072dc45aaded (patch) | |
tree | 8f5c82a0c45aea64fb6e0a4c02c28afd7d02aac4 /editors/openoffice-3-devel | |
parent | 2b061f6240b15155d49297f2e6e100259ff11002 (diff) | |
download | freebsd-ports-gnome-6dc794c693886fec1054961115f7072dc45aaded.tar.gz freebsd-ports-gnome-6dc794c693886fec1054961115f7072dc45aaded.tar.zst freebsd-ports-gnome-6dc794c693886fec1054961115f7072dc45aaded.zip |
Moves the USE_JAVA line to after bsd.port.pre.mk so that _JAVA_VERSION
will be set to "1.4 1.5" instead of "1.1 1.2 1.3 1.4 1.5 1.6" because of
bsd.java.mk being included too early the way it was before.
PR: 116906
Submitted by: Naram Qashat <cyberbotx@cyberbotx.com>
Diffstat (limited to 'editors/openoffice-3-devel')
-rw-r--r-- | editors/openoffice-3-devel/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index f04741c49582..d02efc321823 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -49,12 +49,11 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true +.include <bsd.port.pre.mk> + USE_JAVA= yes JAVA_BUILD= jdk JAVA_VENDOR= freebsd bsdjava - -.include <bsd.port.pre.mk> - .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 .else |