Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id EBC5F7A3D6 for ; Sun, 3 Jul 2016 19:18:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9843685EA2; Sun, 3 Jul 2016 19:18:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 29E8E85E99 for ; Sun, 3 Jul 2016 19:18:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id mWaFak86IqWY for ; Sun, 3 Jul 2016 19:18:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6856685E25 for ; Sun, 3 Jul 2016 19:18:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 62AA2FBB5; Sun, 3 Jul 2016 19:18:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146757352732290" MIME-Version: 1.0 Date: Sun, 3 Jul 2016 19:18:47 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20160703191847.62AA2FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146757352732290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Sun Jul 3 19:18:47 UTC 2016 Modified Files: pkgsrc/lang/smlnj: Makefile distinfo pkgsrc/lang/smlnj/patches: patch-at pkgsrc/lang/smlnj11072: Makefile distinfo pkgsrc/lang/smlnj11072/patches: patch-at Log Message: Honor the pkgsrc configure shell instead of using /bin/sh, as on some platforms /bin/sh gets one something uselessly broken. Also, don't set MAKE to Solaris's make on Solaris; while this might be necessary building standalone, in pkgsrc it's foolish. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/smlnj/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/smlnj/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/smlnj/patches/patch-at cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/smlnj11072/Makefile \ pkgsrc/lang/smlnj11072/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/smlnj11072/patches/patch-at Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146757352732290 Content-Disposition: inline Content-Length: 7399 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/smlnj/Makefile diff -u pkgsrc/lang/smlnj/Makefile:1.29 pkgsrc/lang/smlnj/Makefile:1.30 --- pkgsrc/lang/smlnj/Makefile:1.29 Sun Jul 3 19:16:03 2016 +++ pkgsrc/lang/smlnj/Makefile Sun Jul 3 19:18:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2016/07/03 19:16:03 dholland Exp $ +# $NetBSD: Makefile,v 1.30 2016/07/03 19:18:46 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -118,13 +118,21 @@ SUBST_MESSAGE.cflags= Setting CFLAGS SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/* SUBST_VARS.cflags= CFLAGS +# use the proper shell +SUBST_CLASSES+= shell +SUBST_STAGE.shell= pre-configure +SUBST_MESSAGE.shell= Choosing the right shell +SUBST_FILES.shell= config/install.sh +SUBST_VARS.shell= CONFIG_SHELL + # nothing here any more do-configure: ${DO_NADA} # The build target needs to run $WRKDIR/config/install.sh do-build: - cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh + cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \ + ${CONFIG_SHELL} ./config/install.sh # install target # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) Index: pkgsrc/lang/smlnj/distinfo diff -u pkgsrc/lang/smlnj/distinfo:1.20 pkgsrc/lang/smlnj/distinfo:1.21 --- pkgsrc/lang/smlnj/distinfo:1.20 Sun Jul 3 19:07:38 2016 +++ pkgsrc/lang/smlnj/distinfo Sun Jul 3 19:18:46 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2016/07/03 19:07:38 dholland Exp $ +$NetBSD: distinfo,v 1.21 2016/07/03 19:18:46 dholland Exp $ SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb @@ -95,7 +95,7 @@ SHA1 (patch-an) = 3d750d5d20b2d3ab69b492 SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 -SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae +SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d Index: pkgsrc/lang/smlnj/patches/patch-at diff -u pkgsrc/lang/smlnj/patches/patch-at:1.2 pkgsrc/lang/smlnj/patches/patch-at:1.3 --- pkgsrc/lang/smlnj/patches/patch-at:1.2 Sun Jan 29 20:48:48 2012 +++ pkgsrc/lang/smlnj/patches/patch-at Sun Jul 3 19:18:47 2016 @@ -1,11 +1,31 @@ -$NetBSD: patch-at,v 1.2 2012/01/29 20:48:48 asau Exp $ +$NetBSD: patch-at,v 1.3 2016/07/03 19:18:47 dholland Exp $ -Don't unpack archive, since it is hard to fix, -unpack before patch phase instead. +- Honor the pkgsrc shell, to avoid getting a broken shell on e.g. Solaris. +- Don't use solaris make. +- Don't untar the runtime here since we did it from the pkgsrc makefile. ---- config/install.sh.orig 2007-06-12 20:43:58.000000000 +0400 -+++ config/install.sh 2009-03-19 00:47:06.000000000 +0300 -@@ -316,7 +316,7 @@ +--- config/install.sh.orig 2011-05-16 21:13:32.000000000 +0000 ++++ config/install.sh +@@ -55,7 +55,7 @@ cp config/preloads preloads.standard + # + MAKE=make + +-SHELL=/bin/sh ++SHELL=@CONFIG_SHELL@ + vsay $this: Using shell $SHELL. + + # +@@ -291,7 +291,8 @@ esac + + case $OPSYS in + solaris) +- MAKE=/usr/ccs/bin/make ++ # not in pkgsrc! ++ #MAKE=/usr/ccs/bin/make + ;; + linux) + EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"` +@@ -335,7 +336,7 @@ BOOT_FILES=sml.$BOOT_ARCHIVE if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then vsay $this: Run-time system already exists. else Index: pkgsrc/lang/smlnj11072/Makefile diff -u pkgsrc/lang/smlnj11072/Makefile:1.5 pkgsrc/lang/smlnj11072/Makefile:1.6 --- pkgsrc/lang/smlnj11072/Makefile:1.5 Sun Jul 3 19:16:03 2016 +++ pkgsrc/lang/smlnj11072/Makefile Sun Jul 3 19:18:47 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/07/03 19:16:03 dholland Exp $ +# $NetBSD: Makefile,v 1.6 2016/07/03 19:18:47 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -117,13 +117,21 @@ SUBST_MESSAGE.cflags= Setting CFLAGS SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/* SUBST_VARS.cflags= CFLAGS +# use the proper shell +SUBST_CLASSES+= shell +SUBST_STAGE.shell= pre-configure +SUBST_MESSAGE.shell= Choosing the right shell +SUBST_FILES.shell= config/install.sh +SUBST_VARS.shell= CONFIG_SHELL + # nothing here any more do-configure: ${DO_NADA} # The build target needs to run $WRKDIR/config/install.sh do-build: - cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh + cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \ + ${CONFIG_SHELL} ./config/install.sh # install target # (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) Index: pkgsrc/lang/smlnj11072/distinfo diff -u pkgsrc/lang/smlnj11072/distinfo:1.5 pkgsrc/lang/smlnj11072/distinfo:1.6 --- pkgsrc/lang/smlnj11072/distinfo:1.5 Sun Jul 3 19:11:15 2016 +++ pkgsrc/lang/smlnj11072/distinfo Sun Jul 3 19:18:47 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2016/07/03 19:11:15 dholland Exp $ +$NetBSD: distinfo,v 1.6 2016/07/03 19:18:47 dholland Exp $ SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb @@ -76,7 +76,7 @@ SHA1 (patch-ao) = 1c66024c5949269291cbf6 SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0 -SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae +SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d Index: pkgsrc/lang/smlnj11072/patches/patch-at diff -u pkgsrc/lang/smlnj11072/patches/patch-at:1.2 pkgsrc/lang/smlnj11072/patches/patch-at:1.3 --- pkgsrc/lang/smlnj11072/patches/patch-at:1.2 Sun Jul 3 18:33:36 2016 +++ pkgsrc/lang/smlnj11072/patches/patch-at Sun Jul 3 19:18:47 2016 @@ -1,11 +1,31 @@ -$NetBSD: patch-at,v 1.2 2016/07/03 18:33:36 dholland Exp $ +$NetBSD: patch-at,v 1.3 2016/07/03 19:18:47 dholland Exp $ -Don't unpack archive, since it is hard to fix, -unpack before patch phase instead. +- Honor the pkgsrc shell, to avoid getting a broken shell on e.g. Solaris. +- Don't use solaris make. +- Don't untar the runtime here since we did it from the pkgsrc makefile. ---- config/install.sh.orig 2007-06-12 20:43:58.000000000 +0400 -+++ config/install.sh 2009-03-19 00:47:06.000000000 +0300 -@@ -316,7 +316,7 @@ +--- config/install.sh.orig 2011-05-16 21:13:32.000000000 +0000 ++++ config/install.sh +@@ -55,7 +55,7 @@ cp config/preloads preloads.standard + # + MAKE=make + +-SHELL=/bin/sh ++SHELL=@CONFIG_SHELL@ + vsay $this: Using shell $SHELL. + + # +@@ -291,7 +291,8 @@ esac + + case $OPSYS in + solaris) +- MAKE=/usr/ccs/bin/make ++ # not in pkgsrc! ++ #MAKE=/usr/ccs/bin/make + ;; + linux) + EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"` +@@ -335,7 +336,7 @@ BOOT_FILES=sml.$BOOT_ARCHIVE if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then vsay $this: Run-time system already exists. else --_----------=_146757352732290--