From 01ba206cd133c215e164f71c662ba4bfdcf4f363 Mon Sep 17 00:00:00 2001 From: kurt Date: Wed, 27 Jun 2007 21:33:33 +0000 Subject: [PATCH] expand BUILD_DEPENDS to allow building ports with jdk-1.5.0 update 11 --- devel/jdk/java.port.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/jdk/java.port.mk b/devel/jdk/java.port.mk index fb0a73bb110..660e8bc8d64 100644 --- a/devel/jdk/java.port.mk +++ b/devel/jdk/java.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: java.port.mk,v 1.11 2007/01/16 02:47:14 kurt Exp $ +# $OpenBSD: java.port.mk,v 1.12 2007/06/27 21:33:33 kurt Exp $ # Set MODJAVA_VER to x.y or x.y+ based on the version # of the jdk needed for the port. x.y means any x.y jdk. @@ -41,7 +41,7 @@ MODJAVA_JRERUN?=no ONLY_FOR_ARCHS?= amd64 . if ${NO_BUILD:L} != "yes" JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 - BUILD_DEPENDS+= :jdk-1.5.0:devel/jdk/1.5 + BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5 . endif . if ${MODJAVA_JRERUN:L} == "yes" MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|jre->=1.5.0|kaffe-*|jamvm-*:devel/jdk/1.5 @@ -53,7 +53,7 @@ MODJAVA_JRERUN?=no . if ${NO_BUILD:L} != "yes" . if ${MACHINE_ARCH} == "i386" JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 - BUILD_DEPENDS+= :jdk-1.5.0:devel/jdk/1.5 + BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5 . else JAVA_HOME= ${LOCALBASE}/jdk-1.3.1 BUILD_DEPENDS+= :jdk-1.3.1:devel/jdk/1.3 @@ -85,7 +85,7 @@ MODJAVA_JRERUN?=no ONLY_FOR_ARCHS?= i386 . if ${NO_BUILD:L} != "yes" JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 - BUILD_DEPENDS+= :jdk-1.5.0:devel/jdk/1.5 + BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5 . endif . if ${MODJAVA_JRERUN:L} == "yes" . if ${MODJAVA_VER} == "1.4+" @@ -104,7 +104,7 @@ MODJAVA_JRERUN?=no ONLY_FOR_ARCHS?= i386 amd64 . if ${NO_BUILD:L} != "yes" JAVA_HOME= ${LOCALBASE}/jdk-1.5.0 - BUILD_DEPENDS+= :jdk-1.5.0:devel/jdk/1.5 + BUILD_DEPENDS+= :jdk-1.5.0*:devel/jdk/1.5 . endif . if ${MODJAVA_JRERUN:L} == "yes" _MODJAVA_RUNDEP= jdk-1.5.0|jre-1.5.0