- Update to 3a1

- Split into two ports - interpreter independent library and installation
  into guile
- Give maintainership to submitter

PR:		ports/56393, ports/59888
Submitted by:	Kimura Fuyuki <fuyuki@nigredo.org>

8 files changed, 93 insertions, 42 deletions

diff --git a/lang/Makefile b/lang/Makefile
index ff27646421ba..882d4c80ae8d 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -215,6 +215,7 @@
     SUBDIR += siod
     SUBDIR += sisc
     SUBDIR += slib
+    SUBDIR += slib-guile
     SUBDIR += slisp
     SUBDIR += smalltalk
     SUBDIR += smarteiffel
diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile
new file mode 100644
index 000000000000..5f7ac3bec9b9
--- /dev/null
+++ b/lang/slib-guile/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	SLIB for Guile
+# Date created:                3 November 2003
+# Whom:                        Kimura Fuyuki <fuyuki@nigredo.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	slib
+PORTVERSION=	3a1 # Keep this in sync with lang/slib
+CATEGORIES=	lang scheme
+MASTER_SITES=	# empty
+PKGNAMESUFFIX=	-guile
+DISTFILES=	# empty
+
+MAINTAINER=	fuyuki@nigredo.org
+COMMENT=	SLIB installation for Guile
+
+BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib \
+		guile:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+NO_BUILD=	yes
+
+do-install:
+	${LN} -shf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/slib
+	${LOCALBASE}/bin/guile -c \
+		"(use-modules (ice-9 slib)) (require 'new-catalog)"
+
+.include <bsd.port.mk>
diff --git a/lang/slib-guile/pkg-descr b/lang/slib-guile/pkg-descr
new file mode 100644
index 000000000000..38f64caad716
--- /dev/null
+++ b/lang/slib-guile/pkg-descr
@@ -0,0 +1,4 @@
+To use the features offered by the SLIB library, add the following
+construct to your programs:
+
+	(use-modules (ice-9 slib))
diff --git a/lang/slib-guile/pkg-plist b/lang/slib-guile/pkg-plist
new file mode 100644
index 000000000000..7cac1ba99c30
--- /dev/null
+++ b/lang/slib-guile/pkg-plist
@@ -0,0 +1,4 @@
+@exec ln -shf %D/share/slib %D/share/guile/slib
+@exec %D/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+@unexec rm -f %D/share/guile/slib
+@unexec rm -f %D/share/guile/slibcat
diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index ff61c22842dd..fe874e07cf30 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -6,37 +6,29 @@
 #
 
 PORTNAME=	slib
