Fri Jul 10 19:58:12 2009 UTC ()
Set user-destdir, add (unfortunately) partial patch for NetBSD/m68k


(abs)
diff -r1.71 -r1.72 pkgsrc/lang/kaffe/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/kaffe/Makefile.common
diff -r1.25 -r1.26 pkgsrc/lang/kaffe/distinfo
diff -r0 -r1.7 pkgsrc/lang/kaffe/patches/patch-ag
cvs diff -r1.71 -r1.72 pkgsrc/lang/kaffe/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/Makefile 2007/12/27 16:05:11 1.71
+++ pkgsrc/lang/kaffe/Makefile 2009/07/10 19:58:12 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.71 2007/12/27 16:05:11 joerg Exp $ 1# $NetBSD: Makefile,v 1.72 2009/07/10 19:58:12 abs Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 3 6PKGREVISION= 3
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
@@ -17,17 +17,17 @@ CONFIGURE_ARGS+= --disable-esdtest @@ -17,17 +17,17 @@ CONFIGURE_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 \
20 javap jdb rmic rmiregistry serialver 20 javap jdb rmic rmiregistry serialver
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24UNLIMIT_RESOURCES= datasize 24UNLIMIT_RESOURCES= datasize
25LIBS+= -lltdl 25LIBS+= -lltdl
26 26
27.include "../../devel/gettext-lib/buildlink3.mk" 27.include "../../devel/gettext-lib/buildlink3.mk"
28 28
29post-install: 29post-install:
30 ${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME} 30 ${INSTALL_DATA} ${WRKSRC}/license.terms ${DESTDIR}${JAVA_HOME}
31 31
32.include "../../mk/java-env.mk" 32.include "../../mk/java-env.mk"
33.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/lang/kaffe/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/Makefile.common 2009/04/08 22:43:24 1.17
+++ pkgsrc/lang/kaffe/Makefile.common 2009/07/10 19:58:12 1.18
@@ -1,35 +1,37 @@ @@ -1,35 +1,37 @@
1# $NetBSD: Makefile.common,v 1.17 2009/04/08 22:43:24 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.18 2009/07/10 19:58:12 abs 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
 24
23ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \ 25ONLY_FOR_PLATFORM= *-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k \
24 *-*-mipsel *-*-sparc *-*-powerpc 26 *-*-mipsel *-*-sparc *-*-powerpc
25 27
26GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
27CPPFLAGS+= -Dunix 29CPPFLAGS+= -Dunix
28PATCHDIR= ${.CURDIR}/../../lang/kaffe/patches 30PATCHDIR= ${.CURDIR}/../../lang/kaffe/patches
29DISTINFO_FILE= ${.CURDIR}/../../lang/kaffe/distinfo 31DISTINFO_FILE= ${.CURDIR}/../../lang/kaffe/distinfo
30 32
31BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}/jre/lib/${MACHINE_ARCH} 33BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}/jre/lib/${MACHINE_ARCH}
32 34
33CONFIGURE_ARGS+= --with-gc=kaffe-gc 35CONFIGURE_ARGS+= --with-gc=kaffe-gc
34CONFIGURE_ARGS+= --disable-boehm-gc-configuration 36CONFIGURE_ARGS+= --disable-boehm-gc-configuration
35CONFIGURE_ARGS+= --without-alsa 37CONFIGURE_ARGS+= --without-alsa
cvs diff -r1.25 -r1.26 pkgsrc/lang/kaffe/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/distinfo 2007/07/10 21:16:43 1.25
+++ pkgsrc/lang/kaffe/distinfo 2009/07/10 19:58:12 1.26
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.25 2007/07/10 21:16:43 minskim Exp $ 1$NetBSD: distinfo,v 1.26 2009/07/10 19:58:12 abs Exp $
2 2
3SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817 3SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
4RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b 4RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
5Size (kaffe-1.1.7.tar.gz) = 14494274 bytes 5Size (kaffe-1.1.7.tar.gz) = 14494274 bytes
6SHA1 (patch-aa) = a06b60e1ba76df59955bd1aba305fc8fef0a310a 6SHA1 (patch-aa) = a06b60e1ba76df59955bd1aba305fc8fef0a310a
7SHA1 (patch-ab) = 51382ff9c9672eab7bb1729e8435af3d134a4ea1 7SHA1 (patch-ab) = 51382ff9c9672eab7bb1729e8435af3d134a4ea1
8SHA1 (patch-ac) = 2fb9d3d7bdfdecd6090403aae9485662d1bcfbc5 8SHA1 (patch-ac) = 2fb9d3d7bdfdecd6090403aae9485662d1bcfbc5
9SHA1 (patch-ad) = 6ad03154e1874822d8a784cdcf6faa248e76c38f 9SHA1 (patch-ad) = 6ad03154e1874822d8a784cdcf6faa248e76c38f
10SHA1 (patch-ae) = 81e4a650fbb7fa18fa19597d27362bbb0155847f 10SHA1 (patch-ae) = 81e4a650fbb7fa18fa19597d27362bbb0155847f
11SHA1 (patch-af) = 8f35727c9a6147a8c5af8bcc3279ef29f8c9ad13 11SHA1 (patch-af) = 8f35727c9a6147a8c5af8bcc3279ef29f8c9ad13
 12SHA1 (patch-ag) = f02fd305d0dcb4c0fa2abb89eb566bc3d2edc583
