Changes 1.9:

* Added support for x86_64 (AMD64) Linux
* Added support for PowerPC MacOS X
PkgSrc:
* use buildlink3.mk
* create shared libraries

10 files changed, 95 insertions, 130 deletions

diff --git a/devel/ffcall/Makefile b/devel/ffcall/Makefile
index 7397d7012f5..063cb23c581 100644
--- a/devel/ffcall/Makefile
+++ b/devel/ffcall/Makefile
@@ -1,44 +1,33 @@
-# $NetBSD: Makefile,v 1.15 2004/02/03 01:43:32 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/02 16:05:01 adam Exp $
+#
 
-DISTNAME=	ffcall-1.8d
-PKGNAME=	ffcall-1.8.4
-PKGREVISION=	1
+DISTNAME=	ffcall-1.9
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNUSTEP:=libs/}
+MASTER_SITES=	${MASTER_SITE_GNUSTEP:=libs/} \
+		ftp://ftp.santafe.edu/pub/gnu/ \
+		http://www.haible.de/bruno/gnu/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.haible.de/bruno/packages-ffcall.html
 COMMENT=	Foreign function call libraries
 
-# the file ${WRKDIR}/ffcall-1.8/avcall/avcall-${MACHINE_ARCH}.c needs to
+# the file ${WRKSRC}/avcall/avcall-${MACHINE_ARCH}.c needs to
 # be added for additional port support.
-ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-i386 *-*-m68k *-*-sparc *-*-sparc64 *-*-powerpc
-
-GNU_CONFIGURE=	yes
-USE_BUILDLINK2=	yes
-
-.include "../../mk/bsd.prefs.mk"
-
-# Gnustep requires this by linking ffcall libs into libgnustep-base.so
-# Only tested on powerpc.
-.if (${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "NetBSD")
+ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-convex *-*-hppa *-*-i386 \
+			*-*-ia64 *-*-m68k *-*-m88k *-*-mips *-*-mips64 \
+			*-*-mipsn32 *-*-rs6000 *-*-powerpc *-*-s390 \
+			*-*-sparc *-*-sparc64 *-*-x86_64
+
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
-PLIST_SRC+=		PLIST.shared
-
-post-install:
-	${LN} -sf ../lib/libavcall.so.0.0 ${PREFIX}/lib/libavcall.so.0
-	${LN} -sf ../lib/libavcall.so.0.0 ${PREFIX}/lib/libavcall.so
-	${LN} -sf ../lib/libcallback.so.0.0 ${PREFIX}/lib/libcallback.so.0
-	${LN} -sf ../lib/libcallback.so.0.0 ${PREFIX}/lib/libcallback.so
-.endif
 
 post-patch:
-	${CP} files/tramp-rs6000-netbsd.s ${WRKSRC}/callback/trampoline_r
-	${CP} files/vacall-rs6000-netbsd.s ${WRKSRC}/callback/vacall_r
+	${CP} ${FILESDIR}/tramp-rs6000-netbsd.s ${WRKSRC}/callback/trampoline_r
+	${CP} ${FILESDIR}/vacall-rs6000-netbsd.s ${WRKSRC}/callback/vacall_r
 
-#
 # Run the supplied tests to sanity check everything
-#
 post-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} check
 
diff --git a/devel/ffcall/PLIST b/devel/ffcall/PLIST
index d351f97fdae..5f8f892495b 100644
--- a/devel/ffcall/PLIST
+++ b/devel/ffcall/PLIST
@@ -1,23 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/02 16:05:01 adam Exp $
 include/avcall.h
-include/vacall.h
+include/callback.h
 include/trampoline.h
-include/vacall_r.h
 include/trampoline_r.h
-include/callback.h
-lib/libavcall.la
+include/vacall.h
+include/vacall_r.h
 lib/libavcall.a
-lib/libvacall.a
-lib/libtrampoline.a
-lib/libcallback.la
+lib/libavcall.la
+lib/libavcall.so
+lib/libavcall.so.0
+lib/libavcall.so.0.0
 lib/libcallback.a
+lib/libcallback.la
+lib/libcallback.so
+lib/libcallback.so.0
+lib/libcallback.so.0.0
+lib/libtrampoline.a
+lib/libvacall.a
 man/man3/avcall.3
