update to 0.6.6 (bugfixes and improvments)

6 files changed, 58 insertions, 48 deletions

diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index b32c352e884..a7d879a4bbe 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/21 12:08:09 dillo Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/07/15 15:00:30 cracauer Exp
 #
 
-DISTNAME=		scsh-0.6.4
+DISTNAME=		scsh-0.6.6
 CATEGORIES=		shells lang
 MASTER_SITES=		ftp://ftp.scsh.net/pub/scsh/0.6/
 
diff --git a/shells/scsh/PLIST b/shells/scsh/PLIST
index 6370d5937ab..e3fbc5fd9e1 100644
--- a/shells/scsh/PLIST
+++ b/shells/scsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/06/26 14:51:00 dillo Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/21 12:08:09 dillo Exp $
 bin/scsh
 include/scsh.h
 include/write-barrier.h
@@ -29,7 +29,6 @@ lib/scsh/big/random.scm
 lib/scsh/big/receive.scm
 lib/scsh/big/search-tree.scm
 lib/scsh/big/socket.scm
-lib/scsh/big/sort.scm
 lib/scsh/big/strong.scm
 lib/scsh/big/thread-fluid.scm
 lib/scsh/doc/COPYING
@@ -293,6 +292,7 @@ lib/scsh/scsh/bufpol.scm
 lib/scsh/scsh/ccp-pack.scm
 lib/scsh/scsh/ccp.scm
 lib/scsh/scsh/char-package.scm
+lib/scsh/scsh/configure.scm
 lib/scsh/scsh/db.scm
 lib/scsh/scsh/dbm.scm
 lib/scsh/scsh/defrec.scm
@@ -317,6 +317,7 @@ lib/scsh/scsh/generate-constants.scm
 lib/scsh/scsh/glob.scm
 lib/scsh/scsh/here.scm
 lib/scsh/scsh/let-opt.scm
+lib/scsh/scsh/lib-dirs.scm
 lib/scsh/scsh/libscsh.scm
 lib/scsh/scsh/low-interrupt.scm
 lib/scsh/scsh/md5.scm
@@ -325,8 +326,9 @@ lib/scsh/scsh/ndbm.scm
 lib/scsh/scsh/netconst.scm
 lib/scsh/scsh/network.scm
 lib/scsh/scsh/newports.scm
-lib/scsh/scsh/odbc-bindcol.scm
 lib/scsh/scsh/odbc-constants.scm
+lib/scsh/scsh/odbc-interfaces.scm
+lib/scsh/scsh/odbc-packages.scm
 lib/scsh/scsh/odbc-types.scm
 lib/scsh/scsh/odbc.scm
 lib/scsh/scsh/oldfuns.scm
@@ -393,6 +395,7 @@ lib/scsh/srfi/srfi-27.scm
 lib/scsh/srfi/srfi-28.scm
 lib/scsh/srfi/srfi-31.scm
 lib/scsh/srfi/srfi-37.scm
+lib/scsh/srfi/srfi-42.scm
 lib/scsh/srfi/srfi-5.scm
 lib/scsh/srfi/srfi-7.scm
 lib/scsh/stripped-scsh.image
diff --git a/shells/scsh/distinfo b/shells/scsh/distinfo
index 3f2638c8315..deaf627cf6a 100644
--- a/shells/scsh/distinfo
+++ b/shells/scsh/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2003/06/26 14:51:00 dillo Exp $
+$NetBSD: distinfo,v 1.7 2004/04/21 12:08:10 dillo Exp $
 
-SHA1 (scsh-0.6.4.tar.gz) = ec69f00744604603079f30e61fc62ed6462f4c93
-Size (scsh-0.6.4.tar.gz) = 4302231 bytes
-SHA1 (patch-aa) = 4e34aea5953d4cfe79dbabfc4ba7d0e802b786a2
-SHA1 (patch-ab) = f2282dbcfc40b0f5390f0eabca9f44d72c85a630
-SHA1 (patch-ac) = 10bfd0483b61d3d0749e60589a97eaed2078c704
+SHA1 (scsh-0.6.6.tar.gz) = 5d38ec103e1cb885e634bb3475e8912ac892067b
+Size (scsh-0.6.6.tar.gz) = 4332223 bytes
+SHA1 (patch-aa) = e4456d514815c1a8db0e2c655f37272421ef0007
+SHA1 (patch-ab) = 5a8ba9cfe463c791f8478366933c335683e38c3b
+SHA1 (patch-ac) = e4270b345de59978440e6accec9bcd80c83f6f6e
 SHA1 (patch-ae) = 3838934816cf23f1975d15f3dfd3ce8fae10ee40
 SHA1 (patch-af) = faddb025c3bada2d321b693217104dc986a8a90f
