[pkgsrc/trunk]: pkgsrc/lang Simplify BUILDLINK_JAVA_PREFIX.<jvm>.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4a5a9460f13
branches:  trunk
changeset: 476232:b4a5a9460f13
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jun 05 16:33:52 2004 +0000

description:
Simplify BUILDLINK_JAVA_PREFIX.<jvm>.

diffstat:

 lang/kaffe/buildlink3.mk     |   8 ++------
 lang/sun-jre13/buildlink3.mk |  14 ++++++--------
 lang/sun-jre14/buildlink3.mk |  14 ++++++--------
 lang/wonka/buildlink3.mk     |   8 ++------
 4 files changed, 16 insertions(+), 28 deletions(-)

diffs (103 lines):

diff -r 49d17d69b7a2 -r b4a5a9460f13 lang/kaffe/buildlink3.mk
--- a/lang/kaffe/buildlink3.mk  Sat Jun 05 16:32:02 2004 +0000
+++ b/lang/kaffe/buildlink3.mk  Sat Jun 05 16:33:52 2004 +0000
@@ -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 @@
 .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 -r 49d17d69b7a2 -r b4a5a9460f13 lang/sun-jre13/buildlink3.mk
--- a/lang/sun-jre13/buildlink3.mk      Sat Jun 05 16:32:02 2004 +0000
+++ b/lang/sun-jre13/buildlink3.mk      Sat Jun 05 16:33:52 2004 +0000
@@ -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+=   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 -r 49d17d69b7a2 -r b4a5a9460f13 lang/sun-jre14/buildlink3.mk
--- a/lang/sun-jre14/buildlink3.mk      Sat Jun 05 16:32:02 2004 +0000
+++ b/lang/sun-jre14/buildlink3.mk      Sat Jun 05 16:33:52 2004 +0000
@@ -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+=   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 -r 49d17d69b7a2 -r b4a5a9460f13 lang/wonka/buildlink3.mk
--- a/lang/wonka/buildlink3.mk  Sat Jun 05 16:32:02 2004 +0000
+++ b/lang/wonka/buildlink3.mk  Sat Jun 05 16:33:52 2004 +0000
@@ -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 @@
 .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/+$//}