6 files changed, 102 insertions, 4 deletions
diff --git a/lang/sun-jdk13/buildlink3.mk b/lang/sun-jdk13/buildlink3.mk
new file mode 100644
index 00000000000..33fb96574f7
--- /dev/null
+++ b/lang/sun-jdk13/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 17:22:51 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SUN_JDK13_BUILDLINK3_MK:=	${SUN_JDK13_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sun-jdk13
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk13}
+BUILDLINK_PACKAGES+=	sun-jdk13
+
+.if !empty(SUN_JDK13_BUILDLINK3_MK:M+)
+
+BUILDLINK_DEPENDS.sun-jdk13+=	sun-jdk13-[0-9]*
+BUILDLINK_PKGSRCDIR.sun-jdk13?=	../../lang/sun-jdk13
+BUILDLINK_DEPMETHOD.sun-jdk13?= build
+BUILDLINK_CPPFLAGS.sun-jdk13=						\
+	-I${BUILDLINK_JAVA_PREFIX.sun-jre13}/include			\
+	-I${BUILDLINK_JAVA_PREFIX.sun-jre13}/include/linux
+
+.include "../../lang/sun-jre13/buildlink3.mk"
+
+.endif	# SUN_JDK13_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk
new file mode 100644
index 00000000000..9c7daa46c31
--- /dev/null
+++ b/lang/sun-jdk14/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 17:20:30 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SUN_JDK14_BUILDLINK3_MK:=	${SUN_JDK14_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sun-jdk14
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jdk14}
+BUILDLINK_PACKAGES+=	sun-jdk14
+
+.if !empty(SUN_JDK14_BUILDLINK3_MK:M+)
+
+BUILDLINK_DEPENDS.sun-jdk14+=	sun-jdk14-[0-9]*
+BUILDLINK_PKGSRCDIR.sun-jdk14?=	../../lang/sun-jdk14
+BUILDLINK_DEPMETHOD.sun-jdk14?= build
+BUILDLINK_CPPFLAGS.sun-jdk14=						\
+	-I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include			\
+	-I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include/linux
+
+.include "../../lang/sun-jre14/buildlink3.mk"
+
+.endif	# SUN_JDK14_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index e20e681ed1b..f8c0e66544d 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2004/01/11 19:41:39 cjep Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/05/05 17:22:51 xtraeme Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang java
@@ -45,7 +45,7 @@ PLIST_SRC=	${PKGDIR}/PLIST.Darwin
 NO_PATCH=	yes	# no need for patches on Linux
 .endif
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
diff --git a/lang/sun-jre13/buildlink3.mk b/lang/sun-jre13/buildlink3.mk
new file mode 100644
index 00000000000..a367a4a7508
--- /dev/null
+++ b/lang/sun-jre13/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 17:22:51 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SUN_JRE13_BUILDLINK3_MK:=	${SUN_JRE13_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sun-jre13
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre13}
+BUILDLINK_PACKAGES+=	sun-jre13
+
+.if !empty(SUN_JRE13_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.sun-jre13+=	sun-jre13-[0-9]*
+BUILDLINK_PKGSRCDIR.sun-jre13?=	../../lang/sun-jre13
+EVAL_PREFIX+=   BUILDLINK_JAVA_PREFIX.sun-jre13=sun-jre13
+BUILDLINK_JAVA_PREFIX.sun-jre13= \
+	${BUILDLINK_PREFIX.sun-jre13}/java/sun-1.3
+
+UNLIMIT_RESOURCES+=     datasize        # must be at least 131203
+.endif	# SUN_JRE13_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 0c3d811f672..5744c467eba 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/03/22 03:39:00 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/05/05 17:20:29 xtraeme Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -28,7 +28,7 @@ DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk
new file mode 100644
index 00000000000..cff63081ba0
--- /dev/null
+++ b/lang/sun-jre14/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 17:20:30 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+SUN_JRE14_BUILDLINK3_MK:=	${SUN_JRE14_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	sun-jre14
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsun-jre14}
+BUILDLINK_PACKAGES+=	sun-jre14
+
+.if !empty(SUN_JRE14_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.sun-jre14+=	sun-jre14-[0-9]*
+BUILDLINK_PKGSRCDIR.sun-jre14?=	../../lang/sun-jre14
+EVAL_PREFIX+=   BUILDLINK_JAVA_PREFIX.sun-jre14=sun-jre14
+BUILDLINK_JAVA_PREFIX.sun-jre14= \
+	${BUILDLINK_PREFIX.sun-jre14}/java/sun-1.4
+
+UNLIMIT_RESOURCES+=     datasize        # must be at least 131204
+.endif	# SUN_JRE14_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}