From 68dbc592ae832414ad549e943ef8c8f8b66e2d99 Mon Sep 17 00:00:00 2001
From: Lars Brinkhoff <lars@nocrew.org>
Date: Mon, 21 Jan 2019 12:56:07 +0100
Subject: [PATCH] Use H3MAKE instead of HOSTS3 to compile the host table.

H3MAKE runs HOSTS3 with an appropriate JCL.
---
 Makefile               |  2 +-
 bin/sysbin/hosts3.2013 |  0
 build/basics.tcl       | 13 ++++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 bin/sysbin/hosts3.2013

diff --git a/Makefile b/Makefile
index c01c7487..631641c0 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ DOC = info _info_ sysdoc sysnet syshst kshack _teco_ emacs emacs1 c kcc \
       combat pdl minits mits_s chaos hal
 BIN = sys2 emacs _teco_ lisp liblsp alan inquir sail comlap c decsys \
       graphs draw datdrw fonts fonts1 fonts2 games macsym maint imlac \
-      _www_ hqm gt40 llogo bawden
+      _www_ hqm gt40 llogo bawden sysbin
 MINSRC = midas system $(DDT) $(SALV) $(KSFEDR) $(DUMP)
 
 # These are not included on the tape.
diff --git a/bin/sysbin/hosts3.2013 b/bin/sysbin/hosts3.2013
new file mode 100644
index 00000000..e69de29b
diff --git a/build/basics.tcl b/build/basics.tcl
index 4a186a07..a5b0e326 100644
--- a/build/basics.tcl
+++ b/build/basics.tcl
@@ -178,9 +178,13 @@ respond "*" ":midas syshst;_syshst;h3make\r"
 expect ":KILL"
 respond "*" ":link syshst;ts h3make,syshst;h3make bin\r"
 
-# build binary host table
-respond "*" ":syshst;hosts3 /insert syshst; h3text > /outfil sysbin; hosts3 bin\r"
-expect ":KILL"
+# Run H3MAKE to make the SYSBIN; HOSTS3 > database.  H3MAKE looks for
+# an older version, so there is an empty placeholder to make this
+# work.  H3MAKE runs in the background and leaves either SYSHST; H3TYO
+# or H3ERR with the output from the HOSTS3 program.  The placeholder
+# file is removed later.
+respond "*" ":syshst;h3make\r"
+expect {$$^K}
 
 # basic TCP support
 respond "*" ":midas sys;atsign tcp_syseng;@tcp\r"
@@ -283,6 +287,9 @@ respond "*" ":kill\r"
 respond "*" ":link sys;atsign pword,sysbin;pword bin\r"
 respond "*" ":link sys;ts panda,sysbin;panda bin\r"
 
+# Remove placeholder SYSBIN; HOSTS3 database.
+respond "*" ":delete sysbin; hosts3 <\r"
+
 respond "*" ":copy sysbin;name bin,sys;ts name\r"
 respond "*" "name\033j"
 respond "*" "\033l sys;ts name\r"