Axe the included libffi and use the pkgsrc version. Simpler than

trying to prevent using it or fixing conflicts. Bump revision.

8 files changed, 133 insertions, 49 deletions

diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index 5b4b85eb2ff..bb9647ed937 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2006/06/04 13:52:57 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/06/06 15:40:15 joerg Exp $
 #
 
 DISTNAME=		japhar-0.08
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 
@@ -21,6 +21,10 @@ INFO_FILES=	# PLIST
 # The japhar tar archive uses ././@LongLink GNU tar hacks
 EXTRACT_USING=		nbtar
 
+post-extract:
+	${RM} -r ${WRKSRC}/lib/libffi
+
 .include "../../devel/readline/buildlink3.mk"
+.include "../../devel/libffi/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/japhar/distinfo b/lang/japhar/distinfo
index 86339617e8c..af916fedfed 100644
--- a/lang/japhar/distinfo
+++ b/lang/japhar/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/06/04 13:52:57 joerg Exp $
+$NetBSD: distinfo,v 1.6 2006/06/06 15:40:15 joerg Exp $
 
 SHA1 (japhar-0.08.tar.gz) = 3f450610ca31061c1c183c8e86d1fcd47660f86d
 RMD160 (japhar-0.08.tar.gz) = 283f47db3a54f8f51d755a61fab94c611de13988
@@ -9,7 +9,9 @@ SHA1 (patch-ac) = 26b8f7321fad1944d5df4eba757c35f9e32fa015
 SHA1 (patch-ad) = 640ebdda8fe1a6d51de69dde2626c62f6b2cf1e0
 SHA1 (patch-ae) = 25e5f05ad68b1788247d31144410a87fc2deec1f
 SHA1 (patch-af) = d41e8e516225e5d637882c44e44ac73e91e12941
-SHA1 (patch-ag) = 4c55ba01bb3665b779a534fbe11cd22ec400b78c
-SHA1 (patch-ah) = 9802d78610b06bb2cc0a35c90c7871514b37e4aa
-SHA1 (patch-ai) = 53184296e279f637ed03c7133d93eb328b553b1a
+SHA1 (patch-ag) = 6be1a157dae74f79bd6848d8507fe2abf997be2e
+SHA1 (patch-ai) = c1ec2114b2fdaa00e4d8b5c5bcafc042b50ea077
 SHA1 (patch-aj) = 592306809df6b5f0dd00bf8cfe1c73478222f2dc
+SHA1 (patch-ak) = 0075ab705a19ca055ee3c69d31031efa7091661d
+SHA1 (patch-al) = 8d94f91ad6ec7ff069dc74f6c6b9bc22c5c6885f
+SHA1 (patch-am) = cf3055f178c7f8986e20a73677fde0c2e3a2c12f
diff --git a/lang/japhar/patches/patch-ag b/lang/japhar/patches/patch-ag
index e3907307d0e..bcc59a2186a 100644
--- a/lang/japhar/patches/patch-ag
+++ b/lang/japhar/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
+$NetBSD: patch-ag,v 1.2 2006/06/06 15:40:15 joerg Exp $
 
---- progs/japhar/Makefile.in.orig	2003-07-07 13:52:37.110749000 +0200
+--- progs/japhar/Makefile.in.orig	1999-03-16 03:25:08.000000000 +0000
 +++ progs/japhar/Makefile.in
 @@ -10,6 +10,8 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
  
  SHELL = @SHELL@
  
-@@ -81,10 +83,7 @@ PACKAGE = @PACKAGE@
+@@ -81,14 +83,11 @@ PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  
@@ -23,7 +23,12 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
  @NEED_ZLIB_TRUE@ZLIB = $(top_builddir)/lib/zlib/libzlib.la
  @NEED_ZLIB_FALSE@ZLIB = @ZLIB@
  
-@@ -110,156 +109,157 @@ CONFIG_CLEAN_FILES = 
+-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
++@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
+ 
+ @ENABLE_JVMDI_TRUE@JVMDI_LIB = $(top_builddir)/lib/libjvmdi/src/libjvmdi.la
+ 
+@@ -110,156 +109,149 @@ CONFIG_CLEAN_FILES = 
  PROGRAMS =  $(bin_PROGRAMS)
  
  CPPFLAGS = @CPPFLAGS@
