cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix RUN_DEPENDS with MODJAVA_VER=1.3+ or 1.4+, it was allowing 1.5/jamvm/kaffe

Browse Source 
but not newer jdk/jre versions. Problem noted by Matthew Szudzik. ok kurt@
This commit is contained in:
sthen 2009-11-09 11:02:58 +00:00
parent 7cda62a877
commit 7e2de42881
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/jdk/java.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.18 2009/03/16 16:38:25 sthen Exp $
# $OpenBSD: java.port.mk,v 1.19 2009/11/09 11:02:58 sthen 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.
@ -42,9 +42,9 @@ MODJAVA_JRERUN?=no
BUILD_DEPENDS+= :jdk->=1.5.0,<1.6:devel/jdk/1.5
. endif
. if ${MODJAVA_JRERUN:L} == "yes"
MODJAVA_RUN_DEPENDS= :jdk->=1.5.0,<1.6|jre->=1.5.0,<1.6|kaffe-*|jamvm-*:devel/jdk/1.5
MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|jre->=1.5.0|kaffe-*|jamvm-*:devel/jdk/1.5
. else
MODJAVA_RUN_DEPENDS= :jdk->=1.5.0,<1.6|kaffe-*:devel/jdk/1.5
MODJAVA_RUN_DEPENDS= :jdk->=1.5.0|kaffe-*:devel/jdk/1.5
. endif
.elif ${MODJAVA_VER:S/+//} == "1.5"
ONLY_FOR_ARCHS?= i386 amd64