-man/man3/vacall.3
+man/man3/callback.3
 man/man3/trampoline.3
 man/man3/trampoline_r.3
-man/man3/callback.3
+man/man3/vacall.3
 share/html/avcall.html
-share/html/vacall.html
+share/html/callback.html
 share/html/trampoline.html
 share/html/trampoline_r.html
-share/html/callback.html
+share/html/vacall.html
diff --git a/devel/ffcall/buildlink3.mk b/devel/ffcall/buildlink3.mk
new file mode 100644
index 00000000000..d39d6d11544
--- /dev/null
+++ b/devel/ffcall/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/02 16:05:01 adam Exp $
+#
+# This Makefile fragment is included by packages that use ffcall.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+FFCALL_BUILDLINK3_MK:=	${FFCALL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ffcall
+.endif
+
+.if !empty(FFCALL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			ffcall
+BUILDLINK_DEPENDS.ffcall+=		ffcall>=1.9
+BUILDLINK_PKGSRCDIR.ffcall?=		../../devel/ffcall
+
+.endif # FFCALL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/ffcall/distinfo b/devel/ffcall/distinfo
index 6642510f022..0efb6b2de67 100644
--- a/devel/ffcall/distinfo
+++ b/devel/ffcall/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/03/06 23:50:51 jmc Exp $
+$NetBSD: distinfo,v 1.5 2004/03/02 16:05:01 adam Exp $
 
-SHA1 (ffcall-1.8d.tar.gz) = 41362ce04ba43acbee0083f85077601f41acaf25
-Size (ffcall-1.8d.tar.gz) = 587897 bytes
-SHA1 (patch-aa) = e4ad5a65ab22c638dcf64764d3a54960f65564f1
-SHA1 (patch-ab) = b6bce2134149ed72cb4b4eca4d9eb517d58e80fb
-SHA1 (patch-ac) = 1b8aabb3ec5d26246d583a32e43abad964b9a7e5
-SHA1 (patch-ad) = 8202dd37542ece1a18afcc104cb2fb9ced01cfaa
-SHA1 (patch-ae) = b4a57c3f92e0a032af026ee11635f7ad20886ab0
-SHA1 (patch-af) = 1633a460515f202d117a2ad6652950e14c549742
+SHA1 (ffcall-1.9.tar.gz) = 6088036bd44581853d546d0ab5803dd1b36d61b9
+Size (ffcall-1.9.tar.gz) = 873806 bytes
+SHA1 (patch-aa) = 1aef05b97cf4da460325caddf9410dc7c1917d76
+SHA1 (patch-ab) = 7e4b587a080af5530c7bd883a71b614162522320
+SHA1 (patch-ad) = 4cfba7c4ce9fb709d1e857433c5caad293ca9c29
+SHA1 (patch-ae) = 183b4e0dcd194a47fd94c19573ffd698bab14392
+SHA1 (patch-af) = cff72d52332759b42f09acded753b08043b8aefc
diff --git a/devel/ffcall/patches/patch-aa b/devel/ffcall/patches/patch-aa
index eacb0b7ee18..8b66540ba96 100644
--- a/devel/ffcall/patches/patch-aa
+++ b/devel/ffcall/patches/patch-aa
@@ -1,13 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2003/03/06 23:50:52 jmc Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/02 16:05:01 adam Exp $
 
---- ./avcall/Makefile.in.orig	Thu Mar  6 23:11:35 2003
-+++ ./avcall/Makefile.in	Thu Mar  6 23:15:52 2003
-@@ -116,12 +116,12 @@
- 	case "$(OS)" in \
- 	  aix3*) syntax=aix.old;; \
- 	  aix*) syntax=aix.new;; \
--	  linux*) syntax=linux;; \
-+	  linux* | netbsd* ) syntax=linux;; \
+--- avcall/Makefile.in.orig	2004-01-25 17:34:21.000000000 +0000
++++ avcall/Makefile.in
+@@ -125,8 +125,8 @@ avcall-rs6000.lo : $(srcdir)/avcall-rs60
  	  *) syntax=sysv4;; \
  	esac; \
  	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-rs6000-$${syntax}.s ; \
