The 3a2 distfiles are not available anymore, so update to 3a4.

Many changes, the most notable appear to be improved DFT support,
addition of SRFI-94 (Type-Restricted Numerical Functions) and
SRFI-23 (Error reporting mechanism), and some cleanup/fixing.
See the ANNOUNCE file for details.

There are reports that the 3a4 version breaks gnucash on Debian;
neither wiz nor me could reproduce this.

6 files changed, 44 insertions, 27 deletions

diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile
index d8b8e796861..136e3fe7df1 100644
--- a/devel/guile-slib/Makefile
+++ b/devel/guile-slib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2006/02/17 17:55:15 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/07 19:39:53 drochner Exp $
 
-DISTNAME=	guile-slib-3.1.2
-PKGREVISION=	3
+DISTNAME=	guile-slib-3.1.4
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/guile-slib/PLIST b/devel/guile-slib/PLIST
index 4d5cd8d3f77..b76900e9e6d 100644
--- a/devel/guile-slib/PLIST
+++ b/devel/guile-slib/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2006/02/17 17:55:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/02/07 19:39:53 drochner Exp $
+share/guile/1.6/slibcat
 share/guile/slib
-share/guile/slibcat
+@comment in guile: @dirrm share/guile/1.6
 @comment in guile: @dirrm share/guile
diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index 27885fd8c8d..eaa68e8de83 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2006/03/20 18:15:38 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/07 19:39:52 drochner Exp $
 
-DISTNAME=	slib3a2
+DISTNAME=	slib3a4
 #
 # Convert the version number as follows 2d2 -> 2.4.2, where the d is
 # changed to a 4, representing the 4th letter.
@@ -8,11 +8,9 @@ DISTNAME=	slib3a2
 #
 # Also update guile-slib
 #
-PKGNAME=	slib-3.1.2
-PKGREVISION=	1
+PKGNAME=	slib-3.1.4
 CATEGORIES=	devel
-MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/ \
-		${MASTER_SITE_GNU:=jacal/}
+MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://swissnet.ai.mit.edu/~jaffer/SLIB.html
@@ -28,6 +26,11 @@ INFO_FILES=	# PLIST
 
 INSTALLATION_DIRS=	${PKGINFODIR}
 
+SUBST_CLASSES+=		scmpath
+SUBST_STAGE.scmpath=	post-patch
+SUBST_FILES.scmpath=	guile.init
+SUBST_SED.scmpath=	"s|@PREFIX@|${PREFIX}|"
+
 do-install:
 	${INSTALL_DATA_DIR} ${SLIBDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} *.scm *.init ${SLIBDIR}
diff --git a/devel/slib/PLIST b/devel/slib/PLIST
index 425084c9e97..e5143f70bdd 100644
--- a/devel/slib/PLIST
+++ b/devel/slib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/20 18:15:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/02/07 19:39:53 drochner Exp $
 info/slib.info
 share/doc/slib/FAQ
 share/doc/slib/README
@@ -42,6 +42,7 @@ share/slib/dbutil.scm
 share/slib/debug.scm
 share/slib/defmacex.scm
 share/slib/determ.scm
+share/slib/dft.scm
 share/slib/differ.scm
 share/slib/dirs.scm
 share/slib/dwindtst.scm
@@ -50,7 +51,6 @@ share/slib/dynwind.scm
 share/slib/elk.init
 share/slib/eval.scm
 share/slib/factor.scm
-share/slib/fft.scm
 share/slib/fluidlet.scm
 share/slib/format.scm
 share/slib/formatst.scm
@@ -67,13 +67,17 @@ share/slib/html4each.scm
 share/slib/htmlform.scm
 share/slib/http-cgi.scm
 share/slib/jscheme.init
+share/slib/limit.scm
 share/slib/lineio.scm
+share/slib/linterp.scm
 share/slib/logical.scm
 share/slib/macrotst.scm
 share/slib/macscheme.init
 share/slib/macwork.scm
 share/slib/manifest.scm
 share/slib/matfile.scm
