Changes 5.5.1:

* Improvements

5 files changed, 39 insertions, 24 deletions

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 22442864598..4d8d5fe5724 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/25 09:32:15 adam Exp $
+#
+# Convert the version number as follows 2d2 -> 2.4.2, where the d is
+# changed to a 4, representing the 4th letter.
+# Thus, 5e1 -> 5.5.1
 #
 
-DISTNAME=	scm5d9
-PKGNAME=	scm-5d9
+DISTNAME=	scm5e1
+PKGNAME=	scm-5.5.1
 CATEGORIES=	lang
 MASTER_SITES=	http://swissnet.ai.mit.edu/ftpdir/scm/
 EXTRACT_SUFX=	.zip
@@ -28,8 +32,9 @@ post-patch:
 
 post-build:
 	${CAT} ${FILESDIR}/buildscm.sh \
-		| ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		| ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		| ${SED} -e 's|@CC@|${CC}|g' \
+		| ${SED} -e 's|@CFLAGS@|${CFLAGS}|g' \
+		| ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
 		> ${WRKSRC}/buildscm.sh
 	cd ${WRKSRC} && ${SH} ./buildscm.sh
 
diff --git a/lang/scm/PLIST b/lang/scm/PLIST
index 00d6ac4814f..9f62258c333 100644
--- a/lang/scm/PLIST
+++ b/lang/scm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/04/24 22:06:22 perry Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/10/25 09:32:15 adam Exp $
 bin/scm
 bin/scmlit
 include/patchlvl.h
@@ -9,8 +9,9 @@ include/scmhob.h
 lib/libscm.a
 man/man1/scm.1
 share/scm/COPYING
+share/scm/Idiffer.scm
 share/scm/Iedline.scm
-share/scm/Init${PKGVERSION}.scm
+share/scm/Init5e1.scm
 share/scm/Link.scm
 share/scm/Macexp.scm
 share/scm/Macro.scm
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index de9122a016f..1a57a0ae672 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/04/24 22:06:22 perry Exp $
+$NetBSD: distinfo,v 1.4 2005/10/25 09:32:15 adam Exp $
 
-SHA1 (scm5d9.zip) = cac632cbf45f61451df1456cea9ca843913bd7ad
-RMD160 (scm5d9.zip) = cc150853146cfaa8cfb57bf54f863570a1f65ebc
-Size (scm5d9.zip) = 843122 bytes
-SHA1 (patch-aa) = 8a47d342097d3030f7f31d0248b2f31a89b048ff
+SHA1 (scm5e1.zip) = 20bb517f1b6229644a1f3873d7607cac3569a5fa
+RMD160 (scm5e1.zip) = 2f4c2d05061db2f0929053b0c565631c7a4806e2
+Size (scm5e1.zip) = 868500 bytes
+SHA1 (patch-aa) = a95838a777b6b769ed18635705e081cad40c3971
 SHA1 (patch-ab) = d6c19134cb99d6f4d847ff53c2d73f7ba847becd
diff --git a/lang/scm/files/buildscm.sh b/lang/scm/files/buildscm.sh
index 1e1ca99bb22..205ef3eb8da 100644
--- a/lang/scm/files/buildscm.sh
+++ b/lang/scm/files/buildscm.sh
@@ -2,7 +2,7 @@
 # unix (unix) script created by SLIB/batch Thu Jul 17 21:20:04 2003
 # ================ Write file with C defines
 rm -f scmflags.h
-echo '#define IMPLINIT "%%PREFIX%%/share/scm/Init5d9.scm"'>>scmflags.h
+echo '#define IMPLINIT "@PREFIX@/share/scm/Init5d9.scm"'>>scmflags.h
 echo '#define INITS init_sc2();init_ramap();init_gsubr();init_ioext();init_posix();init_record();init_rgx();init_socket();init_unix();'>>scmflags.h
 echo '#define COMPILED_INITS init_edline();'>>scmflags.h
 echo '#define ARRAYS'>>scmflags.h
@@ -16,8 +16,7 @@ echo '#define MACRO'>>scmflags.h
 echo '#define CCLO'>>scmflags.h
 echo '#define TICKS'>>scmflags.h
 # ================ Compile C source files
