Thu Apr 14 22:10:31 2016 UTC ()
Two more patch comments. Also, remove a debug print that leaked in a year
ago and that nobody's apparently noticed in the interim.


(dholland)
diff -r1.18 -r1.19 pkgsrc/lang/smlnj/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd
diff -r1.1 -r1.2 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd
cvs diff -r1.18 -r1.19 pkgsrc/lang/smlnj/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/distinfo 2016/04/14 22:04:47 1.18
+++ pkgsrc/lang/smlnj/distinfo 2016/04/14 22:10:31 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.18 2016/04/14 22:04:47 dholland Exp $ 1$NetBSD: distinfo,v 1.19 2016/04/14 22:10:31 dholland Exp $
2 2
3SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 3SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9
4RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb 4RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb
5SHA512 (smlnj-110.73/MLRISC.tgz) = e16a213face6dbc128fc117a6ea30042ee49aa3aa985b3b6a9ea4f3ebd8392e2fc9db96451f49eddeab8f35a36665c1dc3dc77b6c615eae1b277192f16805d6b 5SHA512 (smlnj-110.73/MLRISC.tgz) = e16a213face6dbc128fc117a6ea30042ee49aa3aa985b3b6a9ea4f3ebd8392e2fc9db96451f49eddeab8f35a36665c1dc3dc77b6c615eae1b277192f16805d6b
6Size (smlnj-110.73/MLRISC.tgz) = 1422538 bytes 6Size (smlnj-110.73/MLRISC.tgz) = 1422538 bytes
7SHA1 (smlnj-110.73/boot.x86-unix.tgz) = f2a6b89708d41d5968bf6f2e2ee713704f3664fd 7SHA1 (smlnj-110.73/boot.x86-unix.tgz) = f2a6b89708d41d5968bf6f2e2ee713704f3664fd
8RMD160 (smlnj-110.73/boot.x86-unix.tgz) = c6fa71d7a14e79d095159ebd877b7562e88eeeb5 8RMD160 (smlnj-110.73/boot.x86-unix.tgz) = c6fa71d7a14e79d095159ebd877b7562e88eeeb5
9SHA512 (smlnj-110.73/boot.x86-unix.tgz) = 389f18bf989ff70aa4b4e174547bfc1ac00e5b3d0a57d60c96fc105252b94c8233fce0bdc868670386853bad9cc2a8643e9a1d3881bed1e0367d62a6451d6b78 9SHA512 (smlnj-110.73/boot.x86-unix.tgz) = 389f18bf989ff70aa4b4e174547bfc1ac00e5b3d0a57d60c96fc105252b94c8233fce0bdc868670386853bad9cc2a8643e9a1d3881bed1e0367d62a6451d6b78
10Size (smlnj-110.73/boot.x86-unix.tgz) = 5838645 bytes 10Size (smlnj-110.73/boot.x86-unix.tgz) = 5838645 bytes
11SHA1 (smlnj-110.73/ckit.tgz) = afbb7c03aa3aac813f4ce6686a68998b2612bea9 11SHA1 (smlnj-110.73/ckit.tgz) = afbb7c03aa3aac813f4ce6686a68998b2612bea9
12RMD160 (smlnj-110.73/ckit.tgz) = 56586583bbc8eff89e560e692705a7adc8f9c8e9 12RMD160 (smlnj-110.73/ckit.tgz) = 56586583bbc8eff89e560e692705a7adc8f9c8e9
13SHA512 (smlnj-110.73/ckit.tgz) = 555f5b3e7efaa73a9e30da03f664054f68dfe43072f4d380581cd77c5c75a6eb0f6ec296aa304d88d16f796227c45c0a1200c8f03bd6fc6f4160879edcd84299 13SHA512 (smlnj-110.73/ckit.tgz) = 555f5b3e7efaa73a9e30da03f664054f68dfe43072f4d380581cd77c5c75a6eb0f6ec296aa304d88d16f796227c45c0a1200c8f03bd6fc6f4160879edcd84299
14Size (smlnj-110.73/ckit.tgz) = 196369 bytes 14Size (smlnj-110.73/ckit.tgz) = 196369 bytes
@@ -90,20 +90,20 @@ SHA1 (patch-ah) = 93d7453dc82d91d29662cc @@ -90,20 +90,20 @@ SHA1 (patch-ah) = 93d7453dc82d91d29662cc
90SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd 90SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd
91SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e 91SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e
92SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 92SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3
93SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 93SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511
94SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 94SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7
95SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 95SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
96SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b 96SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b
97SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 97SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059
98SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae 98SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae
99SHA1 (patch-base_runtime_gc_gc-stats.h) = 35e54cb66c47c636c5a9f450cff99dced4218dd2 99SHA1 (patch-base_runtime_gc_gc-stats.h) = 35e54cb66c47c636c5a9f450cff99dced4218dd2
100SHA1 (patch-base_runtime_gc_init-gc.c) = f40e961089beab151290ffc8371a48bc9f846511 100SHA1 (patch-base_runtime_gc_init-gc.c) = f40e961089beab151290ffc8371a48bc9f846511
101SHA1 (patch-base_runtime_kernel_unix-timers.c) = 42f1d2964d5de37fdc232139f74fb9a95f21da07 101SHA1 (patch-base_runtime_kernel_unix-timers.c) = 42f1d2964d5de37fdc232139f74fb9a95f21da07
102SHA1 (patch-base_runtime_mach-dep_unix-prof.c) = 1f28a05cfb271c569cfb9778e67076bbfb14d646 102SHA1 (patch-base_runtime_mach-dep_unix-prof.c) = 1f28a05cfb271c569cfb9778e67076bbfb14d646
103SHA1 (patch-base_runtime_objs_mk.x86-netbsd) = 1e5ca88c65066a07b818af76abc2f9f1bafdc339 103SHA1 (patch-base_runtime_objs_mk.x86-netbsd) = 7d716c17c0f6a29acca7b630a1526df4d58e18cf
104SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c 104SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c
105SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 105SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78
106SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d 106SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
107SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c 107SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c
108SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 108SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
109SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = bd29b208b68771ecd1f3c64d896653084c6eb30e 109SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1
cvs diff -r1.1 -r1.2 pkgsrc/lang/smlnj/patches/Attic/patch-base_runtime_objs_mk.x86-netbsd (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/patches/Attic/patch-base_runtime_objs_mk.x86-netbsd 2015/04/22 07:41:38 1.1
+++ pkgsrc/lang/smlnj/patches/Attic/patch-base_runtime_objs_mk.x86-netbsd 2016/04/14 22:10:31 1.2
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: patch-base_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland Exp $ 1$NetBSD: patch-base_runtime_objs_mk.x86-netbsd,v 1.2 2016/04/14 22:10:31 dholland Exp $
 2
 3Configure for pkgsrc. Build as 32-bit.
2 4
3--- base/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 5--- base/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000
4+++ base/runtime/objs/mk.x86-netbsd 6+++ base/runtime/objs/mk.x86-netbsd
5@@ -7,9 +7,10 @@ SHELL = /bin/sh 7@@ -7,9 +7,10 @@ SHELL = /bin/sh
6  8
7 MAKE = gmake 9 MAKE = gmake
8  10
9+AS = as --32 11+AS = as --32
10 ARFLAGS = Trcv 12 ARFLAGS = Trcv
11 CC = gcc -ansi 13 CC = gcc -ansi
12-CFLAGS = -O2 14-CFLAGS = -O2
13+CFLAGS = -O2 -m32 15+CFLAGS = -O2 -m32
14 CPP = gcc -x assembler-with-cpp -E -P 16 CPP = gcc -x assembler-with-cpp -E -P
15 #CPP = /usr/bin/cpp -P 17 #CPP = /usr/bin/cpp -P
16  18
17@@ -23,4 +24,5 @@ VERSION = v-x86-netbsd 19@@ -23,4 +24,4 @@ VERSION = v-x86-netbsd
18 RUNTIME = run.x86-netbsd 20 RUNTIME = run.x86-netbsd
19  21
20 all: 22 all:
21- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) 23- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
22+ echo '************************** schnozzbort ************************' 
23+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) 24+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
cvs diff -r1.1 -r1.2 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd 2015/04/22 07:41:38 1.1
+++ pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd 2016/04/14 22:10:31 1.2
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland Exp $ 1$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.2 2016/04/14 22:10:31 dholland Exp $
 2
 3Configure for pkgsrc. Build as 32-bit.
