chezscheme: Update wip/chezscheme to 9.5

[Aleksej Lebedev <root%zta.lk@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Aleksej Lebedev <root%zta.lk@localhost>
Pushed By:	zhtw
Date:		Thu Jan 4 19:02:48 2018 +0100
Changeset:	920e8f9dfb725d29bb655747b906f184714fa682

Modified Files:
	chezscheme/Makefile
	chezscheme/distinfo
	chezscheme/patches/patch-configure
Removed Files:
	chezscheme/patches/patch-makefiles_installsh

Log Message:
chezscheme: Update wip/chezscheme to 9.5

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=920e8f9dfb725d29bb655747b906f184714fa682

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 chezscheme/Makefile                          | 14 +++++++-------
 chezscheme/distinfo                          | 19 +++++++++----------
 chezscheme/patches/patch-configure           | 10 ++++------
 chezscheme/patches/patch-makefiles_installsh | 15 ---------------
 4 files changed, 20 insertions(+), 38 deletions(-)

diffs:
diff --git a/chezscheme/Makefile b/chezscheme/Makefile
index caf2b90aea..9a8159b186 100644
--- a/chezscheme/Makefile
+++ b/chezscheme/Makefile
@@ -1,19 +1,19 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	ChezScheme
-VERSION=	9.4
+VERSION=	9.5
 PKGNAME=	${GITHUB_PROJECT:tl}-${VERSION}
 DISTNAME=	v${VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cisco/}
 GITHUB_TAG=     ${DISTNAME}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-DISTFILES=	ChezScheme-9.4.tar.gz \
-		zlib-1.2.8.tar.gz \
+DISTFILES=	ChezScheme-${VERSION}.tar.gz \
+		zlib-1.2.11.tar.gz \
 		nanopass-framework-scheme-1.9.tar.gz \
 		stex-1.2.1.tar.gz
-SITES.zlib-1.2.8.tar.gz= -https://github.com/madler/zlib/archive/v1.2.8.tar.gz
-SITES.ChezScheme-9.4.tar.gz= -https://github.com/cisco/ChezScheme/archive/v9.4.tar.gz
+SITES.zlib-1.2.11.tar.gz= -https://github.com/madler/zlib/archive/v1.2.11.tar.gz
+SITES.ChezScheme-${VERSION}.tar.gz= -https://github.com/cisco/ChezScheme/archive/v${VERSION}.tar.gz
 SITES.nanopass-framework-scheme-1.9.tar.gz= -https://github.com/nanopass/nanopass-framework-scheme/archive/v1.9.tar.gz
 SITES.stex-1.2.1.tar.gz= -https://github.com/dybvig/stex/archive/v1.2.1.tar.gz
 
@@ -22,7 +22,7 @@ HOMEPAGE=	https://cisco.github.io/ChezScheme/
 COMMENT=	Cisco implementation of the Scheme programming language
 LICENSE=	apache-2.0
 
-WRKSRC=		${WRKDIR}/ChezScheme-9.4
+WRKSRC=		${WRKDIR}/ChezScheme-${VERSION}
 HAS_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_LANGUAGES+=	c
@@ -31,7 +31,7 @@ USE_LANGUAGES+=	c
 
 pre-configure:
 	cd ${WRKSRC} && rmdir stex && mv ../stex-1.2.1 stex && \
-		        rmdir zlib && mv ../zlib-1.2.8 zlib &&  \
+		        rmdir zlib && mv ../zlib-1.2.11 zlib &&  \
 			rmdir nanopass && mv ../nanopass-framework-scheme-1.9 nanopass
 do-configure:
 	cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS} \
diff --git a/chezscheme/distinfo b/chezscheme/distinfo
index 326fbd035d..cab721ffb0 100644
--- a/chezscheme/distinfo
+++ b/chezscheme/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (ChezScheme/ChezScheme-9.4.tar.gz) = f1273793cbceb545e51baa2cbf1be1d9c870c8f4
-RMD160 (ChezScheme/ChezScheme-9.4.tar.gz) = 6162cde0b929a03bcc1984f83f0e63554018cc53
-SHA512 (ChezScheme/ChezScheme-9.4.tar.gz) = 722b072f28d6a4e3c21b220ddb5c01f60b421feaaa54f837cea3a225ce360eb12f217651538d677daae7187ce6d54f124c8aa697e7e477f1563d65b662002c46
-Size (ChezScheme/ChezScheme-9.4.tar.gz) = 28843543 bytes
+SHA1 (ChezScheme/ChezScheme-9.5.tar.gz) = d7ea3c2465f30802c47150cc46e06ead09a273bb
+RMD160 (ChezScheme/ChezScheme-9.5.tar.gz) = c34fb7741bc9f8ac03795fb9443890728c246f26
+SHA512 (ChezScheme/ChezScheme-9.5.tar.gz) = 493cbfe22b30f8ddc53f619f9371e47b69d7912127ba59c45324755905804aea3faf99cfb316380243e77e07912f779d88aee76f0f3f984316e2607e43e9194a
+Size (ChezScheme/ChezScheme-9.5.tar.gz) = 29245837 bytes
 SHA1 (ChezScheme/nanopass-framework-scheme-1.9.tar.gz) = 7f872c409165e822a031ebfb0f8639271306bcbe
 RMD160 (ChezScheme/nanopass-framework-scheme-1.9.tar.gz) = 783777cdcf0609444c0f7f1481af2320d5003d41
 SHA512 (ChezScheme/nanopass-framework-scheme-1.9.tar.gz) = 6b11058332b52f6cac08855cd5881ddf7ec12f3c1154ebb2a95e0f44ad4d090f8101f3b68419a65a32a1b6f4ae38f39b204ddfec048bfa30adb4456bae14ab7a