diff --git a/devel/ffcall/patches/patch-ab b/devel/ffcall/patches/patch-ab
index bbfccb96cdc..ec8c7ed4696 100644
--- a/devel/ffcall/patches/patch-ab
+++ b/devel/ffcall/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2003/03/06 23:50:52 jmc Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/02 16:05:01 adam Exp $
 
---- ./callback/trampoline_r/Makefile.in.orig	Thu Mar  6 23:16:08 2003
-+++ ./callback/trampoline_r/Makefile.in	Thu Mar  6 23:17:08 2003
-@@ -90,7 +90,7 @@
- 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-hppa.s
- 
- cache-rs6000.lo : $(srcdir)/cache-rs6000-sysv4.s
--	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-sysv4.s ; mv -f cache-rs6000-sysv4.o cache-rs6000.o ; mv -f cache-rs6000-sysv4.lo cache-rs6000.lo
-+	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-sysv4.s ; cp cache-rs6000-sysv4.o cache-rs6000.o ; mv -f cache-rs6000-sysv4.lo cache-rs6000.lo
+--- callback/trampoline_r/Makefile.in.orig	2004-01-06 15:21:24.000000000 +0000
++++ callback/trampoline_r/Makefile.in
+@@ -101,7 +101,7 @@ cache-rs6000.lo : $(srcdir)/cache-rs6000
+ 	  macos* | darwin*) syntax=macos;; \
+ 	  *) syntax=sysv4;; \
+ 	esac; \
+-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-$${syntax}.s ; mv -f cache-rs6000-$${syntax}.o cache-rs6000.o ; mv -f cache-rs6000-$${syntax}.lo cache-rs6000.lo
++	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-$${syntax}.s ; cp cache-rs6000-$${syntax}.o cache-rs6000.o ; mv -f cache-rs6000-$${syntax}.lo cache-rs6000.lo
  
  cache-convex.lo : $(srcdir)/cache-convex.s
  	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-convex.s
diff --git a/devel/ffcall/patches/patch-ac b/devel/ffcall/patches/patch-ac
deleted file mode 100644
index 3a96cd1a13d..00000000000
--- a/devel/ffcall/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/03/06 23:50:52 jmc Exp $
-
---- ./callback/trampoline_r/test1.c.orig	Thu Mar  6 23:18:14 2003
-+++ ./callback/trampoline_r/test1.c	Thu Mar  6 23:18:50 2003
-@@ -69,7 +69,11 @@
- register void* env __asm__("r12");
- #endif
- #ifdef __rs6000__
-+#ifdef __NetBSD__
-+register void* env __asm__("r13");
-+#else
- register void* env __asm__("r11");
-+#endif 
- #endif
- #ifdef __m88k__
- register void* env __asm__("r11");
diff --git a/devel/ffcall/patches/patch-ad b/devel/ffcall/patches/patch-ad
index 046c77d0bd8..dcfa8bd5dc6 100644
--- a/devel/ffcall/patches/patch-ad
+++ b/devel/ffcall/patches/patch-ad
@@ -1,47 +1,21 @@
-$NetBSD: patch-ad,v 1.1 2003/03/06 23:50:53 jmc Exp $
+$NetBSD: patch-ad,v 1.2 2004/03/02 16:05:01 adam Exp $
 
---- ./callback/trampoline_r/trampoline.c.orig	Thu Mar  6 23:19:30 2003
-+++ ./callback/trampoline_r/trampoline.c	Thu Mar  6 23:35:53 2003
-@@ -21,12 +21,16 @@
- #endif
- #endif
- #if defined(__rs6000__)
-+#if defined(__NetBSD__)
-+#define __powerpcnetbsd__
-+#else
- #if !defined(_AIX)
- #define __rs6000sysv4__  /* SysV.4 ABI, real machine code. */
- #else
- #define __rs6000aix__  /* AIX ABI, just a closure. */
- #endif
- #endif
-+#endif
- #if defined(__hppanew__)
- /*
-  * A function pointer is a biased pointer to a data area whose first word
-@@ -259,7 +263,7 @@
- #include <sys/syslocal.h>
- #endif
- /* Inline assembly function for instruction cache flush. */
--#if defined(__sparc__) || defined(__sparc64__) || defined(__alpha__) || defined(__hppaold__) || defined(__rs6000sysv4__) || defined(__convex__)
-+#if defined(__sparc__) || defined(__sparc64__) || defined(__alpha__) || defined(__hppaold__) || defined(__rs6000sysv4__) || defined(__convex__) || defined(__powerpcnetbsd__)
- #ifdef __GNUC__
- extern inline
- #if defined(__sparc__) || defined(__sparc64__)
-@@ -336,7 +340,7 @@
+--- callback/trampoline_r/trampoline.c.orig	2004-01-26 15:00:05.000000000 +0000
++++ callback/trampoline_r/trampoline.c
+@@ -283,7 +283,7 @@ extern void __TR_clear_cache();
  #define TRAMP_LENGTH 32
  #define TRAMP_ALIGN 4
  #endif
 -#ifdef __rs6000sysv4__
