Sat Oct 11 22:33:56 2008 UTC ()
Update to libffi-3.0.6. From Aleksej Saushev, who's taking maintainership,
with an adjustment for info file handling.

Changes from 2.x appear to be large and aren't concisely anywhere I
can find. Changes since 3.0.0:

3.0.6 Jul-17-08
        Fix for closures on sh.
        Mark the sh/sh64 stack as non-executable.
        (both thanks to Kaz Kojima)

3.0.5 Apr-3-08
        Fix libffi.pc file.
        Fix #define ARM for IcedTea users.
        Fix x86 closure bug.

3.0.4 Feb-24-08
        Fix x86 OpenBSD configury.

3.0.3 Feb-22-08
        Enable x86 OpenBSD thanks to Thomas Heller, and
        x86-64 FreeBSD thanks to Bj旦rn K旦nig and Andreas Tobler.
        Clean up test instruction in README.

3.0.2 Feb-21-08
        Improved x86 FreeBSD support.
        Thanks to Bj旦rn K旦nig.

3.0.1 Feb-15-08
        Fix instruction cache flushing bug on MIPS.
        Thanks to David Daney.

3.0.0 Feb-15-08
        Many changes, mostly thanks to the GCC project.
        Cygnus Solutions is now Red Hat.


(dholland)
diff -r1.7 -r1.8 pkgsrc/devel/libffi/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/libffi/PLIST
diff -r1.6 -r1.7 pkgsrc/devel/libffi/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/devel/libffi/distinfo
diff -r1.5 -r0 pkgsrc/devel/libffi/patches/patch-aa
diff -r1.1 -r0 pkgsrc/devel/libffi/patches/patch-ab
diff -r0 -r1.1 pkgsrc/devel/libffi/patches/patch-ac
diff -r0 -r1.1 pkgsrc/devel/libffi/patches/patch-ad
cvs diff -r1.7 -r1.8 pkgsrc/devel/libffi/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libffi/Makefile 2008/04/03 09:34:40 1.7
+++ pkgsrc/devel/libffi/Makefile 2008/10/11 22:33:56 1.8
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.7 2008/04/03 09:34:40 joerg Exp $ 1# $NetBSD: Makefile,v 1.8 2008/10/11 22:33:56 dholland Exp $
 2#
2 3
3DISTNAME= gcc-3.3.5 4DISTNAME= libffi-3.0.6
4PKGNAME= libffi-2.0beta 
5PKGREVISION= 2 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.3.5/} 6MASTER_SITES= ftp://sourceware.org/pub/libffi/
8EXTRACT_SUFX= .tar.bz2 
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= asau@inbox.ru
11HOMEPAGE= http://sources.redhat.com/libffi/ 9HOMEPAGE= http://sources.redhat.com/libffi/
12COMMENT= Foreign function interface 10COMMENT= Foreign function interface
13 11
14PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
15 13
16GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
17CONFIGURE_ENV+= with_target_subdir=. 15CONFIGURE_ARGS= --includedir=${PREFIX}/include
18CONFIG_GUESS_OVERRIDE= ../config.guess 16USE_LIBTOOL= yes
19CONFIG_SUB_OVERRIDE= ../config.sub 17USE_TOOLS+= pkg-config
 18USE_LANGUAGES= c c++
 19INFO_FILES= # PLIST
20 20
21WRKSRC= ${WRKDIR}/${DISTNAME}/libffi 21PKGCONFIG_OVERRIDE+= libffi.pc.in
22 22
23.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/libffi/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/libffi/PLIST 2004/09/22 08:09:26 1.2
+++ pkgsrc/devel/libffi/PLIST 2008/10/11 22:33:56 1.3
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
1@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:26 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/10/11 22:33:56 dholland Exp $
2include/ffi.h 2include/ffi.h
3include/ffi_mips.h 3include/ffitarget.h
4include/fficonfig.h 
5lib/libffi.la 4lib/libffi.la
 5lib/pkgconfig/libffi.pc
 6man/man3/ffi.3
 7man/man3/ffi_call.3
 8man/man3/ffi_prep_cif.3
 9info/libffi.info
cvs diff -r1.6 -r1.7 pkgsrc/devel/libffi/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/libffi/buildlink3.mk 2006/07/08 23:10:44 1.6
+++ pkgsrc/devel/libffi/buildlink3.mk 2008/10/11 22:33:56 1.7
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:44 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2008/10/11 22:33:56 dholland Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4LIBFFI_BUILDLINK3_MK:= ${LIBFFI_BUILDLINK3_MK}+ 4LIBFFI_BUILDLINK3_MK:= ${LIBFFI_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= libffi 7BUILDLINK_DEPENDS+= libffi
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffi} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffi}
11BUILDLINK_PACKAGES+= libffi 11BUILDLINK_PACKAGES+= libffi
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffi 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffi
13 13
14.if !empty(LIBFFI_BUILDLINK3_MK:M+) 14.if ${LIBFFI_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.libffi+= libffi>=1.20 15BUILDLINK_API_DEPENDS.libffi+= libffi>=1.20
16BUILDLINK_ABI_DEPENDS.libffi+= libffi>=2.0betanb1 16BUILDLINK_ABI_DEPENDS.libffi+= libffi>=2.0betanb1
 17#BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.6
17BUILDLINK_PKGSRCDIR.libffi?= ../../devel/libffi 18BUILDLINK_PKGSRCDIR.libffi?= ../../devel/libffi
18.endif # LIBFFI_BUILDLINK3_MK 19.endif # LIBFFI_BUILDLINK3_MK
19 20
20BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 21BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.8 -r1.9 pkgsrc/devel/libffi/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libffi/distinfo 2008/04/03 09:34:40 1.8
+++ pkgsrc/devel/libffi/distinfo 2008/10/11 22:33:56 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2008/04/03 09:34:40 joerg Exp $ 1$NetBSD: distinfo,v 1.9 2008/10/11 22:33:56 dholland Exp $
2 2
3SHA1 (gcc-3.3.5.tar.bz2) = ab24a8690040de967c25a1fc8560d7ecc25bd460 3SHA1 (libffi-3.0.6.tar.gz) = 04a5f38c76dfe3e078767645ca89f2ff71721104
4RMD160 (gcc-3.3.5.tar.bz2) = 34adf1a6f7ea302e9937c1a06ccf362711e25c58 4RMD160 (libffi-3.0.6.tar.gz) = da8f547209e6b13dc7be86ea29ad5fa5e85844e5
5Size (gcc-3.3.5.tar.bz2) = 23833856 bytes 5Size (libffi-3.0.6.tar.gz) = 717171 bytes
6SHA1 (patch-aa) = cef0f1fd24397665aa5120e04e8a539f75f7bf1f 6SHA1 (patch-ac) = 307c08e8e3df5f079c0b2f63da58bb59fc089d30
7SHA1 (patch-ab) = daa5322cde100b035f195dd0f445755c8285a116 7SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b
File Deleted: pkgsrc/devel/libffi/patches/Attic/patch-aa
File Deleted: pkgsrc/devel/libffi/patches/Attic/patch-ab
File Added: pkgsrc/devel/libffi/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2008/10/11 22:33:56 dholland 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 @@
 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 
 all: all-am
File Added: pkgsrc/devel/libffi/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2008/10/11 22:33:56 dholland Exp $

Install header files in backwards compatible way.

--- libffi.pc.in.orig	2008-10-09 12:38:02.000000000 +0400
+++ libffi.pc.in	2008-10-09 12:41:54.000000000 +0400
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=@includedir@
 
 Name: @PACKAGE_NAME@
 Description: Library supporting Foreign Function Interfaces