Convert the Java related packages to use the alternatives system. To do

this, we only need some simple logic in java-env.mk to automatically
generate an ALTERNATIVES file for us.

There are two exceptions, though: fastjar and jikes (pointed out by tv@),
which do not use this file; they have to be handled manually.

Bump PKGREVISION for all affected packages.

While doing this, remove the java-wrapper package, obsoleted by the new
functionality provided by pkg_alternatives.

archivers/fastjar/ALTERNATIVES

@@ -0,0 +1 @@
+bin/jar @PREFIX@/bin/fastjar

archivers/fastjar/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/01/30 23:18:38 jmmv Exp $
 #
 
 DISTNAME=	fastjar-0.93
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fastjar/}
 EXTRACT_SUFX=	.tgz

doc/CHANGES

@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8980 2005/01/30 21:57:44 wiz Exp $
+$NetBSD: CHANGES,v 1.8981 2005/01/30 23:18:37 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -670,3 +670,16 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated python24 to 2.4nb3 [jmmv 2005-01-30]
 	Removed python [jmmv 2005-01-30]
 	Updated mixminion to 0.0.7.1nb1 [wiz 2005-01-30]
+	Updated fastjar to 0.93nb2 [jmmv 2005-01-30]
+	Updated jdk to 1.1.8nb8 [jmmv 2005-01-30]
+	Updated jikes to 1.22nb2 [jmmv 2005-01-30]
+	Updated kaffe to 1.1.4nb6 [jmmv 2005-01-30]
+	Updated sablevm to 1.1.3nb5 [jmmv 2005-01-30]
+	Updated sun-jdk13 to 1.0.15nb1 [jmmv 2005-01-30]
+	Updated sun-jdk14 to 2.7nb1 [jmmv 2005-01-30]
+	Updated sun-jdk15 to 5.0.1nb1 [jmmv 2005-01-30]
+	Updated sun-jre13 to 1.0.15nb1 [jmmv 2005-01-30]
+	Updated sun-jre14 to 2.7nb1 [jmmv 2005-01-30]
+	Updated sun-jre15 to 5.0.1nb2 [jmmv 2005-01-30]
+	Updated win32-jdk to 0.1nb1 [jmmv 2005-01-30]
+	Removed java-wrapper [jmmv 2005-01-30]

lang/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2005/01/23 22:58:08 recht Exp $
+# $NetBSD: Makefile,v 1.208 2005/01/30 23:18:37 jmmv Exp $
 #
 
 COMMENT=	Programming languages
@@ -67,7 +67,6 @@ SUBDIR+=	japhar
 SUBDIR+=	jasmin
 SUBDIR+=	java-lang-spec
 SUBDIR+=	java-vm-spec
-SUBDIR+=	java-wrapper
 SUBDIR+=	jbuilder-jit
 SUBDIR+=	jdk
 SUBDIR+=	jdk-openjit

lang/jdk/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2004/10/11 14:07:37 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/01/30 23:18:38 jmmv Exp $
 #
 
 VERSION=	1.1.8
 PKGNAME=	jdk-${VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ \
 		ftp://ftp.de.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/

lang/jikes/ALTERNATIVES

@@ -0,0 +1 @@
+bin/javac @PREFIX@/bin/jikes

lang/jikes/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/11/13 22:04:53 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/01/30 23:18:38 jmmv Exp $
 #
 
 DISTNAME=	jikes-1.22
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang java
 MASTER_SITES=	http://oss.software.ibm.com/pub/${DISTNAME:S,-,/,}/
 EXTRACT_SUFX=	.tar.bz2

lang/kaffe/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2004/10/17 15:34:56 tv Exp $
+# $NetBSD: Makefile,v 1.58 2005/01/30 23:18:38 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		5
+PKGREVISION=		6
 
 CONFLICTS+=		kaffe-nox11-[0-9]*