@@ -12,9 +12,8 @@ SHA1 (ChezScheme/stex-1.2.1.tar.gz) = e97e52fdad75c150997c30f549e18bbecd785929
 RMD160 (ChezScheme/stex-1.2.1.tar.gz) = a2dbdd9dc857920944b80b53f44e83ec4fa366a4
 SHA512 (ChezScheme/stex-1.2.1.tar.gz) = 29909a05cd813e5b7918d55dc10f1b2de80dec18ae89a1644261decfd79ac8e5468ac3b50f49c70796bde05ddfad5eaacd879dbadc995ce87f6a74c17b947058
 Size (ChezScheme/stex-1.2.1.tar.gz) = 211011 bytes
-SHA1 (ChezScheme/zlib-1.2.8.tar.gz) = 730c4e75b553cafc0c081127de43174192ce98fd
-RMD160 (ChezScheme/zlib-1.2.8.tar.gz) = 820cab211e9311390e206c658c4c1ad3c6c84ccc
-SHA512 (ChezScheme/zlib-1.2.8.tar.gz) = 7e393976368975446b263ae4143fb404bc33bf3b436e72007700b5b88e5be332cd461cdec42d31a4b6dffdca2368550f01b9fa1165d81c0aa818bbf2b1ac191e
-Size (ChezScheme/zlib-1.2.8.tar.gz) = 604952 bytes
-SHA1 (patch-configure) = 807402072a52d243945dec4c5305561d16441b0e
-SHA1 (patch-makefiles_installsh) = e0a597e2c63cfa088a6621bf6bc98f5a1fa5f746
+SHA1 (ChezScheme/zlib-1.2.11.tar.gz) = 56559d4c03beaedb0be1c7481d6a371e2458a496
+RMD160 (ChezScheme/zlib-1.2.11.tar.gz) = 7fe2ff01eab9693ee5dca244161ff595b4372b9b
+SHA512 (ChezScheme/zlib-1.2.11.tar.gz) = 104c62ed1228b5f1199bc037081861576900eb0697a226cafa62a35c4c890b5cb46622e399f9aad82ee5dfb475bae26ae75e2bd6da3d261361b1c8b996970faf
+Size (ChezScheme/zlib-1.2.11.tar.gz) = 644492 bytes
+SHA1 (patch-configure) = 7b772b0a4ae04e9f7c786d7e170ecd8af5a5c0db
diff --git a/chezscheme/patches/patch-configure b/chezscheme/patches/patch-configure
index e93e6a2ed8..16d884a9a1 100644
--- a/chezscheme/patches/patch-configure
+++ b/chezscheme/patches/patch-configure
@@ -1,14 +1,12 @@
 $NetBSD$
 
-Git submodules should not be used.
-
---- configure.orig	2016-05-13 16:59:20.000000000 +0000
+--- configure.orig	2017-10-11 22:26:23.000000000 +0000
 +++ configure
-@@ -288,22 +288,6 @@ if [ "$m" = "" -o ! -f boot/$m/scheme.bo
+@@ -310,22 +310,6 @@ if [ "$m" = "" -o ! -f boot/$m/scheme.bo
    exit 1
  fi
  
--if [ -d '.git' ] ; then
+-if [ -d '.git' ] && command -v git >/dev/null 2>&1 ; then
 -  git submodule init && git submodule update || exit 1
 -else
 -  if [ ! -f 'nanopass/nanopass.ss' ] ; then
@@ -16,7 +14,7 @@ Git submodules should not be used.
 -  fi
 -
 -  if [ ! -f 'zlib/configure' ] ; then
--    rmdir zlib && (curl -L -o v1.2.8.tar.gz https://github.com/madler/zlib/archive/v1.2.8.tar.gz && tar -xzf v1.2.8.tar.gz && mv zlib-1.2.8 zlib && rm v1.2.8.tar.gz) || exit 1
+-    rmdir zlib && (curl -L -o v1.2.11.tar.gz https://github.com/madler/zlib/archive/v1.2.11.tar.gz && tar -xzf v1.2.11.tar.gz && mv zlib-1.2.11 zlib && rm v1.2.11.tar.gz) || exit 1
 -  fi
 -
 -  if [ ! -f 'stex/Mf-stex' ] ; then
diff --git a/chezscheme/patches/patch-makefiles_installsh b/chezscheme/patches/patch-makefiles_installsh
deleted file mode 100644
index e37d609448..0000000000
--- a/chezscheme/patches/patch-makefiles_installsh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-# Posix shell doesn't allow == (only bash does).
-
---- makefiles/installsh.orig	2016-05-13 16:59:20.000000000 +0000
-+++ makefiles/installsh
-@@ -61,7 +61,7 @@ while ${TRUE} ; do
-     for file in $files ; do
-       destfile=$dest
-       if [ -d $destfile ] ; then destfile=$destfile/`basename $file` ; fi
--      if [ $ifdiff == 1 ] && cmp -s $file $destfile || cp -f -p $file $destfile ; then
-+      if [ $ifdiff = 1 ] && cmp -s $file $destfile || cp -f -p $file $destfile ; then
-         if [ "$owner" != "" ] ; then chown $owner $destfile ; fi
-         if [ "$group" != "" ] ; then chgrp $group $destfile ; fi
-         if [ "$mode" != "" ] ; then chmod $mode $destfile ; fi