From ff3021785eb645cba874ba5c965359651e69b7b4 Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Sat, 1 Dec 2007 15:56:25 +0000
Subject: Update version to 3.1.5.

Use "(use-modules (ice-9 slib))" to load guile.init so it's in the
correct module.

Change PLIST to reflect actual location of slibcat in share/guile/site
rather than 1.8.
---
 devel/guile-slib/Makefile | 11 ++++++-----
 devel/guile-slib/PLIST    |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'devel')

diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile
index d4dd92eed4a..9e17d3c6b64 100644
--- a/devel/guile-slib/Makefile
+++ b/devel/guile-slib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2007/06/12 13:35:12 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.35 2007/12/01 15:56:25 gdt Exp $
 
-DISTNAME=	guile-slib-3.1.4
-PKGREVISION=	1
+DISTNAME=	guile-slib-3.1.5
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,6 +9,7 @@ MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://swissnet.ai.mit.edu/~jaffer/SLIB.html
 COMMENT=	SLIB glue files for guile 1.8
 
+# tested with 3.1.5
 DEPENDS+=	slib>=3.1.2nb1:../../devel/slib
 
 EXTRACT_ONLY=	# empty
@@ -23,8 +23,9 @@ do-install:
 	${LN} -sf ${PREFIX}/share/slib ${PREFIX}/share/guile/site/slib
 	${RM} -f ${PREFIX}/share/guile/slibcat
 	cd ${PREFIX}/share/guile/site/slib; \
-		guile -q -L ${PREFIX}/share/guile/site/slib -l guile.init -c \
-			"(require 'new-catalog)"
+		guile -q -c "(begin (use-modules (ice-9 slib)) (require 'new-catalog))"
 
+# Our 1.8.2 package applies a necessary patch.
+BUILDLINK_API_DEPENDS.guile+=	guile>=1.8.2
 .include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-slib/PLIST b/devel/guile-slib/PLIST
index 64b09279ba2..c57005d3367 100644
--- a/devel/guile-slib/PLIST
+++ b/devel/guile-slib/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2007/06/12 13:35:12 dmcmahill Exp $
-share/guile/1.8/slibcat
+@comment $NetBSD: PLIST,v 1.9 2007/12/01 15:56:25 gdt Exp $
+share/guile/site/slibcat
 share/guile/site/slib
-@comment in guile: @dirrm share/guile/1.8
+@comment in guile: @dirrm share/guile/site
 @comment in guile: @dirrm share/guile
-- 
cgit v1.2.3