diff options
| author | maho <maho@FreeBSD.org> | 2009-07-20 06:23:57 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2009-07-20 06:23:57 +0800 |
| commit | d1f20d0bc875f8b785426bfed32dc5467fa9a5c2 (patch) | |
| tree | 921e25ab4bce56f4713da25ca136471c2e954e47 /editors/openoffice.org-2 | |
| parent | 079b9a2692dea2d725ca8e87e562d4bfeab84ecb (diff) | |
| download | freebsd-ports-graphics-d1f20d0bc875f8b785426bfed32dc5467fa9a5c2.tar.gz freebsd-ports-graphics-d1f20d0bc875f8b785426bfed32dc5467fa9a5c2.tar.zst freebsd-ports-graphics-d1f20d0bc875f8b785426bfed32dc5467fa9a5c2.zip | |
Add openjdk as a possible jdk.
Suggested by: jkim
Funded by: OpenOffice.org community
Diffstat (limited to 'editors/openoffice.org-2')
| -rw-r--r-- | editors/openoffice.org-2/Makefile | 2 | ||||
| -rw-r--r-- | editors/openoffice.org-2/files/patch-i103628 | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 4e6ff9e87f6..40e3e92be52 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -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 diff --git a/editors/openoffice.org-2/files/patch-i103628 b/editors/openoffice.org-2/files/patch-i103628 new file mode 100644 index 00000000000..c3846bc27ae --- /dev/null +++ b/editors/openoffice.org-2/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: |