zig-master: Bump version and import pre-config from zig-0.14.0

Author: hellium6

README.md

@@ -24,7 +24,7 @@ Packages here are named differently and installed in different directories. e.g.
 
 In case you reached here check the following:
 
-- Run `pkgin se zig` to see if the Zig version you want (e.g. 0.14.0) is available in NetBSD official repos. If it is available then probably it is not necessary to use this repo at all.
+- Run `pkgin se zig` to see if the Zig version you want (e.g. 0.15.0) is available in NetBSD official repos. If it is available then probably it is not necessary to use this repo at all.
 - If you want to skip building, you might [find releases](https://github.com/hellium6/zig-master-netbsd/releases) with binary packages which you can install in this order - llvm, lld, clang, zig-master - with something like: `doas pkg_add /path/to/some-package.tgz`
 - If you want to build from source, follow the instructions below.
 - Building from source might require some hours or days (depending on your hardware) to finish as some packages have big codebases. Megabytes of sources producing gigabytes of outputs.
@@ -59,7 +59,7 @@ ZIGF=$(curl -s https://ziglang.org/download/ | grep '\-dev' | head -n1 | sed -ne
 ## put the fetched value in previous command as DISTNAME
 sed -i -e "s/^DISTNAME=.*/DISTNAME=	$ZIGF/" Makefile
 ## or enter manually
-#sed -i -e 's/^DISTNAME=.*/DISTNAME=	zig-0.14.0-dev.3456+00a8742bb/' Makefile
+#sed -i -e 's/^DISTNAME=.*/DISTNAME=	zig-0.15.0-dev.56+d0911786c/' Makefile
 ## optionally change MASTER_SITES to use a mirror
 sed -i -e 's/^MASTER_SITES=.*/MASTER_SITES=	https:\/\/zig.linus.dev\/zig\//' Makefile
 make makesum  # update checksums according to new DISTNAME
@@ -103,9 +103,9 @@ Target: x86_64-unknown-netbsd10.0
 Thread model: posix
 InstalledDir: /usr/pkg/llvm19/bin
 $ zig-master version
-0.14.0
+0.15.0-dev.77+aa8aa6625
 $ pkg_info -a | grep ^zig
-zig-master-0.14.0-dev.3462+edabcf619 Programming language designed for robustness and clarity
+zig-master-0.15.0-dev.77+aa8aa6625 Programming language designed for robustness and clarity
 ```
 
 Example of working with both Zig and Zig master on the same system:
@@ -117,7 +117,7 @@ $ doas pkgin in zig
 $ zig version
 0.13.0
 $ zig-master version
-0.14.0
+0.15.0-dev.77+aa8aa6625
 ### For lang/zig-0.14.0 you'd have to run zig-0.14.0 or
 ### if you've changed DISTNAME, type "zig" and press tab twice for hint.
 ### Example:
@@ -128,7 +128,7 @@ $ zig-master version
 $ alias zig=zig-master
 ### above can be added in ~/.bashrc to do this automatically on startup
 $ zig version
-0.14.0
+0.15.0-dev.77+aa8aa6625
 $ cd `mktemp -d`
 $ zig init
 info: created build.zig
@@ -147,10 +147,10 @@ Example of uninstalling a package:
 
 ```sh
 $ pkg_info -a | grep ^zig
-zig-master-0.14.0-dev.3462+edabcf619 Programming language designed for robustness and clarity
+zig-master-0.15.0-dev.77+aa8aa6625 Programming language designed for robustness and clarity
 ### For lang/zig-0.14.0 the output might be something like:
 ### zig-isolated0140-0.14.0 Programming language designed for robustness and clarity (prefix isolated)
-$ doas pkg_delete zig-master-0.14.0-dev.3462+edabcf619
+$ doas pkg_delete zig-master-0.15.0-dev.77+aa8aa6625
 ```
 
 License: Anything added by me in this repo (not what is based on another project) is public domain or CC0 1.0 Universal. For things taken from other projects, refer to those projects, such as [pkgsrc](https://github.com/NetBSD/pkgsrc).

pkgsrc/lang/zig-master/Makefile

@@ -3,10 +3,10 @@
 ## Update DISTNAME according to the latest master download URL and run
 ## "make makesum" after that.
 ## Example: If the URL is:
-## https://ziglang.org/builds/zig-0.14.0-dev.3462+edabcf619.tar.xz
-## then this value would be: zig-0.14.0-dev.3462+edabcf619
+## https://ziglang.org/builds/zig-0.15.0-dev.77+aa8aa6625.tar.xz
+## then this value would be: zig-0.15.0-dev.77+aa8aa6625
 ## Meaning, filename minus the .tar.xz extension
-DISTNAME=	zig-0.14.0-dev.3462+edabcf619
+DISTNAME=	zig-0.15.0-dev.77+aa8aa6625
 ## To make this a separate package than lang/zig
 PKGNAME=	${DISTNAME:S/zig-/zig-master-/}
 CATEGORIES=	lang
@@ -67,21 +67,23 @@ MKPIE_SUPPORTED=	no
 # TODO: /usr/bin/env + /bin/env in lib/std/zig/system.zig
 
 pre-configure:
-	## Make zig build see LD_LIBRARY_PATH (e.g. path to
+	## - Make zig build see LD_LIBRARY_PATH (e.g. path to
 	## "libclang-cpp.so.xx.y")
+	## - Set version string (esp. for dev builds)
+	## - Make stage3 zig build process (build.zig) see the path
 	${SED} -i'_orig' \
 		-e '1{h;s,.*,set(ENV{LD_LIBRARY_PATH} "'${LLVM_ISOLATED_PREFIX}'/lib:/usr/pkg/lib:/usr/lib:$$\ENV{LD_LIBRARY_PATH}")\n,;G;}' \
 		-e '1{h;s,.*,set(ENV{LIBRARY_PATH} "'${LLVM_ISOLATED_PREFIX}'/lib:/usr/pkg/lib:/usr/lib:$$\ENV{LIBRARY_PATH}")\n,;G;}' \
 		-e '1{h;s,.*,set(ENV{LDFLAGS} "-Wl\,-R'${LLVM_ISOLATED_PREFIX}'/lib -L'${LLVM_ISOLATED_PREFIX}'/lib $$\ENV{LDFLAGS}")\n,;G;}' \
+		-e '/set(ZIG_VERSION/ s,set(ZIG_VERSION "",set(ZIG_VERSION "${DISTNAME:S/zig-//}",' \
+		-e '/$${CMAKE_PREFIX_PATH}/ s,^,list(APPEND ZIG_CMAKE_PREFIX_PATH "${LLVM_ISOLATED_PREFIX}")\n,' \
 		${WRKDIR}/${DISTNAME}/CMakeLists.txt
 	## Fix paths when lang/clang is already installed on system
 	${SED} -i'_orig' \
 		-e '1{h;s,.*,set(LLVM_INCLUDE_DIRS "'${LLVM_ISOLATED_PREFIX}'/include:$$\{LLVM_INCLUDE_DIRS}")\n,;G;}' \
 		-e '1{h;s,.*,set(LLVM_LIBDIRS "'${LLVM_ISOLATED_PREFIX}'/lib:$$\{LLVM_LIBDIRS}")\n,;G;}' \
 		-e '1{h;s,.*,set(CMAKE_PREFIX_PATH "'${LLVM_ISOLATED_PREFIX}'")\n,;G;}' \
 		${WRKDIR}/${DISTNAME}/cmake/Findclang.cmake
-	## Make stage3 zig build process (build.zig) see the path
-	${SED} -i'_orig' -e '/$${CMAKE_PREFIX_PATH}/ s,^,list(APPEND ZIG_CMAKE_PREFIX_PATH "${LLVM_ISOLATED_PREFIX}")\n,' ${WRKDIR}/${DISTNAME}/CMakeLists.txt
 
 post-configure:
 	## Workaround for making CMake see the isolated prefix

pkgsrc/lang/zig-master/PLIST

@@ -13925,6 +13925,7 @@ zig-master/lib/zig/std/c/freebsd.zig
 zig-master/lib/zig/std/c/haiku.zig
 zig-master/lib/zig/std/c/netbsd.zig
 zig-master/lib/zig/std/c/openbsd.zig
+zig-master/lib/zig/std/c/serenity.zig
 zig-master/lib/zig/std/c/solaris.zig
 zig-master/lib/zig/std/coff.zig
 zig-master/lib/zig/std/compress.zig

pkgsrc/lang/zig-master/distinfo

@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (zig-0.14.0-dev.3462+edabcf619.tar.xz) = 8696b273e7947fe2f5e0130cd41c5916d63f23e68269a456936af353996157e4
-SHA512 (zig-0.14.0-dev.3462+edabcf619.tar.xz) = ee8e27307c38742b358ddebfd3990d4e3c595e7d3166497748388d89021123543b8147e92277feb18e993cbdece714f30886ea9765c7b4adc5211b7c03ee49a2
-Size (zig-0.14.0-dev.3462+edabcf619.tar.xz) = 17770376 bytes
+BLAKE2s (zig-0.15.0-dev.77+aa8aa6625.tar.xz) = 74f4b3b58c1ed16f47351c15f8667914e40ce21131ece577f9fd1a88ebdd6d39
+SHA512 (zig-0.15.0-dev.77+aa8aa6625.tar.xz) = db1ee716b5d14230da5871df09c0ac4ee80db8d540c7bd817d79bb353739455d8ecb2ad56615d8c682c1dfc9b90c7e0aca943fab63b931b12d7a1331a14f94f0
+Size (zig-0.15.0-dev.77+aa8aa6625.tar.xz) = 17783340 bytes