On 3/28/26 7:04 PM, Stuart Henderson wrote:

> it doesn't seem useful to have ZIG_VERSION and V as separate vars?

Good point - update attached.


>> +WRKDIST =	${WRKDIR}/zig
> 
> this one is so annoying, it seems like it should be simple to fix
> so that dist-tuple.port.mk sets it correctly, but nothing I try works...
> (all the ports using codeberg DIST_TUPLE explicitly set WRKDIST to what
> you get from ${WRKDIR}/${_project})

Agreed, but honestly I'm glad there's no canonical way to deal with this
(yet) that I missed :-)
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/zig/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile	24 Oct 2025 18:49:56 -0000	1.30
+++ Makefile	28 Mar 2026 22:13:01 -0000
@@ -5,14 +5,11 @@ BROKEN-powerpc64 =	ld: error: undefined 
 
 COMMENT =	zig compiler and toolchain
 
-DISTNAME =	zig-0.15.2
+V =		0.15.2
+DIST_TUPLE =	codeberg ziglang zig ${V} .
+REVISION =	0
 
-GH_ACCOUNT =	ziglang
-GH_PROJECT =	zig
-GH_COMMIT =	${ZIG_COMMIT}
-
-# see https://github.com/ziglang/zig/tree/0.15.x
-ZIG_VERSION =	0.15.2
+# see https://codeberg.org/ziglang/zig/src/branch/0.15.x
 ZIG_COMMIT =	e4cbd752c8c05f131051f8c873cff7823177d7d3
 
 CATEGORIES =	lang
@@ -37,8 +34,10 @@ MODCLANG_VERSION =	20
 
 SEPARATE_BUILD =	Yes
 
+WRKDIST =	${WRKDIR}/zig
+
 CONFIGURE_ARGS +=	\
-	-DZIG_VERSION="${ZIG_VERSION}+${ZIG_COMMIT:C/(.........).*/\1/}" \
+	-DZIG_VERSION="${V}+${ZIG_COMMIT:C/(.........).*/\1/}" \
 	-DZIG_STATIC_LLVM=ON \
 	-DZIG_TARGET_TRIPLE=native \
 	-DZIG_TARGET_MCPU=baseline \
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/zig/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo	24 Oct 2025 18:49:56 -0000	1.15
+++ distinfo	28 Mar 2026 22:13:01 -0000
@@ -1,2 +1,2 @@
-SHA256 (zig-0.15.2-e4cbd752.tar.gz) = 3hqImz5al36rMYi6SVD8rvoYhgwwmoGpqblXFo8lKtw=
-SIZE (zig-0.15.2-e4cbd752.tar.gz) = 32750678
+SHA256 (ziglang-zig-0.15.2.tar.gz) = jOmKNYxWFDLs5iRROeAoyA4qzTv1JeLRUSHGL+86Xmw=
+SIZE (ziglang-zig-0.15.2.tar.gz) = 32663361

• zig-codeberg2.diff (2K)