Replace sun15 with sun6 to match reality.

2 files changed, 29 insertions, 29 deletions

diff --git a/lang/sun-jdk6/buildlink3.mk b/lang/sun-jdk6/buildlink3.mk
index 99f9dea758f..a81e3feab13 100644
--- a/lang/sun-jdk6/buildlink3.mk
+++ b/lang/sun-jdk6/buildlink3.mk
@@ -1,31 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/02/18 19:11:27 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/05/25 02:04:15 rh Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JDK15_BUILDLINK3_MK:=	${SUN_JDK15_BUILDLINK3_MK}+
+SUN_JDK6_BUILDLINK3_MK:=	${SUN_JDK6_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jdk15
+BUILDLINK_DEPENDS+=	sun-jdk6
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk15}
-BUILDLINK_PACKAGES+=	sun-jdk15
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk15
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk6}
+BUILDLINK_PACKAGES+=	sun-jdk6
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk6
 
-.if !empty(SUN_JDK15_BUILDLINK3_MK:M+)
+.if !empty(SUN_JDK6_BUILDLINK3_MK:M+)
 
-BUILDLINK_API_DEPENDS.sun-jdk15+=	sun-jdk15-[0-9]*
-BUILDLINK_ABI_DEPENDS.sun-jdk15?=	sun-jdk15>=5.0.6nb1
-BUILDLINK_PKGSRCDIR.sun-jdk15?=	../../lang/sun-jdk15
-BUILDLINK_DEPMETHOD.sun-jdk15?= build
+BUILDLINK_API_DEPENDS.sun-jdk6+=	sun-jdk6-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jdk6?=	sun-jdk6>=6.0.1
+BUILDLINK_PKGSRCDIR.sun-jdk6?=	../../lang/sun-jdk6
+BUILDLINK_DEPMETHOD.sun-jdk6?= build
 
-BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.sun-jre15}
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.sun-jre6}
 
-BUILDLINK_CPPFLAGS.sun-jdk15=						\
-	-I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include			\
-	-I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include/linux
+BUILDLINK_CPPFLAGS.sun-jdk6=						\
+	-I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include			\
+	-I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include/linux
 
-.include "../../lang/sun-jre15/buildlink3.mk"
+.include "../../lang/sun-jre6/buildlink3.mk"
 
-.endif	# SUN_JDK15_BUILDLINK3_MK
+.endif	# SUN_JDK6_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk
index ace0237a3fd..df95e390730 100644
--- a/lang/sun-jre6/buildlink3.mk
+++ b/lang/sun-jre6/buildlink3.mk
@@ -1,23 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/02/18 19:11:28 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/05/25 02:04:15 rh Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-SUN_JRE15_BUILDLINK3_MK:=	${SUN_JRE15_BUILDLINK3_MK}+
+SUN_JRE6_BUILDLINK3_MK:=	${SUN_JRE6_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	sun-jre15
+BUILDLINK_DEPENDS+=	sun-jre6
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre15}
-BUILDLINK_PACKAGES+=	sun-jre15
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre15
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre6}
+BUILDLINK_PACKAGES+=	sun-jre6
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre6
 
-.if !empty(SUN_JRE15_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.sun-jre15+=		sun-jre15-[0-9]*
-BUILDLINK_ABI_DEPENDS.sun-jre15?=		sun-jre15>=5.0.6nb2
-BUILDLINK_PKGSRCDIR.sun-jre15?=		../../lang/sun-jre15
-BUILDLINK_JAVA_PREFIX.sun-jre15=	${PREFIX}/java/sun-1.5
+.if !empty(SUN_JRE6_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.sun-jre6+=		sun-jre6-[0-9]*
+BUILDLINK_ABI_DEPENDS.sun-jre6?=		sun-jre6>=6.0.1
+BUILDLINK_PKGSRCDIR.sun-jre6?=		../../lang/sun-jre6
+BUILDLINK_JAVA_PREFIX.sun-jre6=	${PREFIX}/java/sun-6
 
 UNLIMIT_RESOURCES+=	datasize	# Must be at least 131204
-.endif	# SUN_JRE15_BUILDLINK3_MK
+.endif	# SUN_JRE6_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}