Set user-destdir, add (unfortunately) partial patch for NetBSD/m68k

4 files changed, 91 insertions, 4 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index f3fbb58405e..c941edf2475 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2007/12/27 16:05:11 joerg Exp $
+# $NetBSD: Makefile,v 1.72 2009/07/10 19:58:12 abs Exp $
 #
 
 .include "Makefile.common"
@@ -27,7 +27,7 @@ LIBS+= -lltdl
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${DESTDIR}${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 55edafce24f..bfd7f0973e2 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2009/04/08 22:43:24 joerg Exp $
+# $NetBSD: Makefile.common,v 1.18 2009/07/10 19:58:12 abs Exp $
 
 DISTNAME=		kaffe-1.1.7
 CATEGORIES=		lang java
@@ -20,6 +20,8 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 TEST_TARGET=		check
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k 	\
 			*-*-mipsel *-*-sparc *-*-powerpc
 
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index c04e8297892..5ad24c1034f 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/07/10 21:16:43 minskim Exp $
+$NetBSD: distinfo,v 1.26 2009/07/10 19:58:12 abs Exp $
 
 SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
 RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 2fb9d3d7bdfdecd6090403aae9485662d1bcfbc5
 SHA1 (patch-ad) = 6ad03154e1874822d8a784cdcf6faa248e76c38f
 SHA1 (patch-ae) = 81e4a650fbb7fa18fa19597d27362bbb0155847f
 SHA1 (patch-af) = 8f35727c9a6147a8c5af8bcc3279ef29f8c9ad13
+SHA1 (patch-ag) = f02fd305d0dcb4c0fa2abb89eb566bc3d2edc583
diff --git a/lang/kaffe/patches/patch-ag b/lang/kaffe/patches/patch-ag
new file mode 100644
index 00000000000..7ab83b18392
--- /dev/null
+++ b/lang/kaffe/patches/patch-ag
@@ -0,0 +1,84 @@
+$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:
+  *