summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv>2006-05-15 19:51:53 +0000
committertv <tv>2006-05-15 19:51:53 +0000
commit9251f4dffb9e3ccc1808ecf1252c03046123b83e (patch)
treeff4615ab74372b2db2014700cfa7df04032e42ad
parentb8d1bfbf8f379f1b0524e2ef0f56bef8609247b2 (diff)
downloadpkgsrc-9251f4dffb9e3ccc1808ecf1252c03046123b83e.tar.gz
Fix buildlink DEPENDS versioning (these originally came from the sun-*
incarnations).
-rw-r--r--lang/scsl-jdk15/buildlink3.mk6
-rw-r--r--lang/scsl-jre15/buildlink3.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/lang/scsl-jdk15/buildlink3.mk b/lang/scsl-jdk15/buildlink3.mk
index 4a32bdd6fdb..0dbf5a1a28a 100644
--- a/lang/scsl-jdk15/buildlink3.mk
+++ b/lang/scsl-jdk15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/05/15 19:44:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/05/15 19:51:53 tv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SCSL_JDK15_BUILDLINK3_MK:= ${SCSL_JDK15_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES+= scsl-jdk15
.if !empty(SCSL_JDK15_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.scsl-jdk15+= scsl-jdk15-[0-9]*
-BUILDLINK_ABI_DEPENDS.scsl-jdk15?= scsl-jdk15>=5.0.6nb1
+BUILDLINK_ABI_DEPENDS.scsl-jdk15?= scsl-jdk15>=1.5.0
BUILDLINK_PKGSRCDIR.scsl-jdk15?= ../../lang/scsl-jdk15
BUILDLINK_DEPMETHOD.scsl-jdk15?= build
@@ -21,7 +21,7 @@ BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.scsl-jre15}
BUILDLINK_CPPFLAGS.scsl-jdk15= \
-I${BUILDLINK_JAVA_PREFIX.scsl-jre15}/include \
- -I${BUILDLINK_JAVA_PREFIX.scsl-jre15}/include/linux
+ -I${BUILDLINK_JAVA_PREFIX.scsl-jre15}/include/${LOWER_OPSYS}
.include "../../lang/scsl-jre15/buildlink3.mk"
diff --git a/lang/scsl-jre15/buildlink3.mk b/lang/scsl-jre15/buildlink3.mk
index 540a00512f8..4036867a3e1 100644
--- a/lang/scsl-jre15/buildlink3.mk
+++ b/lang/scsl-jre15/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/05/15 19:44:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/05/15 19:51:53 tv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SCSL_JRE15_BUILDLINK3_MK:= ${SCSL_JRE15_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= scsl-jre15
.if !empty(SCSL_JRE15_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.scsl-jre15+= scsl-jre15-[0-9]*
-BUILDLINK_ABI_DEPENDS.scsl-jre15?= scsl-jre15>=5.0.6nb2
+BUILDLINK_ABI_DEPENDS.scsl-jre15?= scsl-jre15>=1.5.0
BUILDLINK_PKGSRCDIR.scsl-jre15?= ../../lang/scsl-jre15
BUILDLINK_JAVA_PREFIX.scsl-jre15= ${PREFIX}/java/scsl-1.5
.endif # SCSL_JRE15_BUILDLINK3_MK