Update to 2d5.

PR:		ports/45845
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org>
Approved by:	maintainer timeout (4 months)

4 files changed, 170 insertions, 132 deletions

diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index 802f5671aeb9..d65cceb81d0e 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	slib
-PORTVERSION=	2d1
-PORTREVISION=	2
+PORTVERSION=	2d5
 CATEGORIES=	lang
 MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
-DISTNAME=	slib2d1
+DISTNAME=	slib${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
-COMMENT=	A portable scheme library for all standard scheme implementation
+COMMENT=	A portable scheme library
 
 RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
 
 WRKSRC=		${WRKDIR}/slib
 
-USE_ZIP=	yes
 NO_BUILD=	yes
 
 do-install:
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.scm ${DATADIR}
 	${MKDIR} ${PREFIX}/share/slib
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${PREFIX}/share/slib
 	${RM} -f ${LOCALBASE}/share/guile/slib
@@ -30,4 +30,14 @@ do-install:
 	${LOCALBASE}/bin/guile -c \
 		"(use-modules (ice-9 slib)) (require 'new-catalog)"
 
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for file in ANNOUNCE COPYING 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 d94b4243a596..cee4754b454b 100644
--- a/lang/slib/distinfo
+++ b/lang/slib/distinfo
@@ -1 +1 @@
-MD5 (slib2d1.zip) = 63923a04bf33f7419d6ba8f62bcc6cb2
+MD5 (slib2d5.tar.gz) = e76f8d3b52ccd5c0f9c559310ecf6f68
diff --git a/lang/slib/pkg-descr b/lang/slib/pkg-descr
index 0e0f220e66eb..cd240f62571d 100644
--- a/lang/slib/pkg-descr
+++ b/lang/slib/pkg-descr
@@ -1 +1,9 @@
-a portable scheme library for all standard scheme implementation
+A portable scheme library
+
+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
diff --git a/lang/slib/pkg-plist b/lang/slib/pkg-plist
index 0fd2900df127..752b3972b21c 100644
--- a/lang/slib/pkg-plist
+++ b/lang/slib/pkg-plist
@@ -1,127 +1,147 @@
-share/slib/Bev2slib.scm
-share/slib/Template.scm
-share/slib/alist.scm
-share/slib/alistab.scm
-share/slib/array.scm
-share/slib/arraymap.scm
-share/slib/batch.scm
-share/slib/break.scm
-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
-share/slib/defmacex.scm
-share/slib/determ.scm
-share/slib/dwindtst.scm
-share/slib/dynamic.scm
-share/slib/dynwind.scm
-share/slib/eval.scm
-share/slib/factor.scm
-share/slib/fft.scm
-share/slib/fluidlet.scm
-share/slib/format.scm
-share/slib/formatst.scm
-share/slib/genwrite.scm
-share/slib/getopt.scm
-share/slib/getparam.scm
-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
-share/slib/mularg.scm
-share/slib/mwdenote.scm
-share/slib/mwexpand.scm
-share/slib/mwsynrul.scm
-share/slib/nclients.scm
-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
-share/slib/printf.scm
-share/slib/priorque.scm
-share/slib/process.scm
-share/slib/promise.scm
-share/slib/psxtime.scm
-share/slib/qp.scm
-share/slib/queue.scm
-share/slib/r4rsyn.scm
-share/slib/randinex.scm
-share/slib/random.scm
-share/slib/ratize.scm
-share/slib/rdms.scm
-share/slib/recobj.scm
-share/slib/record.scm
-share/slib/repl.scm
-share/slib/report.scm
-share/slib/require.scm
-share/slib/root.scm
-share/slib/sc2.scm
-share/slib/sc4opt.scm
-share/slib/sc4sc3.scm
-share/slib/scaexpp.scm
-share/slib/scaglob.scm
-share/slib/scainit.scm
-share/slib/scamacr.scm
-share/slib/scanf.scm
-share/slib/scaoutp.scm
-share/slib/schmooz.scm
-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
-share/slib/strcase.scm
-share/slib/strport.scm
-share/slib/strsrch.scm
-share/slib/struct.scm
-share/slib/structst.scm
-share/slib/structure.scm
-share/slib/synchk.scm
-share/slib/synclo.scm
-share/slib/synrul.scm
-share/slib/tek40.scm
-share/slib/tek41.scm
-share/slib/timezone.scm
-share/slib/trace.scm
-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
-@exec ln -shf %D/share/slib %%LOCALBASE%%/share/guile/slib
-@exec %%LOCALBASE%%/bin/guile -c "(use-modules (slib)) (require 'new-catalog)"
+%%DATADIR%%/Bev2slib.scm
+%%DATADIR%%/Template.scm
+%%DATADIR%%/alist.scm
+%%DATADIR%%/alistab.scm
+%%DATADIR%%/array.scm
+%%DATADIR%%/arraymap.scm
+%%DATADIR%%/batch.scm
+%%DATADIR%%/break.scm
+%%DATADIR%%/byte.scm
+%%DATADIR%%/chap.scm
+%%DATADIR%%/charplot.scm
+%%DATADIR%%/cltime.scm
+%%DATADIR%%/coerce.scm
+%%DATADIR%%/collect.scm
+%%DATADIR%%/color.scm
+%%DATADIR%%/colornam.scm
+%%DATADIR%%/colorspc.scm
+%%DATADIR%%/comlist.scm
+%%DATADIR%%/comparse.scm
+%%DATADIR%%/crc.scm
+%%DATADIR%%/cring.scm
+%%DATADIR%%/cvs.scm
+%%DATADIR%%/daylight.scm
+%%DATADIR%%/db2html.scm
+%%DATADIR%%/dbcom.scm
+%%DATADIR%%/dbrowse.scm
+%%DATADIR%%/dbsyn.scm
+%%DATADIR%%/dbutil.scm
+%%DATADIR%%/debug.scm
+%%DATADIR%%/defmacex.scm
+%%DATADIR%%/determ.scm
+%%DATADIR%%/differ.scm
+%%DATADIR%%/dirs.scm
+%%DATADIR%%/dwindtst.scm
+%%DATADIR%%/dynamic.scm
+%%DATADIR%%/dynwind.scm
+%%DATADIR%%/eval.scm
+%%DATADIR%%/factor.scm
+%%DATADIR%%/fft.scm
+%%DATADIR%%/fluidlet.scm
+%%DATADIR%%/format.scm
+%%DATADIR%%/formatst.scm
+%%DATADIR%%/genwrite.scm
+%%DATADIR%%/getopt.scm
+%%DATADIR%%/getparam.scm
+%%DATADIR%%/glob.scm
+%%DATADIR%%/hash.scm
+%%DATADIR%%/hashtab.scm
+%%DATADIR%%/html4each.scm
+%%DATADIR%%/htmlform.scm
+%%DATADIR%%/http-cgi.scm
+%%DATADIR%%/lineio.scm
+%%DATADIR%%/logical.scm
+%%DATADIR%%/macrotst.scm
+%%DATADIR%%/macwork.scm
+%%DATADIR%%/matfile.scm
+%%DATADIR%%/mbe.scm
+%%DATADIR%%/minimize.scm
+%%DATADIR%%/mklibcat.scm
+%%DATADIR%%/modular.scm
+%%DATADIR%%/mulapply.scm
+%%DATADIR%%/mularg.scm
+%%DATADIR%%/mwdenote.scm
+%%DATADIR%%/mwexpand.scm
+%%DATADIR%%/mwsynrul.scm
+%%DATADIR%%/null.scm
+%%DATADIR%%/obj2str.scm
+%%DATADIR%%/object.scm
+%%DATADIR%%/paramlst.scm
+%%DATADIR%%/plottest.scm
+%%DATADIR%%/pnm.scm
+%%DATADIR%%/pp.scm
+%%DATADIR%%/ppfile.scm
+%%DATADIR%%/prec.scm
+%%DATADIR%%/printf.scm
+%%DATADIR%%/priorque.scm
+%%DATADIR%%/process.scm
+%%DATADIR%%/promise.scm
+%%DATADIR%%/psxtime.scm
+%%DATADIR%%/qp.scm
+%%DATADIR%%/queue.scm
+%%DATADIR%%/r4rsyn.scm
+%%DATADIR%%/randinex.scm
+%%DATADIR%%/random.scm
+%%DATADIR%%/ratize.scm
+%%DATADIR%%/rdms.scm
+%%DATADIR%%/recobj.scm
+%%DATADIR%%/record.scm
+%%DATADIR%%/repl.scm
+%%DATADIR%%/report.scm
+%%DATADIR%%/require.scm
+%%DATADIR%%/root.scm
+%%DATADIR%%/sc2.scm
+%%DATADIR%%/sc4opt.scm
+%%DATADIR%%/sc4sc3.scm
+%%DATADIR%%/scaexpp.scm
+%%DATADIR%%/scaglob.scm
+%%DATADIR%%/scainit.scm
+%%DATADIR%%/scamacr.scm
+%%DATADIR%%/scanf.scm
+%%DATADIR%%/scaoutp.scm
+%%DATADIR%%/schmooz.scm
+%%DATADIR%%/scmacro.scm
+%%DATADIR%%/selfset.scm
+%%DATADIR%%/sierpinski.scm
+%%DATADIR%%/simetrix.scm
+%%DATADIR%%/solid.scm
+%%DATADIR%%/sort.scm
+%%DATADIR%%/soundex.scm
+%%DATADIR%%/srfi-1.scm
+%%DATADIR%%/srfi.scm
+%%DATADIR%%/stdio.scm
+%%DATADIR%%/strcase.scm
+%%DATADIR%%/strport.scm
+%%DATADIR%%/strsrch.scm
+%%DATADIR%%/structure.scm
+%%DATADIR%%/subarray.scm
+%%DATADIR%%/synchk.scm
+%%DATADIR%%/synclo.scm
+%%DATADIR%%/synrul.scm
+%%DATADIR%%/timezone.scm
+%%DATADIR%%/trace.scm
+%%DATADIR%%/transact.scm
+%%DATADIR%%/tree.scm
+%%DATADIR%%/trnscrpt.scm
+%%DATADIR%%/tsort.scm
+%%DATADIR%%/tzfile.scm
+%%DATADIR%%/uri.scm
+%%DATADIR%%/values.scm
+%%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
-@dirrm share/slib
+@dirrm %%DATADIR%%