Mon Dec 14 18:32:08 2009 UTC ()
Override LIBLTDL explicitly to unbreak build with libtool 2.2.
Fix PLIST. Bump revision.


(joerg)
diff -r1.72 -r1.73 pkgsrc/lang/kaffe/Makefile
diff -r1.19 -r1.20 pkgsrc/lang/kaffe/Makefile.common
diff -r1.16 -r1.17 pkgsrc/lang/kaffe/PLIST
cvs diff -r1.72 -r1.73 pkgsrc/lang/kaffe/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/Makefile 2009/07/10 19:58:12 1.72
+++ pkgsrc/lang/kaffe/Makefile 2009/12/14 18:32:07 1.73
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.72 2009/07/10 19:58:12 abs Exp $ 1# $NetBSD: Makefile,v 1.73 2009/12/14 18:32:07 joerg Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 3 6PKGREVISION= 4
7 7
8CONFLICTS+= kaffe-nox11-[0-9]* 8CONFLICTS+= kaffe-nox11-[0-9]*
9 9
10USE_PKGLOCALEDIR= yes 10USE_PKGLOCALEDIR= yes
11 11
12CONFIGURE_ARGS+= --disable-native-awt 12CONFIGURE_ARGS+= --disable-native-awt
13CONFIGURE_ARGS+= --disable-gtk-peer 13CONFIGURE_ARGS+= --disable-gtk-peer
14CONFIGURE_ARGS+= --without-x 14CONFIGURE_ARGS+= --without-x
15CONFIGURE_ARGS+= --without-esd 15CONFIGURE_ARGS+= --without-esd
16CONFIGURE_ARGS+= --disable-esdtest 16CONFIGURE_ARGS+= --disable-esdtest
17MAKE_ENV+= PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR} 17MAKE_ENV+= PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}
18 18
19JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \ 19JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javakey \
cvs diff -r1.19 -r1.20 pkgsrc/lang/kaffe/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/Makefile.common 2009/10/19 06:03:16 1.19
+++ pkgsrc/lang/kaffe/Makefile.common 2009/12/14 18:32:08 1.20
@@ -1,40 +1,42 @@ @@ -1,40 +1,42 @@
1# $NetBSD: Makefile.common,v 1.19 2009/10/19 06:03:16 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.20 2009/12/14 18:32:08 joerg Exp $
2 2
3DISTNAME= kaffe-1.1.7 3DISTNAME= kaffe-1.1.7
4CATEGORIES= lang java 4CATEGORIES= lang java
5MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ 5MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
6 6
7MAINTAINER= tonio@NetBSD.org 7MAINTAINER= tonio@NetBSD.org
8HOMEPAGE= http://www.kaffe.org/ 8HOMEPAGE= http://www.kaffe.org/
9COMMENT= Virtual machine capable of running Java(tm) code 9COMMENT= Virtual machine capable of running Java(tm) code
10 10
11DEPENDS+= jikes>=1.22:../../lang/jikes 11DEPENDS+= jikes>=1.22:../../lang/jikes
12DEPENDS+= fastjar>=0.93:../../archivers/fastjar 12DEPENDS+= fastjar>=0.93:../../archivers/fastjar
13 13
14EXTRACT_USING= gtar 14EXTRACT_USING= gtar
15GNU_CONFIGURE_PREFIX= ${JAVA_HOME} 15GNU_CONFIGURE_PREFIX= ${JAVA_HOME}
16GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} 16GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}
17JAVA_HOME= ${PREFIX}/java/kaffe 17JAVA_HOME= ${PREFIX}/java/kaffe
18JAVA_NAME= kaffe 18JAVA_NAME= kaffe
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21TEST_TARGET= check 21TEST_TARGET= check
22 22
23PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
24 24
25ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \ 25ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
26 *-*-mipsel *-*-sparc *-*-powerpc *-*-x86_64 26 *-*-mipsel *-*-sparc *-*-powerpc *-*-x86_64
27 27
 28MAKE_FLAGS+= LIBLTDL=-lltdl
 29
28GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
29CPPFLAGS+= -Dunix 31CPPFLAGS+= -Dunix
30PATCHDIR= ${.CURDIR}/../../lang/kaffe/patches 32PATCHDIR= ${.CURDIR}/../../lang/kaffe/patches
31DISTINFO_FILE= ${.CURDIR}/../../lang/kaffe/distinfo 33DISTINFO_FILE= ${.CURDIR}/../../lang/kaffe/distinfo
32 34
33BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}/jre/lib/${MACHINE_ARCH} 35BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}/jre/lib/${MACHINE_ARCH}
34 36
35CONFIGURE_ARGS+= --with-gc=kaffe-gc 37CONFIGURE_ARGS+= --with-gc=kaffe-gc
36CONFIGURE_ARGS+= --disable-boehm-gc-configuration 38CONFIGURE_ARGS+= --disable-boehm-gc-configuration
37CONFIGURE_ARGS+= --without-alsa 39CONFIGURE_ARGS+= --without-alsa
38CONFIGURE_ARGS+= --without-esd 40CONFIGURE_ARGS+= --without-esd
39CONFIGURE_ARGS+= --disable-esdtest 41CONFIGURE_ARGS+= --disable-esdtest
40CONFIGURE_ARGS+= --disable-fastjar 42CONFIGURE_ARGS+= --disable-fastjar
cvs diff -r1.16 -r1.17 pkgsrc/lang/kaffe/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/PLIST 2009/06/14 18:03:35 1.16
+++ pkgsrc/lang/kaffe/PLIST 2009/12/14 18:32:08 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:03:35 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.17 2009/12/14 18:32:08 joerg Exp $
2bin/kaffe-appletviewer 2bin/kaffe-appletviewer
3bin/kaffe-jar 3bin/kaffe-jar
4bin/kaffe-java 4bin/kaffe-java
5bin/kaffe-javac 5bin/kaffe-javac
6bin/kaffe-javadoc 6bin/kaffe-javadoc
7bin/kaffe-javah 7bin/kaffe-javah
8bin/kaffe-javakey 8bin/kaffe-javakey
9bin/kaffe-javap 9bin/kaffe-javap
10bin/kaffe-jdb 10bin/kaffe-jdb
11bin/kaffe-rmic 11bin/kaffe-rmic
12bin/kaffe-rmiregistry 12bin/kaffe-rmiregistry
13bin/kaffe-serialver 13bin/kaffe-serialver
14java/kaffe/bin/install-jar 14java/kaffe/bin/install-jar
@@ -50,25 +50,26 @@ java/kaffe/jre/bin/kaffe-bin @@ -50,25 +50,26 @@ java/kaffe/jre/bin/kaffe-bin
50java/kaffe/jre/bin/rmiregistry 50java/kaffe/jre/bin/rmiregistry
51java/kaffe/jre/lib/glibj.zip 51java/kaffe/jre/lib/glibj.zip
52java/kaffe/jre/lib/gmpjavamath.jar 52java/kaffe/jre/lib/gmpjavamath.jar
53java/kaffe/jre/lib/${MACHINE_ARCH}/libjavaio.la 53java/kaffe/jre/lib/${MACHINE_ARCH}/libjavaio.la
54java/kaffe/jre/lib/${MACHINE_ARCH}/libjavalang.la 54java/kaffe/jre/lib/${MACHINE_ARCH}/libjavalang.la
55java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanet.la 55java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanet.la
56java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanio.la 56java/kaffe/jre/lib/${MACHINE_ARCH}/libjavanio.la
57java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la 57java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la
58java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la 58java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la
59java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la 59java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la
60java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la 60java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
61java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la 61java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
62java/kaffe/jre/lib/logging.properties 62java/kaffe/jre/lib/logging.properties
 63java/kaffe/jre/lib/rt.jar
63java/kaffe/jre/lib/security/Kaffe.security 64java/kaffe/jre/lib/security/Kaffe.security
64java/kaffe/lib/logging.properties 65java/kaffe/lib/logging.properties
65java/kaffe/lib/security/classpath.security 66java/kaffe/lib/security/classpath.security
66java/kaffe/lib/tools.jar 67java/kaffe/lib/tools.jar
67java/kaffe/license.terms 68java/kaffe/license.terms
68man/man1/kaffe.1 69man/man1/kaffe.1
69java/kaffe/share/classpath/README 70java/kaffe/share/classpath/README
70java/kaffe/share/classpath/tools.zip 71java/kaffe/share/classpath/tools.zip
71share/locale/de/LC_MESSAGES/kaffe.mo 72share/locale/de/LC_MESSAGES/kaffe.mo
72share/locale/fr/LC_MESSAGES/kaffe.mo 73share/locale/fr/LC_MESSAGES/kaffe.mo
73share/locale/zh_CN/LC_MESSAGES/kaffe.mo 74share/locale/zh_CN/LC_MESSAGES/kaffe.mo
74share/locale/zh_TW/LC_MESSAGES/kaffe.mo 75share/locale/zh_TW/LC_MESSAGES/kaffe.mo