Remove deprecated USE_JAVA code from bsd.pkg.mk. Packages should use

java-vm.mk instead (see java-vm.mk for details on proper usage).

1 files changed, 1 insertions, 84 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 0c619db16bc..d608d6194b2 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1119 2002/12/29 19:02:06 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1120 2002/12/31 15:46:42 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -55,89 +55,6 @@ _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
 
 INTERACTIVE_STAGE?=	none
 
-.if !defined(JAVA_VM_MK)
-.if defined(USE_JAVA)
-BUILD_DEFS+=		PKG_JVM
-.  if !defined(PKG_JVM)
-.    if ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" || \
-       ${MACHINE_PLATFORM:MLinux-*-i[3456]86} != ""
-PKG_JVM?=		jdk
-.    elif ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != ""
-PKG_JVM?=		blackdown-jdk13
-.    elif ${MACHINE_PLATFORM:MDarwin-*-*} != ""
-PKG_JVM?=		sun-jdk
-.    else
-PKG_JVM?=		kaffe
-.    endif
-.  endif
-.  if (${USE_JAVA} == "run")
-_JDK_DEPMETHOD=		_UNUSED_DEPENDS
-.  else
-_JDK_DEPMETHOD=		BUILD_DEPENDS
-.  endif
-.  if ${PKG_JVM} == "jdk"
-_JAVA_PKGBASE=		jdk
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.1.8
-DEPENDS+=		jdk-[0-9]*:../../lang/jdk
-.  elif ${PKG_JVM} == "sun-jdk14"
-_JAVA_PKGBASE=		sun-jdk14
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.4.0
-${_JDK_DEPMETHOD}+=	sun-jdk14-[0-9]*:../../lang/sun-jdk14
-DEPENDS+=		sun-jre14-[0-9]*:../../lang/sun-jre14
-UNLIMIT_RESOURCES+=	datasize
-.  elif ${PKG_JVM} == "sun-jdk13"
-_JAVA_PKGBASE=		sun-jdk13
-.    if ${_OPSYS_HAS_JAVA} == "yes"
-_JAVA_HOME_DEFAULT=	/usr
-.    else
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.3.1
-.    endif
-${_JDK_DEPMETHOD}+=	sun-jdk13-[0-9]*:../../lang/sun-jdk13
-DEPENDS+=		sun-jre13-[0-9]*:../../lang/sun-jre13
-.  elif ${PKG_JVM} == "sun-jdk"
-.    if ${MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386} != "" || \
-	${MACHINE_PLATFORM:MNetBSD-1.[6-9]*-i386} != "" || \
-	${MACHINE_PLATFORM:MLinux-*-i[3456]86} != ""
-_JAVA_PKGBASE=		sun-jdk1[34]*
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.4.0
-${_JDK_DEPMETHOD}+=	sun-jdk1[34]-[0-9]*:../../lang/sun-jdk14
-DEPENDS+=		sun-jre1[34]-[0-9]*:../../lang/sun-jre14
-.    elif ${MACHINE_PLATFORM:MNetBSD-*-i386} != "" || \
-	${MACHINE_PLATFORM:MDarwin-*-*} != "" || \
-	${MACHINE_PLATFORM:MLinux-*-i[3456]86} != ""
-_JAVA_PKGBASE=		sun-jdk1[34]*
-.    if ${_OPSYS_HAS_JAVA} == "yes"
-_JAVA_HOME_DEFAULT=	/usr
-.    else
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/sun-1.3.1
-.    endif
-${_JDK_DEPMETHOD}+=	sun-jdk1[34]-[0-9]*:../../lang/sun-jdk13
-DEPENDS+=		sun-jre1[34]-[0-9]*:../../lang/sun-jre13
-.    endif
-UNLIMIT_RESOURCES+=	datasize
-.  elif ${PKG_JVM} == "blackdown-jdk13"
-_JAVA_PKGBASE=		blackdown-jdk13
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/blackdown-1.3.1
-${_JDK_DEPMETHOD}+=	blackdown-jdk13-[0-9]*:../../lang/blackdown-jdk13
-DEPENDS+=		blackdown-jre13-[0-9]*:../../lang/blackdown-jre13
-.  elif ${PKG_JVM} == "kaffe"
-_JAVA_PKGBASE=		kaffe
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/kaffe
-DEPENDS+=		kaffe-[0-9]*:../../lang/kaffe
-.  endif
-.  undef _UNUSED_DEPENDS
-EVAL_PREFIX+=		_JAVA_HOME=${_JAVA_PKGBASE}
-
-PKG_JAVA_HOME?=		${_JAVA_HOME}
-BUILD_DEFS+=		PKG_JAVA_HOME
-MAKE_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
-CONFIGURE_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
-SCRIPTS_ENV+=		JAVA_HOME=${PKG_JAVA_HOME}
-
-PATH:=			${PKG_JAVA_HOME}/bin:${PATH}
-.endif
-.endif	! JAVA_VM_MK
-
 # Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR,  BUILDLINK_X11_DIR so
 # that if no buildlink2.mk files are included, then they still point to
 # where headers and libraries for installed packages and X11R6 may be found.