2 4
3--- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 5--- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000
4+++ src/runtime/objs/mk.x86-netbsd 6+++ src/runtime/objs/mk.x86-netbsd
5@@ -7,9 +7,10 @@ SHELL = /bin/sh 7@@ -7,9 +7,10 @@ SHELL = /bin/sh
6  8
7 MAKE = gmake 9 MAKE = gmake
8  10
9+AS = as --32 11+AS = as --32
10 ARFLAGS = Trcv 12 ARFLAGS = Trcv
11 CC = gcc -ansi 13 CC = gcc -ansi
12-CFLAGS = -O2 14-CFLAGS = -O2
13+CFLAGS = -O2 -m32 15+CFLAGS = -O2 -m32
14 CPP = gcc -x assembler-with-cpp -E -P 16 CPP = gcc -x assembler-with-cpp -E -P
15 #CPP = /usr/bin/cpp -P 17 #CPP = /usr/bin/cpp -P
16  18
17@@ -23,4 +24,5 @@ VERSION = v-x86-netbsd 19@@ -23,4 +24,4 @@ VERSION = v-x86-netbsd
18 RUNTIME = run.x86-netbsd 20 RUNTIME = run.x86-netbsd
19  21
20 all: 22 all:
21- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) 23- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
22+ echo '************************** schnozzbort ************************' 
23+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) 24+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))