-cc -O -c -Wall sc2.c ramap.c dynl.c edline.c gsubr.c ioext.c posix.c record.c rgx.c socket.c unix.c  continue.c scm.c scmmain.c findexec.c script.c time.c repl.c scl.c eval.c sys.c subr.c debug.c unif.c rope.c unexelf.c
+@CC@ @CFLAGS@ -c -Wall sc2.c ramap.c dynl.c edline.c gsubr.c ioext.c posix.c record.c rgx.c socket.c unix.c  continue.c scm.c scmmain.c findexec.c script.c time.c repl.c scl.c eval.c sys.c subr.c debug.c unif.c rope.c unexelf.c
 # ================ Link C object files
 mv -f scm scm~
-cc -o scm sc2.o ramap.o dynl.o edline.o gsubr.o ioext.o posix.o record.o rgx.o socket.o unix.o continue.o scm.o scmmain.o findexec.o script.o time.o repl.o scl.o eval.o sys.o subr.o debug.o unif.o rope.o unexelf.o -lm -ledit -ltermcap
-
+@CC@ -o scm sc2.o ramap.o dynl.o edline.o gsubr.o ioext.o posix.o record.o rgx.o socket.o unix.o continue.o scm.o scmmain.o findexec.o script.o time.o repl.o scl.o eval.o sys.o subr.o debug.o unif.o rope.o unexelf.o -lm -ledit -ltermcap
diff --git a/lang/scm/patches/patch-aa b/lang/scm/patches/patch-aa
index 0d45bffe3f3..dcf8dae5c3d 100644
--- a/lang/scm/patches/patch-aa
+++ b/lang/scm/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:31:23 agc Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/25 09:32:15 adam Exp $
 
---- Makefile.orig	2003-06-17 20:25:30.000000000 -0700
+--- Makefile.orig	2005-06-24 01:20:35.000000000 +0000
 +++ Makefile
-@@ -92,7 +92,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o
+@@ -97,7 +97,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o
  # ramap.o
  ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \
- 	Tscript.scm compile.scm
+ 	Tscript.scm compile.scm Iedline.scm Idiffer.scm
 -hobfiles = hobbit.scm scmhob.scm scmhob.h
 +hobsrcs = hobbit.scm scmhob.scm
 +hobincs = scmhob.h
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:31:23 agc Exp $
  xafiles = xatoms.scm x11.scm xevent.scm keysymdef.scm
  xfiles = x.c x.h xgen.scm xevent.h inc2scm $(xafiles)
  
-@@ -341,12 +343,12 @@ $(PREVDOCS)scm.info:	srcdir.mk Makefile
+@@ -396,12 +398,12 @@ $(PREVDOCS)scm.info:	srcdir.mk Makefile
  
  rpm_prefix=/usr/src/redhat/
  
@@ -28,7 +28,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:31:23 agc Exp $
  # directory where `make install' will put manual page.
  mandir = $(prefix)man/
  man1dir = $(mandir)man1/
-@@ -407,15 +409,15 @@ install:	scm.1
+@@ -453,7 +455,7 @@ $(infodir)Xlibscm.info.gz:	$(infodir)Xli
+ $(infodir)hobbit.info.gz:	$(infodir)hobbit.info
+ 	gzip -f $(infodir)hobbit.info
+ 
+-install:	scm.1 db.so wbtab.scm rwb-isam.scm
++install:
+ 	test -d $(bindir) || mkdir $(bindir)
+ 	test -d $(mandir) || mkdir $(mandir)
+ 	test -d $(man1dir) || mkdir $(man1dir)
+@@ -462,16 +464,16 @@ install:	scm.1 db.so wbtab.scm rwb-isam.
  	-cp scm.1 $(man1dir)
  	test -d $(libdir) || mkdir $(libdir)
  	test -d $(libscmdir) || mkdir $(libscmdir)
@@ -36,9 +45,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/10/04 20:31:23 agc Exp $
 +	-cp $(ifiles) $(hobsrcs) COPYING r4rstest.scm $(libscmdir)
  	test -f $(libscmdir)require.scm || \
  		cp requires.scm $(libscmdir)require.scm
--	-cp build build.scm mkimpcat.scm Iedline.scm *.sl *.so patchlvl.h\
-+	-cp build build.scm mkimpcat.scm Iedline.scm *.sl *.so \
+-	-cp build build.scm mkimpcat.scm Iedline.scm $(SHOBJS) patchlvl.h\
++	-cp build build.scm mkimpcat.scm Iedline.scm $(SHOBJS) \
  		$(xafiles) $(libscmdir)
+ 	-cp db.so wbtab.scm rwb-isam.scm $(libscmdir)
  
  installlib:
  	test -d $(includedir) || mkdir $(includedir)