cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add openjdk as a possible jdk.

Browse Source 
Suggested by: jkim
Funded by: OpenOffice.org community
This commit is contained in:
Maho Nakata 2009-07-19 22:23:57 +00:00
parent 647c7cf176
commit 4aaac129f0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=238078
8 changed files with 108 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ MAKE_JOBS_SAFE= yes
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= freebsd bsdjava
JAVA_VENDOR= freebsd bsdjava openjdk
.if (${OSVERSION} >= 700000)
JAVA_VERSION= 1.5 1.6
.else

26
editors/openoffice.org-2-RC/files/patch-i103628 Normal file
View File

@ -0,0 +1,26 @@
very strange workaround indeed.
--- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900
+++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900
@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
+JAR=${JAVA_HOME}/bin/jar
# --- Targets ------------------------------------------------------
.IF "$(SOLAR_JAVA)"=="TRUE"
@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
# LLA: parameter v is only verbose, need too long!
OWNJAR: LIGHT
- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
# LLA: parameter v is only verbose, need too long!
LIGHT:
- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
.ELSE
all:

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

@ -49,7 +49,7 @@ MAKE_JOBS_SAFE= yes
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= freebsd bsdjava
JAVA_VENDOR= freebsd bsdjava openjdk
.if (${OSVERSION} >= 700000)
JAVA_VERSION= 1.5 1.6
.else

26
editors/openoffice.org-2-devel/files/patch-i103628 Normal file
View File

@ -0,0 +1,26 @@
very strange workaround indeed.
--- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900
+++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900
@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
+JAR=${JAVA_HOME}/bin/jar
# --- Targets ------------------------------------------------------
.IF "$(SOLAR_JAVA)"=="TRUE"
@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
# LLA: parameter v is only verbose, need too long!
OWNJAR: LIGHT
- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
# LLA: parameter v is only verbose, need too long!
LIGHT:
- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
.ELSE
all:

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

@ -48,7 +48,7 @@ MAKE_JOBS_SAFE= yes
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= freebsd bsdjava
JAVA_VENDOR= freebsd bsdjava openjdk
.if (${OSVERSION} >= 700000)
JAVA_VERSION= 1.5 1.6
.else

26
editors/openoffice.org-2/files/patch-i103628 Normal file
View File

@ -0,0 +1,26 @@
very strange workaround indeed.
--- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900
+++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900
@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
+JAR=${JAVA_HOME}/bin/jar
# --- Targets ------------------------------------------------------
.IF "$(SOLAR_JAVA)"=="TRUE"
@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
# LLA: parameter v is only verbose, need too long!
OWNJAR: LIGHT
- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
# LLA: parameter v is only verbose, need too long!
LIGHT:
- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
.ELSE
all:

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

@ -49,7 +49,7 @@ MAKE_JOBS_SAFE= yes
USE_JAVA= yes
JAVA_BUILD= jdk
JAVA_VENDOR= freebsd bsdjava
JAVA_VENDOR= freebsd bsdjava openjdk
.if (${OSVERSION} >= 700000)
JAVA_VERSION= 1.5 1.6
.else

26
editors/openoffice.org-vcltesttool/files/patch-i103628 Normal file
View File

@ -0,0 +1,26 @@
very strange workaround indeed.
--- qadevOOo/runner/makefile.mk 2009-07-04 12:13:19.000000000 +0900
+++ qadevOOo/runner/makefile.mk 2009-07-19 09:37:44.000000000 +0900
@@ -42,6 +42,7 @@ SUBDIRS_RUNNER = util share stats lib co
JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
+JAR=${JAVA_HOME}/bin/jar
# --- Targets ------------------------------------------------------
.IF "$(SOLAR_JAVA)"=="TRUE"
@@ -52,11 +53,11 @@ OWNJAR: ALLTAR
# LLA: parameter v is only verbose, need too long!
OWNJAR: LIGHT
- jar cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET).jar manifest -C $(PRJ) objdsc $(JARCOMMANDS_TESTS) $(JARCOMMANDS_RUNNER)
# LLA: parameter v is only verbose, need too long!
LIGHT:
- jar cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
+ ${JAR} cfm $(CLASSDIR)$/$(TARGET)Light.jar manifest $(JARCOMMANDS_RUNNER)
.ELSE
all: