Module Name:	pkgsrc
Committed By:	jmmv
Date:		Sun Jan 30 23:18:39 UTC 2005

Modified Files:
	pkgsrc/archivers/fastjar: Makefile
	pkgsrc/doc: CHANGES
	pkgsrc/lang: Makefile
	pkgsrc/lang/jdk: Makefile
	pkgsrc/lang/jikes: Makefile
	pkgsrc/lang/kaffe: Makefile
	pkgsrc/lang/sablevm: Makefile
	pkgsrc/lang/sun-jdk13: Makefile
	pkgsrc/lang/sun-jdk14: Makefile
	pkgsrc/lang/sun-jdk15: Makefile
	pkgsrc/lang/sun-jre13: Makefile
	pkgsrc/lang/sun-jre14: Makefile
	pkgsrc/lang/sun-jre15: Makefile
	pkgsrc/lang/win32-jdk: Makefile
	pkgsrc/mk: java-env.mk
Added Files:
	pkgsrc/archivers/fastjar: ALTERNATIVES
	pkgsrc/lang/jikes: ALTERNATIVES
Removed Files:
	pkgsrc/lang/java-wrapper: DESCR Makefile PLIST
	pkgsrc/lang/java-wrapper/files: java-wrapper.1 java-wrapper.conf
	    java-wrapper.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r0 -r1.1 pkgsrc/archivers/fastjar/ALTERNATIVES
cvs rdiff -r1.11 -r1.12 pkgsrc/archivers/fastjar/Makefile
cvs rdiff -r1.8980 -r1.8981 pkgsrc/doc/CHANGES
cvs rdiff -r1.207 -r1.208 pkgsrc/lang/Makefile
cvs rdiff -r1.1.1.1 -r0 pkgsrc/lang/java-wrapper/DESCR
cvs rdiff -r1.3 -r0 pkgsrc/lang/java-wrapper/Makefile \
    pkgsrc/lang/java-wrapper/PLIST
cvs rdiff -r1.1.1.1 -r0 pkgsrc/lang/java-wrapper/files/java-wrapper.1
cvs rdiff -r1.3 -r0 pkgsrc/lang/java-wrapper/files/java-wrapper.conf
cvs rdiff -r1.2 -r0 pkgsrc/lang/java-wrapper/files/java-wrapper.sh
cvs rdiff -r1.41 -r1.42 pkgsrc/lang/jdk/Makefile
cvs rdiff -r0 -r1.1 pkgsrc/lang/jikes/ALTERNATIVES
cvs rdiff -r1.29 -r1.30 pkgsrc/lang/jikes/Makefile
cvs rdiff -r1.57 -r1.58 pkgsrc/lang/kaffe/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/lang/sablevm/Makefile
cvs rdiff -r1.33 -r1.34 pkgsrc/lang/sun-jdk13/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/lang/sun-jdk14/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/lang/sun-jdk15/Makefile
cvs rdiff -r1.38 -r1.39 pkgsrc/lang/sun-jre13/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/lang/sun-jre14/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/lang/sun-jre15/Makefile
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/lang/win32-jdk/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/java-env.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.