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

unbreak RUN_DEPENDS for MOD_JAVA_VER=1.x+, which I missed when I fixed

Browse Source 
the normal case. problem found by Andreas Kahari.
This commit is contained in:
sthen 2009-03-16 16:38:25 +00:00
parent 2901c5bac6
commit 744eb19e33
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.17 2009/03/11 22:04:07 sthen Exp $
# $OpenBSD: java.port.mk,v 1.18 2009/03/16 16:38:25 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.
@ -58,7 +58,7 @@ MODJAVA_JRERUN?=no
_MODJAVA_RUNDEP= jdk->=1.5.0,<1.6
. endif
. if ${MODJAVA_VER} == "1.5+"
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP:S/-/->=/g}:devel/jdk/1.5
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP:S/,<1.6//g}:devel/jdk/1.5
. else
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}:devel/jdk/1.5
. endif
@ -74,7 +74,7 @@ MODJAVA_JRERUN?=no
_MODJAVA_RUNDEP= jdk->=1.6.0,<1.7
. endif
. if ${MODJAVA_VER} == "1.6+"
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP:S/-/->=/g}:devel/jdk/1.6
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP:S/,<1.7//g}:devel/jdk/1.6
. else
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}:devel/jdk/1.6
. endif
@ -90,7 +90,7 @@ MODJAVA_JRERUN?=no
_MODJAVA_RUNDEP= jdk->=1.7.0,<1.8
. endif
. if ${MODJAVA_VER} == "1.7+"
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP:S/-/->=/g}:devel/jdk/1.7
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP:S/,<1.8//g}:devel/jdk/1.7
. else
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}:devel/jdk/1.7
. endif