hare: Update to latest

[Charlotte Koch <charlotte%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Wed Jan 18 17:46:36 2023 -0800
Changeset:	afa6b607998e0fb007fe736d3c7631da90ee1009

Modified Files:
	hare/Makefile
	hare/TODO
	hare/distinfo
Added Files:
	hare/files/config.mk
Removed Files:
	hare/patches/patch-config.example.mk

Log Message:
hare: Update to latest

Still doesn't quite build for me on NetBSD/amd64 9.3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=afa6b607998e0fb007fe736d3c7631da90ee1009

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 hare/Makefile                        |  6 ++--
 hare/TODO                            |  8 ++++--
 hare/distinfo                        |  1 -
 hare/files/config.mk                 | 47 +++++++++++++++++++++++++++++++
 hare/patches/patch-config.example.mk | 54 ------------------------------------
 5 files changed, 55 insertions(+), 61 deletions(-)

diffs:
diff --git a/hare/Makefile b/hare/Makefile
index 636ba310bd..9205cc6728 100644
--- a/hare/Makefile
+++ b/hare/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	hare-0
 CATEGORIES=	lang
 GIT_REPO=	https://git.sr.ht/~sircmpwn/hare
 GIT_BRANCH=	master
-GIT_REVISION=	d9870303ec34c851b5d5a06402d8009dac76d174
+GIT_REVISION=	6390e11472e2393e4b26bf2e81c2d762546187b0
 
 MAINTAINER=	charlotte%NetBSD.org@localhost
 HOMEPAGE=	https://harelang.org/
@@ -20,11 +20,11 @@ MAKE_FLAGS+=	MANDIR=${MANDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 
 BUILD_DEPENDS+=		harec-[0-9]*:../../wip/harec
-BUILD_DEPENDS+=		qbe-[0-9]*:../../wip/qbe
+BUILD_DEPENDS+=		qbe-git-[0-9]*:../../wip/qbe-git
 BUILD_DEPENDS+=		scdoc-[0-9]*:../../textproc/scdoc
 
 pre-configure:
-	${RUN} cd ${WRKSRC} && ${CP} -f config.example.mk config.mk
+	${RUN} ${CP} -f ${FILESDIR}/config.mk ${WRKSRC}
 
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/hare/TODO b/hare/TODO
index 492e177f32..2cfac2c480 100644
--- a/hare/TODO
+++ b/hare/TODO
@@ -1,4 +1,6 @@
-hare TODO!
+hare TODO:
+
+Build fails on NetBSD/amd64 9.3:
+
+- /bin/sh: Cannot execute ELF binary .bin/hare
 
-Doesn't work on NetBSD at all -- requires that we provide a NetBSD runtime
-for Hare, whatever that takes
diff --git a/hare/distinfo b/hare/distinfo
index 8bd4d58cb0..afc76512f4 100644
--- a/hare/distinfo
+++ b/hare/distinfo
@@ -1,3 +1,2 @@
 $NetBSD$
 
-SHA1 (patch-config.example.mk) = 40412e3a887c4c1b742429c50da00b0abd12376a
diff --git a/hare/files/config.mk b/hare/files/config.mk
new file mode 100644
index 0000000000..e7018de992
--- /dev/null
+++ b/hare/files/config.mk
@@ -0,0 +1,47 @@
+## Install configuration
+
+PREFIX ?= /usr/local
+BINDIR ?= $(PREFIX)/bin
+MANDIR ?= $(PREFIX)/share/man
+SRCDIR ?= $(PREFIX)/src
+
+# Where to install the stdlib tree
+STDLIB ?= $(SRCDIR)/hare/stdlib
+
+# Default HAREPATH
+HAREPATH ?= $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
+
+## Build configuration
+
+# Platform to build for
+PLATFORM ?= linux
+ARCH ?= x86_64
+
+# External tools and flags
+HAREC ?= harec
+HAREFLAGS ?=
+QBE ?= qbe
+AS ?= as
+LD ?= ld
+AR ?= ar
+SCDOC ?= scdoc
+
+# Where to store build artifacts
+HARECACHE = .cache
+BINOUT = .bin
+
+# Cross-compiler toolchains
+AARCH64_AS?=aarch64-as
+AARCH64_AR?=aarch64-ar
+AARCH64_CC?=aarch64-cc
+AARCH64_LD?=aarch64-ld
+
+RISCV64_AS?=riscv64-as
+RISCV64_AR?=riscv64-ar
+RISCV64_CC?=riscv64-cc
+RISCV64_LD?=riscv64-ld
+
+X86_64_AS?=as
+X86_64_AR?=ar
+X86_64_CC?=cc
+X86_64_LD?=ld
diff --git a/hare/patches/patch-config.example.mk b/hare/patches/patch-config.example.mk
deleted file mode 100644
index d692d707e5..0000000000
--- a/hare/patches/patch-config.example.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-Allow configuration vars to be overridden
---- config.example.mk.orig	2022-05-03 19:56:11.565203456 -0700
-+++ config.example.mk	2022-05-03 19:56:36.752923296 -0700
-@@ -1,31 +1,31 @@
- ## Install configuration
- 
--PREFIX = /usr
--BINDIR = $(PREFIX)/bin
--MANDIR = $(PREFIX)/share/man
--SRCDIR = $(PREFIX)/src
-+PREFIX ?= /usr
-+BINDIR ?= $(PREFIX)/bin
-+MANDIR ?= $(PREFIX)/share/man
-+SRCDIR ?= $(PREFIX)/src
- 
- # Where to install the stdlib tree
--STDLIB = $(SRCDIR)/hare/stdlib
-+STDLIB ?= $(SRCDIR)/hare/stdlib
- 
- # Default HAREPATH
--LOCALSRCDIR = /usr/local/src/hare
--HAREPATH = $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
-+LOCALSRCDIR ?= /usr/local/src/hare
-+HAREPATH ?= $(LOCALSRCDIR)/stdlib:$(LOCALSRCDIR)/third-party:$(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party
- 
- ## Build configuration
- 
- # Platform to build for
--PLATFORM = linux
--ARCH = x86_64
-+PLATFORM ?= linux
-+ARCH ?= x86_64
- 
- # External tools and flags
--HAREC = harec
--HAREFLAGS =
--QBE = qbe
--AS = as
--LD = ld
--AR = ar
--SCDOC = scdoc
-+HAREC ?= harec
-+HAREFLAGS ?=
-+QBE ?= qbe
-+AS ?= as
-+LD ?= ld
-+AR ?= ar
-+SCDOC ?= scdoc
- 
- # Where to store build artifacts
--HARECACHE = .cache
-+HARECACHE ?= .cache