-+#if defined(__rs6000sysv4__) || defined(__powerpcnetbsd__)
++#if defined(__rs6000sysv4__) || defined(__rs6000netbsd__)
  #define TRAMP_LENGTH 24
  #define TRAMP_ALIGN 4
  #endif
-@@ -876,6 +880,39 @@
+@@ -878,6 +878,39 @@ __TR_function alloc_trampoline_r (addres
  #define tramp_data(function)  \
    hilo(*(unsigned short *) (function + 2), *(unsigned short *) (function + 6))
  #endif
-+#ifdef __powerpcnetbsd__
++#ifdef __rs6000netbsd__
 +  /* function:
 +   *    {liu|lis} 13,hi16(<data>)              3D A0 hi16(<data>)
 +   *    {oril|ori} 13,13,lo16(<data>)          61 AD lo16(<data>)
diff --git a/devel/ffcall/patches/patch-ae b/devel/ffcall/patches/patch-ae
index e8b6a49ae57..166b1373c82 100644
--- a/devel/ffcall/patches/patch-ae
+++ b/devel/ffcall/patches/patch-ae
@@ -1,12 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2003/03/06 23:50:53 jmc Exp $
+$NetBSD: patch-ae,v 1.2 2004/03/02 16:05:01 adam Exp $
 
---- ./callback/vacall_r/Makefile.in.orig	Thu Mar  6 23:14:38 2003
-+++ ./callback/vacall_r/Makefile.in	Thu Mar  6 23:15:37 2003
-@@ -118,11 +118,12 @@
+--- callback/vacall_r/Makefile.in.orig	2004-01-25 14:17:01.000000000 +0000
++++ callback/vacall_r/Makefile.in
+@@ -121,12 +121,13 @@ vacall-rs6000.lo : $(srcdir)/vacall-rs60
  	  aix3*) syntax=aix.old;; \
  	  aix*) syntax=aix.new;; \
  	  linux*) syntax=linux;; \
 +	  netbsd*) syntax=netbsd;; \
+ 	  macos* | darwin*) syntax=macos;; \
  	  *) syntax=sysv4;; \
  	esac; \
  	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-rs6000-$${syntax}.s ; \
diff --git a/devel/ffcall/patches/patch-af b/devel/ffcall/patches/patch-af
index 0d2e6e757ed..2570e6fdecc 100644
--- a/devel/ffcall/patches/patch-af
+++ b/devel/ffcall/patches/patch-af
@@ -1,13 +1,8 @@
-$NetBSD: patch-af,v 1.1 2003/03/06 23:50:53 jmc Exp $
+$NetBSD: patch-af,v 1.2 2004/03/02 16:05:01 adam Exp $
 
---- ./vacall/Makefile.in.orig	Thu Mar  6 23:13:48 2003
-+++ ./vacall/Makefile.in	Thu Mar  6 23:14:07 2003
-@@ -108,11 +108,11 @@
- 	case "$(OS)" in \
- 	  aix3*) syntax=aix.old;; \
- 	  aix*) syntax=aix.new;; \
--	  linux*) syntax=linux;; \
-+	  linux* | netbsd*) syntax=linux;; \
+--- vacall/Makefile.in.orig	2004-01-25 13:46:00.000000000 +0000
++++ vacall/Makefile.in
+@@ -116,7 +116,7 @@ vacall-rs6000.o : $(srcdir)/vacall-rs600
  	  *) syntax=sysv4;; \
  	esac; \
  	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-rs6000-$${syntax}.s ; \