* Use buildlink2.

* Build the kaffe package with PREFIX=${LOCALBASE}/java/kaffe and adjust
  the PLIST accordingly.  This is to make the Java VM packages consistently
  return JAVA_HOME from `pkg_info -qp <jvm-pkg>'.
* License file was wrongly being installed as ${PREFIX}/share.
* Separate out last half of DESCR into a more appropriate MESSAGE file.

4 files changed, 111 insertions, 113 deletions

diff --git a/lang/kaffe/DESCR b/lang/kaffe/DESCR
index 55a63a4a0b8..795c8533cbc 100644
--- a/lang/kaffe/DESCR
+++ b/lang/kaffe/DESCR
@@ -2,21 +2,3 @@ This is the first release of "Kaffe OpenVM", a complete virtual machine
 and class library set which allows the execution of Java code without any
 code from Javasoft.  It comes with a virtual machine and a set of class
 libraries including beans, and the all important AWT graphics system.
-
-Running Kaffe
-=============
-Before running Kaffe it is necessary to configure the environment.
-This requires the setting of PATH and LD_LIBRARY_PATH.
-For the standard installation these would be defined as follows:
-
-	PATH=$PATH:/${PREFIX}/kaffe/bin
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PREFIX}/kaffe/lib
-
-Note that you don't have to setup the CLASSPATH - if you do then that's
-fine, but if you don't Kaffe will cosntruct a classpath from the Jar and Zip
-files it finds in the standard places (the default would be to include all
-files in ${PREFIX}/kaffe/share/kaffe).
-
-The value ${PREFIX} above is whatever LOCALBASE is set to in the
-environment, or in /etc/mk.conf, when the package was installed on
-NetBSD.  By default this is /usr/pkg.
diff --git a/lang/kaffe/MESSAGE b/lang/kaffe/MESSAGE
new file mode 100644
index 00000000000..ec45667332b
--- /dev/null
+++ b/lang/kaffe/MESSAGE
@@ -0,0 +1,16 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/10/13 07:33:27 jlam Exp $
+
+Before running Kaffe it is necessary to configure the environment.
+This requires the setting of PATH and LD_LIBRARY_PATH.
+For the standard installation these would be defined as follows:
+
+	PATH=$PATH:/${PREFIX}/java/kaffe/bin
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PREFIX}/java/kaffe/lib
+
+Note that you don't have to setup the CLASSPATH - if you do then that's
+fine, but if you don't Kaffe will construct a classpath from the Jar and Zip
+files it finds in the standard places (the default would be to include all
+files in ${PREFIX}/java/kaffe/share/kaffe).
+
+===========================================================================
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index a1dfb107a4d..fc66f5d2438 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/09/08 09:03:37 zuntum Exp $
+# $NetBSD: Makefile,v 1.41 2002/10/13 07:33:28 jlam Exp $
 #
 
 DISTNAME=		kaffe-1.0.7
@@ -17,11 +17,11 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 ONLY_FOR_PLATFORM=	*-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc *-*-powerpc
 
 GNU_CONFIGURE=		yes
-GNU_CONFIGURE_PREFIX=	${PREFIX}/java/kaffe
-CONFIGURE_ARGS+=	--with-includes=""
-CONFIGURE_ARGS+=	--with-libraries=""
 CPPFLAGS+=		-Dunix
 
+JVM_HOME=		${LOCALBASE}/java/kaffe
+NO_MTREE=		# defined, since we change PREFIX below
+
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
@@ -32,10 +32,8 @@ CPPFLAGS+=		-Dunix
 CONFIGURE_ENV+=		VM_LIBS="-lc"
 .endif
 
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/license.terms \
-		${PREFIX}/java/kaffe/share
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
 
 test:
 	@cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} check
@@ -47,3 +45,5 @@ test:
 .include "../../graphics/png/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
+
+PREFIX=		${JVM_HOME}
diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST
index dcb3c377e34..f359c30dbbf 100644
--- a/lang/kaffe/PLIST
+++ b/lang/kaffe/PLIST
@@ -1,88 +1,88 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/01 13:02:42 wiz Exp $
-java/kaffe/include/jni.h
-java/kaffe/include/kaffe/java_lang_Object.h
-java/kaffe/include/kaffe/java_lang_String.h
-java/kaffe/include/kaffe/java_lang_Thread.h
-java/kaffe/include/kaffe/java_lang_ThreadGroup.h
-java/kaffe/include/kaffe/java_lang_Throwable.h
-java/kaffe/include/kaffe/Arrays.h
-java/kaffe/include/kaffe/errors.h
-java/kaffe/include/kaffe/jmalloc.h
-java/kaffe/include/kaffe/jni_cpp.h
-java/kaffe/include/kaffe/jsyscall.h
-java/kaffe/include/kaffe/jtypes.h
-java/kaffe/include/kaffe/native.h
-java/kaffe/lib/kjc.jar
-java/kaffe/lib/tools.jar
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnative-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnative.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnative.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libio-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libio.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnet-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnet.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libnet.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libzip-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmath-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libawt-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmicrosoft-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmicrosoft.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libmicrosoft.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm-1.0.7.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la
-java/kaffe/jre/lib/security/java.security
-java/kaffe/jre/lib/rt.jar
-java/kaffe/jre/lib/comm.jar
-java/kaffe/jre/lib/pjava.jar
-java/kaffe/jre/lib/servlet.jar
-java/kaffe/jre/lib/microsoft.jar
-java/kaffe/jre/lib/rmi.jar
-java/kaffe/jre/bin/kaffe-bin
-java/kaffe/jre/bin/java
-java/kaffe/jre/bin/kaffe
-java/kaffe/jre/bin/rmiregistry
-java/kaffe/bin/kaffeh
-java/kaffe/bin/appletviewer
-java/kaffe/bin/javac
-java/kaffe/bin/javadoc
-java/kaffe/bin/java
-java/kaffe/bin/kjc
-java/kaffe/bin/kopi
-java/kaffe/bin/jar
-java/kaffe/bin/javakey
-java/kaffe/bin/javap
-java/kaffe/bin/jdb
-java/kaffe/bin/native2ascii
-java/kaffe/bin/rmic
-java/kaffe/bin/serialver
-java/kaffe/bin/install-jar
-java/kaffe/bin/kaffe
-java/kaffe/bin/rmiregistry
-java/kaffe/man/man1/kaffe.1
-java/kaffe/share
-@dirrm java/kaffe/bin
-@dirrm java/kaffe/man/man1
-@dirrm java/kaffe/man
-@dirrm java/kaffe/jre/lib/security
-@dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
-@dirrm java/kaffe/jre/lib
-@dirrm java/kaffe/jre/bin
-@dirrm java/kaffe/jre
-@dirrm java/kaffe/lib
-@dirrm java/kaffe/include/kaffe
-@dirrm java/kaffe/include
-@dirrm java/kaffe
+@comment $NetBSD: PLIST,v 1.4 2002/10/13 07:33:28 jlam Exp $
+bin/appletviewer
+bin/install-jar
+bin/jar
+bin/java
+bin/javac
+bin/javadoc
+bin/javakey
+bin/javap
+bin/jdb
+bin/kaffe
+bin/kaffeh
+bin/kjc
+bin/kopi
+bin/native2ascii
+bin/rmic
+bin/rmiregistry
+bin/serialver
+include/jni.h
+include/kaffe/Arrays.h
+include/kaffe/errors.h
+include/kaffe/java_lang_Object.h
+include/kaffe/java_lang_String.h
+include/kaffe/java_lang_Thread.h
+include/kaffe/java_lang_ThreadGroup.h
+include/kaffe/java_lang_Throwable.h
+include/kaffe/jmalloc.h
+include/kaffe/jni_cpp.h
+include/kaffe/jsyscall.h
+include/kaffe/jtypes.h
+include/kaffe/native.h
+jre/bin/java
+jre/bin/kaffe
+jre/bin/kaffe-bin
+jre/bin/rmiregistry
+jre/lib/${MACHINE_ARCH}/libawt-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libawt.la
+jre/lib/${MACHINE_ARCH}/libawt.so
+jre/lib/${MACHINE_ARCH}/libio-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libio.la
+jre/lib/${MACHINE_ARCH}/libio.so
+jre/lib/${MACHINE_ARCH}/libkaffevm-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libkaffevm.la
+jre/lib/${MACHINE_ARCH}/libkaffevm.so
+jre/lib/${MACHINE_ARCH}/libmanagement-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libmanagement.la
+jre/lib/${MACHINE_ARCH}/libmanagement.so
+jre/lib/${MACHINE_ARCH}/libmath-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libmath.la
+jre/lib/${MACHINE_ARCH}/libmath.so
+jre/lib/${MACHINE_ARCH}/libmicrosoft-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libmicrosoft.la
+jre/lib/${MACHINE_ARCH}/libmicrosoft.so
+jre/lib/${MACHINE_ARCH}/libnative-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libnative.la
+jre/lib/${MACHINE_ARCH}/libnative.so
+jre/lib/${MACHINE_ARCH}/libnet-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libnet.la
+jre/lib/${MACHINE_ARCH}/libnet.so
+jre/lib/${MACHINE_ARCH}/libsecurity-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libsecurity.la
+jre/lib/${MACHINE_ARCH}/libsecurity.so
+jre/lib/${MACHINE_ARCH}/libzip-1.0.7.so
+jre/lib/${MACHINE_ARCH}/libzip.la
+jre/lib/${MACHINE_ARCH}/libzip.so
+jre/lib/comm.jar
+jre/lib/microsoft.jar
+jre/lib/pjava.jar
+jre/lib/rmi.jar
+jre/lib/rt.jar
+jre/lib/security/java.security
+jre/lib/servlet.jar
+lib/kjc.jar
+lib/tools.jar
+license.terms
+man/man1/kaffe.1
+@dirrm man/man1
+@dirrm man
+@dirrm lib
+@dirrm jre/lib/security
+@dirrm jre/lib/${MACHINE_ARCH}
+@dirrm jre/lib
+@dirrm jre/bin
+@dirrm jre
+@dirrm include/kaffe
+@dirrm include
+@dirrm bin
+@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}