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.

4 files changed, 27 insertions, 50 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"
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index 99dfaed9ed8..296726ff37c 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile.common,v 1.2 2004/05/22 21:46:57 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/07/04 15:24:46 jmmv Exp $
 
-DISTNAME=		kaffe-${KAFFE_VERSION}
+DISTNAME=		kaffe-1.1.4
 CATEGORIES=		lang java
 MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.kaffe.org/
+COMMENT=		Virtual machine capable of running Java(tm) code
 
 GNU_CONFIGURE_PREFIX=	${JAVA_HOME}
 JAVA_HOME=		${PREFIX}/java/kaffe
 JAVA_NAME=		kaffe
-JAVA_WRAPPERS=		appletviewer jar java javac javadoc javah javap
 NO_MTREE=		yes
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
@@ -26,26 +26,12 @@ GNU_CONFIGURE=		yes
 CPPFLAGS+=		-Dunix
 PATCHDIR=		${.CURDIR}/../../lang/kaffe/patches
 DISTINFO_FILE=		${.CURDIR}/../../lang/kaffe/distinfo
-DESCR_SRC=		${.CURDIR}/../../lang/kaffe/DESCR
-PLIST_SRC=		${.CURDIR}/../../lang/kaffe/PLIST
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=		USE_ESOUND
-
-.if !empty(USE_ESOUND:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--with-esd
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
-
-KAFFE_VERSION=		1.1.4
 
 BUILDLINK_PASSTHRU_DIRS+=	${JAVA_HOME}/jre/lib/${MACHINE_ARCH}
 
-SUPPORT_FILES=	${JAVA_HOME}/jre/lib/security/java.security.default \
-		${JAVA_HOME}/jre/lib/security/java.security
+CONFIGURE_ARGS+=	--without-alsa
+CONFIGURE_ARGS+=	--without-esd
+CONFIGURE_ARGS+=	--without-awt
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -62,17 +48,6 @@ CONFIGURE_ENV+=		VM_LIBS="-lc"
 CONFIGURE_ARGS+=	--with-engine=intrp
 .endif
 
-PRINT_PLIST_AWK+=	/^java\/kaffe\/jre\/lib\/security\/java.security$$/ \
-				{ next; }
-PRINT_PLIST_AWK+=	/libawt/ { print "$${WITH_X11}" $$0; next; }
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/java-env.mk"
diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST
index 60e5e4cc7fb..9f7661e0993 100644
--- a/lang/kaffe/PLIST
+++ b/lang/kaffe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/05/22 21:46:57 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/07/04 15:24:46 jmmv Exp $
 bin/kaffe-appletviewer
 bin/kaffe-jar
 bin/kaffe-java
@@ -40,10 +40,6 @@ java/kaffe/jre/bin/java
 java/kaffe/jre/bin/kaffe
 java/kaffe/jre/bin/kaffe-bin
 java/kaffe/jre/bin/rmiregistry
-${WITH_X11}java/kaffe/jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
-${WITH_X11}java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.a
-${WITH_X11}java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.la
-${WITH_X11}java/kaffe/jre/lib/${MACHINE_ARCH}/libawt.so
 java/kaffe/jre/lib/${MACHINE_ARCH}/libio-${PKGVERSION}.so
 java/kaffe/jre/lib/${MACHINE_ARCH}/libio.a
 java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la
@@ -76,10 +72,6 @@ java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity-${PKGVERSION}.so
 java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.a
 java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libtritonusesd-${PKGVERSION}.so
-java/kaffe/jre/lib/${MACHINE_ARCH}/libtritonusesd.a
-java/kaffe/jre/lib/${MACHINE_ARCH}/libtritonusesd.la
-java/kaffe/jre/lib/${MACHINE_ARCH}/libtritonusesd.so
 java/kaffe/jre/lib/${MACHINE_ARCH}/libzip-${PKGVERSION}.so
 java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.a
 java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index b4ce61689ee..45b025042b3 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/07/02 12:51:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/07/04 15:24:46 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkaffe}
 BUILDLINK_PACKAGES+=	kaffe
 
 .if !empty(KAFFE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kaffe+=	kaffe-[0-9]*
+BUILDLINK_DEPENDS.kaffe+=	kaffe>=1.1.4nb2
 BUILDLINK_PKGSRCDIR.kaffe?=	../../lang/kaffe
 BUILDLINK_JAVA_PREFIX.kaffe=	${PREFIX}/java/kaffe