summaryrefslogtreecommitdiff
path: root/lang/jdk/buildlink3.mk
diff options
context:
space:
mode:
Diffstat (limited to 'lang/jdk/buildlink3.mk')
-rw-r--r--lang/jdk/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/lang/jdk/buildlink3.mk b/lang/jdk/buildlink3.mk
index 95204f03a7a..3cecc7943ca 100644
--- a/lang/jdk/buildlink3.mk
+++ b/lang/jdk/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:50 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-JDK_BUILDLINK3_MK:= ${JDK_BUILDLINK3_MK}+
+BUILDLINK_TREE+= jdk
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= jdk
-.endif
+.if !defined(JDK_BUILDLINK3_MK)
+JDK_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Njdk}
-BUILDLINK_PACKAGES+= jdk
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}jdk
-
-.if !empty(JDK_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.jdk+= jdk>=1.1.8
BUILDLINK_PKGSRCDIR.jdk?= ../../lang/jdk
BUILDLINK_JAVA_PREFIX.jdk= ${PREFIX}/java/jdk-1.1.8
@@ -21,6 +14,6 @@ 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
+.endif # JDK_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -jdk