Re: [PR PATCH] [Updated] New package: himitsu-0.6

[Pestdoktor <Pestdoktor@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1303 bytes --]

There is an updated pull request by Pestdoktor against master on the void-packages repository

https://github.com/Pestdoktor/void-packages himitsu
https://github.com/void-linux/void-packages/pull/48784

New package: himitsu-0.6
<!-- Uncomment relevant sections and delete options which are not applicable -->

requested by  #40466
dependencies tracked at #48783

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/48784.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-himitsu-48784.patch --]
[-- Type: text/x-diff, Size: 20122 bytes --]

From 154d8cdce4f81daa7f4cfe7df2234cde4928b5e7 Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Sat, 17 Feb 2024 00:34:18 +0100
Subject: [PATCH 1/6] qbe: update to 1.2.

---
 srcpkgs/qbe/template | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
index e56a69ffcc107b..8a42d36e3fe21d 100644
--- a/srcpkgs/qbe/template
+++ b/srcpkgs/qbe/template
@@ -1,6 +1,6 @@
 # Template file for 'qbe'
 pkgname=qbe
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,15 +9,19 @@ maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
 license="MIT"
 homepage="https://c9x.me/compile/"
 distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
-checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+checksum=a6d50eb952525a234bf76ba151861f73b7a382ac952d985f2b9af1df5368225d
 
-# Currently only aarch64 and x86_64 targets are supported and the checks
-# test the compiled binaries.
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|x86_64*) ;;
+	aarch64*|riscv64*|x86_64*) ;;
+	# Currently only aarch64, riscv64 and x86_64 targets are supported and the checks
+	# test the compiled binaries.
 	*) make_check=no ;;
 esac
 