@@ -202,8 +207,7 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.util/libjaphar_util.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.util.zip/libjaphar_zip.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.security/libjaphar_security.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/sysresource/libjaphar_sysresource.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/sysresource/libjaphar_sysresource.la
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@PROFILING_FALSE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@PROFILING_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@PROFILING_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -212,14 +216,12 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/arch/libarch.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/arch/libarch.la
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/arch/libarch.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/zlib/libzlib.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/zlib/libzlib.la
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -243,8 +245,7 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.util.zip/libjaphar_zip.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.security/libjaphar_security.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/sysresource/libjaphar_sysresource.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/zlib/libzlib.la
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -257,8 +258,7 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.util.zip/libjaphar_zip.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.security/libjaphar_security.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/sysresource/libjaphar_sysresource.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/zlib/libzlib.la
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -280,8 +280,7 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.util/libjaphar_util.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.util.zip/libjaphar_zip.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/java.security/libjaphar_security.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/sysresource/libjaphar_sysresource.la \
-+@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_TRUE@$(top_builddir)/lib/libnative/sysresource/libjaphar_sysresource.la
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@PROFILING_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -299,8 +298,7 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/arch/libarch.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/zlib/libzlib.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_TRUE@@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/zlib/libzlib.la
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_FALSE@japhar_DEPENDENCIES =  \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_FALSE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@PROFILING_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -320,12 +318,11 @@ $NetBSD: patch-ag,v 1.1 2003/07/07 13:56:27 seb Exp $
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
 +@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/arch/libarch.la \
-+@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
++@ENABLE_JVMDI_TRUE@@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@PROFILING_FALSE@$(top_builddir)/arch/libarch.la
  japhar_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -397,10 +397,6 @@ distdir: $(DISTFILES)
+@@ -397,10 +389,6 @@ distdir: $(DISTFILES)
  	    || cp -p $$d/$$file $(distdir)/$$file || :; \
  	  fi; \
  	done
diff --git a/lang/japhar/patches/patch-ah b/lang/japhar/patches/patch-ah
deleted file mode 100644
index 25e7abbceb2..00000000000
--- a/lang/japhar/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/06/04 13:52:57 joerg Exp $
-
---- lib/libffi/configure.orig	2006-05-21 16:01:22.000000000 +0000
-+++ lib/libffi/configure
-@@ -1763,6 +1763,7 @@ case "$host" in
- mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS; TARGETDIR=mips;;
- i*86-pc-linux*) TARGET=X86; TARGETDIR=x86;;
- i*86-*-freebsd*) TARGET=X86; TARGETDIR=x86;;
-+i*86-*-dragonfly*) TARGET=X86; TARGETDIR=x86;;
- sparc-sun-4*) TARGET=SPARC; TARGETDIR=sparc;;
- sparc-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
- alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; TARGETDIR=alpha;;
diff --git a/lang/japhar/patches/patch-ai b/lang/japhar/patches/patch-ai
index 897c37f7a1c..dc40835ef9b 100644
--- a/lang/japhar/patches/patch-ai
+++ b/lang/japhar/patches/patch-ai
@@ -1,10 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2006/06/04 13:52:57 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2006/06/06 15:40:15 joerg Exp $
 
---- progs/japhard/Makefile.in.orig	2006-05-21 16:09:03.000000000 +0000
+--- progs/japhard/Makefile.in.orig	1999-03-16 03:25:11.000000000 +0000
 +++ progs/japhard/Makefile.in
-@@ -89,14 +89,14 @@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C
+@@ -87,16 +87,16 @@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C
+ @NEED_ZLIB_TRUE@ZLIB = $(top_builddir)/lib/zlib/libzlib.la
+ @NEED_ZLIB_FALSE@ZLIB = @ZLIB@
  
- @LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
+-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
++@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
  
 -SUBDIRS = readline
 +SUBDIRS =
@@ -19,7 +22,7 @@ $NetBSD: patch-ai,v 1.1 2006/06/04 13:52:57 joerg Exp $
  
  
  INCLUDES =  -I$(top_srcdir)/include 		-I$(top_srcdir)/lib/libjvmdi/include 		-I$(top_srcdir)/lib/libjni/include 		-I$(top_builddir)/lib/libjni/include @OS_DEFINE@ 		-DVERSION="@VERSION@"
-@@ -120,30 +120,26 @@ japhard_OBJECTS =  break.o cmd_line.o ja
+@@ -120,30 +120,24 @@ japhard_OBJECTS =  break.o cmd_line.o ja
  @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
  @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
  @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
@@ -31,10 +34,10 @@ $NetBSD: patch-ai,v 1.1 2006/06/04 13:52:57 joerg Exp $
  @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
  @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
  @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
- @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
 -@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la \
 -@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/progs/japhard/readline/libreadline.a
-+@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/zlib/libzlib.la
  @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@japhard_DEPENDENCIES =  \
  @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
  @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
@@ -47,14 +50,14 @@ $NetBSD: patch-ai,v 1.1 2006/06/04 13:52:57 joerg Exp $
  @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
  @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
  @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
- @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la \
 -@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la \
 -@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/progs/japhard/readline/libreadline.a
-+@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@$(top_builddir)/arch/libarch.la
  japhard_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -364,18 +360,15 @@ cmd_line.o: cmd_line.c ../../include/con
+@@ -364,18 +358,15 @@ cmd_line.o: cmd_line.c ../../include/con
  	../../lib/libjni/include/jni.h \
  	../../lib/libjni/include/jnitypes.h ../../include/ClazzFile.h \
  	../../include/native-threads.h ../../include/sig.h stack.h \
