kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace sun15 with sun6 to match reality.

Browse source
This commit is contained in:
rh 2007-05-25 02:04:15 +00:00
parent a9f99cffe4
commit 6d8e22770e
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lang/sun-jdk6/buildlink3.mk
View file

@ -1,31 +1,31 @@
# $NetBSD: buildlink3.mk,v 1.1 2007/02/18 19:11:27 tv Exp $ # $NetBSD: buildlink3.mk,v 1.2 2007/05/25 02:04:15 rh Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JDK15_BUILDLINK3_MK:= ${SUN_JDK15_BUILDLINK3_MK}+ SUN_JDK6_BUILDLINK3_MK:= ${SUN_JDK6_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+) .if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= sun-jdk15 BUILDLINK_DEPENDS+= sun-jdk6
.endif .endif
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk15} BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk6}
BUILDLINK_PACKAGES+= sun-jdk15 BUILDLINK_PACKAGES+= sun-jdk6
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk15 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk6
.if !empty(SUN_JDK15_BUILDLINK3_MK:M+) .if !empty(SUN_JDK6_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.sun-jdk15+= sun-jdk15-[0-9]* BUILDLINK_API_DEPENDS.sun-jdk6+= sun-jdk6-[0-9]*
BUILDLINK_ABI_DEPENDS.sun-jdk15?= sun-jdk15>=5.0.6nb1 BUILDLINK_ABI_DEPENDS.sun-jdk6?= sun-jdk6>=6.0.1
BUILDLINK_PKGSRCDIR.sun-jdk15?= ../../lang/sun-jdk15 BUILDLINK_PKGSRCDIR.sun-jdk6?= ../../lang/sun-jdk6
BUILDLINK_DEPMETHOD.sun-jdk15?= build BUILDLINK_DEPMETHOD.sun-jdk6?= build
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre15} BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre6}
BUILDLINK_CPPFLAGS.sun-jdk15= \ BUILDLINK_CPPFLAGS.sun-jdk6= \
-I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include \ -I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include \
-I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include/linux -I${BUILDLINK_JAVA_PREFIX.sun-jre6}/include/linux
.include "../../lang/sun-jre15/buildlink3.mk" .include "../../lang/sun-jre6/buildlink3.mk"
.endif # SUN_JDK15_BUILDLINK3_MK .endif # SUN_JDK6_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}

24
lang/sun-jre6/buildlink3.mk
View file

@ -1,23 +1,23 @@
# $NetBSD: buildlink3.mk,v 1.1 2007/02/18 19:11:28 tv Exp $ # $NetBSD: buildlink3.mk,v 1.2 2007/05/25 02:04:15 rh Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SUN_JRE15_BUILDLINK3_MK:= ${SUN_JRE15_BUILDLINK3_MK}+ SUN_JRE6_BUILDLINK3_MK:= ${SUN_JRE6_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+) .if !empty(BUILDLINK_DEPTH:M+)
BUILDLINK_DEPENDS+= sun-jre15 BUILDLINK_DEPENDS+= sun-jre6
.endif .endif
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre15} BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jre6}
BUILDLINK_PACKAGES+= sun-jre15 BUILDLINK_PACKAGES+= sun-jre6
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre15 BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jre6
.if !empty(SUN_JRE15_BUILDLINK3_MK:M+) .if !empty(SUN_JRE6_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.sun-jre15+= sun-jre15-[0-9]* BUILDLINK_API_DEPENDS.sun-jre6+= sun-jre6-[0-9]*
BUILDLINK_ABI_DEPENDS.sun-jre15?= sun-jre15>=5.0.6nb2 BUILDLINK_ABI_DEPENDS.sun-jre6?= sun-jre6>=6.0.1
BUILDLINK_PKGSRCDIR.sun-jre15?= ../../lang/sun-jre15 BUILDLINK_PKGSRCDIR.sun-jre6?= ../../lang/sun-jre6
BUILDLINK_JAVA_PREFIX.sun-jre15= ${PREFIX}/java/sun-1.5 BUILDLINK_JAVA_PREFIX.sun-jre6= ${PREFIX}/java/sun-6
UNLIMIT_RESOURCES+= datasize # Must be at least 131204 UNLIMIT_RESOURCES+= datasize # Must be at least 131204
.endif # SUN_JRE15_BUILDLINK3_MK .endif # SUN_JRE6_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}