+do_configure() {
+	sed -i "s|^CC       = cc$|CC = ${CC}|" Makefile
+}
+
 post_install() {
 	vdoc doc/abi.txt
 	vdoc doc/il.txt

From a54f5861c91020befbe8382d859f2a0c0ed8dec9 Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Sat, 17 Feb 2024 00:36:25 +0100
Subject: [PATCH 2/6] New package: harec-0.24.0

---
 srcpkgs/harec/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/harec/template

diff --git a/srcpkgs/harec/template b/srcpkgs/harec/template
new file mode 100644
index 00000000000000..831adad5e0b9fc
--- /dev/null
+++ b/srcpkgs/harec/template
@@ -0,0 +1,20 @@
+# Template file for 'harec'
+pkgname=harec
+version=0.24.0
+revision=1
+build_style=configure
+checkdepends="qbe"
+short_desc="Hare bootstrap compiler"
+maintainer="Jonas Fentker <jonas@fentker.eu>"
+license="GPL-3.0-only"
+homepage="https://git.sr.ht/~sircmpwn/harec"
+distfiles="https://git.sr.ht/~sircmpwn/${pkgname}/archive/${version}.tar.gz"
+checksum="add6a7c4cbfd130c5e9fcecd2d43bec39640ed9f9cfbe9166e4b7e945a46b7de"
+
+do_configure() {
+	sed 's|^PREFIX = /usr/local$|PREFIX = /usr|' configs/linux.mk | \
+	sed "s|^ARCH = x86_64$|ARCH = ${XBPS_TARGET_MACHINE}|" | \
+	sed "s|^CC = cc$|CC = ${CC}|" | \
+	sed "s|^AS = as$|AS = ${AS}|" | \
+	sed "s|^LD = ld$|LD = ${LD}|" > config.mk
+}

From a6237473bc0872d505c06ca8a80d45140e2e1973 Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Sat, 17 Feb 2024 20:43:46 +0100
Subject: [PATCH 3/6] New package: hare-driver-0.24.0

---
 ...-add-separate-haredoc-install-target.patch |  42 ++++
 .../patches/02-pass-arch-to-harec.patch       | 180 ++++++++++++++++++
 srcpkgs/hare-driver/template                  |  45 +++++
 3 files changed, 267 insertions(+)
 create mode 100644 srcpkgs/hare-driver/patches/01-add-separate-haredoc-install-target.patch
 create mode 100644 srcpkgs/hare-driver/patches/02-pass-arch-to-harec.patch
 create mode 100644 srcpkgs/hare-driver/template

diff --git a/srcpkgs/hare-driver/patches/01-add-separate-haredoc-install-target.patch b/srcpkgs/hare-driver/patches/01-add-separate-haredoc-install-target.patch
new file mode 100644
index 00000000000000..8019c08aa7de41
--- /dev/null
+++ b/srcpkgs/hare-driver/patches/01-add-separate-haredoc-install-target.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 2482be1f..69e5ab8e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -82,8 +82,8 @@ docs: \
+ 	docs/haredoc.5 \
+ 	docs/hare-module.5
+ 
+-MAN1 = hare hare-build hare-cache hare-deps haredoc hare-run hare-test
+-MAN5 = haredoc hare-module
++MAN1 = hare hare-build hare-cache hare-deps hare-run hare-test
++MAN5 = hare-module
+ 
+ bootstrap:
+ 	@BINOUT=$(BINOUT) ./scripts/genbootstrap
+@@ -97,17 +97,24 @@ check: $(BINOUT)/hare
+ 		QBEFLAGS='$(QBEFLAGS)' ASFLAGS='$(ASFLAGS)' \
+ 		LDLINKFLAGS='$(LDLINKFLAGS)' '$(BINOUT)/hare' test
+ 
+-install: install-cmd install-mods
++install: install-cmd install-haredoc install-mods
+ 
+ install-cmd:
+ 	mkdir -p -- \
+ 		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \
+ 		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5'
+ 	install -m755 '$(BINOUT)/hare' '$(DESTDIR)$(BINDIR)/hare'
+-	install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc'
+ 	for i in $(MAN1); do install -m644 docs/$$i.1 '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done
+ 	for i in $(MAN5); do install -m644 docs/$$i.5 '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done
+ 
++install-haredoc:
++	mkdir -p -- \
++		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \
++		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5'
++	install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc'
++	install -m644 docs/haredoc.1 '$(DESTDIR)$(MANDIR)'/man1/haredoc.1
++	install -m644 docs/haredoc.5 '$(DESTDIR)$(MANDIR)'/man5/haredoc.5
++
+ install-mods:
+ 	rm -rf -- '$(DESTDIR)$(STDLIB)'
+ 	mkdir -p -- '$(DESTDIR)$(STDLIB)'
diff --git a/srcpkgs/hare-driver/patches/02-pass-arch-to-harec.patch b/srcpkgs/hare-driver/patches/02-pass-arch-to-harec.patch
new file mode 100644
index 00000000000000..550fa2fd66b3f1
--- /dev/null
+++ b/srcpkgs/hare-driver/patches/02-pass-arch-to-harec.patch
@@ -0,0 +1,180 @@
+From 700336294285a553fe47600b6d155a4a7dba8339 Mon Sep 17 00:00:00 2001
+From: Ember Sawady <ecs@d2evs.net>
+Date: Sun, 18 Feb 2024 19:32:10 +0000
+Subject: [PATCH hare] hare build: pass -a to harec
+
+reported by Jonas Fenkter
+
+Signed-off-by: Ember Sawady <ecs@d2evs.net>
+---
+ cmd/hare/arch.ha        | 22 ++++++++--------------
+ cmd/hare/build.ha       |  7 +++----
+ cmd/hare/build/types.ha | 10 +++++++++-
+ cmd/hare/build/util.ha  |  9 +++++++--
+ 4 files changed, 27 insertions(+), 21 deletions(-)
+
+diff --git a/cmd/hare/arch.ha b/cmd/hare/arch.ha
+index 791fac9b..10bf79f7 100644
+--- a/cmd/hare/arch.ha
++++ b/cmd/hare/arch.ha
+@@ -1,6 +1,8 @@
+ // SPDX-License-Identifier: GPL-3.0-only
+ // (c) Hare authors <https://harelang.org>
+ 
++use cmd::hare::build;
++
+ // When building the bootstrap toolchain, these values will get overwritten to
+ // equal the values in config.mk
+ def AARCH64_AS = "as";
+@@ -13,32 +15,24 @@ def X86_64_AS  = "as";
+ def X86_64_CC  = "cc";
+ def X86_64_LD  = "ld";
+ 
+-type arch = struct {
+-	name: str,
+-	qbe_name: str,
+-	as_cmd: str,
+-	cc_cmd: str,
+-	ld_cmd: str,
+-};
+-
+ // TODO: implement cross compiling to other kernels (e.g. linux => freebsd)
+ // TODO: sysroots
+-const arches: [_]arch = [
+-	arch {
++const arches: [_]build::arch = [
++	build::arch {
+ 		name = "aarch64",
+ 		qbe_name = "arm64",
+ 		as_cmd = AARCH64_AS,
+ 		cc_cmd = AARCH64_CC,
+ 		ld_cmd = AARCH64_LD,
+ 	},
+-	arch {
++	build::arch {
+ 		name = "riscv64",
+ 		qbe_name = "rv64",
+ 		as_cmd = RISCV64_AS,
+ 		cc_cmd = RISCV64_CC,
+ 		ld_cmd = RISCV64_LD,
+ 	},
+-	arch {
++	build::arch {
+ 		name = "x86_64",
+ 		qbe_name = "amd64_sysv",
+ 		as_cmd = X86_64_AS,
+@@ -47,12 +41,12 @@ const arches: [_]arch = [
+ 	},
+ ];
+ 
+-fn set_arch_tags(tags: *[]str, a: *arch) void = {
++fn set_arch_tags(tags: *[]str, a: *build::arch) void = {
+ 	merge_tags(tags, "-aarch64-riscv64-x86_64")!;
+ 	append(tags, a.name);
+ };
+ 
+-fn get_arch(name: str) (*arch | unknown_arch) = {
++fn get_arch(name: str) (*build::arch | unknown_arch) = {
+ 	for (let i = 0z; i < len(arches); i += 1) {
+ 		if (arches[i].name == name) {
+ 			return &arches[i];
+diff --git a/cmd/hare/build.ha b/cmd/hare/build.ha
+index b2ac6518..bf6b26a9 100644
+--- a/cmd/hare/build.ha
++++ b/cmd/hare/build.ha
+@@ -21,8 +21,7 @@ use strings;
+ use unix::tty;
+ 
+ fn build(name: str, cmd: *getopt::command) (void | error) = {
+-	let arch = os::arch_name(os::architecture());
+-	let arch = get_arch(arch)!;
++	let arch = get_arch(os::arch_name(os::architecture()))!;
+ 	let output = "";
+ 	let ctx = build::context {
+ 		ctx = module::context {
+@@ -38,7 +37,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
+ 			yield ncpu;
+ 		},
+ 		version = build::get_version(os::tryenv("HAREC", "harec"))?,
+-		arch = arch.qbe_name,
++		arch = arch,
+ 		platform = build::get_platform(os::sysname())?,
+ 		...
+ 	};
+@@ -59,7 +58,7 @@ fn build(name: str, cmd: *getopt::command) (void | error) = {
+ 		switch (opt.0) {
+ 		case 'a' =>
+ 			arch = get_arch(opt.1)?;
+-			ctx.arch = arch.qbe_name;
++			ctx.arch = arch;
+ 		case 'D' =>
+ 			let buf = memio::fixed(strings::toutf8(opt.1));
+ 			let sc = bufio::newscanner(&buf, len(opt.1));
+diff --git a/cmd/hare/build/types.ha b/cmd/hare/build/types.ha
+index df6c12b9..d7086c47 100644
+--- a/cmd/hare/build/types.ha
++++ b/cmd/hare/build/types.ha
+@@ -51,9 +51,17 @@ export type output = enum {
+ 	VVERBOSE,
+ };
+ 
++export type arch = struct {
++	name: str,
++	qbe_name: str,
++	as_cmd: str,
++	cc_cmd: str,
++	ld_cmd: str,
++};
++
+ export type context = struct {
+ 	ctx: module::context,
+-	arch: str,
++	arch: *arch,
+ 	platform: *platform,
+ 	goal: stage,
+ 	defines: []ast::decl_const,
+diff --git a/cmd/hare/build/util.ha b/cmd/hare/build/util.ha
+index a648788f..d4725b1e 100644
+--- a/cmd/hare/build/util.ha
++++ b/cmd/hare/build/util.ha
+@@ -104,7 +104,7 @@ fn get_flags(ctx: *context, t: *task) ([]str | error) = {
+ 	case stage::SSA => void; // below
+ 	case stage::S =>
+ 		append(flags, strings::dup("-t"));
+-		append(flags, strings::dup(ctx.arch));
++		append(flags, strings::dup(ctx.arch.qbe_name));
+ 		return flags;
+ 	case stage::O =>
+ 		return flags;
+@@ -123,6 +123,9 @@ fn get_flags(ctx: *context, t: *task) ([]str | error) = {
+ 		return flags;
+ 	};
+ 
++	append(flags, strings::dup("-a"));
++	append(flags, strings::dup(ctx.arch.name));
++
+ 	let mod = ctx.mods[t.idx];
+ 	if (len(ctx.ns) != 0 && t.idx == ctx.top) {
+ 		append(flags, strings::dup("-N"));
+@@ -190,6 +193,8 @@ fn get_hash(
+ 	switch (t.kind) {
+ 	case stage::TD => abort();
+ 	case stage::SSA =>
++		hash::write(&h, strings::toutf8(ctx.arch.name));
++		hash::write(&h, [0]);
+ 		hash::write(&h, ctx.version);
+ 		hash::write(&h, [0]);
+ 		for (let i = 0z; i < len(ctx.mods[t.idx].deps); i += 1) {
+@@ -209,7 +214,7 @@ fn get_hash(
+ 			hash::write(&h, [0]);
+ 		};
+ 	case stage::S =>
+-		hash::write(&h, strings::toutf8(ctx.arch));
++		hash::write(&h, strings::toutf8(ctx.arch.qbe_name));
+ 		hash::write(&h, [0]);
+ 	case stage::O => void;
+ 	case stage::BIN =>
+-- 
+2.43.1
+
+
diff --git a/srcpkgs/hare-driver/template b/srcpkgs/hare-driver/template
new file mode 100644
index 00000000000000..1be1f80c40ae08
--- /dev/null
+++ b/srcpkgs/hare-driver/template
@@ -0,0 +1,45 @@
+# Template file for 'hare-driver'
+pkgname=hare-driver
+version=0.24.0
+revision=1
+archs="x86_64 x86_64-musl aarch64 aarch64-musl riscv64 riscv64-musl"
+build_style=configure
+make_build_target=".bin/hare docs"
+make_install_target="install-cmd install-mods"
+hostmakedepends="qbe harec scdoc"
+depends="qbe-1.2_1 harec-0.24.0_1"
+short_desc="Hare build driver"
+maintainer="Jonas Fentker <jonas@fentker.eu>"
+license="MPL-2.0, GPL-3.0-only"
+homepage="https://harelang.org/"
+distfiles="https://git.sr.ht/~sircmpwn/hare/archive/${version}.tar.gz"
+checksum="7061dad3c79cca51a1662a71b1c6f8ec001f52ef3053dd3c2dbb95ae9beff7bc"
+
+do_configure() {
+	case "${XBPS_LIBC}" in
+		glibc) lib=gnu ;;
+		musl) lib=musl ;;
+	esac
+	case "${XBPS_TARGET_MACHINE%-musl}" in
+		aarch64) target=arm64 ;;
+		riscv64) target=rv64 ;;
+		x86_64) target=amd64_sysv ;;
+	esac
+
+	sed 's|^PREFIX = /usr/local$|PREFIX = /usr|' configs/linux.mk | \
+	sed "s|^ARCH = x86_64$|ARCH = ${XBPS_TARGET_MACHINE%-musl}|" | \
+	sed "s|^HARECFLAGS =$|HARECFLAGS = -a${XBPS_TARGET_MACHINE%-musl}|" | \
+	sed "s|^QBEFLAGS =$|QBEFLAGS = -t${target}|" | \
+	sed "s|^AS = as$|AS = ${AS}|" | \
+	sed "s|^LD = ld$|LD = ${LD}|" | \
+	sed 's|^VERSION=$$(./scripts/version)$|VERSION=0.24.0|' | \
+	sed "s|^AARCH64_AS=as$|AARCH64_AS=aarch64-unknown-linux-${lib}-as|" | \
+	sed "s|^AARCH64_CC=cc$|AARCH64_CC=aarch64-unknown-linux-${lib}-cc|" | \
+	sed "s|^AARCH64_LD=ld$|AARCH64_LD=aarch64-unknown-linux-${lib}-ld|" | \
+	sed "s|^RISCV64_AS=as$|RISCV64_AS=riscv64-unknown-linux-${lib}-as|" | \
+	sed "s|^RISCV64_CC=cc$|RISCV64_CC=riscv64-unknown-linux-${lib}-cc|" | \
+	sed "s|^RISCV64_LD=ld$|RISCV64_LD=riscv64-unknown-linux-${lib}-ld|" | \
+	sed "s|^X86_64_AS=as$|X86_64_AS=x86_64-unknown-linux-${lib}-as|" | \
+	sed "s|^X86_64_CC=cc$|X86_64_CC=x86_64-unknown-linux-${lib}-cc|" | \
+	sed "s|^X86_64_LD=ld$|X86_64_LD=x86_64-unknown-linux-${lib}-ld|" > config.mk
+}

From 3e4bb1fbf5c88e552ac3cac0e174a09d27911769 Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Sat, 17 Feb 2024 20:24:10 +0100
Subject: [PATCH 4/6] New package: haredoc-0.24.0

---
 ...-add-separate-haredoc-install-target.patch | 42 +++++++++++++++++++
 .../02-use-native-compiler-for-haredoc.patch  | 18 ++++++++
 srcpkgs/haredoc/template                      | 24 +++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 srcpkgs/haredoc/patches/01-add-separate-haredoc-install-target.patch
 create mode 100644 srcpkgs/haredoc/patches/02-use-native-compiler-for-haredoc.patch
 create mode 100644 srcpkgs/haredoc/template

diff --git a/srcpkgs/haredoc/patches/01-add-separate-haredoc-install-target.patch b/srcpkgs/haredoc/patches/01-add-separate-haredoc-install-target.patch
new file mode 100644
index 00000000000000..8019c08aa7de41
--- /dev/null
+++ b/srcpkgs/haredoc/patches/01-add-separate-haredoc-install-target.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 2482be1f..69e5ab8e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -82,8 +82,8 @@ docs: \
+ 	docs/haredoc.5 \
+ 	docs/hare-module.5
+ 
+-MAN1 = hare hare-build hare-cache hare-deps haredoc hare-run hare-test
+-MAN5 = haredoc hare-module
++MAN1 = hare hare-build hare-cache hare-deps hare-run hare-test
++MAN5 = hare-module
+ 
+ bootstrap:
+ 	@BINOUT=$(BINOUT) ./scripts/genbootstrap
+@@ -97,17 +97,24 @@ check: $(BINOUT)/hare
+ 		QBEFLAGS='$(QBEFLAGS)' ASFLAGS='$(ASFLAGS)' \
+ 		LDLINKFLAGS='$(LDLINKFLAGS)' '$(BINOUT)/hare' test
+ 
+-install: install-cmd install-mods
++install: install-cmd install-haredoc install-mods
+ 
+ install-cmd:
+ 	mkdir -p -- \
+ 		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \
+ 		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5'
+ 	install -m755 '$(BINOUT)/hare' '$(DESTDIR)$(BINDIR)/hare'
+-	install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc'
+ 	for i in $(MAN1); do install -m644 docs/$$i.1 '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done
+ 	for i in $(MAN5); do install -m644 docs/$$i.5 '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done
+ 
++install-haredoc:
++	mkdir -p -- \
++		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \
++		'$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5'
++	install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc'
++	install -m644 docs/haredoc.1 '$(DESTDIR)$(MANDIR)'/man1/haredoc.1
++	install -m644 docs/haredoc.5 '$(DESTDIR)$(MANDIR)'/man5/haredoc.5
++
+ install-mods:
+ 	rm -rf -- '$(DESTDIR)$(STDLIB)'
+ 	mkdir -p -- '$(DESTDIR)$(STDLIB)'
diff --git a/srcpkgs/haredoc/patches/02-use-native-compiler-for-haredoc.patch b/srcpkgs/haredoc/patches/02-use-native-compiler-for-haredoc.patch
new file mode 100644
index 00000000000000..328795e4a1363f
--- /dev/null
+++ b/srcpkgs/haredoc/patches/02-use-native-compiler-for-haredoc.patch
@@ -0,0 +1,18 @@
+diff --git a/Makefile b/Makefile
+index 2482be1f..0f86869e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,11 +52,10 @@ $(BINOUT)/harec2: $(BINOUT)/hare
+ 		LDLINKFLAGS="$(LDLINKFLAGS)" \
+ 		$(BINOUT)/hare build $(HARE_DEFINES) -o $(BINOUT)/harec2 cmd/harec
+ 
+-$(BINOUT)/haredoc: $(BINOUT)/hare
++$(BINOUT)/haredoc:
+ 	@mkdir -p $(BINOUT)
+ 	@printf 'HARE\t%s\n' "$@"
+-	@env HAREPATH=. HAREC="$(HAREC)" QBE="$(QBE)" $(BINOUT)/hare build \
+-		$(HARE_DEFINES) -o $(BINOUT)/haredoc ./cmd/haredoc
++	@hare build $(HAREFLAGS) -o $(BINOUT)/haredoc ./cmd/haredoc
+ 
+ docs/html: $(BINOUT)/haredoc
+ 	mkdir -p docs/html
diff --git a/srcpkgs/haredoc/template b/srcpkgs/haredoc/template
new file mode 100644
index 00000000000000..3183d99fe4df15
--- /dev/null
+++ b/srcpkgs/haredoc/template
@@ -0,0 +1,24 @@
+# Template file for 'haredoc'
+pkgname=haredoc
+version=0.24.0
+revision=1
+archs="x86_64 x86_64-musl aarch64 aarch64-musl riscv64 riscv64-musl"
+build_style=configure
+make_build_target=".bin/haredoc docs"
+make_install_target="install-haredoc"
+# disable check of seperately packaged build driver
+make_check=no
+hostmakedepends="hare-driver scdoc"
+short_desc="Hare documentation reader and formatter"
+maintainer="Jonas Fentker <jonas@fentker.eu>"
+license="MPL-2.0, GPL-3.0-only"
+homepage="https://harelang.org/"
+distfiles="https://git.sr.ht/~sircmpwn/hare/archive/${version}.tar.gz"
+checksum="7061dad3c79cca51a1662a71b1c6f8ec001f52ef3053dd3c2dbb95ae9beff7bc"
+
+do_configure() {
+	sed 's|^PREFIX = /usr/local$|PREFIX = /usr|' configs/linux.mk | \
+	sed "s|^HAREFLAGS =$|HAREFLAGS = -a${XBPS_TARGET_MACHINE%-musl}|" | \
+	sed "s|^AS = as$|AS = ${AS}|" | \
+	sed "s|^LD = ld$|LD = ${LD}|" > config.mk
+}

From 93766a4ea524abf3c44abdca856da65a19b6ba4e Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Sat, 17 Feb 2024 00:37:22 +0100
Subject: [PATCH 5/6] New package: hare-0.24.0

---
 srcpkgs/hare/template | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/hare/template

diff --git a/srcpkgs/hare/template b/srcpkgs/hare/template
new file mode 100644
index 00000000000000..5760c39b5d33fa
--- /dev/null
+++ b/srcpkgs/hare/template
@@ -0,0 +1,10 @@
+# Template file for 'hare'
+pkgname=hare
+version=0.24.0
+revision=1
+build_style=meta
+depends="hare-driver-0.24.0_1 haredoc-0.24.0_1"
+short_desc="Systems programming language"
+maintainer="Jonas Fentker <jonas@fentker.eu>"
+license="MPL-2.0, GPL-3.0-only"
+homepage="https://harelang.org/"

From 2bfde827bf998320980e8b4fd6d7cd6aa7fc8ca0 Mon Sep 17 00:00:00 2001
From: Jonas Fentker <jonas@fentker.eu>
Date: Sat, 17 Feb 2024 01:44:02 +0100
Subject: [PATCH 6/6] New package: himitsu-0.6

---
 .../himitsu/patches/01-use-hareflags.patch    | 25 +++++++++++++++++++
 srcpkgs/himitsu/template                      | 18 +++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/himitsu/patches/01-use-hareflags.patch
 create mode 100644 srcpkgs/himitsu/template

diff --git a/srcpkgs/himitsu/patches/01-use-hareflags.patch b/srcpkgs/himitsu/patches/01-use-hareflags.patch
new file mode 100644
index 00000000000000..42aa37b20a23c1
--- /dev/null
+++ b/srcpkgs/himitsu/patches/01-use-hareflags.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile b/Makefile
+index c861fef..6668520 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,16 +15,16 @@ THIRDPARTYDIR=$(HARESRCDIR)/third-party
+ all: himitsud himitsu-store hiq hiprompt-tty docs
+ 
+ himitsud:
+-	hare build -o $@ cmd/$@/
++	hare build $(HAREFLAGS) -o $@ cmd/$@/
+ 
+ himitsu-store:
+-	hare build -o $@ cmd/$@/
++	hare build $(HAREFLAGS) -o $@ cmd/$@/
+ 
+ hiprompt-tty:
+-	hare build -o $@ cmd/$@/
++	hare build $(HAREFLAGS) -o $@ cmd/$@/
+ 
+ hiq:
+-	hare build -o $@ cmd/$@/
++	hare build $(HAREFLAGS) -o $@ cmd/$@/
+ 
+ check:
+ 	hare test
diff --git a/srcpkgs/himitsu/template b/srcpkgs/himitsu/template
new file mode 100644
index 00000000000000..8f70a4abd45151
--- /dev/null
+++ b/srcpkgs/himitsu/template
@@ -0,0 +1,18 @@
+# Template file for 'himitsu'
+pkgname=himitsu
+version=0.6
+revision=1
+archs="x86_64 x86_64-musl aarch64 aarch64-musl riscv64 riscv64-musl"
+build_style=configure
+hostmakedepends="hare-driver scdoc"
+short_desc="Secret storage manager"
+maintainer="Jonas Fentker <jonas@fentker.eu>"
+license="GPL-3.0-only"
+homepage="https://himitsustore.org/"
+distfiles="https://git.sr.ht/~sircmpwn/${pkgname}/archive/${version}.tar.gz"
+checksum="a71c9a9b4cb41946261ca84bf8f6e252149e1c12cf106cdbd6644d8952b64b3e"
+
+do_configure() {
+	sed -i 's|^PREFIX=/usr/local$|PREFIX=/usr|' Makefile
+	sed -i "s|^HAREFLAGS=$|HAREFLAGS= -a${XBPS_TARGET_MACHINE%-musl} -R|" Makefile
+}