diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-06-05 16:33:52 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-06-05 16:33:52 +0000 |
commit | c67c0108b8ccf19719ffa5eb35af15c7d8c719cd (patch) | |
tree | bbe02e3135583d1543b86d85f4b6db5fb146e97f | |
parent | 25d93d9c988f94aeeaae4416481585485dcbcc17 (diff) | |
download | pkgsrc-c67c0108b8ccf19719ffa5eb35af15c7d8c719cd.tar.gz |
Simplify BUILDLINK_JAVA_PREFIX.<jvm>.
-rw-r--r-- | lang/kaffe/buildlink3.mk | 8 | ||||
-rw-r--r-- | lang/sun-jre13/buildlink3.mk | 14 | ||||
-rw-r--r-- | lang/sun-jre14/buildlink3.mk | 14 | ||||
-rw-r--r-- | lang/wonka/buildlink3.mk | 8 |
4 files changed, 16 insertions, 28 deletions
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk index 25593212be1..00738702304 100644 --- a/lang/kaffe/buildlink3.mk +++ b/lang/kaffe/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2004/05/05 18:06:03 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2004/06/05 16:33:52 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KAFFE_BUILDLINK3_MK:= ${KAFFE_BUILDLINK3_MK}+ @@ -13,11 +13,7 @@ BUILDLINK_PACKAGES+= kaffe .if !empty(KAFFE_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.kaffe+= kaffe-[0-9]* BUILDLINK_PKGSRCDIR.kaffe?= ../../lang/kaffe -EVAL_PREFIX+= BUILDLINK_JAVA_PREFIX.kaffe=kaffe -BUILDLINK_JAVA_PREFIX.kaffe= ${BUILDLINK_PREFIX.kaffe}/java/kaffe -BUILDLINK_CPPFLAGS.kaffe= \ - -I${BUILDLINK_JAVA_PREFIX.kaffe}/include \ - -I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe +BUILDLINK_JAVA_PREFIX.kaffe= ${PREFIX}/java/kaffe .endif # KAFFE_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/sun-jre13/buildlink3.mk b/lang/sun-jre13/buildlink3.mk index a367a4a7508..0688d80ff72 100644 --- a/lang/sun-jre13/buildlink3.mk +++ b/lang/sun-jre13/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/06/05 16:33:52 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUN_JRE13_BUILDLINK3_MK:= ${SUN_JRE13_BUILDLINK3_MK}+ @@ -11,13 +11,11 @@ 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 +BUILDLINK_DEPENDS.sun-jre13+= sun-jre13-[0-9]* +BUILDLINK_PKGSRCDIR.sun-jre13?= ../../lang/sun-jre13 +BUILDLINK_JAVA_PREFIX.sun-jre13= ${PREFIX}/java/sun-1.3 .endif # SUN_JRE13_BUILDLINK3_MK +UNLIMIT_RESOURCES+= datasize # Must be at least 131203 + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/sun-jre14/buildlink3.mk b/lang/sun-jre14/buildlink3.mk index cff63081ba0..427a88b1e8d 100644 --- a/lang/sun-jre14/buildlink3.mk +++ b/lang/sun-jre14/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/06/05 16:33:52 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUN_JRE14_BUILDLINK3_MK:= ${SUN_JRE14_BUILDLINK3_MK}+ @@ -11,13 +11,11 @@ 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 +BUILDLINK_DEPENDS.sun-jre14+= sun-jre14-[0-9]* +BUILDLINK_PKGSRCDIR.sun-jre14?= ../../lang/sun-jre14 +BUILDLINK_JAVA_PREFIX.sun-jre14= ${PREFIX}/java/sun-1.4 .endif # SUN_JRE14_BUILDLINK3_MK +UNLIMIT_RESOURCES+= datasize # Must be at least 131204 + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/lang/wonka/buildlink3.mk b/lang/wonka/buildlink3.mk index 7f5c82b0fda..24779c4529c 100644 --- a/lang/wonka/buildlink3.mk +++ b/lang/wonka/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 18:04:29 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2004/06/05 16:35:51 xtraeme Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WONKA_BUILDLINK3_MK:= ${WONKA_BUILDLINK3_MK}+ @@ -13,14 +13,10 @@ BUILDLINK_PACKAGES+= wonka .if !empty(WONKA_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.wonka+= wonka-[0-9]* BUILDLINK_PKGSRCDIR.wonka?= ../../lang/wonka -EVAL_PREFIX+= BUILDLINK_JAVA_PREFIX.wonka=wonka -BUILDLINK_JAVA_PREFIX.wonka_DEFAULT= \ - ${BUILDLINK_PREFIX.wonka}/java/wonka - +BUILDLINK_JAVA_PREFIX.wonka= ${PREFIX}/java/wonka BUILDLINK_CPPFLAGS.wonka= \ -I${BUILDLINK_JAVA_PREFIX.wonka}/include \ -I${BUILDLINK_JAVA_PREFIX.wonka}/include/wonka - .endif # WONKA_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |