diff options
| author | tron <tron@pkgsrc.org> | 2001-07-13 11:28:23 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-07-13 11:28:23 +0000 |
| commit | cd704ea25bbf3dc319dab28e3343eefd1eff85a5 (patch) | |
| tree | b05bd43c52c3b0f9b64f2b4d11d198b79930acd3 /mk | |
| parent | 42f06cdebe7ab14f69488c1f54a7b662a0cbe85a (diff) | |
| download | pkgsrc-cd704ea25bbf3dc319dab28e3343eefd1eff85a5.tar.gz | |
Improve Java handling via "USE_JAVA" option:
- The "sun-jre" and "sun-jdk" packages can now be directly selected by
setting "PKG_JVM" to "sun-jdk". "JAVA_HOME" is set to
"${LOCALBASE}/java/jre/bin" in this case which fixes PR pkg/11901
by myself.
- Only set "CLASSPATH" to "${JAVA_HOME}/lib/classes.zip" if that file
really exists.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6a231606052..16e47085a3d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.786 2001/07/13 06:16:02 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.787 2001/07/13 11:28:23 tron Exp $ # # This file is in the public domain. # @@ -68,25 +68,35 @@ PKG_JVM?= kaffe .endif .endif .if ${PKG_JVM} == "jdk" -DEPENDS+= {sun-jre,jdk}-*:../../lang/jdk -BUILD_DEPENDS+= {sun-jdk,jdk}-*:../../lang/jdk +DEPENDS+= jdk-*:../../lang/jdk .if defined(JDK_HOME) JAVA_HOME?= ${JDK_HOME} .else JAVA_HOME?= ${LOCALBASE}/java .endif +.elif ${PKG_JVM} == "sun-jdk" +BUILD_DEPENDS+= sun-jdk-*:../../lang/sun-jdk13 +DEPENDS+= sun-jre-*:../../lang/sun-jre13 + +JAVA_HOME?= ${LOCALBASE}/java/jre .elif ${PKG_JVM} == "blackdown-jdk13" DEPENDS+= blackdown-jdk-*:../../lang/blackdown-jdk13 -JAVA_HOME?= ${PREFIX}/java +JAVA_HOME?= ${LOCALBASE}/java .elif ${PKG_JVM} == "kaffe" DEPENDS+= kaffe-[0-9]*:../../lang/kaffe JAVA_HOME?= ${LOCALBASE}/kaffe .endif +.if exists(${JAVA_HOME}/lib/classes.zip:) CLASSPATH?= ${JAVA_HOME}/lib/classes.zip:. + +MAKE_ENV+= CLASSPATH=${CLASSPATH} +CONFIGURE_ENV+= CLASSPATH=${CLASSPATH} +SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} +.endif PATH:= ${PATH}:${JAVA_HOME}/bin -MAKE_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} -CONFIGURE_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} -SCRIPTS_ENV+= CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME} +MAKE_ENV+= JAVA_HOME=${JAVA_HOME} +CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} +SCRIPTS_ENV+= JAVA_HOME=${JAVA_HOME} .endif # Set X11PREFIX to reflect the install directory of X11 packages. |