diff --git a/lang/japhar/patches/patch-ak b/lang/japhar/patches/patch-ak
new file mode 100644
index 00000000000..2118430f28a
--- /dev/null
+++ b/lang/japhar/patches/patch-ak
@@ -0,0 +1,53 @@
+$NetBSD: patch-ak,v 1.1 2006/06/06 15:40:15 joerg Exp $
+
+--- progs/japharh/Makefile.in.orig	2006-06-06 14:44:32.000000000 +0000
++++ progs/japharh/Makefile.in
+@@ -87,7 +87,7 @@ LINK = $(LIBTOOL) --mode=link $(CXX) $(C
+ @NEED_ZLIB_TRUE@ZLIB = $(top_builddir)/lib/zlib/libzlib.la
+ @NEED_ZLIB_FALSE@ZLIB = @ZLIB@
+ 
+-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
++@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
+ 
+ @ENABLE_JVMDI_TRUE@JVMDI_LIB = $(top_builddir)/lib/libjvmdi/src/libjvmdi.la
+ 
+@@ -120,8 +120,7 @@ clazz.o method.o field.o misc.o
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/zlib/libzlib.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/zlib/libzlib.la
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_FALSE@japharh_DEPENDENCIES =  \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
+@@ -134,8 +133,7 @@ clazz.o method.o field.o misc.o
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@japharh_DEPENDENCIES =  \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
++@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/arch/libarch.la
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@japharh_DEPENDENCIES =  \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
+@@ -145,8 +143,7 @@ clazz.o method.o field.o misc.o
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjvmdi/src/libjvmdi.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libffi/src/libffi.la
++@NEED_ZLIB_FALSE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_TRUE@$(top_builddir)/arch/libarch.la
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@japharh_DEPENDENCIES =  \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_FALSE@@ENABLE_JVMDI_TRUE@$(top_builddir)/lib/libruntime/libruntime.la \
+@@ -157,8 +154,7 @@ clazz.o method.o field.o misc.o
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libjni/src/libjni.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libruntime/libruntime.la \
+ @NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/arch/libarch.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/zlib/libzlib.la \
+-@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/libffi/src/libffi.la
++@NEED_ZLIB_TRUE@@LIBFFI_SUPPORT_TRUE@@ENABLE_JVMDI_FALSE@$(top_builddir)/lib/zlib/libzlib.la
+ japharh_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/lang/japhar/patches/patch-al b/lang/japhar/patches/patch-al
new file mode 100644
index 00000000000..32c5ec4fe86
--- /dev/null
+++ b/lang/japhar/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/06/06 15:40:15 joerg Exp $
+
+--- lib/Makefile.in.orig	2006-06-06 15:09:59.000000000 +0000
++++ lib/Makefile.in
+@@ -84,7 +84,7 @@ ZLIB = @ZLIB@
+ 
+ @NEED_ZLIB_TRUE@ZLIB_DIR = zlib
+ 
+-@LIBFFI_SUPPORT_TRUE@LIBFFI_DIR = libffi
++@LIBFFI_SUPPORT_TRUE@LIBFFI_DIR =
+ 
+ @OJI_SUPPORT_TRUE@LIBOJI_DIR = liboji
+ 
diff --git a/lang/japhar/patches/patch-am b/lang/japhar/patches/patch-am
new file mode 100644
index 00000000000..dd7facee4b5
--- /dev/null
+++ b/lang/japhar/patches/patch-am
@@ -0,0 +1,24 @@
+$NetBSD: patch-am,v 1.1 2006/06/06 15:40:15 joerg Exp $
+
+--- lib/libruntime/Makefile.in.orig	2006-06-06 15:22:19.000000000 +0000
++++ lib/libruntime/Makefile.in
+@@ -87,8 +87,7 @@ LIBS = 
+ @NEED_ZLIB_TRUE@ZLIB_INCLUDES = -I$(top_srcdir)/lib/zlib
+ @NEED_ZLIB_FALSE@ZLIB_INCLUDES = 
+ 
+-@LIBFFI_SUPPORT_TRUE@FFI_INCLUDES = -I$(top_srcdir)/lib/libffi/include
+-@LIBFFI_SUPPORT_TRUE@LIBFFI = $(top_builddir)/lib/libffi/src/libffi.la
++@LIBFFI_SUPPORT_TRUE@LIBFFI = -lffi
+ 
+ @PROFILING_TRUE@OPSTACK_C = op_stack.c
+ 
+@@ -384,8 +383,7 @@ nativeglue.lo nativeglue.o : nativeglue.
+ 	../../include/objects.h ../../include/gc.h ../../include/log.h \
+ 	../../include/dynamic_loading.h ../../include/exceptions.h \
+ 	../../include/compat.h ../../include/primitive-class.h \
+-	../../include/util.h ../../lib/libffi/include/ffi.h \
+-	../../lib/libffi/include/fficonfig.h ../../include/op_stack.h
++	../../include/util.h ../../include/op_stack.h
+ objects.lo objects.o : objects.c ../../include/config.h \
+ 	../../lib/libjni/include/jniint.h \
+ 	../../lib/libjni/include/jni.h \