diff options
| author | dinoex <dinoex@FreeBSD.org> | 2010-12-16 02:47:40 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2010-12-16 02:47:40 +0800 |
| commit | 835dd720facc96bb956c5167b27cf4701c21becd (patch) | |
| tree | f921d5464303b46bb237f13656a1656cd78402a6 | |
| parent | a8b0d1f0a0e95bc62cb3e124bfd73a7254ef1e2b (diff) | |
| download | freebsd-ports-gnome-835dd720facc96bb956c5167b27cf4701c21becd.tar.gz freebsd-ports-gnome-835dd720facc96bb956c5167b27cf4701c21becd.tar.zst freebsd-ports-gnome-835dd720facc96bb956c5167b27cf4701c21becd.zip | |
- allow users override JAVA_VENDOR
- set OpenOffice Vendor in About-dialog
PR: 152262
Approved by: (maintainer timeout)
| -rw-r--r-- | editors/openoffice-3/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-3/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index ee64c6f4eb65..c63d0ed7143d 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -58,7 +58,7 @@ MAKE_JOBS_SAFE= yes USE_JAVA= yes JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava openjdk +JAVA_VENDOR?= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else @@ -143,6 +143,7 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-system-zlib \ --with-system-stdlibs \ --with-epm=internal \ + --with-vendor=FreeBSD-port \ --enable-hids \ --enable-minimizer \ --enable-presenter-console \ diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index ee64c6f4eb65..c63d0ed7143d 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -58,7 +58,7 @@ MAKE_JOBS_SAFE= yes USE_JAVA= yes JAVA_BUILD= jdk -JAVA_VENDOR= freebsd bsdjava openjdk +JAVA_VENDOR?= freebsd bsdjava openjdk .if (${OSVERSION} >= 700000) JAVA_VERSION= 1.5 1.6 .else @@ -143,6 +143,7 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-system-zlib \ --with-system-stdlibs \ --with-epm=internal \ + --with-vendor=FreeBSD-port \ --enable-hids \ --enable-minimizer \ --enable-presenter-console \ |