another attempt at slib init. use a real module, so that later uses

from different modules will work.  Export the same symbols as before,
but obtain definitions from guile.init instead of home-grown.

3 files changed, 11 insertions, 68 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index abb5c64b633..e6a8b05694c 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2005/10/30 00:56:40 gdt Exp $
+# $NetBSD: Makefile,v 1.68 2005/10/30 14:55:46 gdt Exp $
 
 DISTNAME=		guile-1.6.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 9894e3f9ce7..69c66178c5a 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/10/30 00:56:40 gdt Exp $
+$NetBSD: distinfo,v 1.26 2005/10/30 14:55:46 gdt Exp $
 
 SHA1 (guile-1.6.7.tar.gz) = 00a82dc4c7c19f9b791e116a2baf83e7d0c0856d
 RMD160 (guile-1.6.7.tar.gz) = 63d45e8143834c641d4a4732cfbb34e8984f55dd
@@ -10,4 +10,4 @@ SHA1 (patch-ag) = a4b5f490e9c9520120bcb2824004cb8bfa1027e1
 SHA1 (patch-ah) = e66596a5ecc5c2d4fd09833507499b4d02c7af8a
 SHA1 (patch-ai) = 3343ea669fa05c93a2af5a75cf9da5a04d068273
 SHA1 (patch-aj) = 2d55986fd8161bdc32c6e2ef7fe3d89310ab20cd
-SHA1 (patch-ak) = 7da8cba3f56b2f3c036a5db767184931b0afcb95
+SHA1 (patch-ak) = be1900854a398db3ccdb17ed918ae4f76266f66a
diff --git a/lang/guile/patches/patch-ak b/lang/guile/patches/patch-ak
index 367d22418bd..0abb642a1cd 100644
--- a/lang/guile/patches/patch-ak
+++ b/lang/guile/patches/patch-ak
@@ -1,68 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2005/10/30 00:56:40 gdt Exp $
+$NetBSD: patch-ak,v 1.2 2005/10/30 14:55:46 gdt Exp $
 
 --- ice-9/slib.scm.orig	2004-08-11 21:04:21.000000000 -0400
 +++ ice-9/slib.scm
-@@ -1,390 +1,7 @@
--;;;; slib.scm --- definitions needed to get SLIB to work with Guile
--;;;;
--;;;;	Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--;;;;
--;;;; This file is part of GUILE.
--;;;; 
--;;;; GUILE is free software; you can redistribute it and/or modify it
--;;;; under the terms of the GNU General Public License as published by
--;;;; the Free Software Foundation; either version 2, or (at your
--;;;; option) any later version.
--;;;; 
--;;;; GUILE is distributed in the hope that it will be useful, but
--;;;; WITHOUT ANY WARRANTY; without even the implied warranty of
--;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--;;;; General Public License for more details.
--;;;; 
--;;;; You should have received a copy of the GNU General Public License
--;;;; along with GUILE; see the file COPYING.  If not, write to the
--;;;; Free Software Foundation, Inc., 59 Temple Place, Suite 330,
--;;;; Boston, MA 02111-1307 USA
--;;;;
--;;;; As a special exception, the Free Software Foundation gives permission
--;;;; for additional uses of the text contained in its release of GUILE.
--;;;;
--;;;; The exception is that, if you link the GUILE library with other files
--;;;; to produce an executable, this does not by itself cause the
--;;;; resulting executable to be covered by the GNU General Public License.
--;;;; Your use of that executable is in no way restricted on account of
--;;;; linking the GUILE library code into it.
--;;;;
--;;;; This exception does not however invalidate any other reasons why
--;;;; the executable file might be covered by the GNU General Public License.
--;;;;
--;;;; This exception applies only to the code released by the
--;;;; Free Software Foundation under the name GUILE.  If you copy
--;;;; code from other Free Software Foundation releases into a copy of
--;;;; GUILE, as the General Public License permits, the exception does
--;;;; not apply to the code that you add in this way.  To avoid misleading
--;;;; anyone as to the status of such modified files, you must delete
--;;;; this exception notice from them.
--;;;;
--;;;; If you write modifications of your own for GUILE, it is your choice
--;;;; whether to permit this exception to apply to your modifications.
--;;;; If you do not wish that, delete this exception notice.
--;;;;
--(define-module (ice-9 slib)
--  :export (slib:load
--	   implementation-vicinity
--	   library-vicinity
--	   home-vicinity
--	   scheme-implementation-type
--	   scheme-implementation-version
--	   make-random-state
--	   <? <=? =? >? >=?
--	   require)
--  :no-backtrace)
-+;; Load slib's init file directly, implicitly symbols into the current
-+;; module.
-+(load (string-append (assoc-ref %guile-build-info 'pkgdatadir)
-+		     "/slib/guile.init"))
+@@ -55,336 +55,6 @@
+ 	   require)
+   :no-backtrace)
  
 -
 -
@@ -397,5 +339,6 @@ $NetBSD: patch-ak,v 1.1 2005/10/30 00:56:40 gdt Exp $
 -
 -(define (make-exchanger obj)
 -  (lambda (rep) (let ((old obj)) (set! obj rep) old)))
-+;; use-modules will fail if the file fails to define the module
-+(define-module (ice-9 slib))
++;; Load slib's init routine.
++(load (string-append (assoc-ref %guile-build-info 'pkgdatadir)
++		     "/slib/guile.init"))