File Added: pkgsrc/lang/kaffe/patches/patch-ag
$NetBSD: patch-ag,v 1.7 2009/07/10 19:58:12 abs Exp $

(unfortunately) incomplete patch to update NetBSD/m68k to be closer to working

--- config/m68k/netbsd1/md.h.orig	2009-02-05 20:12:32.000000000 +0000
+++ config/m68k/netbsd1/md.h
@@ -17,34 +17,65 @@
 #include "m68k/common.h"
 #include "m68k/threads.h"
 
+#if defined(HAVE_SIGNAL_H)
+#include <signal.h>
+#endif
+#if defined(HAVE_SYS_RESOURCE_H)
+#include <sys/resource.h>
+#endif
+#if defined(HAVE_SYS_SIGNAL_H)
+#include <sys/signal.h>
+#endif
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
 /*
  * Alignment in structure is 8 bytes packed
  */
 #define ALIGNMENT_OF_SIZE(S)    ((S) < 8 ? (S) : 8)
 
 /*
- * Stack offset.
- * This is the offset into the setjmp buffer where the stack pointer is
- * stored.
+ * Redefine stack pointer offset.
  */
-#define SP_OFFSET       2
+#undef SP_OFFSET
+#define SP_OFFSET 2
 
-/**/
-/* Extra exception handling information. */
-/**/
-#include <signal.h>
+#if defined(HAVE_SYS_UCONTEXT_H)
+#include <sys/ucontext.h>
 
-#define	SIGNAL_ARGS(sig, sc) int sig, int code, struct sigcontext *sc
+/* older netbsd's could have this macro missing, so we provide it */
+#ifndef _UC_MACHINE_SP
+#define _UC_MACHINE_SP(uc)      ((uc)->uc_mcontext.__gregs[_REG_UESP])
+#endif
+#ifndef _UC_MACHINE_PC
+#define _UC_MACHINE_PC(uc)      ((uc)->uc_mcontext.__gregs[_REG_EIP])
+#endif
+
+#define SIGCONTEXT ucontext_t
+
+#define SIGNAL_ARGS(sig, sc) int sig, siginfo_t *__si, void *sc
+#define SIGNAL_CONTEXT_POINTER(scp) SIGCONTEXT *scp
+#define SIGNAL_PC(scp) _UC_MACHINE_PC(((SIGCONTEXT *)(scp)))
+#define STACK_POINTER(scp) _UC_MACHINE_SP(((SIGCONTEXT *)(scp)))
+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+
+#else
+
+#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *sc
 #define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp
-#define GET_SIGNAL_CONTEXT_POINTER(scp) (scp)
-#define SIGNAL_PC(scp) ((uintp)(scp)->sc_pc)
+#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+#define SIGNAL_PC(scp) (scp)->sc_pc
+#define STACK_POINTER(scp) (scp)->sc_sp
 
-#include "kaffe-unix-stack.h"
+#endif
 
 #if defined(TRANSLATOR)
 #include "jit-md.h"
 #endif
 
+#include "kaffe-unix-stack.h"
+
 /*
  * sysdepCallMethod supports:
  *