mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Moves the USE_JAVA line to after bsd.port.pre.mk so that _JAVA_VERSION

Browse Source 
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>
This commit is contained in:
Maho Nakata 2007-10-09 06:05:11 +00:00
parent b4cce89d62
commit 84ae881da2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=201138
9 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/openoffice-3-devel/Makefile
View File

@ -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

7
editors/openoffice-3/Makefile
View File

@ -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

5
editors/openoffice.org-2-RC/Makefile
View File

@ -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

5
editors/openoffice.org-2-devel/Makefile
View File

@ -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

7
editors/openoffice.org-2/Makefile
View File

@ -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

5
editors/openoffice.org-3-RC/Makefile
View File

@ -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

5
editors/openoffice.org-3-devel/Makefile
View File

@ -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

7
editors/openoffice.org-3/Makefile
View File

@ -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

5
editors/openoffice.org-vcltesttool/Makefile
View File

@ -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