diff --git a/shells/scsh/patches/patch-aa b/shells/scsh/patches/patch-aa
index eb896fc5a81..fb9e42fd026 100644
--- a/shells/scsh/patches/patch-aa
+++ b/shells/scsh/patches/patch-aa
@@ -1,56 +1,63 @@
-$NetBSD: patch-aa,v 1.9 2003/06/26 14:51:00 dillo Exp $
+$NetBSD: patch-aa,v 1.10 2004/04/21 12:08:10 dillo Exp $
 
---- Makefile.in.orig	Mon Mar 10 13:13:19 2003
+--- Makefile.in.orig	Tue Feb 17 17:11:13 2004
 +++ Makefile.in
-@@ -336,12 +336,12 @@ inst-man:
+@@ -338,12 +338,12 @@ inst-man:
  	fi
  
  inst-inc:
--	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(incdir)	
-+	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(incdir)/scsh.h
- 	$(INSTALL_DATA) $(srcdir)/c/write-barrier.h $(incdir)
+-	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(DESTDIR)$(incdir)	
++	$(INSTALL_DATA) $(srcdir)/c/scheme48.h $(DESTDIR)$(incdir)/scsh.h
+ 	$(INSTALL_DATA) $(srcdir)/c/write-barrier.h $(DESTDIR)$(incdir)
  
  install-cig: cig
