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.

3 files changed, 35 insertions, 0 deletions

diff --git a/lang/kaffe-x11/DESCR b/lang/kaffe-x11/DESCR
new file mode 100644
index 00000000000..27b064c8955
--- /dev/null
+++ b/lang/kaffe-x11/DESCR
@@ -0,0 +1,5 @@
+Kaffe is a clean room implementation of Java virtual machine plus associated
+class libraries needed to provide a Java runtime environment.
+
+This package provides a plugin which enables AWT support through the
+standard X11 libraries.
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
new file mode 100644
index 00000000000..1cb8ea6a834
--- /dev/null
+++ b/lang/kaffe-x11/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2004/07/04 15:24:46 jmmv Exp $
+#
+
+.include "../../lang/kaffe/Makefile.common"
+
+PKGNAME=		${DISTNAME:S/kaffe/kaffe-x11/}
+
+COMMENT+=		(AWT support through X11)
+
+USE_X11=		YES
+
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--without-awt/--with-awt=X/}
+
+BUILD_DIRS=		${WRKSRC}/config
+BUILD_DIRS+=		${WRKSRC}/libraries/clib/awt
+INSTALL_DIRS=		${WRKSRC}/libraries/clib/awt
+
+PRINT_PLIST_AWK+=	/^@dirrm/ { print "@comment in kaffe: " $$0; next; }
+
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/kaffe/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe-x11/PLIST b/lang/kaffe-x11/PLIST
new file mode 100644
index 00000000000..eb61a38bfe7
--- /dev/null
+++ b/lang/kaffe-x11/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2004/07/04 15:24:46 jmmv Exp $
+java/kaffe/jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
+java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.a
+java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.so
+@comment in kaffe: @dirrm java/kaffe/jre/lib/${MACHINE_ARCH}