diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2006-09-06 21:38:02 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2006-09-06 21:38:02 +0000 |
| commit | 6ccc8cf40e1b8e73aeed41940a84709b13cf458b (patch) | |
| tree | 14e67dc60cc5f2ca9765aba9113ed839007a51f1 /editors | |
| parent | There is no JDK package on -Current. (diff) | |
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')
22 files changed, 44 insertions, 44 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 3421029d04bf..c6e52fc50347 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-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-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-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) diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 5c04571f8701..ebb50074c01b 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -99,9 +99,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 @@ -155,7 +155,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-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice-3/files/Makefile.knobs +++ b/editors/openoffice-3/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) diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 5c04571f8701..ebb50074c01b 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -99,9 +99,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 @@ -155,7 +155,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-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-2-RC/files/Makefile.knobs +++ b/editors/openoffice.org-2-RC/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) 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) diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 3421029d04bf..c6e52fc50347 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-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.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2.0-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) diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 5c04571f8701..ebb50074c01b 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -99,9 +99,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 @@ -155,7 +155,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.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-2.0/files/Makefile.knobs +++ b/editors/openoffice.org-2.0/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) diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 5c04571f8701..ebb50074c01b 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -99,9 +99,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 @@ -155,7 +155,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/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-2/files/Makefile.knobs +++ b/editors/openoffice.org-2/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) diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 5c04571f8701..ebb50074c01b 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -99,9 +99,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 @@ -155,7 +155,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-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-3-RC/files/Makefile.knobs +++ b/editors/openoffice.org-3-RC/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) diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 3421029d04bf..c6e52fc50347 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-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-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-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) diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 5c04571f8701..ebb50074c01b 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -99,9 +99,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 @@ -155,7 +155,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-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-3/files/Makefile.knobs +++ b/editors/openoffice.org-3/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) diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 3421029d04bf..c6e52fc50347 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/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-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index 5f2a32adb100..8abea94c74a2 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/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) |