slib dans base et maj 3b2-1

6 files changed, 38 insertions, 39 deletions

diff --git a/extra/slib/.footprint b/base/slib/.footprint
index 4ddfa6fe0..dd32e14ea 100644
--- a/extra/slib/.footprint
+++ b/base/slib/.footprint
@@ -3,8 +3,8 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/slib
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/guile/
-lrwxrwxrwx	root/root	usr/share/guile/slib -> ../slib
--rw-r--r--	root/root	usr/share/guile/slibcat
+drwxr-xr-x	root/root	usr/share/guile/site/
+lrwxrwxrwx	root/root	usr/share/guile/site/slib -> /usr/share/slib
 drwxr-xr-x	root/root	usr/share/info/
 -rw-r--r--	root/root	usr/share/info/slib.info.gz
 drwxr-xr-x	root/root	usr/share/man/
@@ -12,8 +12,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/slib.1.gz
 drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/Bev2slib.scm
--rw-r--r--	root/root	usr/share/slib/DrScheme.init
--rw-r--r--	root/root	usr/share/slib/Makefile
 -rw-r--r--	root/root	usr/share/slib/RScheme.init
 -rw-r--r--	root/root	usr/share/slib/STk.init
 -rw-r--r--	root/root	usr/share/slib/Template.scm
@@ -59,6 +57,7 @@ drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/dft.scm
 -rw-r--r--	root/root	usr/share/slib/differ.scm
 -rw-r--r--	root/root	usr/share/slib/dirs.scm
+-rw-r--r--	root/root	usr/share/slib/dwindtst.scm
 -rw-r--r--	root/root	usr/share/slib/dynamic.scm
 -rw-r--r--	root/root	usr/share/slib/dynwind.scm
 -rw-r--r--	root/root	usr/share/slib/elk.init
@@ -66,6 +65,7 @@ drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/factor.scm
 -rw-r--r--	root/root	usr/share/slib/fluidlet.scm
 -rw-r--r--	root/root	usr/share/slib/format.scm
+-rw-r--r--	root/root	usr/share/slib/formatst.scm
 -rw-r--r--	root/root	usr/share/slib/gambit.init
 -rw-r--r--	root/root	usr/share/slib/genwrite.scm
 -rw-r--r--	root/root	usr/share/slib/getopt.scm
@@ -85,6 +85,7 @@ drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/lineio.scm
 -rw-r--r--	root/root	usr/share/slib/linterp.scm
 -rw-r--r--	root/root	usr/share/slib/logical.scm
+-rw-r--r--	root/root	usr/share/slib/macrotst.scm
 -rw-r--r--	root/root	usr/share/slib/macscheme.init
 -rw-r--r--	root/root	usr/share/slib/macwork.scm
 -rw-r--r--	root/root	usr/share/slib/manifest.scm
@@ -96,12 +97,14 @@ drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/mitscheme.init
 -rw-r--r--	root/root	usr/share/slib/mkclrnam.scm
 -rw-r--r--	root/root	usr/share/slib/mklibcat.scm
+-rw-r--r--	root/root	usr/share/slib/mkpltcat.scm
 -rw-r--r--	root/root	usr/share/slib/modular.scm
 -rw-r--r--	root/root	usr/share/slib/mulapply.scm
 -rw-r--r--	root/root	usr/share/slib/mularg.scm
 -rw-r--r--	root/root	usr/share/slib/mwdenote.scm
 -rw-r--r--	root/root	usr/share/slib/mwexpand.scm
 -rw-r--r--	root/root	usr/share/slib/mwsynrul.scm
+-rw-r--r--	root/root	usr/share/slib/mzscheme.init
 -rw-r--r--	root/root	usr/share/slib/nbs-iscc.txt
 -rw-r--r--	root/root	usr/share/slib/ncbi-dna.scm
 -rw-r--r--	root/root	usr/share/slib/null.scm
@@ -153,9 +156,6 @@ drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/sierpinski.scm
 -rw-r--r--	root/root	usr/share/slib/simetrix.scm
 -rw-r--r--	root/root	usr/share/slib/sisc.init
--rw-r--r--	root/root	usr/share/slib/slib.nsi
--rwxr-xr-x	root/root	usr/share/slib/slib.sh
--rw-r--r--	root/root	usr/share/slib/slib.spec
 -rw-r--r--	root/root	usr/share/slib/solid.scm
 -rw-r--r--	root/root	usr/share/slib/sort.scm
 -rw-r--r--	root/root	usr/share/slib/soundex.scm
