From 33a5dd8a8bd87770b2d3db7cb418814e10f8cf25 Mon Sep 17 00:00:00 2001 From: mbr Date: Sun, 3 Mar 2002 00:00:14 +0000 Subject: Fix dependency of pth and fix jdk paths --- editors/openoffice-1.0/Makefile | 6 ++++-- editors/openoffice-1.1-devel/Makefile | 6 ++++-- editors/openoffice-1.1/Makefile | 6 ++++-- editors/openoffice-2.0-devel/Makefile | 6 ++++-- editors/openoffice-3-devel/Makefile | 6 ++++-- editors/openoffice-3/Makefile | 6 ++++-- editors/openoffice-devel/Makefile | 6 ++++-- editors/openoffice.org-1.0/Makefile | 6 ++++-- editors/openoffice.org-1.1-devel/Makefile | 6 ++++-- editors/openoffice.org-1.1/Makefile | 6 ++++-- editors/openoffice.org-2-RC/Makefile | 6 ++++-- editors/openoffice.org-2-devel/Makefile | 6 ++++-- editors/openoffice.org-2.0-devel/Makefile | 6 ++++-- editors/openoffice.org-2.0/Makefile | 6 ++++-- editors/openoffice.org-2/Makefile | 6 ++++-- editors/openoffice.org-3-RC/Makefile | 6 ++++-- editors/openoffice.org-3-devel/Makefile | 6 ++++-- editors/openoffice.org-3/Makefile | 6 ++++-- editors/openoffice.org-vcltesttool/Makefile | 6 ++++-- editors/openoffice/Makefile | 6 ++++-- 20 files changed, 80 insertions(+), 40 deletions(-) diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-2.0-devel/Makefile +++ b/editors/openoffice-2.0-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-3/Makefile +++ b/editors/openoffice-3/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-2/Makefile +++ b/editors/openoffice.org-2/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-3/Makefile +++ b/editors/openoffice.org-3/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 540dcca90adc..6c68d25c5f1f 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -24,19 +24,21 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf - EXTRACT_CMD_R= ${GZIP_CMD} GCC_VERSION!= ${CC} --version +JDK13DIR?= ${LOCALBASE}/jdk1.3.1 +JAVAVM= ${JDK13DIR}/bin/java BUILD_DEPENDS= stlport:${PORTSDIR}/devel/stlport BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= pth:${PORTSDIR}/devel/pth +BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/oo_641_src/config_office CONFIGURE_ARGS+= --with-stlport4-home=${PREFIX} \ - --with-jdk-home=${PREFIX}/jdk1.3.1 + --with-jdk-home=${JDK13DIR} .include -- cgit