diff options
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i103628 | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 71317e710352..0c40a767429c 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -47,7 +47,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 diff --git a/editors/openoffice.org-3-RC/files/patch-i103628 b/editors/openoffice.org-3-RC/files/patch-i103628 new file mode 100644 index 000000000000..c3846bc27ae2 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-i103628 @@ -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: |