From e61a34bc373ec05c3698b12bb0ef0ae737b14852 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sat, 1 Feb 2003 10:43:36 +0000 Subject: [PATCH] Fix the build dependendency for the JDK. We don't need the USE_LINUX since the linux-sun-jdk port already has it defined. --- editors/openoffice-1.0/Makefile | 5 +++-- editors/openoffice.org-1.0/Makefile | 5 +++-- editors/openoffice/Makefile | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 338af5caad8e..8084bc9ff31e 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -114,13 +114,14 @@ MAINTAINER= openoffice@FreeBSD.org BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif .if !defined(WITH_BSD_JDK) -USE_LINUX= yes +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 +.else +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 .endif USE_PERL5= yes diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 338af5caad8e..8084bc9ff31e 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -114,13 +114,14 @@ MAINTAINER= openoffice@FreeBSD.org BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif .if !defined(WITH_BSD_JDK) -USE_LINUX= yes +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 +.else +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 .endif USE_PERL5= yes diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 338af5caad8e..8084bc9ff31e 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -114,13 +114,14 @@ MAINTAINER= openoffice@FreeBSD.org BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/jakarta-ant -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif .if !defined(WITH_BSD_JDK) -USE_LINUX= yes +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 +.else +BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 .endif USE_PERL5= yes