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

Change the default package for 1.3+ and 1.4+ ports to devel/jdk/1.5 on

Browse Source 
i386. This fixed a 'FORCE_UPDATE=yes make install' issue noticed by brad@
and further encourages users to use the 1.5 jdk which works the best.
This commit is contained in:
kurt 2007-01-16 02:47:14 +00:00
parent 27566592b4
commit 80d3cd2c49
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: java.port.mk,v 1.10 2006/11/28 14:28:25 kurt Exp $
# $OpenBSD: java.port.mk,v 1.11 2007/01/16 02:47:14 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.
@ -73,7 +73,11 @@ MODJAVA_JRERUN?=no
. endif
. endif
. if ${MACHINE_ARCH} == "i386"
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}|jdk-linux-1.3.1*:devel/jdk/1.3
. if ${MODJAVA_VER} == "1.3+"
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}|jdk-linux-1.3.1*:devel/jdk/1.5
. else
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}|jdk-linux-1.3.1*:devel/jdk/1.3
. endif
. else
MODJAVA_RUN_DEPENDS= :${_MODJAVA_RUNDEP}:devel/jdk/1.3
. endif
@ -85,13 +89,13 @@ MODJAVA_JRERUN?=no
. endif
. if ${MODJAVA_JRERUN:L} == "yes"
. if ${MODJAVA_VER} == "1.4+"
MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9|jre->=1.4.2p9|kaffe-*|jamvm-*:devel/jdk/1.4
MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9|jre->=1.4.2p9|kaffe-*|jamvm-*:devel/jdk/1.5
. else
MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9,<1.5|jre->=1.4.2p9,<1.5|kaffe-*|jamvm-*:devel/jdk/1.4
. endif
. else
. if ${MODJAVA_VER} == "1.4+"
MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9|kaffe-*:devel/jdk/1.4
MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9|kaffe-*:devel/jdk/1.5
. else
MODJAVA_RUN_DEPENDS= :jdk->=1.4.2p9,<1.5|kaffe-*:devel/jdk/1.4
. endif