6 files changed, 81 insertions, 6 deletions
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index e1d257215fb..8c993b3c39e 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9.2.1 2009/05/22 11:55:35 tron Exp $
+# $NetBSD: Makefile,v 1.9.2.2 2009/05/30 21:02:34 tron Exp $
 #
 
 DISTNAME=	libffi-3.0.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://sourceware.org/pub/libffi/
 
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo
index 330f087e319..977b66529bb 100644
--- a/devel/libffi/distinfo
+++ b/devel/libffi/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.10.2.1 2009/05/22 11:55:35 tron Exp $
+$NetBSD: distinfo,v 1.10.2.2 2009/05/30 21:02:34 tron Exp $
 
 SHA1 (libffi-3.0.8.tar.gz) = ce44d10c39d9a37479c8777e206cac0f36c48712
 RMD160 (libffi-3.0.8.tar.gz) = 4144f64e79ebf95161a6afd58ceaeef8372b5e57
 Size (libffi-3.0.8.tar.gz) = 722834 bytes
-SHA1 (patch-aa) = c15f4b7838ff7f4838de2981a5f3681a43a99503
+SHA1 (patch-aa) = 6020adaf5c9ab0f6de94f930214fa1d726fe8717
 SHA1 (patch-ac) = 307c08e8e3df5f079c0b2f63da58bb59fc089d30
 SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b
+SHA1 (patch-ae) = d3cbb4e3e00e0b7ced9cd50198da0772f6c73111
+SHA1 (patch-af) = daa640516b837ffeb925b2b3b97a5d75d5156165
+SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2
diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa
index 31c8e0833d7..8fc6c98aebe 100644
--- a/devel/libffi/patches/patch-aa
+++ b/devel/libffi/patches/patch-aa
@@ -1,7 +1,18 @@
-$NetBSD: patch-aa,v 1.7.2.2 2009/05/22 11:55:35 tron Exp $
+$NetBSD: patch-aa,v 1.7.2.3 2009/05/30 21:02:35 tron Exp $
 
---- configure.orig	2008-12-20 02:12:45.000000000 +1000
+Extend which ports we accept to deal with.
+
+--- configure.orig	2008-12-19 17:12:45.000000000 +0100
 +++ configure
+@@ -21017,7 +21017,7 @@ case "$host" in
+   mips-sgi-irix5.* | mips-sgi-irix6.*)
+ 	TARGET=MIPS; TARGETDIR=mips
+ 	;;
+-  mips*-*-linux*)
++  mips*-*-linux* | mips*-*-netbsd*)
+ 	TARGET=MIPS; TARGETDIR=mips
+ 	;;
+ 
 @@ -21033,7 +21033,7 @@ case "$host" in
    powerpc-*-aix* | rs6000-*-aix*)
  	TARGET=POWERPC_AIX; TARGETDIR=powerpc
diff --git a/devel/libffi/patches/patch-ae b/devel/libffi/patches/patch-ae
new file mode 100644
index 00000000000..3c119a6d458
--- /dev/null
+++ b/devel/libffi/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1.2.2 2009/05/30 21:02:35 tron Exp $
+
+Make a minimal adjustment to support the various NetBSD mips ports.
+
+--- src/mips/ffitarget.h.orig	2008-02-15 19:43:40.000000000 +0100
++++ src/mips/ffitarget.h
+@@ -39,6 +39,11 @@
+ #    define _ABIO32 _MIPS_SIM_ABI32
+ #  endif
+ #endif
++#ifdef __NetBSD__
++/* Let's cheat a bit... */   
++#  define _ABIO32 1     
++#  define _MIPS_SIM _ABIO32
++#endif
+ 
+ #if !defined(_MIPS_SIM)
+ -- something is very wrong --
diff --git a/devel/libffi/patches/patch-af b/devel/libffi/patches/patch-af
new file mode 100644
index 00000000000..da7925302c6
--- /dev/null
+++ b/devel/libffi/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1.2.2 2009/05/30 21:02:35 tron Exp $
+
+Fixes to support the various NetBSD mips ports.
+
+--- src/mips/ffi.c.orig	2008-02-26 18:34:36.000000000 +0100
++++ src/mips/ffi.c
+@@ -32,12 +32,19 @@
+ 
+ #ifdef __GNUC__
+ #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
+-#    define USE__BUILTIN___CLEAR_CACHE 1
++#    if !defined(__NetBSD__)
++#      define USE__BUILTIN___CLEAR_CACHE 1
++#    endif
+ #  endif
+ #endif
+ 
+ #ifndef USE__BUILTIN___CLEAR_CACHE
+-#include <sys/cachectl.h>
++#  if !defined(__NetBSD__)
++#    include <sys/cachectl.h>
++#  else
++#    include <mips/cachectl.h>
++#    define cacheflush _cacheflush
++#  endif
+ #endif
+ 
+ #ifdef FFI_DEBUG
diff --git a/devel/libffi/patches/patch-ag b/devel/libffi/patches/patch-ag
new file mode 100644
index 00000000000..5e64e36ce6e
--- /dev/null
+++ b/devel/libffi/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.2.2 2009/05/30 21:02:35 tron Exp $
+
+The %Lf printf format expects "long double", so cast args accordingly.
+
+--- testsuite/libffi.call/float2.c.orig	2008-01-29 16:15:20.000000000 +0100
++++ testsuite/libffi.call/float2.c
+@@ -44,7 +44,7 @@ int main (void)
+   /* This is ifdef'd out for now. long double support under SunOS/gcc
+      is pretty much non-existent.  You'll get the odd bus error in library
+      routines like printf().  */
+-  printf ("%Lf, %Lf, %Lf, %Lf\n", ld, ldblit(f), ld - ldblit(f), LDBL_EPSILON);
++  printf ("%Lf, %Lf, %Lf, %Lf\n", (long double)ld, (long double)ldblit(f), (long double)(ld - ldblit(f)), (long double)LDBL_EPSILON);
+ #endif
+ 
+   /* These are not always the same!! Check for a reasonable delta */