pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Rework the way the kaffe packages work:
details: https://anonhg.NetBSD.org/pkgsrc/rev/108694783225
branches: trunk
changeset: 477527:108694783225
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Sun Jul 04 15:24:46 2004 +0000
description:
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.
diffstat:
lang/Makefile | 5 +++--
lang/kaffe-esound/DESCR | 5 +++++
lang/kaffe-esound/Makefile | 21 +++++++++++++++++++++
lang/kaffe-esound/PLIST | 6 ++++++
lang/kaffe-nox11/Makefile | 14 --------------
lang/kaffe-x11/DESCR | 5 +++++
lang/kaffe-x11/Makefile | 24 ++++++++++++++++++++++++
lang/kaffe-x11/PLIST | 6 ++++++
lang/kaffe/Makefile | 26 ++++++++++++++++++--------
lang/kaffe/Makefile.common | 37 ++++++-------------------------------
lang/kaffe/PLIST | 10 +---------
lang/kaffe/buildlink3.mk | 4 ++--
12 files changed, 97 insertions(+), 66 deletions(-)
diffs (284 lines):
diff -r 6e10029325c4 -r 108694783225 lang/Makefile
--- a/lang/Makefile Sun Jul 04 14:27:20 2004 +0000
+++ b/lang/Makefile Sun Jul 04 15:24:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.182 2004/06/30 17:41:54 salo Exp $
+# $NetBSD: Makefile,v 1.183 2004/07/04 15:24:46 jmmv Exp $
#
COMMENT= Programming languages
@@ -73,7 +73,8 @@
SUBDIR+= jini
SUBDIR+= joos
SUBDIR+= kaffe
-SUBDIR+= kaffe-nox11
+SUBDIR+= kaffe-esound
+SUBDIR+= kaffe-x11
SUBDIR+= kali
SUBDIR+= ksi
SUBDIR+= libperl
diff -r 6e10029325c4 -r 108694783225 lang/kaffe-esound/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe-esound/DESCR Sun Jul 04 15:24:46 2004 +0000
@@ -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 sound support through the
+Enlightened Sound Daemon (esd, for short).
diff -r 6e10029325c4 -r 108694783225 lang/kaffe-esound/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe-esound/Makefile Sun Jul 04 15:24:46 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2004/07/04 15:24:46 jmmv Exp $
+#
+
+.include "../../lang/kaffe/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/kaffe/kaffe-esound/}
+
+COMMENT+= (sound support through esound)
+
+CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-esd/--with-esd/}
+
+BUILD_DIRS= ${WRKSRC}/config
+BUILD_DIRS+= ${WRKSRC}/include
+BUILD_DIRS+= ${WRKSRC}/libraries/extensions/sound/esd
+INSTALL_DIRS= ${WRKSRC}/libraries/extensions/sound/esd
+
+PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
+
+.include "../../audio/esound/buildlink3.mk"
+.include "../../lang/kaffe/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 6e10029325c4 -r 108694783225 lang/kaffe-esound/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe-esound/PLIST Sun Jul 04 15:24:46 2004 +0000
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2004/07/04 15:24:46 jmmv Exp $
+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
+@comment in kaffe: @dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
diff -r 6e10029325c4 -r 108694783225 lang/kaffe-nox11/Makefile
--- a/lang/kaffe-nox11/Makefile Sun Jul 04 14:27:20 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2004/05/22 21:46:56 jmmv Exp $
-#
-
-PKGNAME= kaffe-nox11-1.1.4
-PKGREVISION= 1
-COMMENT= Virtual machine capable of running Java(tm) code (without X)
-
-CONFIGURE_ARGS+= --without-x
-
-CONFLICTS= kaffe-[0-9]*
-PLIST_SUBST+= WITH_X11='@comment '
-
-.include "../kaffe/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff -r 6e10029325c4 -r 108694783225 lang/kaffe-x11/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe-x11/DESCR Sun Jul 04 15:24:46 2004 +0000
@@ -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 -r 6e10029325c4 -r 108694783225 lang/kaffe-x11/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe-x11/Makefile Sun Jul 04 15:24:46 2004 +0000
@@ -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 -r 6e10029325c4 -r 108694783225 lang/kaffe-x11/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/kaffe-x11/PLIST Sun Jul 04 15:24:46 2004 +0000
@@ -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}
diff -r 6e10029325c4 -r 108694783225 lang/kaffe/Makefile
--- a/lang/kaffe/Makefile Sun Jul 04 14:27:20 2004 +0000
+++ b/lang/kaffe/Makefile Sun Jul 04 15:24:46 2004 +0000
@@ -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"
+
+PKGREVISION= 2
-USE_X11= yes
+CONFLICTS+= kaffe-nox11-[0-9]*
+
+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
-CONFLICTS= kaffe-nox11-[0-9]*
-PLIST_SUBST+= WITH_X11=
+.include "../../mk/bsd.prefs.mk"
+
+PRINT_PLIST_AWK+= /^java\/kaffe\/jre\/lib\/security\/java.security$$/ \
+ { next; }
-.include "Makefile.common"
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
+
+.include "../../mk/java-env.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6e10029325c4 -r 108694783225 lang/kaffe/Makefile.common
--- a/lang/kaffe/Makefile.common Sun Jul 04 14:27:20 2004 +0000
+++ b/lang/kaffe/Makefile.common Sun Jul 04 15:24:46 2004 +0000
@@ -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@localhost
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 @@
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_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 -r 6e10029325c4 -r 108694783225 lang/kaffe/PLIST
--- a/lang/kaffe/PLIST Sun Jul 04 14:27:20 2004 +0000
+++ b/lang/kaffe/PLIST Sun Jul 04 15:24:46 2004 +0000
@@ -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/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.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 -r 6e10029325c4 -r 108694783225 lang/kaffe/buildlink3.mk
--- a/lang/kaffe/buildlink3.mk Sun Jul 04 14:27:20 2004 +0000
+++ b/lang/kaffe/buildlink3.mk Sun Jul 04 15:24:46 2004 +0000
@@ -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+= 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
Home |
Main Index |
Thread Index |
Old Index