diff options
| author | maho <maho@FreeBSD.org> | 2006-09-07 05:38:02 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2006-09-07 05:38:02 +0800 |
| commit | 02589707fb3ed6e18de7f6789d1ec230e184dfa3 (patch) | |
| tree | b65dd3668697ef041d198fa2f0d5bdc4049052eb /editors/openoffice.org-2-devel | |
| parent | 63c8df29ac0b38d065d15f13b8747f892940771d (diff) | |
| download | freebsd-ports-gnome-02589707fb3ed6e18de7f6789d1ec230e184dfa3.tar.gz freebsd-ports-gnome-02589707fb3ed6e18de7f6789d1ec230e184dfa3.tar.zst freebsd-ports-gnome-02589707fb3ed6e18de7f6789d1ec230e184dfa3.zip | |
JAVA_HOME of java-gcj-compat has been changed
from ${LOCALBASE}/lib/jvm/java-gcj to ${LOCALBASE}/lib/jvm/java-gcj41
Diffstat (limited to 'editors/openoffice.org-2-devel')
| -rw-r--r-- | editors/openoffice.org-2-devel/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice.org-2-devel/files/Makefile.knobs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 3421029d04bf..c6e52fc50347 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -100,9 +100,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj/bin/java:${PORTSDIR}/java/java-gcj-compat +BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj/bin/java:${PORTSDIR}/java/java-gcj-compat +RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat .else .if ${ARCH} == amd64 GCCVER=41 @@ -157,7 +157,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 .if defined(WITH_GNUGCJ) -CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj/bin:${PATH}" +CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" .endif CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2-devel/files/Makefile.knobs @@ -5,7 +5,7 @@ .if !defined(WITH_GNUGCJ) CONFIGURE_ARGS+= --with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant .else -CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" +CONFIGURE_ARGS+= --with-jdk-home="${LOCALBASE}/lib/jvm/java-gcj41" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}" .endif .if defined(WITH_KDE) |