diff options
| author | jmmv <jmmv> | 2005-01-30 23:18:37 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-01-30 23:18:37 +0000 |
| commit | 882ada6d78650c06e86fffa06dcf4be8ffb9a1f1 (patch) | |
| tree | 17d159d3154d2d594360395d2ea5d260221a8b24 /mk | |
| parent | 18e817d2cbf32455d3f72bb229a2fcce19b35938 (diff) | |
| download | pkgsrc-882ada6d78650c06e86fffa06dcf4be8ffb9a1f1.tar.gz | |
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.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/java-env.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mk/java-env.mk b/mk/java-env.mk index 144acc765ce..04d136df200 100644 --- a/mk/java-env.mk +++ b/mk/java-env.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-env.mk,v 1.3 2004/05/23 10:29:43 jmmv Exp $ +# $NetBSD: java-env.mk,v 1.4 2005/01/30 23:18:38 jmmv Exp $ # # This Makefile fragment handles Java wrappers and is meant to be included # by packages that provide a Java build-time and/or run-time environment. @@ -39,6 +39,13 @@ JAVA_WRAPPERS?= # empty INSTALLATION_DIRS+= bin .endif +ALTERNATIVES_SRC= ${WRKDIR}/.ALTERNATIVES +${WRKDIR}/.ALTERNATIVES: +.for w in ${JAVA_WRAPPERS} + @${ECHO} 'bin/${w} ${PREFIX}/bin/${JAVA_NAME}-${w}' \ + >>${WRKDIR}/.ALTERNATIVES +.endfor + .for w in ${JAVA_WRAPPERS} JAVA_WRAPPER_BIN.${w}?= ${JAVA_HOME}/bin/${w} |