Sun Jul 3 19:18:47 2016 UTC ()
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.


(dholland)
diff -r1.29 -r1.30 pkgsrc/lang/smlnj/Makefile
diff -r1.20 -r1.21 pkgsrc/lang/smlnj/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/smlnj/patches/patch-at
diff -r1.5 -r1.6 pkgsrc/lang/smlnj11072/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/smlnj11072/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/smlnj11072/patches/patch-at
cvs diff -r1.29 -r1.30 pkgsrc/lang/smlnj/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/Makefile 2016/07/03 19:16:03 1.29
+++ pkgsrc/lang/smlnj/Makefile 2016/07/03 19:18:46 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2016/07/03 19:16:03 dholland Exp $ 1# $NetBSD: Makefile,v 1.30 2016/07/03 19:18:46 dholland Exp $
2# 2#
3 3
4DISTNAME= boot.${BOX}-unix 4DISTNAME= boot.${BOX}-unix
5PKGNAME= smlnj-${SML_VERSION} 5PKGNAME= smlnj-${SML_VERSION}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/ 7MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/
8DISTFILES= MLRISC.tgz \ 8DISTFILES= MLRISC.tgz \
9 boot.${BOX}-unix.tgz \ 9 boot.${BOX}-unix.tgz \
10 ckit.tgz \ 10 ckit.tgz \
11 cm.tgz \ 11 cm.tgz \
12 cml.tgz \ 12 cml.tgz \
13 compiler.tgz \ 13 compiler.tgz \
14 config.tgz \ 14 config.tgz \
@@ -108,33 +108,41 @@ SUBST_CLASSES+= smlbase @@ -108,33 +108,41 @@ SUBST_CLASSES+= smlbase
108SUBST_STAGE.smlbase= pre-configure 108SUBST_STAGE.smlbase= pre-configure
109SUBST_MESSAGE.smlbase= Setting SML_BASE 109SUBST_MESSAGE.smlbase= Setting SML_BASE
110SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//} 110SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//}
111SUBST_VARS.smlbase= SML_BASE 111SUBST_VARS.smlbase= SML_BASE
112 112
113# resolve definition of CFLAGS in patched files 113# resolve definition of CFLAGS in patched files
114# (note that we need to do this in both src/runtime and base/runtime) 114# (note that we need to do this in both src/runtime and base/runtime)
115SUBST_CLASSES+= cflags 115SUBST_CLASSES+= cflags
116SUBST_STAGE.cflags= pre-configure 116SUBST_STAGE.cflags= pre-configure
117SUBST_MESSAGE.cflags= Setting CFLAGS 117SUBST_MESSAGE.cflags= Setting CFLAGS
118SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/* 118SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/*
119SUBST_VARS.cflags= CFLAGS 119SUBST_VARS.cflags= CFLAGS
120 120
 121# use the proper shell
 122SUBST_CLASSES+= shell
 123SUBST_STAGE.shell= pre-configure
 124SUBST_MESSAGE.shell= Choosing the right shell
 125SUBST_FILES.shell= config/install.sh
 126SUBST_VARS.shell= CONFIG_SHELL
 127
121# nothing here any more 128# nothing here any more
122do-configure: 129do-configure:
123 ${DO_NADA} 130 ${DO_NADA}
124 131
125# The build target needs to run $WRKDIR/config/install.sh 132# The build target needs to run $WRKDIR/config/install.sh
126do-build: 133do-build:
127 cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh 134 cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \
 135 ${CONFIG_SHELL} ./config/install.sh
128 136
129# install target 137# install target
130# (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) 138# (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
131# 1. create installation directories 139# 1. create installation directories
132# 2. copy the ./bin and ./lib directories across 140# 2. copy the ./bin and ./lib directories across
133# 3. install links to executables in $PREFIX/bin 141# 3. install links to executables in $PREFIX/bin
134INSTALLATION_DIRS= bin 142INSTALLATION_DIRS= bin
135do-install: 143do-install:
136 ${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE} 144 ${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE}
137 cd ${WRKDIR} && pax -rw -pam bin lib ${DESTDIR}${SML_BASE} 145 cd ${WRKDIR} && pax -rw -pam bin lib ${DESTDIR}${SML_BASE}
138 cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* . 146 cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* .
139 147
140.include "../../mk/bsd.pkg.mk" 148.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/lang/smlnj/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/distinfo 2016/07/03 19:07:38 1.20
+++ pkgsrc/lang/smlnj/distinfo 2016/07/03 19:18:46 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.20 2016/07/03 19:07:38 dholland Exp $ 1$NetBSD: distinfo,v 1.21 2016/07/03 19:18:46 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
@@ -85,20 +85,20 @@ SHA1 (patch-ab) = 2c9a448c8566d87a2d0152 @@ -85,20 +85,20 @@ SHA1 (patch-ab) = 2c9a448c8566d87a2d0152
85SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677 85SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677
86SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b 86SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b
87SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b 87SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b
88SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf 88SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf
89SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393 89SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393
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) = cd7d23adaf8882e9b431d6581283fdb58044e05c
99SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c 99SHA1 (patch-config___arch-n-opsys) = b0c952b0b9ed6312a115761fdbd4c30aaa208b4c
100SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 100SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78
101SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d 101SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
102SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c 102SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c
103SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 103SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
104SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1 104SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1
cvs diff -r1.2 -r1.3 pkgsrc/lang/smlnj/patches/patch-at (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/patches/patch-at 2012/01/29 20:48:48 1.2
+++ pkgsrc/lang/smlnj/patches/patch-at 2016/07/03 19:18:47 1.3
@@ -1,16 +1,36 @@ @@ -1,16 +1,36 @@
1$NetBSD: patch-at,v 1.2 2012/01/29 20:48:48 asau Exp $ 1$NetBSD: patch-at,v 1.3 2016/07/03 19:18:47 dholland Exp $
2 2
3Don't unpack archive, since it is hard to fix, 3- Honor the pkgsrc shell, to avoid getting a broken shell on e.g. Solaris.
4unpack before patch phase instead. 4- Don't use solaris make.
 5- Don't untar the runtime here since we did it from the pkgsrc makefile.
5 6
6--- config/install.sh.orig 2007-06-12 20:43:58.000000000 +0400 7--- config/install.sh.orig 2011-05-16 21:13:32.000000000 +0000
7+++ config/install.sh 2009-03-19 00:47:06.000000000 +0300 8+++ config/install.sh
8@@ -316,7 +316,7 @@ 9@@ -55,7 +55,7 @@ cp config/preloads preloads.standard
 10 #
 11 MAKE=make
 12
 13-SHELL=/bin/sh
 14+SHELL=@CONFIG_SHELL@
 15 vsay $this: Using shell $SHELL.
 16
 17 #
 18@@ -291,7 +291,8 @@ esac
 19
 20 case $OPSYS in
 21 solaris)
 22- MAKE=/usr/ccs/bin/make
 23+ # not in pkgsrc!
 24+ #MAKE=/usr/ccs/bin/make
 25 ;;
 26 linux)
 27 EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"`
 28@@ -335,7 +336,7 @@ BOOT_FILES=sml.$BOOT_ARCHIVE
9 if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then 29 if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
10 vsay $this: Run-time system already exists. 30 vsay $this: Run-time system already exists.
11 else 31 else
12- "$CONFIGDIR"/unpack "$ROOT" runtime 32- "$CONFIGDIR"/unpack "$ROOT" runtime
13+# "$CONFIGDIR"/unpack "$ROOT" runtime 33+# "$CONFIGDIR"/unpack "$ROOT" runtime
14 cd "$BASEDIR"/runtime/objs 34 cd "$BASEDIR"/runtime/objs
15 echo $this: Compiling the run-time system. 35 echo $this: Compiling the run-time system.
16 $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS 36 $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
cvs diff -r1.5 -r1.6 pkgsrc/lang/smlnj11072/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/smlnj11072/Makefile 2016/07/03 19:16:03 1.5
+++ pkgsrc/lang/smlnj11072/Makefile 2016/07/03 19:18:47 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2016/07/03 19:16:03 dholland Exp $ 1# $NetBSD: Makefile,v 1.6 2016/07/03 19:18:47 dholland Exp $
2# 2#
3 3
4DISTNAME= boot.${BOX}-unix 4DISTNAME= boot.${BOX}-unix
5PKGNAME= smlnj-${SML_VERSION} 5PKGNAME= smlnj-${SML_VERSION}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/ 7MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/
8DISTFILES= MLRISC.tgz \ 8DISTFILES= MLRISC.tgz \
9 boot.${BOX}-unix.tgz \ 9 boot.${BOX}-unix.tgz \
10 ckit.tgz \ 10 ckit.tgz \
11 cm.tgz \ 11 cm.tgz \
12 cml.tgz \ 12 cml.tgz \
13 compiler.tgz \ 13 compiler.tgz \
14 config.tgz \ 14 config.tgz \
@@ -107,33 +107,41 @@ SUBST_CLASSES+= smlbase @@ -107,33 +107,41 @@ SUBST_CLASSES+= smlbase
107SUBST_STAGE.smlbase= pre-configure 107SUBST_STAGE.smlbase= pre-configure
108SUBST_MESSAGE.smlbase= Setting SML_BASE 108SUBST_MESSAGE.smlbase= Setting SML_BASE
109SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//} 109SUBST_FILES.smlbase= ${SML_SCRIPTS:S/^/config\//}
110SUBST_VARS.smlbase= SML_BASE 110SUBST_VARS.smlbase= SML_BASE
111 111
112# resolve definition of CFLAGS in patched files 112# resolve definition of CFLAGS in patched files
113# (note that we need to do this in both src/runtime and base/runtime) 113# (note that we need to do this in both src/runtime and base/runtime)
114SUBST_CLASSES+= cflags 114SUBST_CLASSES+= cflags
115SUBST_STAGE.cflags= pre-configure 115SUBST_STAGE.cflags= pre-configure
116SUBST_MESSAGE.cflags= Setting CFLAGS 116SUBST_MESSAGE.cflags= Setting CFLAGS
117SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/* 117SUBST_FILES.cflags= src/runtime/objs/* base/runtime/objs/*
118SUBST_VARS.cflags= CFLAGS 118SUBST_VARS.cflags= CFLAGS
119 119
 120# use the proper shell
 121SUBST_CLASSES+= shell
 122SUBST_STAGE.shell= pre-configure
 123SUBST_MESSAGE.shell= Choosing the right shell
 124SUBST_FILES.shell= config/install.sh
 125SUBST_VARS.shell= CONFIG_SHELL
 126
120# nothing here any more 127# nothing here any more
121do-configure: 128do-configure:
122 ${DO_NADA} 129 ${DO_NADA}
123 130
124# The build target needs to run $WRKDIR/config/install.sh 131# The build target needs to run $WRKDIR/config/install.sh
125do-build: 132do-build:
126 cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} ./config/install.sh 133 cd ${WRKDIR} && unset PWD && ${SETENV} ${BUILD_ENV} \
 134 ${CONFIG_SHELL} ./config/install.sh
127 135
128# install target 136# install target
129# (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL) 137# (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
130# 1. create installation directories 138# 1. create installation directories
131# 2. copy the ./bin and ./lib directories across 139# 2. copy the ./bin and ./lib directories across
132# 3. install links to executables in $PREFIX/bin 140# 3. install links to executables in $PREFIX/bin
133INSTALLATION_DIRS= bin 141INSTALLATION_DIRS= bin
134do-install: 142do-install:
135 ${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE} 143 ${INSTALL_DATA_DIR} ${DESTDIR}${SML_BASE}
136 cd ${WRKDIR} && pax -rw -pam bin lib ${DESTDIR}${SML_BASE} 144 cd ${WRKDIR} && pax -rw -pam bin lib ${DESTDIR}${SML_BASE}
137 cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* . 145 cd ${DESTDIR}${PREFIX}/bin && ${LN} -sf ../lib/smlnj/bin/* .
138 146
139.include "../../mk/bsd.pkg.mk" 147.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/lang/smlnj11072/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/smlnj11072/distinfo 2016/07/03 19:11:15 1.5
+++ pkgsrc/lang/smlnj11072/distinfo 2016/07/03 19:18:47 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.5 2016/07/03 19:11:15 dholland Exp $ 1$NetBSD: distinfo,v 1.6 2016/07/03 19:18:47 dholland Exp $
2 2
3SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a 3SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a
4RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb 4RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb
5Size (smlnj-110.72/MLRISC.tgz) = 1432663 bytes 5Size (smlnj-110.72/MLRISC.tgz) = 1432663 bytes
6SHA1 (smlnj-110.72/boot.x86-unix.tgz) = 799f02f3e880a829b48962994b563f7321385d87 6SHA1 (smlnj-110.72/boot.x86-unix.tgz) = 799f02f3e880a829b48962994b563f7321385d87
7RMD160 (smlnj-110.72/boot.x86-unix.tgz) = bd2962ea25d6f384a3f458759a1c655960dc4208 7RMD160 (smlnj-110.72/boot.x86-unix.tgz) = bd2962ea25d6f384a3f458759a1c655960dc4208
8Size (smlnj-110.72/boot.x86-unix.tgz) = 5847908 bytes 8Size (smlnj-110.72/boot.x86-unix.tgz) = 5847908 bytes
9SHA1 (smlnj-110.72/ckit.tgz) = 0ebcdbd0a494eb051b4e6081f5e9312a0a54f03d 9SHA1 (smlnj-110.72/ckit.tgz) = 0ebcdbd0a494eb051b4e6081f5e9312a0a54f03d
10RMD160 (smlnj-110.72/ckit.tgz) = 0d94d522b22b21600ad99aaf22fb671c12a6ea59 10RMD160 (smlnj-110.72/ckit.tgz) = 0d94d522b22b21600ad99aaf22fb671c12a6ea59
11Size (smlnj-110.72/ckit.tgz) = 199126 bytes 11Size (smlnj-110.72/ckit.tgz) = 199126 bytes
12SHA1 (smlnj-110.72/cm.tgz) = 0a85eaecc101c45c769e6beb8ace8a8bf0f4d32f 12SHA1 (smlnj-110.72/cm.tgz) = 0a85eaecc101c45c769e6beb8ace8a8bf0f4d32f
13RMD160 (smlnj-110.72/cm.tgz) = 821eb682bfb4e6ef6a71fe341ba018059301a233 13RMD160 (smlnj-110.72/cm.tgz) = 821eb682bfb4e6ef6a71fe341ba018059301a233
14Size (smlnj-110.72/cm.tgz) = 201235 bytes 14Size (smlnj-110.72/cm.tgz) = 201235 bytes
@@ -66,20 +66,20 @@ SHA1 (patch-ad) = 67802bbdf42408c60bbce4 @@ -66,20 +66,20 @@ SHA1 (patch-ad) = 67802bbdf42408c60bbce4
66SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b 66SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b
67SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b 67SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b
68SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf 68SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf
69SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393 69SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393
70SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd 70SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd
71SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e 71SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e
72SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 72SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3
73SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 73SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511
74SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 74SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7
75SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 75SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
76SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b 76SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b
77SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 77SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059
78SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0 78SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0
79SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae 79SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c
80SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea 80SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea
81SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 81SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78
82SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d 82SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
83SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c 83SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c
84SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 84SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
85SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1 85SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = d2ede7ce4fca3c400f82ae09ee352ee6872bb1b1
cvs diff -r1.2 -r1.3 pkgsrc/lang/smlnj11072/patches/patch-at (expand / switch to unified diff)

--- pkgsrc/lang/smlnj11072/patches/patch-at 2016/07/03 18:33:36 1.2
+++ pkgsrc/lang/smlnj11072/patches/patch-at 2016/07/03 19:18:47 1.3
@@ -1,16 +1,36 @@ @@ -1,16 +1,36 @@
1$NetBSD: patch-at,v 1.2 2016/07/03 18:33:36 dholland Exp $ 1$NetBSD: patch-at,v 1.3 2016/07/03 19:18:47 dholland Exp $
2 2
3Don't unpack archive, since it is hard to fix, 3- Honor the pkgsrc shell, to avoid getting a broken shell on e.g. Solaris.
4unpack before patch phase instead. 4- Don't use solaris make.
 5- Don't untar the runtime here since we did it from the pkgsrc makefile.
5 6
6--- config/install.sh.orig 2007-06-12 20:43:58.000000000 +0400 7--- config/install.sh.orig 2011-05-16 21:13:32.000000000 +0000
7+++ config/install.sh 2009-03-19 00:47:06.000000000 +0300 8+++ config/install.sh
8@@ -316,7 +316,7 @@ 9@@ -55,7 +55,7 @@ cp config/preloads preloads.standard
 10 #
 11 MAKE=make
 12
 13-SHELL=/bin/sh
 14+SHELL=@CONFIG_SHELL@
 15 vsay $this: Using shell $SHELL.
 16
 17 #
 18@@ -291,7 +291,8 @@ esac
 19
 20 case $OPSYS in
 21 solaris)
 22- MAKE=/usr/ccs/bin/make
 23+ # not in pkgsrc!
 24+ #MAKE=/usr/ccs/bin/make
 25 ;;
 26 linux)
 27 EXTRA_DEFS=`"$CONFIGDIR/chk-global-names.sh"`
 28@@ -335,7 +336,7 @@ BOOT_FILES=sml.$BOOT_ARCHIVE
9 if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then 29 if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
10 vsay $this: Run-time system already exists. 30 vsay $this: Run-time system already exists.
11 else 31 else
12- "$CONFIGDIR"/unpack "$ROOT" runtime 32- "$CONFIGDIR"/unpack "$ROOT" runtime
13+# "$CONFIGDIR"/unpack "$ROOT" runtime 33+# "$CONFIGDIR"/unpack "$ROOT" runtime
14 cd "$BASEDIR"/runtime/objs 34 cd "$BASEDIR"/runtime/objs
15 echo $this: Compiling the run-time system. 35 echo $this: Compiling the run-time system.
16 $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS 36 $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS