Rework the way the kaffe packages work:

- Make kaffe the main package, on which others can depend, and which has no
  support for things like sound nor graphics.  Bump its revision to 2.
  While here, do some cleanup too.
- Add a kaffe-x11 package, that installs on top of kaffe, and which provides
  the library needed for AWT support through X11.
- Add a kaffe-esound package, that installs on top of kaffe, and which provides
  the library needed for sound support through esound (i.e., no more need for
  the USE_ESOUND variable here).
- Remove the kaffe-nox11 package.

1 files changed, 18 insertions, 8 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 497757aef7a..fcd10885e89 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,14 +1,24 @@
-# $NetBSD: Makefile,v 1.53 2004/05/22 21:46:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2004/07/04 15:24:46 jmmv Exp $
 #
 
-PKGNAME=	kaffe-${KAFFE_VERSION}
-PKGREVISION=	1
-COMMENT=	Virtual machine capable of running Java(tm) code
+.include "Makefile.common"
 
-USE_X11=	yes
+PKGREVISION=		2
 
-CONFLICTS=	kaffe-nox11-[0-9]*
-PLIST_SUBST+=	WITH_X11=
+CONFLICTS+=		kaffe-nox11-[0-9]*
 
-.include "Makefile.common"
+JAVA_WRAPPERS=		appletviewer jar java javac javadoc javah javap
+
+SUPPORT_FILES=		${JAVA_HOME}/jre/lib/security/java.security.default \
+			${JAVA_HOME}/jre/lib/security/java.security
+
+.include "../../mk/bsd.prefs.mk"
+
+PRINT_PLIST_AWK+=	/^java\/kaffe\/jre\/lib\/security\/java.security$$/ \
+				{ next; }
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
+
+.include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"