Add appropriate CPPFLAGS and PASSTHRU_DIRS variables so that packages

depending on this one can find the header files. Noted broken by snj.

5 files changed, 26 insertions, 5 deletions

diff --git a/lang/blackdown-jdk13/buildlink3.mk b/lang/blackdown-jdk13/buildlink3.mk
index b3567c422e4..ddbbe02064f 100644
--- a/lang/blackdown-jdk13/buildlink3.mk
+++ b/lang/blackdown-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 18:12:11 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BLACKDOWN_JDK13_BUILDLINK3_MK:=	${BLACKDOWN_JDK13_BUILDLINK3_MK}+
@@ -15,6 +15,9 @@ BUILDLINK_PACKAGES+=	blackdown-jdk13
 BUILDLINK_DEPENDS.blackdown-jdk13+=	blackdown-jdk13-[0-9]*
 BUILDLINK_PKGSRCDIR.blackdown-jdk13?=	../../lang/blackdown-jdk13
 BUILDLINK_DEPMETHOD.blackdown-jdk13?=   build
+
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.blackdown-jre13}
+
 BUILDLINK_CPPFLAGS.blackdown-jdk13=					\
 	-I${BUILDLINK_JAVA_PREFIX.blackdown-jre13}/include		\
 	-I${BUILDLINK_JAVA_PREFIX.blackdown-jre13}/include/linux
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk
index 923fad93e2d..6ead112d630 100644
--- a/lang/jdk/buildlink3.mk
+++ b/lang/jdk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/06/28 16:59:34 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JDK_BUILDLINK3_MK:=	${JDK_BUILDLINK3_MK}+
@@ -14,6 +14,12 @@ BUILDLINK_PACKAGES+=	jdk
 BUILDLINK_DEPENDS.jdk+=	jdk>=1.1.8
 BUILDLINK_PKGSRCDIR.jdk?=	../../lang/jdk
 BUILDLINK_JAVA_PREFIX.jdk=	${PREFIX}/java/jdk-1.1.8
+
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.jdk}
+
+BUILDLINK_CPPFLAGS.jdk= \
+	-I${BUILDLINK_JAVA_PREFIX.jdk}/include				\
+	-I${BUILDLINK_JAVA_PREFIX.jdk}/include/netbsd
 .endif	# JDK_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index 00738702304..b4ce61689ee 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/06/05 16:33:52 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/07/02 12:51:57 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
@@ -14,6 +14,12 @@ BUILDLINK_PACKAGES+=	kaffe
 BUILDLINK_DEPENDS.kaffe+=	kaffe-[0-9]*
 BUILDLINK_PKGSRCDIR.kaffe?=	../../lang/kaffe
 BUILDLINK_JAVA_PREFIX.kaffe=	${PREFIX}/java/kaffe
+
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.kaffe}
+
+BUILDLINK_CPPFLAGS.kaffe= \
+	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include			\
+	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe
 .endif  # KAFFE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/sun-jdk13/buildlink3.mk b/lang/sun-jdk13/buildlink3.mk
index 33fb96574f7..aebb09cfb59 100644
--- a/lang/sun-jdk13/buildlink3.mk
+++ b/lang/sun-jdk13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 17:22:51 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK13_BUILDLINK3_MK:=	${SUN_JDK13_BUILDLINK3_MK}+
@@ -15,6 +15,9 @@ BUILDLINK_PACKAGES+=	sun-jdk13
 BUILDLINK_DEPENDS.sun-jdk13+=	sun-jdk13-[0-9]*
 BUILDLINK_PKGSRCDIR.sun-jdk13?=	../../lang/sun-jdk13
 BUILDLINK_DEPMETHOD.sun-jdk13?= build
+
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.sun-jre13}
+
 BUILDLINK_CPPFLAGS.sun-jdk13=						\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre13}/include			\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre13}/include/linux
diff --git a/lang/sun-jdk14/buildlink3.mk b/lang/sun-jdk14/buildlink3.mk
index 9c7daa46c31..cad043f6a50 100644
--- a/lang/sun-jdk14/buildlink3.mk
+++ b/lang/sun-jdk14/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 17:20:30 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/02 12:51:57 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUN_JDK14_BUILDLINK3_MK:=	${SUN_JDK14_BUILDLINK3_MK}+
@@ -15,6 +15,9 @@ BUILDLINK_PACKAGES+=	sun-jdk14
 BUILDLINK_DEPENDS.sun-jdk14+=	sun-jdk14-[0-9]*
 BUILDLINK_PKGSRCDIR.sun-jdk14?=	../../lang/sun-jdk14
 BUILDLINK_DEPMETHOD.sun-jdk14?= build
+
+BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.sun-jre14}
+
 BUILDLINK_CPPFLAGS.sun-jdk14=						\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include			\
 	-I${BUILDLINK_JAVA_PREFIX.sun-jre14}/include/linux