-PORTVERSION=	2d5
-PORTREVISION=	1
+PORTVERSION=	3a1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
 DISTNAME=	slib${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fuyuki@nigredo.org
 COMMENT=	A portable scheme library
 
-RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
-
 WRKSRC=		${WRKDIR}/slib
-
-NO_BUILD=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	slib.info
+INFO=		slib
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
-	${RM} -f ${LOCALBASE}/share/guile/slib
-	${LN} -sf ${PREFIX}/share/slib ${LOCALBASE}/share/guile/slib
-	${LOCALBASE}/bin/guile -c \
-		"(use-modules (ice-9 slib)) (require 'new-catalog)"
-
-post-install:
+	cd ${WRKSRC}; ${INSTALL_DATA} *.scm *.init *.txt *.xyz *.ps ${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/slib.info ${PREFIX}/info
+	install-info ${PREFIX}/info/slib.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for file in ANNOUNCE COPYING ChangeLog FAQ README
+.for file in ANNOUNCE ChangeLog FAQ README
 	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/slib.info ${PREFIX}/info
-	install-info ${PREFIX}/info/slib.info ${PREFIX}/info/dir
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/slib/distinfo b/lang/slib/distinfo
index cee4754b454b..3578a24da7d6 100644
--- a/lang/slib/distinfo
+++ b/lang/slib/distinfo
@@ -1 +1 @@
-MD5 (slib2d5.tar.gz) = e76f8d3b52ccd5c0f9c559310ecf6f68
+MD5 (slib3a1.tar.gz) = dc1aa0ffb9e2414223ceefc315f6baf9
diff --git a/lang/slib/pkg-descr b/lang/slib/pkg-descr
index cd240f62571d..b49514049d00 100644
--- a/lang/slib/pkg-descr
+++ b/lang/slib/pkg-descr
@@ -1,9 +1,4 @@
-A portable scheme library
+SLIB is a portable scheme library providing compatibility and utility
+functions for standard Scheme implementations.
 
-This package is constructed to work with GNU Guile. To use the
-features offered by the SLIB library, add the following construct
-to your programs:
-
-       (use-modules (ice-9 slib))
-
-WWW: http://www.swiss.ai.mit.edu/~jaffer/SLIB.html
+WWW: http://swissnet.ai.mit.edu/~jaffer/SLIB.html
diff --git a/lang/slib/pkg-plist b/lang/slib/pkg-plist
index 752b3972b21c..baa74db5d97a 100644
--- a/lang/slib/pkg-plist
+++ b/lang/slib/pkg-plist
@@ -1,17 +1,26 @@
 %%DATADIR%%/Bev2slib.scm
+%%DATADIR%%/DrScheme.init
+%%DATADIR%%/RScheme.init
+%%DATADIR%%/STk.init
 %%DATADIR%%/Template.scm
 %%DATADIR%%/alist.scm
 %%DATADIR%%/alistab.scm
 %%DATADIR%%/array.scm
 %%DATADIR%%/arraymap.scm
 %%DATADIR%%/batch.scm
+%%DATADIR%%/bigloo.init
 %%DATADIR%%/break.scm
 %%DATADIR%%/byte.scm
+%%DATADIR%%/bytenumb.scm
 %%DATADIR%%/chap.scm
 %%DATADIR%%/charplot.scm
+%%DATADIR%%/chez.init
+%%DATADIR%%/cie1931.xyz
+%%DATADIR%%/cie1964.xyz
 %%DATADIR%%/cltime.scm
 %%DATADIR%%/coerce.scm
 %%DATADIR%%/collect.scm
+%%DATADIR%%/collectx.scm
 %%DATADIR%%/color.scm
 %%DATADIR%%/colornam.scm
 %%DATADIR%%/colorspc.scm
@@ -23,6 +32,7 @@
 %%DATADIR%%/daylight.scm
 %%DATADIR%%/db2html.scm
 %%DATADIR%%/dbcom.scm
+%%DATADIR%%/dbinterp.scm
 %%DATADIR%%/dbrowse.scm
 %%DATADIR%%/dbsyn.scm
 %%DATADIR%%/dbutil.scm
@@ -34,16 +44,19 @@
 %%DATADIR%%/dwindtst.scm
 %%DATADIR%%/dynamic.scm
 %%DATADIR%%/dynwind.scm
+%%DATADIR%%/elk.init
 %%DATADIR%%/eval.scm
 %%DATADIR%%/factor.scm
 %%DATADIR%%/fft.scm
 %%DATADIR%%/fluidlet.scm
-%%DATADIR%%/format.scm
-%%DATADIR%%/formatst.scm
+%%DATADIR%%/gambit.init
 %%DATADIR%%/genwrite.scm
 %%DATADIR%%/getopt.scm
 %%DATADIR%%/getparam.scm
 %%DATADIR%%/glob.scm
+%%DATADIR%%/grapheps.ps
+%%DATADIR%%/grapheps.scm
+%%DATADIR%%/guile.init
 %%DATADIR%%/hash.scm
 %%DATADIR%%/hashtab.scm
 %%DATADIR%%/html4each.scm
@@ -52,10 +65,14 @@
 %%DATADIR%%/lineio.scm
 %%DATADIR%%/logical.scm
 %%DATADIR%%/macrotst.scm
+%%DATADIR%%/macscheme.init
 %%DATADIR%%/macwork.scm
+%%DATADIR%%/manifest.scm
 %%DATADIR%%/matfile.scm
 %%DATADIR%%/mbe.scm
 %%DATADIR%%/minimize.scm
+%%DATADIR%%/mitscheme.init
+%%DATADIR%%/mkclrnam.scm
 %%DATADIR%%/mklibcat.scm
 %%DATADIR%%/modular.scm
 %%DATADIR%%/mulapply.scm
@@ -63,10 +80,12 @@
 %%DATADIR%%/mwdenote.scm
 %%DATADIR%%/mwexpand.scm
 %%DATADIR%%/mwsynrul.scm
+%%DATADIR%%/ncbi-dna.scm
 %%DATADIR%%/null.scm
 %%DATADIR%%/obj2str.scm
 %%DATADIR%%/object.scm
 %%DATADIR%%/paramlst.scm
+%%DATADIR%%/phil-spc.scm
 %%DATADIR%%/plottest.scm
 %%DATADIR%%/pnm.scm
 %%DATADIR%%/pp.scm
@@ -76,6 +95,7 @@
 %%DATADIR%%/priorque.scm
 %%DATADIR%%/process.scm
 %%DATADIR%%/promise.scm
+%%DATADIR%%/pscheme.init
 %%DATADIR%%/psxtime.scm
 %%DATADIR%%/qp.scm
 %%DATADIR%%/queue.scm
@@ -87,9 +107,11 @@
 %%DATADIR%%/recobj.scm
 %%DATADIR%%/record.scm
 %%DATADIR%%/repl.scm
-%%DATADIR%%/report.scm
 %%DATADIR%%/require.scm
+%%DATADIR%%/resenecolours.txt
 %%DATADIR%%/root.scm
+%%DATADIR%%/s48-0_57.init
+%%DATADIR%%/saturate.txt
 %%DATADIR%%/sc2.scm
 %%DATADIR%%/sc4opt.scm
 %%DATADIR%%/sc4sc3.scm
@@ -99,8 +121,12 @@
 %%DATADIR%%/scamacr.scm
 %%DATADIR%%/scanf.scm
 %%DATADIR%%/scaoutp.scm
+%%DATADIR%%/scheme2c.init
+%%DATADIR%%/scheme48.init
 %%DATADIR%%/schmooz.scm
+%%DATADIR%%/scm.init
 %%DATADIR%%/scmacro.scm
+%%DATADIR%%/scsh.init
 %%DATADIR%%/selfset.scm
 %%DATADIR%%/sierpinski.scm
 %%DATADIR%%/simetrix.scm
@@ -108,6 +134,9 @@
 %%DATADIR%%/sort.scm
 %%DATADIR%%/soundex.scm
 %%DATADIR%%/srfi-1.scm
+%%DATADIR%%/srfi-2.scm
+%%DATADIR%%/srfi-8.scm
+%%DATADIR%%/srfi-9.scm
 %%DATADIR%%/srfi.scm
 %%DATADIR%%/stdio.scm
 %%DATADIR%%/strcase.scm
@@ -118,30 +147,27 @@
 %%DATADIR%%/synchk.scm
 %%DATADIR%%/synclo.scm
 %%DATADIR%%/synrul.scm
+%%DATADIR%%/t3.init
 %%DATADIR%%/timezone.scm
+%%DATADIR%%/top-refs.scm
 %%DATADIR%%/trace.scm
 %%DATADIR%%/transact.scm
 %%DATADIR%%/tree.scm
 %%DATADIR%%/trnscrpt.scm
 %%DATADIR%%/tsort.scm
 %%DATADIR%%/tzfile.scm
+%%DATADIR%%/umbscheme.init
 %%DATADIR%%/uri.scm
 %%DATADIR%%/values.scm
+%%DATADIR%%/vet.scm
+%%DATADIR%%/vscm.init
 %%DATADIR%%/withfile.scm
 %%DATADIR%%/wttest.scm
 %%DATADIR%%/wttree.scm
 %%DATADIR%%/yasyn.scm
-%%PORTDOCS%%share/doc/slib/ANNOUNCE
-%%PORTDOCS%%share/doc/slib/COPYING
-%%PORTDOCS%%share/doc/slib/ChangeLog
-%%PORTDOCS%%share/doc/slib/FAQ
-%%PORTDOCS%%share/doc/slib/README
-%%PORTDOCS%%@unexec install-info --delete %D/info/slib.info %D/info/dir
-%%PORTDOCS%%info/slib.info
-%%PORTDOCS%%@exec install-info %D/info/slib.info %D/info/dir
-%%PORTDOCS%%@dirrm share/doc/slib
-@exec ln -shf %D/%%DATADIR%% %%LOCALBASE%%/share/guile/slib
-@exec %%LOCALBASE%%/bin/guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-@unexec rm -f %%LOCALBASE%%/share/guile/slib
-@unexec rm -f %%LOCALBASE%%/share/guile/slibcat
+%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%