+share/slib/math-integer.scm
+share/slib/math-real.scm
 share/slib/mbe.scm
 share/slib/minimize.scm
 share/slib/mitscheme.init
@@ -92,7 +96,6 @@ share/slib/object.scm
 share/slib/paramlst.scm
 share/slib/peanosfc.scm
 share/slib/phil-spc.scm
-share/slib/plottest.scm
 share/slib/pnm.scm
 share/slib/pp.scm
 share/slib/ppfile.scm
@@ -138,6 +141,8 @@ share/slib/sort.scm
 share/slib/soundex.scm
 share/slib/srfi-1.scm
 share/slib/srfi-2.scm
+share/slib/srfi-23.scm
+share/slib/srfi-61.scm
 share/slib/srfi-8.scm
 share/slib/srfi-9.scm
 share/slib/srfi.scm
diff --git a/devel/slib/distinfo b/devel/slib/distinfo
index 56aedcf0243..06eafce9286 100644
--- a/devel/slib/distinfo
+++ b/devel/slib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/10/26 09:19:19 adam Exp $
+$NetBSD: distinfo,v 1.10 2007/02/07 19:39:53 drochner Exp $
 
-SHA1 (slib3a2.tar.gz) = 200821f6991e7a78c244d15492eb5e7229255cd0
-RMD160 (slib3a2.tar.gz) = a58445e0b98e67e8dd0daff9362194244497a3ef
-Size (slib3a2.tar.gz) = 846350 bytes
-SHA1 (patch-aa) = f12fbd3ec8607f40604529a2aae637ae1f866650
+SHA1 (slib3a4.tar.gz) = 90fda911735648d985b9f5c1a716369272a5ef06
+RMD160 (slib3a4.tar.gz) = e5386c9ce84b818f2b81f4dcb7ebe41ea472814a
+Size (slib3a4.tar.gz) = 877792 bytes
+SHA1 (patch-aa) = 401df5f09f6179934d660b33484a7c5b5daf0132
diff --git a/devel/slib/patches/patch-aa b/devel/slib/patches/patch-aa
index 280201e8af8..6c3c51b976e 100644
--- a/devel/slib/patches/patch-aa
+++ b/devel/slib/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.3 2005/10/26 09:19:19 adam Exp $
+$NetBSD: patch-aa,v 1.4 2007/02/07 19:39:53 drochner Exp $
 
---- guile.init.orig	2005-10-26 11:05:58.000000000 +0000
+--- guile.init.orig	2006-04-24 05:53:25.000000000 +0200
 +++ guile.init
-@@ -124,7 +124,8 @@
- 		   ((NOSVE) ".")
- 		   ((MACOS THINKC) ":")
- 		   ((MS-DOS WINDOWS ATARIST OS/2) "\\")
--		   ((UNIX COHERENT PLAN9 AMIGA) "/"))))
-+		   ((UNIX COHERENT PLAN9 AMIGA) "/")
+@@ -58,7 +58,7 @@
+ 	  (and (defined? 'getenv) (getenv "SCHEME_LIBRARY_PATH"))
+ 	  ;; Use this path if your scheme does not support GETENV
+ 	  ;; or if SCHEME_LIBRARY_PATH is not set.
+-	  "/usr/lib/slib/"
++	  "@PREFIX@/share/slib/"
+ 	  (in-vicinity (implementation-vicinity) "slib/"))))
+     (lambda () library-path)))
+ 
+@@ -122,7 +122,8 @@
+ 		   ((nosve) ".")
+ 		   ((macos thinkc) ":")
+ 		   ((ms-dos windows atarist os/2) "\\")
+-		   ((unix coherent plan9 amiga) "/"))))
++		   ((unix coherent plan9 amiga) "/")
 +		   (else "/"))))
  	    (lambda (vic name)
  	      (string-append vic name *vicinity-suffix*))))))