clisp now ships with its own copy of ffcall that has evolved from the

last released version that we have as devel/ffcall.  Arrange for
powerpc files (from files/) to end up in the right place and get used
by the build:

tramp-* files are no longer used, so don't copy them.  They can
probably be deleted from files/ now.

powerpc is now known to ffcall as powerpc, not rs6000 so change the
target name accordingly and make the makefile rule recognize netbsd
and pick up our file.

Makes clisp build/work on my macppc.

Ok wiz@ (except any typos in this commit message).

3 files changed, 23 insertions, 9 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 4173a63d14f..28dff3edd31 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/04/01 12:45:39 tron Exp $
+# $NetBSD: Makefile,v 1.61 2007/06/06 21:29:54 uwe Exp $
 
 DISTNAME=	clisp-2.39
 PKGREVISION=	1
@@ -40,9 +40,8 @@ MAKE_ENV+=		TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q}
 MAKE_FLAGS+=		mandir=${PREFIX}/${PKGMANDIR}
 
 post-patch:
-	${CP} files/tramp-rs6000-netbsd.o ${WRKSRC}/ffcall/callback/trampoline_r
-	${CP} files/tramp-rs6000-netbsd.s ${WRKSRC}/ffcall/callback/trampoline_r
-	${CP} files/vacall-rs6000-netbsd.s ${WRKSRC}/ffcall/callback/vacall_r
+	${CP} files/vacall-rs6000-netbsd.s \
+		${WRKSRC}/ffcall/callback/vacall_r/vacall-powerpc-netbsd.s
 
 post-configure:
 	cd ${WRKSRC}/src && \
diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index a867d2ecd91..24a2328a6b2 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/04/01 12:45:39 tron Exp $
+$NetBSD: distinfo,v 1.16 2007/06/06 21:29:55 uwe Exp $
 
 SHA1 (clisp-2.39.tar.bz2) = 388cc208cd0bd05a154840e83a4b824a493acbc0
 RMD160 (clisp-2.39.tar.bz2) = b31e53cb97a116c683543ee74093fe2a05ed9ea4
@@ -13,5 +13,5 @@ SHA1 (patch-ag) = f3ce92e3f0806197015b971cce24311a5a447050
 SHA1 (patch-ah) = 6a607e00e1815fe332325a91865889a03c60c3a0
 SHA1 (patch-ai) = 8291cfd4c27cbb22d5a72168cdb21c6d26400f54
 SHA1 (patch-aj) = 37af4382519ddb21587006789165ba1173e17577
-SHA1 (patch-ak) = 748c6638cab0f401d8f1f4e60df8cf5394d593ca
+SHA1 (patch-ak) = 690589ada412c8de3cb60a2db3b47c8a753b723c
 SHA1 (patch-al) = 90ec5cc5028dba1ecda7d499def88303cbff2d2a
diff --git a/lang/clisp/patches/patch-ak b/lang/clisp/patches/patch-ak
index 9a7292361a7..e2149dc21fb 100644
--- a/lang/clisp/patches/patch-ak
+++ b/lang/clisp/patches/patch-ak
@@ -1,8 +1,23 @@
-$NetBSD: patch-ak,v 1.4 2007/04/01 12:45:40 tron Exp $
+$NetBSD: patch-ak,v 1.5 2007/06/06 21:29:55 uwe Exp $
 
---- ffcall/callback/vacall_r/Makefile.in.orig	2006-04-25 11:10:44.000000000 +0300
+--- ffcall/callback/vacall_r/Makefile.in.orig	2006-04-25 12:10:44.000000000 +0400
 +++ ffcall/callback/vacall_r/Makefile.in
-@@ -163,7 +163,7 @@ libvacall.la : $(OBJECTS)
+@@ -120,12 +120,13 @@ vacall-arm.lo : vacall-arm.s
+ vacall-arm.s : $(srcdir)/vacall-arm.S
+ 	$(CPP) $(ASPFLAGS) $(srcdir)/vacall-arm.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//,@,g' -e 's,\$$,#,g' > vacall-arm.s
+ 
+-vacall-powerpc.lo : $(srcdir)/vacall-powerpc-aix.old.s $(srcdir)/vacall-powerpc-aix.new.s $(srcdir)/vacall-powerpc-sysv4.s $(srcdir)/vacall-powerpc-linux.s $(srcdir)/vacall-powerpc-macos.s
++vacall-powerpc.lo : $(srcdir)/vacall-powerpc-aix.old.s $(srcdir)/vacall-powerpc-aix.new.s $(srcdir)/vacall-powerpc-sysv4.s $(srcdir)/vacall-powerpc-linux.s $(srcdir)/vacall-powerpc-macos.s $(srcdir)/vacall-powerpc-netbsd.s
+ 	case "$(OS)" in \
+ 	  aix3*) syntax=aix.old;; \
+ 	  aix*) syntax=aix.new;; \
+ 	  linux*) syntax=linux;; \
+ 	  macos* | darwin*) syntax=macos;; \
++	  netbsd*) syntax=netbsd;; \
+ 	  *) syntax=sysv4;; \
+ 	esac; \
+ 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-powerpc-$${syntax}.s ; \
+@@ -163,7 +164,7 @@ libvacall.la : $(OBJECTS)
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
  	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi