Update to libffi 3.0.9.

This release includes many important fixes as well as a couple of new ports.

8 files changed, 42 insertions, 69 deletions

diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 4a61be0b935..1bc93fa90e6 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2009/09/20 13:10:30 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2010/01/16 16:28:58 asau Exp $
 #
 
-DISTNAME=	libffi-3.0.8
-PKGREVISION=	2
+DISTNAME=	libffi-3.0.9
 CATEGORIES=	devel
 MASTER_SITES=	ftp://sourceware.org/pub/libffi/
 
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo
index 8dae63245c3..53885404678 100644
--- a/devel/libffi/distinfo
+++ b/devel/libffi/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.14 2009/09/21 00:33:51 seb Exp $
+$NetBSD: distinfo,v 1.15 2010/01/16 16:28:58 asau 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) = 6020adaf5c9ab0f6de94f930214fa1d726fe8717
-SHA1 (patch-ab) = deeaf203d807db40357e5650523a8d02f469217d
-SHA1 (patch-ac) = 307c08e8e3df5f079c0b2f63da58bb59fc089d30
+SHA1 (libffi-3.0.9.tar.gz) = 56e41f87780e09d06d279690e53d4ea2c371ea88
+RMD160 (libffi-3.0.9.tar.gz) = 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a
+Size (libffi-3.0.9.tar.gz) = 731719 bytes
+SHA1 (patch-aa) = eb6838b48bfaa9594f0853928c3587036cdef1b3
+SHA1 (patch-ab) = a63e2fa11c16410f280de19c1ef47e6c7884c2b8
+SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb
 SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b
-SHA1 (patch-ae) = d3cbb4e3e00e0b7ced9cd50198da0772f6c73111
+SHA1 (patch-ae) = 529cace02cf2b5cd36b01458d10eb18e116c79bd
 SHA1 (patch-af) = daa640516b837ffeb925b2b3b97a5d75d5156165
 SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2
 SHA1 (patch-ah) = e9580069ede90cd616da7bc230b28acbf5d204a6
-SHA1 (patch-ai) = f9a81054764fd15bcd2e4743c90e425e844b0825
-SHA1 (patch-aj) = 6fa0cff1b0e764fe0311d87365b85d2318814a2d
+SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b
diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa
index 841bedce267..7b2120b918a 100644
--- a/devel/libffi/patches/patch-aa
+++ b/devel/libffi/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.8 2009/05/26 12:27:12 he Exp $
+$NetBSD: patch-aa,v 1.9 2010/01/16 16:28:58 asau Exp $
 
 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
+--- configure.orig	2009-12-31 15:41:51.000000000 +0300
++++ configure	2010-01-12 12:40:15.000000000 +0300
+@@ -12210,7 +12210,7 @@
    mips-sgi-irix5.* | mips-sgi-irix6.*)
  	TARGET=MIPS; TARGETDIR=mips
  	;;
 -  mips*-*-linux*)
 +  mips*-*-linux* | mips*-*-netbsd*)
+ 	# Support 128-bit long double for NewABI.
+ 	HAVE_LONG_DOUBLE='defined(__mips64)'
  	TARGET=MIPS; TARGETDIR=mips
- 	;;
- 
-@@ -21033,7 +21033,7 @@ case "$host" in
+@@ -12228,7 +12228,7 @@
    powerpc-*-aix* | rs6000-*-aix*)
  	TARGET=POWERPC_AIX; TARGETDIR=powerpc
  	;;
diff --git a/devel/libffi/patches/patch-ab b/devel/libffi/patches/patch-ab
index a7d54b91353..f656d7a0479 100644
--- a/devel/libffi/patches/patch-ab
+++ b/devel/libffi/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2009/09/21 00:33:51 seb Exp $
+$NetBSD: patch-ab,v 1.4 2010/01/16 16:28:58 asau Exp $
 