@@ -173,7 +173,6 @@ drwxr-xr-x	root/root	usr/share/slib/
 -rw-r--r--	root/root	usr/share/slib/strsrch.scm
 -rw-r--r--	root/root	usr/share/slib/structure.scm
 -rw-r--r--	root/root	usr/share/slib/subarray.scm
--rwxr-xr-x	root/root	usr/share/slib/syncase.sh
 -rw-r--r--	root/root	usr/share/slib/synchk.scm
 -rw-r--r--	root/root	usr/share/slib/synclo.scm
 -rw-r--r--	root/root	usr/share/slib/synrul.scm
diff --git a/base/slib/.md5sum b/base/slib/.md5sum
new file mode 100644
index 000000000..3528a6956
--- /dev/null
+++ b/base/slib/.md5sum
@@ -0,0 +1 @@
+850f48ad933e2fe8bb03b1e994ed4407  slib-3b2.tar.gz
diff --git a/base/slib/Pkgfile b/base/slib/Pkgfile
new file mode 100755
index 000000000..deac3eecb
--- /dev/null
+++ b/base/slib/Pkgfile
@@ -0,0 +1,30 @@
+# Description: portable library for the Scheme programming language
+# URL: http://groups.csail.mit.edu/
+# Maintainer: NuTyX core team 
+# Packager: thierryn1 at hispeed dot ch
+
+name=slib
+version=3b2
+release=1
+source=( http://groups.csail.mit.edu/mac/ftpdir/scm/OLD/$name-$version.tar.gz )
+
+build() {
+	cd $name
+	sed -r -i "s,/usr/(local/)?lib/slib,/usr/share/slib,g" *.init
+        install -m755 -d $PKG/usr/{bin,share/{slib,man/man1,info,guile/site}}
+	install -m644 *.scm *.init *.xyz *.txt *.dat *.ps $PKG/usr/share/slib
+	install -m644 slib.info $PKG/usr/share/info/
+	cat > $PKG/usr/bin/slib << EOF
+#!/bin/sh
+SCHEME_LIBRARY_PATH=/usr/share/slib/
+export SCHEME_LIBRARY_PATH
+VERSION=${pkgver}
+S48_VICINITY="/usr/share/scheme48/"
+export S48_VICINITY
+EOF
+	cat slib.sh >> $PKG/usr/bin/slib
+	chmod 755 $PKG/usr/bin/slib
+	install -m644 slib.1 $PKG/usr/share/man/man1/
+        ln -s /usr/share/slib $PKG/usr/share/guile/site/
+}
+  
diff --git a/extra/slib/slibcat b/base/slib/slibcat
index 293f2684c..293f2684c 100644
--- a/extra/slib/slibcat
+++ b/base/slib/slibcat
diff --git a/extra/slib/.md5sum b/extra/slib/.md5sum
deleted file mode 100644
index 57c392b2f..000000000
--- a/extra/slib/.md5sum
+++ /dev/null
@@ -1,2 +0,0 @@
-eaa9be13722c5e16879bd33e0763246f  slib3a5.tar.gz
-cb692ab4d397b189066a4a60a935b837  slibcat
diff --git a/extra/slib/Pkgfile b/extra/slib/Pkgfile
deleted file mode 100755
index f3e67ea31..000000000
--- a/extra/slib/Pkgfile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Description: portable library for the Scheme programming language
-# URL: http://groups.csail.mit.edu/
-# Maintainer: NuTyX core team 
-# Packager: thierryn1 at hispeed dot ch
-# Depends on: aspell
-# Run on: aspell
-
-name=slib
-version=3a5
-release=1
-source=( http://groups.csail.mit.edu/mac/ftpdir/scm/OLD//$name$version.tar.gz\
-         slibcat)
-
-#         http://www.linuxfromscratch.org/patches/blfs/svn/slib-3a4-guile_fixes-1.patch\
-
-build() {
-	cd $name
-        sed -i 's|usr/lib|usr/share|' {RScheme,guile}.init
-        mkdir -p $PKG/usr/share/{man,info,guile}
-        ln -s ../slib $PKG/usr/share/guile
-	make    prefix=$PKG/usr/ \
-                libdir=$PKG/usr/share/ \
-		mandir=$PKG/usr/share/man/ \
-		infodir=$PKG/usr/share/info/ \
-	         install installinfo
-        rm $PKG/usr/share/info/dir
-        mv ../slibcat $PKG/usr/share/guile/
-}
-