diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-10-09 06:05:11 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-10-09 06:05:11 +0000 |
| commit | 84ae881da28aa2995bfb603be9cde1fc3cb64b9e (patch) | |
| tree | e1d339066119ed23aaaa7ba61753e64e02ba0baf | |
| parent | - New port: emulators/mupen64-softgfx (diff) | |
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>
Notes
Notes:
svn path=/head/; revision=201138
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice-3/Makefile | 7 | ||||
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice.org-2-devel/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice.org-2/Makefile | 7 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 5 | ||||
| -rw-r--r-- | editors/openoffice.org-3/Makefile | 7 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/Makefile | 5 |
9 files changed, 21 insertions, 30 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 diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 29be2f616351..4de2ebb6d233 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -51,12 +51,11 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava - .include <bsd.port.pre.mk> +JAVA_BUILD= jdk +JAVA_VENDOR= freebsd bsdjava +USE_JAVA= yes .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 .else diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 8ee5fd69e66e..783889674361 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/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 diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index f04741c49582..d02efc321823 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-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 diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 29be2f616351..4de2ebb6d233 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -51,12 +51,11 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava - .include <bsd.port.pre.mk> +JAVA_BUILD= jdk +JAVA_VENDOR= freebsd bsdjava +USE_JAVA= yes .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 .else diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 8ee5fd69e66e..783889674361 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/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 diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index f04741c49582..d02efc321823 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-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 diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 29be2f616351..4de2ebb6d233 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -51,12 +51,11 @@ USE_PERL5= yes USE_BZIP2= yes WITHOUT_CPU_CFLAGS= true -USE_JAVA= yes -JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava - .include <bsd.port.pre.mk> +JAVA_BUILD= jdk +JAVA_VENDOR= freebsd bsdjava +USE_JAVA= yes .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 .else diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index f04741c49582..d02efc321823 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/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 |