--	$(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(LIB)/cig
--	$(INSTALL_PROGRAM) $(srcdir)/$(CIG).image $(LIB)/cig
-+	$(BSD_INSTALL_SCRIPT) $(srcdir)/$(CIG) $(LIB)/cig
-+	$(BSD_INSTALL_SCRIPT) $(srcdir)/$(CIG).image $(LIB)/cig
- 	$(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(LIB)/cig
- 	$(INSTALL_DATA) $(srcdir)/cig/libcig.h $(LIB)/cig
+-	$(INSTALL_PROGRAM) $(srcdir)/$(CIG) $(DESTDIR)$(LIB)/cig
+-	$(INSTALL_PROGRAM) $(srcdir)/$(CIG).image $(DESTDIR)$(LIB)/cig
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/$(CIG) $(DESTDIR)$(LIB)/cig
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/$(CIG).image $(DESTDIR)$(LIB)/cig
+ 	$(INSTALL_DATA) $(srcdir)/$(LIBCIG) $(DESTDIR)$(LIB)/cig
+ 	$(INSTALL_DATA) $(srcdir)/cig/libcig.h $(DESTDIR)$(LIB)/cig
  
-@@ -353,7 +353,10 @@ inst-misc:
+@@ -355,7 +355,11 @@ inst-misc:
  	done &&								\
  	for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do	\
- 		$(INSTALL_DATA) $$f $(LIB)/rts || exit 1;		\
+ 		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1;	\
 -	done 
-+	done  &&							\
-+	for f in emacs/*; do						\
-+		$(INSTALL_DATA) $$f $(LIB)/emacs || exit 1;		\
++	done  &&                                                        \
++	for f in emacs/*; do                                            \
++		$(INSTALL_DATA) $$f $(LIB)/emacs || exit 1;             \
 +	done
++
  
  inst-doc:
  	for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \
-@@ -417,8 +420,8 @@ dirs:
+@@ -419,8 +423,8 @@ dirs:
  	}								\
  	done &&								\
  	for dir in								\
 -		rts env big opt misc link srfi scsh doc/scsh-manual			\
 -		doc/s48-manual/html doc/scsh-paper/html cig; do			\
-+		emacs rts env big opt misc link srfi scsh doc/scsh-manual	\
++		emacs rts env big opt misc link srfi scsh doc/scsh-manual			\
 +		doc/s48-manual/html doc/scsh-paper/html; do			\
- 		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {		\
- 			echo "$(LIB)/$$dir not a writable directory" >&2; 	\
+ 		{ mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ]; } || {	\
+ 			echo "$(DESTDIR)$(LIB)/$$dir not a writable directory" >&2; 	\
  		exit 1;						  		\
-@@ -892,9 +895,9 @@ scsh/stripped-scsh.image: $(VM) $(SCHEME
+@@ -899,9 +903,9 @@ scsh/stripped-scsh.image: $(VM) $(SCHEME
  
  install-scsh: scsh install-scsh-image install-stripped-scsh-image
- 	$(RM) $(bindir)/$(RUNNABLE)
--	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
--	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
--	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
-+	$(BSD_INSTALL_SCRIPT) $(srcdir)/scsh/scsh $(bindir)/$(RUNNABLE)
-+	$(INSTALL_DATA) $(srcdir)/$(LIBSCSHVM) $(libdir)/$(LIBSCSHVM)
-+	$(INSTALL_DATA) $(srcdir)/$(LIBSCSH) $(libdir)/$(LIBSCSH)
- 	$(RANLIB) $(libdir)/$(LIBSCSH)
+ 	$(RM) $(DESTDIR)$(bindir)/$(RUNNABLE)
+-	$(INSTALL_PROGRAM) $(srcdir)/scsh/scsh $(DESTDIR)$(bindir)/$(RUNNABLE)
+-	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSHVM) $(DESTDIR)$(libdir)/$(LIBSCSHVM)
+-	$(INSTALL_PROGRAM) $(srcdir)/$(LIBSCSH) $(DESTDIR)$(libdir)/$(LIBSCSH)
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/scsh/scsh $(DESTDIR)$(bindir)/$(RUNNABLE)
++	$(INSTALL_DATA) $(srcdir)/$(LIBSCSHVM) $(DESTDIR)$(libdir)/$(LIBSCSHVM)
++	$(INSTALL_DATA) $(srcdir)/$(LIBSCSH) $(DESTDIR)$(libdir)/$(LIBSCSH)
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBSCSH)
  	for f in $(srcdir)/scsh/*.scm $(srcdir)/scsh/*/*.scm; \
- 	    do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
+ 	    do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/scsh/; done
+@@ -939,4 +943,4 @@ scsh/configure.scm: scsh/configure.scm.i
+             -e 's|@scsh_DEFS@|$(DEFS)|g' \
+             -e 's|@scsh_CFLAGS@|$(CFLAGS)|g' \
+             -e 's|@scsh_CPPFLAGS@|$(CPPFLAGS)|g' \
+-            -e 's|@scsh_LDFLAGS@|$(LDFLAGS)|g'  $< > $@
++            -e 's|@scsh_LDFLAGS@|$(LDFLAGS)|g'  scsh/configure.scm.in > $@
diff --git a/shells/scsh/patches/patch-ab b/shells/scsh/patches/patch-ab
index 00d0f13c389..5ebe9c5314e 100644
--- a/shells/scsh/patches/patch-ab
+++ b/shells/scsh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2003/06/26 14:51:00 dillo Exp $
+$NetBSD: patch-ab,v 1.5 2004/04/21 12:08:10 dillo Exp $
 
---- configure.in.orig	Fri Dec 13 16:22:13 2002
+--- configure.in.orig	Mon Mar 15 16:53:48 2004
 +++ configure.in
-@@ -267,6 +267,7 @@ AC_INIT(c/scheme48vm.c)
+@@ -269,6 +269,7 @@ AC_INIT(c/scheme48vm.c)
  
    ## NetBSD and FreeBSD ( and maybe 386BSD also)
    *-*-*bsd*|*-*-darwin* )
diff --git a/shells/scsh/patches/patch-ac b/shells/scsh/patches/patch-ac
index 5c846f27c8d..67d9fd6bf53 100644
--- a/shells/scsh/patches/patch-ac
+++ b/shells/scsh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2003/06/26 14:51:00 dillo Exp $
+$NetBSD: patch-ac,v 1.5 2004/04/21 12:08:10 dillo Exp $
 
---- configure.orig	Wed Mar  5 18:36:07 2003
+--- configure.orig	Thu Mar 11 16:53:58 2004
 +++ configure
-@@ -3076,6 +3076,7 @@ echo "${ECHO_T}$scsh_cv_elf" >&6
+@@ -3129,6 +3129,7 @@ echo "${ECHO_T}$scsh_cv_elf" >&6
  
    ## NetBSD and FreeBSD ( and maybe 386BSD also)
    *-*-*bsd*|*-*-darwin* )