---- src/x86/ffitarget.h.orig	2008-02-14 17:24:06.000000000 -0800
-+++ src/x86/ffitarget.h
-@@ -54,10 +54,10 @@ typedef enum ffi_abi {
- #endif
+--- src/x86/ffitarget.h.orig	2009-12-29 18:22:26.000000000 +0300
++++ src/x86/ffitarget.h	2010-01-12 12:42:54.000000000 +0300
+@@ -74,10 +74,10 @@
+ #else
  
    /* ---- Intel x86 and AMD x86-64 - */
 -#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
diff --git a/devel/libffi/patches/patch-ac b/devel/libffi/patches/patch-ac
index 474cc672626..5fd6bf8d70a 100644
--- a/devel/libffi/patches/patch-ac
+++ b/devel/libffi/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2008/10/11 22:33:56 dholland Exp $
+$NetBSD: patch-ac,v 1.2 2010/01/16 16:28:58 asau Exp $
 
 Install header files in backwards compatible way.
 
---- include/Makefile.in.orig	2008-02-14 18:37:00.000000000 +0300
-+++ include/Makefile.in	2008-10-09 12:34:51.000000000 +0400
-@@ -182,7 +182,7 @@
+--- include/Makefile.in.orig	2009-12-31 15:41:01.000000000 +0300
++++ include/Makefile.in	2010-01-12 12:43:57.000000000 +0300
+@@ -203,7 +203,7 @@
  AUTOMAKE_OPTIONS = foreign
  DISTCLEANFILES = ffitarget.h
  EXTRA_DIST = ffi.h.in ffi_common.h
 -includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
 +includesdir = $(includedir)
- nodist_includes_HEADERS = ffi.h ffitarget.h 
+ nodist_includes_HEADERS = ffi.h ffitarget.h
  all: all-am
  
diff --git a/devel/libffi/patches/patch-ae b/devel/libffi/patches/patch-ae
index 6f13eb34edb..1bb57475b62 100644
--- a/devel/libffi/patches/patch-ae
+++ b/devel/libffi/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2009/05/26 12:27:12 he Exp $
+$NetBSD: patch-ae,v 1.2 2010/01/16 16:28:58 asau 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 @@
+--- src/mips/ffitarget.h.orig	2009-12-29 18:22:26.000000000 +0300
++++ src/mips/ffitarget.h	2010-01-12 12:45:23.000000000 +0300
+@@ -41,6 +41,11 @@
+ #  ifndef _ABIO32
  #    define _ABIO32 _MIPS_SIM_ABI32
  #  endif
- #endif
 +#ifdef __NetBSD__
 +/* Let's cheat a bit... */   
 +#  define _ABIO32 1     
diff --git a/devel/libffi/patches/patch-ai b/devel/libffi/patches/patch-ai
index a5a29c12fba..a0ec8299a92 100644
--- a/devel/libffi/patches/patch-ai
+++ b/devel/libffi/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.1 2009/09/20 13:10:30 tnn Exp $
+$NetBSD: patch-ai,v 1.2 2010/01/16 16:28:58 asau Exp $
 
---- include/ffi_common.h.orig	2008-07-12 07:43:00.000000000 +0200
-+++ include/ffi_common.h
-@@ -77,6 +77,16 @@ typedef struct
- } extended_cif;
- 
- /* Terse sized type definitions.  */
-+#if defined(__digital__) && !defined(__GNUC__) /* XXX tnn: check sunpro */
+--- include/ffi_common.h.orig	2009-12-29 18:22:26.000000000 +0300
++++ include/ffi_common.h	2010-01-12 12:47:54.000000000 +0300
+@@ -99,6 +99,15 @@
+ typedef uint64_t UINT64;
+ typedef int64_t  SINT64;
+ # endif
++#elif defined(__digital__) && !defined(__GNUC__) /* XXX tnn: check sunpro */
 +typedef unsigned int UINT8;
 +typedef signed int   SINT8;
 +typedef unsigned int UINT16;
@@ -15,15 +15,6 @@ $NetBSD: patch-ai,v 1.1 2009/09/20 13:10:30 tnn Exp $
 +typedef signed int   SINT32;
 +typedef unsigned int UINT64;
 +typedef signed int   SINT64;
-+#else
+ #else
  typedef unsigned int UINT8  __attribute__((__mode__(__QI__)));
  typedef signed int   SINT8  __attribute__((__mode__(__QI__)));
- typedef unsigned int UINT16 __attribute__((__mode__(__HI__)));
-@@ -85,6 +95,7 @@ typedef unsigned int UINT32 __attribute_
- typedef signed int   SINT32 __attribute__((__mode__(__SI__)));
- typedef unsigned int UINT64 __attribute__((__mode__(__DI__)));
- typedef signed int   SINT64 __attribute__((__mode__(__DI__)));
-+#endif
- 
- typedef float FLOAT32;
- 
diff --git a/devel/libffi/patches/patch-aj b/devel/libffi/patches/patch-aj
deleted file mode 100644
index c0e41407484..00000000000
--- a/devel/libffi/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/09/20 13:10:30 tnn Exp $
-
---- include/ffi.h.in.orig	2008-04-03 20:57:34.000000000 +0200
-+++ include/ffi.h.in
-@@ -254,7 +254,11 @@ typedef struct {
-   ffi_cif   *cif;
-   void     (*fun)(ffi_cif*,void*,void**,void*);
-   void      *user_data;
-+#if defined(__digital__) && !defined(__GNUC__)
-+} ffi_closure;
-+#else
- } ffi_closure __attribute__((aligned (8)));
-+#endif
- 
- void *ffi_closure_alloc (size_t size, void **code);
- void ffi_closure_free (void *);