- switch chicken to use libffi

- regen PLIST

maintained timed-out

lang/chicken/Makefile

@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2009/09/23 20:56:22 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2009/10/09 13:03:22 jasper Exp $
 
 COMMENT=	practical and portable Scheme system
 
 DISTNAME=	chicken-2.6
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS +=	chicken              1.0      # .0.0
 SHARED_LIBS +=	uchicken             1.0      # .0.0
@@ -26,9 +27,13 @@ PERMIT_DISTFILES_FTP=	Yes
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 
+LIB_DEPENDS+=		ffi::devel/libffi
+
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--without-libffi
+CONFIGURE_ARGS=		${CONFIGURE_SHARED}
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
 REGRESS_TARGET=		bench
 REGRESS_DEPENDS=	:${PKGNAME}:lang/chicken
 
@@ -41,4 +46,7 @@ EXTRA_CFLAGS=	-O0
 
 MAKE_FLAGS+=		EXTRA_CFLAGS=${EXTRA_CFLAGS}
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/cscbench.scm
+
 .include <bsd.port.mk>

lang/chicken/patches/patch-cscbench_scm

@@ -0,0 +1,12 @@
+$OpenBSD: patch-cscbench_scm,v 1.3 2009/10/09 13:03:22 jasper Exp $
+--- cscbench.scm.orig	Wed Sep 23 23:23:35 2009
++++ cscbench.scm	Wed Sep 23 23:23:54 2009
+@@ -48,7 +48,7 @@
+ 	   cc coptions 
+ 	   (if (eq? (software-version) 'macosx) "" "-static")
+ 	   (if unsafe "u" "")
+-	   (if (test-feature? 'libffi) "-lffi" "") )
++	   (if (test-feature? 'libffi) "-L${LOCALBASE}/lib -lffi" "") )
+   (let ([time (call-with-current-continuation
+ 	       (lambda (abort)
+ 		 (set! abort-run (cut abort #f))

lang/chicken/pkg/PLIST

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2007/04/24 17:07:19 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.6 2009/10/09 13:03:22 jasper Exp $
 %%SHARED%%
-bin/chicken
-bin/chicken-profile
-bin/chicken-setup
-bin/csc
-bin/csi
+@bin bin/chicken
+@bin bin/chicken-profile
+@bin bin/chicken-setup
+@bin bin/csc
+@bin bin/csi
 include/chicken-config.h
 include/chicken-defaults.h
 include/chicken.h