- Update to 2d1

- independent from scheme48

4 files changed, 13 insertions, 47 deletions

diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index 24a7a0d75462..d1e84c687814 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -6,27 +6,19 @@
 #
 
 PORTNAME=	slib
-PORTVERSION=	2c9
-PORTREVISION=	1
+PORTVERSION=	2d1
 CATEGORIES=	lang
 MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
+DISTNAME=	slib2d1
 
 MAINTAINER=	nakai@FreeBSD.org
-DISTNAME=	slib2c9
-
-BUILD_DEPENDS=	scheme48:${PORTSDIR}/lang/scheme48 \
-		scm:${PORTSDIR}/lang/scm
 
 WRKSRC=		${WRKDIR}/slib
 
 USE_ZIP=	yes
-ALL_TARGET=	slib48
-INSTALL_TARGET=	install48
+NO_BUILD=	yes
 
-post-install:
-	# 	moved here from author's makefile
-	${MKDIR} ${PREFIX}/lib/scheme48
-	${TOUCH} -r ${WRKSRC}/slibcat ${PREFIX}/lib/scheme48/slibcat
+do-install:
 	${MKDIR} ${PREFIX}/share/slib
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${PREFIX}/share/slib
 
diff --git a/lang/slib/distinfo b/lang/slib/distinfo
index 8816ba068936..d94b4243a596 100644
--- a/lang/slib/distinfo
+++ b/lang/slib/distinfo
@@ -1 +1 @@
-MD5 (slib2c9.zip) = db159efaee38d34e7c0b2395ecc7222c
+MD5 (slib2d1.zip) = 63923a04bf33f7419d6ba8f62bcc6cb2
diff --git a/lang/slib/files/patch-01 b/lang/slib/files/patch-01
deleted file mode 100644
index 9e945202452f..000000000000
--- a/lang/slib/files/patch-01
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.orig	Sun Oct  8 12:09:41 2000
-+++ Makefile	Fri Oct 20 13:47:06 2000
-@@ -56,11 +56,11 @@
- 	  > $(bindir)/slib48
- 	chmod +x $(bindir)/slib48
- 
--$(LIB)/slibcat:
--	touch $(LIB)/slibcat
-+./slibcat:
-+	touch ./slibcat
- 
--slib48:	$(LIB)/slibcat Makefile
--	(echo ",batch on"; \
-+slib48:	./slibcat Makefile
-+	-(echo ",batch on"; \
- 	 echo ",config"; \
- 	 echo ",load =scheme48/misc/packages.scm"; \
- 	 echo "(define-structure slib-primitives"; \
-@@ -93,13 +93,9 @@
- 	 echo ",batch off"; \
- 	 echo ",dump $(IMAGE) \"(slib $(VERSION))\""; \
- 	 echo ",exit") | scheme48
-+	 touch slib48
- 
- install48: slib48
--	$(INSTALL_DATA) $(IMAGE) $(LIB)
--	(echo '#!/bin/sh'; \
--	 echo exec $(RUNNABLE) -i '$(LIB)/$(IMAGE)' \"\$$\@\") \
--	  > $(bindir)/slib48
--	chmod +x $(bindir)/slib48
- 
- #### Stuff for maintaining SLIB below ####
- 
diff --git a/lang/slib/pkg-plist b/lang/slib/pkg-plist
index af7b6206767e..4a04bbffce9a 100644
--- a/lang/slib/pkg-plist
+++ b/lang/slib/pkg-plist
@@ -1,4 +1,3 @@
-lib/scheme48/slibcat
 share/slib/Bev2slib.scm
 share/slib/Template.scm
 share/slib/alist.scm
@@ -11,10 +10,12 @@ share/slib/byte.scm
 share/slib/chap.scm
 share/slib/charplot.scm
 share/slib/cltime.scm
+share/slib/coerce.scm
 share/slib/collect.scm
 share/slib/comlist.scm
 share/slib/comparse.scm
 share/slib/cring.scm
+share/slib/db2html.scm
 share/slib/dbrowse.scm
 share/slib/dbutil.scm
 share/slib/debug.scm
@@ -36,12 +37,14 @@ share/slib/glob.scm
 share/slib/hash.scm
 share/slib/hashtab.scm
 share/slib/htmlform.scm
+share/slib/http-cgi.scm
 share/slib/lineio.scm
 share/slib/logical.scm
 share/slib/macrotst.scm
 share/slib/macwork.scm
 share/slib/makcrc.scm
 share/slib/mbe.scm
+share/slib/minimize.scm
 share/slib/mklibcat.scm
 share/slib/modular.scm
 share/slib/mulapply.scm
@@ -54,6 +57,7 @@ share/slib/obj2str.scm
 share/slib/object.scm
 share/slib/paramlst.scm
 share/slib/plottest.scm
+share/slib/pnm.scm
 share/slib/pp.scm
 share/slib/ppfile.scm
 share/slib/prec.scm
@@ -89,6 +93,7 @@ share/slib/scmacro.scm
 share/slib/scmactst.scm
 share/slib/selfset.scm
 share/slib/sierpinski.scm
+share/slib/simetrix.scm
 share/slib/sort.scm
 share/slib/soundex.scm
 share/slib/stdio.scm
@@ -109,8 +114,10 @@ share/slib/tree.scm
 share/slib/trnscrpt.scm
 share/slib/tsort.scm
 share/slib/tzfile.scm
+share/slib/uri.scm
 share/slib/values.scm
 share/slib/withfile.scm
 share/slib/wttest.scm
 share/slib/wttree.scm
 share/slib/yasyn.scm
+@dirrm share/slib