Update lang/scheme48 to 1.9.2.

Patch provided by Aleksej Lebedev via PR pkg/50425 and pkgsrc-users@.

pkgsrc changes:
 o While here fix various pkglint warnings (spaces vs tabs)
 o Update DESCR to reflect current status of scheme48 and R5RS

Changes:
* 2014-04-12 (version 1.9.2)
** Bug fixes
- Some regressions with respect to integer shifts were fixed.
- Some compiler warnings were fixed.

* 2014-02-22 (version 1.9.1)
** Bug fixes
- A bug fix from SRFI 13 was imported (in `string-trim-right').
- =DESTDIR= is now used consistently in the Makefile.
- A bug in `integer->errno' was fixed. (William Vining)
- Various problems that broke the VM when compiled with Clang were
  fixed.

5 files changed, 29 insertions, 38 deletions

diff --git a/lang/scheme48/DESCR b/lang/scheme48/DESCR
index a5977c27b4d..339f72d1715 100644
--- a/lang/scheme48/DESCR
+++ b/lang/scheme48/DESCR
@@ -1,16 +1,11 @@
 Scheme 48 is an implementation of the Scheme programming language as
-described in the Revised^4 Report on the Algorithmic Language Scheme.
+described in the Revised^5 Report on the Algorithmic Language Scheme.
 It is based on a compiler and interpreter for a virtual Scheme
 machine.  The name derives from our desire to have an implementation
 that is simple and lucid enough that it looks as if it were written in
 just 48 hours.  We don't claim to have reached that stage yet; much
 more simplification is necessary.
 
-Scheme 48 tries to be faithful to the upcoming Revised^5 Scheme
-Report, providing neither more nor less in the initial user
-environment.  (This is not to say that more isn't available in other
-environments; see below.)  Support for numbers is weak: bignums are
-slow and floating point is almost nonexistent (see description of
-floatnums, below).  DEFINE-SYNTAX, LET-SYNTAX, LETREC-SYNTAX, and
-SYNTAX-RULES are supported, but not the rest of the Revised^4 Scheme
-macro proposal.
+Scheme 48 tries to be faithful to Revised^5 Scheme Report, providing
+neither more nor less in the initial user environment. (This is not to
+say that more isn't available in other environments.)
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 48565281a87..1a503836c44 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2015/01/04 03:31:07 dholland Exp $
+# $NetBSD: Makefile,v 1.42 2015/11/14 14:14:46 leot Exp $
 
-DISTNAME=		scheme48-1.9
-PKGREVISION=		1
+DISTNAME=		scheme48-1.9.2
 CATEGORIES=		lang
-MASTER_SITES=		http://s48.org/1.9/
+MASTER_SITES=		http://s48.org/1.9.2/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -20,7 +19,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--docdir=${PREFIX}/share/doc/${PKGNAME_NOREV} \
 			--htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html \
 			--mandir=${PREFIX}/${PKGMANDIR}
-USE_TOOLS=		gmake
+USE_TOOLS+=		gmake
 BUILD_TARGET=		enough
 TEST_TARGET=		check		# fail if USER == root directory owner
 
@@ -31,11 +30,11 @@ REPLACE_FILES.scheme=	build/scheme48-config.in
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-SUBST_CLASSES+= 	pthr
+SUBST_CLASSES+=		pthr
 SUBST_STAGE.pthr=	post-patch
 SUBST_FILES.pthr=	configure
 SUBST_MESSAGE.pthr=	Hardcoding -pthread in CFLAGS and LDFLAGS
-SUBST_SED.pthr= 	-e 's,pthreads_done=\"no\",pthreads_done=\"yes\"; CFLAGS=\"$$CFLAGS -pthread\"; LDFLAGS=\"$$LDFLAGS -pthread\",'
+SUBST_SED.pthr=		-e 's,pthreads_done=\"no\",pthreads_done=\"yes\"; CFLAGS=\"$$CFLAGS -pthread\"; LDFLAGS=\"$$LDFLAGS -pthread\",'
 .endif
 
 .include "../../mk/compiler.mk"
diff --git a/lang/scheme48/PLIST b/lang/scheme48/PLIST
index 682abadbeed..cc8f16dc59c 100644
--- a/lang/scheme48/PLIST
+++ b/lang/scheme48/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/08/06 19:57:42 asau Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/11/14 14:14:46 leot Exp $
 bin/scheme-r5rs
 bin/scheme-srfi-7
 bin/scheme48
diff --git a/lang/scheme48/distinfo b/lang/scheme48/distinfo
index fbf020a4d54..ed09bda9db6 100644
--- a/lang/scheme48/distinfo
+++ b/lang/scheme48/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 22:50:44 agc Exp $
+$NetBSD: distinfo,v 1.12 2015/11/14 14:14:46 leot Exp $
 
-SHA1 (scheme48-1.9.tgz) = 8fd78d328a8c39ecd848e849ade094c30c2bb4ba
-RMD160 (scheme48-1.9.tgz) = 273f7de5d3775d80e91e8e8876e0d1328320d9e2
-SHA512 (scheme48-1.9.tgz) = d1fc0ba92df8a621028b6baa05c9193a3bb468d685fb70e717b2199233224da6b2697558857584869afd92a176bcc41a72807256f44fc317038b28eac2758d8a
-Size (scheme48-1.9.tgz) = 3945425 bytes
-SHA1 (patch-Makefile.in) = 0bebb77ceac6785476ec0ad7b3ddd2744e74b11c
+SHA1 (scheme48-1.9.2.tgz) = b2d02b6ddac56e566d170b9c916f11dbd182390a
+RMD160 (scheme48-1.9.2.tgz) = 81f7f253f4fb9ff7771c44b28f437ebb77756669
+Size (scheme48-1.9.2.tgz) = 3951356 bytes
+SHA1 (patch-Makefile.in) = 1a4aa120fc1b6b3bb88242e4a40cd5dcca530930
diff --git a/lang/scheme48/patches/patch-Makefile.in b/lang/scheme48/patches/patch-Makefile.in
index 6ddb5551813..d58226f56da 100644
--- a/lang/scheme48/patches/patch-Makefile.in
+++ b/lang/scheme48/patches/patch-Makefile.in
@@ -1,8 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1 2013/08/06 19:57:42 asau Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2015/11/14 14:14:46 leot Exp $
 
---- Makefile.in.orig	2012-12-27 16:46:24.000000000 +0000
+Html documentation should be installed to a separate dir
+
+--- Makefile.in.orig	2014-02-22 13:09:49.000000000 +0000
 +++ Makefile.in
-@@ -47,6 +47,7 @@ mandir = @mandir@/man$(manext)
+@@ -48,6 +48,7 @@ mandir = @mandir@/man$(manext)
  docdir = @docdir@
  datarootdir = @datarootdir@
  datadir = @datadir@
@@ -10,22 +12,18 @@ $NetBSD: patch-Makefile.in,v 1.1 2013/08/06 19:57:42 asau Exp $
  
  DYNAMIC_EXTERNALS_CFLAGS=@DYNAMIC_EXTERNALS_CFLAGS@
  DYNAMIC_EXTERNALS_LDFLAGS=@DYNAMIC_EXTERNALS_LDFLAGS@
-@@ -533,15 +534,15 @@ install-no-doc: enough dirs
+@@ -533,7 +534,7 @@ install-no-doc: enough dirs
+ # install the external modules
  	$(INSTALL_PROGRAM) $(EXTERNALS) $(DESTDIR)$(LIB)/
  # install the documentation
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
--	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)
-+	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)
- 
- install-doc: dirs doc
 -	$(srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
--	$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)
--	$(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(docdir)
--	$(INSTALL_DATA) $(srcdir)/doc/manual.ps $(docdir)
 +	$(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) $(DESTDIR)$(htmldir)
-+	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)
-+	$(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(DESTDIR)$(docdir)
-+	$(INSTALL_DATA) $(srcdir)/doc/manual.ps $(DESTDIR)$(docdir)
+ 	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir)
+ 
+ install-doc: dirs doc
+@@ -542,7 +543,7 @@ install-doc: dirs doc
+ 	$(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(DESTDIR)$(docdir)
+ 	$(INSTALL_DATA) $(srcdir)/doc/manual.ps $(DESTDIR)$(docdir)
  	for f in $(srcdir)/doc/html/*; do \
 -		$(INSTALL_DATA) $$f $(DESTDIR)$(docdir) || exit 1; \
 +		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldir) || exit 1; \