diff options
| author | reed <reed@pkgsrc.org> | 2006-04-06 06:21:32 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2006-04-06 06:21:32 +0000 |
| commit | 5abef9be142e900cceace758044a1b2ee493daf3 (patch) | |
| tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /mk/java-vm.mk | |
| parent | d4d013cda2a033b026f37936932a1fbee6613fbc (diff) | |
| download | pkgsrc-5abef9be142e900cceace758044a1b2ee493daf3.tar.gz | |
Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
Diffstat (limited to 'mk/java-vm.mk')
| -rw-r--r-- | mk/java-vm.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mk/java-vm.mk b/mk/java-vm.mk index d61d9a274cc..a27190a987f 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.44 2005/12/12 14:43:26 joerg Exp $ +# $NetBSD: java-vm.mk,v 1.45 2006/04/06 06:23:06 reed Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -199,18 +199,18 @@ PKG_SKIP_REASON= "no acceptable JVM found" _PKG_JVM= "none" .endif -BUILDLINK_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]* -BUILDLINK_DEPENDS.blackdown-jre13?= blackdown-jre13-[0-9]* -BUILDLINK_DEPENDS.jdk?= jdk-[0-9]* -BUILDLINK_DEPENDS.jdk14?= jdk14-[0-9]* -BUILDLINK_DEPENDS.kaffe?= kaffe>=1.1.4 -BUILDLINK_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]* -BUILDLINK_DEPENDS.sun-jre13?= sun-jre13-[0-9]* -BUILDLINK_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]* -BUILDLINK_DEPENDS.sun-jre14?= sun-jre14-[0-9]* -BUILDLINK_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]* -BUILDLINK_DEPENDS.sun-jre15?= sun-jre15-[0-9]* -#BUILDLINK_DEPENDS.win32-jdk?= win32-jdk>=0.1 +BUILDLINK_API_DEPENDS.blackdown-jdk13?= blackdown-jdk13-[0-9]* +BUILDLINK_API_DEPENDS.blackdown-jre13?= blackdown-jre13-[0-9]* +BUILDLINK_API_DEPENDS.jdk?= jdk-[0-9]* +BUILDLINK_API_DEPENDS.jdk14?= jdk14-[0-9]* +BUILDLINK_API_DEPENDS.kaffe?= kaffe>=1.1.4 +BUILDLINK_API_DEPENDS.sun-jdk13?= sun-jdk13-[0-9]* +BUILDLINK_API_DEPENDS.sun-jre13?= sun-jre13-[0-9]* +BUILDLINK_API_DEPENDS.sun-jdk14?= sun-jdk14-[0-9]* +BUILDLINK_API_DEPENDS.sun-jre14?= sun-jre14-[0-9]* +BUILDLINK_API_DEPENDS.sun-jdk15?= sun-jdk15-[0-9]* +BUILDLINK_API_DEPENDS.sun-jre15?= sun-jre15-[0-9]* +#BUILDLINK_API_DEPENDS.win32-jdk?= win32-jdk>=0.1 _JRE.blackdown-jdk13= blackdown-jre13 _JRE.jdk= jdk |