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 25E147A3D6 for ; Sun, 3 Jul 2016 19:07:40 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C0A7F85EA1; Sun, 3 Jul 2016 19:07:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 52FEC85E99 for ; Sun, 3 Jul 2016 19:07:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id LLhFntxkSU5p for ; Sun, 3 Jul 2016 19:07:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D0D5285E25 for ; Sun, 3 Jul 2016 19:07:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CB222FBB5; Sun, 3 Jul 2016 19:07:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1467572858154280" MIME-Version: 1.0 Date: Sun, 3 Jul 2016 19:07:38 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/lang/smlnj To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20160703190738.CB222FBB5@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. --_----------=_1467572858154280 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:07:38 UTC 2016 Modified Files: pkgsrc/lang/smlnj: distinfo Removed Files: pkgsrc/lang/smlnj/patches: patch-base_runtime_gc_gc-stats.h patch-base_runtime_gc_init-gc.c patch-base_runtime_kernel_unix-timers.c patch-base_runtime_mach-dep_unix-prof.c patch-base_runtime_objs_mk.x86-netbsd Log Message: Remove duplicate patches. Patch only the src/ copy of the runtime. Instead of extracting the runtime twice for src/ and base/ and then haphazardly patching either or both copies, patch only one copy and create the other *after* patching. (better yet would be not to copy the thing at all, but I think there are smlnj reasons you can't do that) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/smlnj/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/lang/smlnj/patches/patch-base_runtime_gc_gc-stats.h \ pkgsrc/lang/smlnj/patches/patch-base_runtime_gc_init-gc.c \ pkgsrc/lang/smlnj/patches/patch-base_runtime_kernel_unix-timers.c \ pkgsrc/lang/smlnj/patches/patch-base_runtime_mach-dep_unix-prof.c cvs rdiff -u -r1.2 -r0 \ pkgsrc/lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1467572858154280 Content-Disposition: inline Content-Length: 1455 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/smlnj/distinfo diff -u pkgsrc/lang/smlnj/distinfo:1.19 pkgsrc/lang/smlnj/distinfo:1.20 --- pkgsrc/lang/smlnj/distinfo:1.19 Thu Apr 14 22:10:31 2016 +++ pkgsrc/lang/smlnj/distinfo Sun Jul 3 19:07:38 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2016/04/14 22:10:31 dholland Exp $ +$NetBSD: distinfo,v 1.20 2016/07/03 19:07:38 dholland Exp $ SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb @@ -96,11 +96,6 @@ SHA1 (patch-ao) = 1c66024c5949269291cbf6 SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae -SHA1 (patch-base_runtime_gc_gc-stats.h) = 35e54cb66c47c636c5a9f450cff99dced4218dd2 -SHA1 (patch-base_runtime_gc_init-gc.c) = f40e961089beab151290ffc8371a48bc9f846511 -SHA1 (patch-base_runtime_kernel_unix-timers.c) = 42f1d2964d5de37fdc232139f74fb9a95f21da07 -SHA1 (patch-base_runtime_mach-dep_unix-prof.c) = 1f28a05cfb271c569cfb9778e67076bbfb14d646 -SHA1 (patch-base_runtime_objs_mk.x86-netbsd) = 7d716c17c0f6a29acca7b630a1526df4d58e18cf 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 --_----------=_1467572858154280--