From 82c4ca69ccc2658b93da393d1f0ae3b1f6b96cd9 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma>
Date: Sat, 20 Jul 2002 17:01:09 +0000
Subject: On -current, let PKG_JVM default to the same as on 1.6. I should have
 done this when I added sun's jdk 1.4 originally, but did not account for
 version names like 1.6[A-Z].

---
 mk/bsd.pkg.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index c60aba13e31..feecc8882f7 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1007 2002/07/18 10:21:18 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1008 2002/07/20 17:01:09 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -100,7 +100,7 @@ JAVA_HOME?=		${LOCALBASE}/java
 .    endif
 .  elif ${PKG_JVM} == "sun-jdk"
 .    if ${MACHINE_PLATFORM:MNetBSD-1.5Z[A-Z]-i386} != "" || \
-	${MACHINE_PLATFORM:MNetBSD-1.[6-9]-i386} != "" || \
+	${MACHINE_PLATFORM:MNetBSD-1.[6-9]*-i386} != "" || \
 	${MACHINE_PLATFORM:MLinux-*-i386} != ""
 BUILD_DEPENDS+=         sun-jdk-[0-9]*:../../lang/sun-jdk14
 DEPENDS+=               sun-jre-[0-9]*:../../lang/sun-jre14
-- 
cgit v1.2.3