Make guile-fcgi work with guile-1.6.x. Bump PKGREVISION.

Patch provided by Aleksej Saushev.

3 files changed, 65 insertions, 4 deletions

diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index 5cebca9daf1..e5c1c3b08e6 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/06/05 05:44:37 wiz Exp $
 
 DISTNAME=	guile-fcgi-0.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -18,6 +18,6 @@ do-build:
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} guile-fcgi.x
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
 
-.include "../../lang/guile14/buildlink3.mk"
+.include "../../lang/guile/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-fcgi/distinfo b/devel/guile-fcgi/distinfo
index fdc37859c63..25509d319cd 100644
--- a/devel/guile-fcgi/distinfo
+++ b/devel/guile-fcgi/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:16 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/06/05 05:44:37 wiz Exp $
 
 SHA1 (guile-fcgi-0.1.tar.gz) = 878d1f1e2a7a2ce618043cd19567f9fd1fa7ee4c
 RMD160 (guile-fcgi-0.1.tar.gz) = 96aaf411ed6db3276f8f7d3cebf52f9e5ef9ba16
 Size (guile-fcgi-0.1.tar.gz) = 110853 bytes
 SHA1 (patch-aa) = 44bb69029dd16d8be1696b69cf258bb968cde989
+SHA1 (patch-ab) = 13fa69f67e74efdffe569a1df1328fa7ecde0b3b
diff --git a/devel/guile-fcgi/patches/patch-ab b/devel/guile-fcgi/patches/patch-ab
new file mode 100644
index 00000000000..d3a78884b0d
--- /dev/null
+++ b/devel/guile-fcgi/patches/patch-ab
@@ -0,0 +1,60 @@
+$NetBSD: patch-ab,v 1.1 2007/06/05 05:44:37 wiz Exp $
+
+--- src/guile-fcgi.c.orig	2007-06-04 01:13:05.000000000 +0400
++++ src/guile-fcgi.c	2007-06-04 01:13:16.000000000 +0400
+@@ -43,11 +43,11 @@
+ /****************************************************************************/
+ 
+ static long tagFCGX_Stream;
+-#define SCM_FCGX_STREAMP(smob) (SCM_NIMP(smob) && SCM_CAR(smob)==tagFCGX_Stream)
++#define SCM_FCGX_STREAMP(smob) (SCM_NIMP(smob) && (long)(SCM_CAR(smob))==tagFCGX_Stream)
+ #define SCM_FCGX_STREAM(smob) ((FCGX_Stream*)SCM_CDR(smob))
+ 
+ static long tagFCGX_Request;
+-#define SCM_FCGX_REQUESTP(smob) (SCM_NIMP(smob) && SCM_CAR(smob)==tagFCGX_Request)
++#define SCM_FCGX_REQUESTP(smob) (SCM_NIMP(smob) && (long)(SCM_CAR(smob))==tagFCGX_Request)
+ #define SCM_FCGX_REQUEST(smob) (FCGX_Request*)SCM_CDR(smob)
+ 
+ long fcgi_ptype=0;
+@@ -524,7 +524,7 @@
+ {
+   SCM_ASSERT((SCM_FCGX_STREAMP(stream)), stream, SCM_ARG1, s_scm_FCGX_FFlush);
+ 
+-  return (-1==FCGX_FFlush(SCM_FCGX_STREAM(stream)));
++  return (void*)(-1==FCGX_FFlush(SCM_FCGX_STREAM(stream)));
+ }
+ /*DLLAPI int FCGX_FClose(FCGX_Stream *stream);*/
+ SCM_DEFINE (scm_FCGX_FClose,"FCGX:FClose",1,0,0,
+@@ -544,7 +544,7 @@
+ {
+   SCM_ASSERT((SCM_FCGX_STREAMP(stream)), stream, SCM_ARG1, s_scm_FCGX_FClose);
+ 
+-  return (-1==FCGX_FClose(SCM_FCGX_STREAM(stream)));
++  return (void*)(-1==FCGX_FClose(SCM_FCGX_STREAM(stream)));
+ }
+ /*DLLAPI int FCGX_GetError(FCGX_Stream *stream);*/
+ SCM_DEFINE (scm_FCGX_GetError,"FCGX:GetError",1,0,0,
+@@ -702,7 +702,7 @@
+ 
+ static SCM
+ fcgi_port_mark(SCM port){
+-  scm_gc_mark (SCM_STREAM(port));
++  scm_gc_mark ((void*)SCM_STREAM(port));
+   return SCM_BOOL_F;
+ }
+ 
+@@ -842,12 +842,12 @@
+           (SCM port),"")
+ {
+   SCM_ASSERT(SCM_PORTP(port) && 
+-	  ((SCM_CAR(port) & fcgi_ptype)==fcgi_ptype),
++	  (((long)SCM_CAR(port) & fcgi_ptype)==fcgi_ptype),
+ 	  port,
+ 	  SCM_ARG1,
+ 	  s_scm_fcgi_make_stream);
+ 
+-  return SCM_STREAM(port);
++  return (void*)SCM_STREAM(port);
+ }
+ 
+ void