Page MenuHomeFreeBSD

D54132.diff
No OneTemporary

D54132.diff

diff --git a/astro/mepo/Makefile b/astro/mepo/Makefile
--- a/astro/mepo/Makefile
+++ b/astro/mepo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mepo
DISTVERSION= 1.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= astro geography wayland
MASTER_SITES= https://git.sr.ht/~mil/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
@@ -12,7 +12,7 @@
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= zig>=0.14.0:lang/zig
+BUILD_DEPENDS= zig014=0.14.0:lang/zig014
LIB_DEPENDS= libcurl.so:ftp/curl
RUN_DEPENDS= jq:textproc/jq
diff --git a/audio/linuxwave/Makefile b/audio/linuxwave/Makefile
--- a/audio/linuxwave/Makefile
+++ b/audio/linuxwave/Makefile
@@ -1,6 +1,7 @@
PORTNAME= linuxwave
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= ports@FreeBSD.org
@@ -10,7 +11,7 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= zig>=0.14.0:lang/zig
+BUILD_DEPENDS= zig014=0.14.0:lang/zig014
USE_GITHUB= yes
GH_ACCOUNT= orhun
diff --git a/biology/vcflib/Makefile b/biology/vcflib/Makefile
--- a/biology/vcflib/Makefile
+++ b/biology/vcflib/Makefile
@@ -40,7 +40,7 @@
ZIG_DESC= Include Zig language support
-ZIG_BUILD_DEPENDS= zig>0:lang/zig
+ZIG_BUILD_DEPENDS= zig014=0.14.0:lang/zig014
CMAKE_ARGS+= -DWFA_GITMODULE=OFF -DWFALIB=${LOCALBASE}/lib/libwfa2.so.0 \
-DTABIXPP_LOCAL=${WRKSRC}/contrib/tabixpp
diff --git a/devel/zls/Makefile b/devel/zls/Makefile
--- a/devel/zls/Makefile
+++ b/devel/zls/Makefile
@@ -1,5 +1,6 @@
PORTNAME= zls
DISTVERSION= 0.14.0
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= ports@FreeBSD.org
@@ -9,8 +10,8 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= zig>=0.14.0:lang/zig
-RUN_DEPENDS= zig:lang/zig
+BUILD_DEPENDS= zig014>=0.14.0:lang/zig014
+RUN_DEPENDS= zig014>=0.14.0:lang/zig014
USE_GITHUB= yes
GH_ACCOUNT= zigtools
diff --git a/games/xtxf/Makefile b/games/xtxf/Makefile
--- a/games/xtxf/Makefile
+++ b/games/xtxf/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xtxf
-DISTVERSION= 0.11.4
+DISTVERSION= 0.11.5
CATEGORIES= games
MAINTAINER= slowdive@me.com
@@ -9,13 +9,13 @@
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= zig>=0.14:lang/zig
+BUILD_DEPENDS= zig>=0.15.1:lang/zig
USE_GITHUB= yes
GH_ACCOUNT= charlesrocket
GH_TUPLE= termbox:termbox2:9c9281a:zig_termbox/../.cache/zig/p/N-V-__8AAOfjBAD89_CGaCDSoVLTnCjzs3NRNGCkfL9zNuNo \
- 00JCIV00:cova:4c56696:zig_cova/../.cache/zig/p/cova-0.10.1-AAAAAPqeBAAThnQ-eGLXG9tyPsBRehaw8ySs8nEPwMUy \
- charlesrocket:ghext:0.7.2:zig_ghext/../.cache/zig/p/ghext-0.7.2-dKaQN31QAABGONiBUrG8LuTUWwpEbiXF4syy_NmTdizp
+ 00JCIV00:cova:3fa729c:zig_cova/../.cache/zig/p/cova-0.10.1-_OE4Rw-xBAB9zj1dPhUxLKnar89L5nouEmYY6Q1S23jU \
+ charlesrocket:ghext:0.7.4:zig_ghext/../.cache/zig/p/ghext-0.7.4-dKaQN8JPAAA7IjZbcuelgCivahSMKsFGrvE5LLM3RJyl
BUILD_ARGS= --prefix ${PREFIX} ${WITH_DEBUG:U-Doptimize=ReleaseFast} \
${WITH_PIE:D-Dpie} -Dcpu=${CPUTYPE:Ubaseline} --verbose
diff --git a/games/xtxf/distinfo b/games/xtxf/distinfo
--- a/games/xtxf/distinfo
+++ b/games/xtxf/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1754738873
-SHA256 (charlesrocket-xtxf-0.11.4_GH0.tar.gz) = 4dd2029868c838b3e1e716de05f27bd77af719a1c4c4a38ba0b0f538cab0714f
-SIZE (charlesrocket-xtxf-0.11.4_GH0.tar.gz) = 17267
+TIMESTAMP = 1764628103
+SHA256 (charlesrocket-xtxf-0.11.5_GH0.tar.gz) = cb159878ff2b86ad001f7688ced84a2efa7e6c745b380e254e1937b5c5d05052
+SIZE (charlesrocket-xtxf-0.11.5_GH0.tar.gz) = 17491
SHA256 (termbox-termbox2-9c9281a_GH0.tar.gz) = 4781a10e1f8dedc52ed1c93f1c306ec97acf81654135efd125e779c99bceab77
SIZE (termbox-termbox2-9c9281a_GH0.tar.gz) = 81538
-SHA256 (00JCIV00-cova-4c56696_GH0.tar.gz) = de1bc17b6d68f3beaf440841d7d52199059ab250950a37c00a49af2a0059d1e0
-SIZE (00JCIV00-cova-4c56696_GH0.tar.gz) = 6132977
-SHA256 (charlesrocket-ghext-0.7.2_GH0.tar.gz) = 3a9a6fe581ea4b9c6bf851f11bcd51f872a0ab4416dc9728fffcee6a4debfd17
-SIZE (charlesrocket-ghext-0.7.2_GH0.tar.gz) = 8538
+SHA256 (00JCIV00-cova-3fa729c_GH0.tar.gz) = fc9ce7a5eac22d11f16f0af3fe9430a6b23a6ed1c1b5848644c04d42e873c037
+SIZE (00JCIV00-cova-3fa729c_GH0.tar.gz) = 6529870
+SHA256 (charlesrocket-ghext-0.7.4_GH0.tar.gz) = a5d1c628d411bb42d3533adc76ec0ba16b60fffd0fde062ba1f0c0abe3fe8d75
+SIZE (charlesrocket-ghext-0.7.4_GH0.tar.gz) = 8622
diff --git a/lang/Makefile b/lang/Makefile
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -403,5 +403,6 @@
SUBDIR += ypsilon
SUBDIR += zephir
SUBDIR += zig
+ SUBDIR += zig014
.include <bsd.port.subdir.mk>
diff --git a/lang/zig/Makefile b/lang/zig/Makefile
--- a/lang/zig/Makefile
+++ b/lang/zig/Makefile
@@ -1,5 +1,5 @@
PORTNAME= zig
-DISTVERSION= 0.14.0
+DISTVERSION= 0.15.2
CATEGORIES= lang
MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \
https://ziglang.org/builds/
@@ -16,13 +16,13 @@
ONLY_FOR_ARCHS= aarch64 amd64
ONLY_FOR_ARCHS_REASON= not yet supported
-BUILD_DEPENDS= icu>=71:devel/icu \
- llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
+BUILD_DEPENDS= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
LIB_DEPENDS= libzstd.so:archivers/zstd
USES= cmake compiler:c++11-lang localbase:ldflags tar:xz
CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere
+CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${_LLVM_VER}
CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG
CONFLICTS_INSTALL= zig0*
@@ -37,7 +37,7 @@
STATIC_LDFLAGS= -licudata -licuuc -llzma -lm -lmd -lxml2 -lz -lzstd
STATIC_LIB_DEPENDS+= libxml2.so:textproc/libxml2
-_LLVM_VER= 19
+_LLVM_VER= 20
_ZIG_BIN= ${STAGEDIR}${PREFIX}/bin/zig
post-configure-STATIC-on:
@@ -45,20 +45,16 @@
${BUILD_WRKSRC}/build.ninja
post-install:
- @${RM} -rf ${WRKDIR}/.build
+ # Zig install creates this dir, which causes check-plist error
@${RM} -rf ${STAGEDIR}/wrkdirs
+
# Automatically create the PLIST file
@${FIND} -s ${_ZIG_BIN} -not -type d | ${SORT} | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
@${FIND} -s ${STAGEDIR}${PREFIX}/lib/${PORTNAME} -not -type d | ${SORT} | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/compress/flate/testdata/block_writer" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/compress/flate/testdata/fuzz" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/compress/lzma/testdata" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/compress/testdata" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/compress/xz/testdata" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/tar/testdata" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir lib/zig/std/tz" >> ${TMPPLIST}
+ @${FIND} -s ${STAGEDIR}${PREFIX}/lib/${PORTNAME} -type d -empty | ${SORT} | \
+ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##; s#^#@dir #' >> ${TMPPLIST}
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/std
@@ -71,7 +67,7 @@
@${ECHO_CMD} "@dir share/doc/zig/std" >> ${TMPPLIST}
do-test:
- mkdir ${WRKDIR}/cache
+ mkdir -p ${WRKDIR}/cache
(cd ${WRKSRC} && \
${_ZIG_BIN} build test-behavior --cache-dir ${WRKDIR}/cache \
--global-cache-dir ${WRKDIR}/cache --zig-lib-dir ${WRKSRC}/lib)
diff --git a/lang/zig/distinfo b/lang/zig/distinfo
--- a/lang/zig/distinfo
+++ b/lang/zig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744681910
-SHA256 (zig-0.14.0.tar.xz) = c76638c03eb204c4432ae092f6fa07c208567e110fbd4d862d131a7332584046
-SIZE (zig-0.14.0.tar.xz) = 17772188
+TIMESTAMP = 1761276338
+SHA256 (zig-0.15.2.tar.xz) = d9b30c7aa983fcff5eed2084d54ae83eaafe7ff3a84d8fb754d854165a6e521c
+SIZE (zig-0.15.2.tar.xz) = 21366268
diff --git a/lang/zig/Makefile b/lang/zig014/Makefile
copy from lang/zig/Makefile
copy to lang/zig014/Makefile
--- a/lang/zig/Makefile
+++ b/lang/zig014/Makefile
@@ -1,5 +1,6 @@
PORTNAME= zig
DISTVERSION= 0.14.0
+PKGNAMESUFFIX= 014
CATEGORIES= lang
MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \
https://ziglang.org/builds/
@@ -25,7 +26,8 @@
CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere
CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG
-CONFLICTS_INSTALL= zig0*
+CONFLICTS_INSTALL= zig*
+PORTSCOUT= limit:^0\.14\.
OPTIONS_DEFINE= DOCS STATIC
OPTIONS_DEFAULT= DOCS
diff --git a/lang/zig/distinfo b/lang/zig014/distinfo
copy from lang/zig/distinfo
copy to lang/zig014/distinfo
diff --git a/lang/zig014/pkg-descr b/lang/zig014/pkg-descr
new file mode 100644
--- /dev/null
+++ b/lang/zig014/pkg-descr
@@ -0,0 +1,2 @@
+Zig is a general purpose programming language designed for robustness,
+optimality, and maintainability.
diff --git a/ports-mgmt/zig2tuple/Makefile b/ports-mgmt/zig2tuple/Makefile
--- a/ports-mgmt/zig2tuple/Makefile
+++ b/ports-mgmt/zig2tuple/Makefile
@@ -10,6 +10,7 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= zig
+ZIG_PORT= lang/zig014
USE_GITHUB= yes
GH_ACCOUNT= kenrap
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,6 +1,6 @@
PORTNAME= river
DISTVERSIONPREFIX= v
-DISTVERSION= 0.3.11
+DISTVERSION= 0.3.12
CATEGORIES= x11-wm wayland
MAINTAINER= ports@FreeBSD.org
@@ -12,7 +12,7 @@
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
wayland-protocols>0:graphics/wayland-protocols \
- zig>=0.14.0:lang/zig
+ zig>=0.15.1:lang/zig
LIB_DEPENDS= libevdev.so:devel/libevdev \
libwayland-server.so:graphics/wayland \
libwlroots-0.19.so:x11-toolkits/wlroots019 \
@@ -24,9 +24,9 @@
USE_XORG= pixman
GH_ACCOUNT= riverwm
GH_TUPLE= ifreund:zig-pixman:v0.3.0:zig_pixman/../.cache/zig/p/pixman-0.3.0-LClMnz2VAAAs7QSCGwLimV5VUYx0JFnX5xWU6HwtMuDX \
- ifreund:zig-wayland:v0.3.0:zig_wayland/../.cache/zig/p/wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl \
+ ifreund:zig-wayland:v0.4.0:zig_wayland/../.cache/zig/p/wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27 \
ifreund:zig-xkbcommon:v0.3.0:zig_xkbcommon/../.cache/zig/p/xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr \
- swaywm:zig-wlroots:v0.19.2:zig_wlroots/../.cache/zig/p/wlroots-0.19.2-jmOlcsnnAwDFAeOamkUaxyHNhKngH4Ai5rrLSVbqA8LW
+ swaywm:zig-wlroots:v0.19.3:zig_wlroots/../.cache/zig/p/wlroots-0.19.3-jmOlcuL_AwBHhLCwpFsXbTizE3q9BugFmGX-XIxqcPMc
MAKE_ENV= DESTDIR="${STAGEDIR}"
CONFIGURE_ARGS= --prefix "${PREFIX}" \
${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \
diff --git a/x11-wm/river/distinfo b/x11-wm/river/distinfo
--- a/x11-wm/river/distinfo
+++ b/x11-wm/river/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1751355476
-SHA256 (riverwm-river-v0.3.11_GH0.tar.gz) = bd2732f0d515ea4b669b17b48cfda2a271f013fa9aeaba61453b610b381f474a
-SIZE (riverwm-river-v0.3.11_GH0.tar.gz) = 171257
+TIMESTAMP = 1764665794
+SHA256 (riverwm-river-v0.3.12_GH0.tar.gz) = 4752d8585419f57b3e0edd2b9b270e85d3fa38d2ee2ff92835c8050324946f30
+SIZE (riverwm-river-v0.3.12_GH0.tar.gz) = 171041
SHA256 (ifreund-zig-pixman-v0.3.0_GH0.tar.gz) = b09b4d733430d3341c9fa340b13b84da058068764b9239452b5161c015ac3b08
SIZE (ifreund-zig-pixman-v0.3.0_GH0.tar.gz) = 7976
-SHA256 (ifreund-zig-wayland-v0.3.0_GH0.tar.gz) = 8697cb2d056bc88e76e4f44e68e4346bf1ab4b325acd38b52dae7924754ea0ad
-SIZE (ifreund-zig-wayland-v0.3.0_GH0.tar.gz) = 75460
+SHA256 (ifreund-zig-wayland-v0.4.0_GH0.tar.gz) = a001733a3a2a71f64b9cd136b60219bd5d0e870e1974159ae9102951a31bd940
+SIZE (ifreund-zig-wayland-v0.4.0_GH0.tar.gz) = 111961
SHA256 (ifreund-zig-xkbcommon-v0.3.0_GH0.tar.gz) = 492b670d9bddc596184b2ec46d06dbcafdfb9c4b6b6fa7ad9ba98a4d2f921d59
SIZE (ifreund-zig-xkbcommon-v0.3.0_GH0.tar.gz) = 22520
-SHA256 (swaywm-zig-wlroots-v0.19.2_GH0.tar.gz) = 92f483605472e57e891e88b7e10cc833ad03883e292b81ac3c37ae7410dfdedd
-SIZE (swaywm-zig-wlroots-v0.19.2_GH0.tar.gz) = 59078
+SHA256 (swaywm-zig-wlroots-v0.19.3_GH0.tar.gz) = 93c7e410dbfc3d3fe03ca3cc5e2599557eab963357016b9c8b2ca9d6fafb8214
+SIZE (swaywm-zig-wlroots-v0.19.3_GH0.tar.gz) = 59843
diff --git a/x11/waylock/Makefile b/x11/waylock/Makefile
--- a/x11/waylock/Makefile
+++ b/x11/waylock/Makefile
@@ -1,6 +1,6 @@
PORTNAME= waylock
DISTVERSIONPREFIX= v
-DISTVERSION= 1.4.0
+DISTVERSION= 1.5.0
CATEGORIES= x11 wayland
MAINTAINER= ports@FreeBSD.org
@@ -11,7 +11,7 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \
- zig>=0.14.0:lang/zig
+ zig>=0.15.1:lang/zig
LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper
@@ -19,7 +19,7 @@
USES= pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= ifreund
-GH_TUPLE= ifreund:zig-wayland:v0.3.0:zig_wayland/../.cache/zig/p/wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl \
+GH_TUPLE= ifreund:zig-wayland:v0.4.0:zig_wayland/../.cache/zig/p/wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27 \
ifreund:zig-xkbcommon:v0.3.0:zig_xkbcommon/../.cache/zig/p/xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr
MAKE_ENV= DESTDIR="${STAGEDIR}"
CONFIGURE_ARGS= --prefix "${PREFIX}" \
diff --git a/x11/waylock/distinfo b/x11/waylock/distinfo
--- a/x11/waylock/distinfo
+++ b/x11/waylock/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1741342864
-SHA256 (ifreund-waylock-v1.4.0_GH0.tar.gz) = 921d744f4c1ea0c79de5c730afdc4928273a69ae18ff69b063fc5ca8c70fb977
-SIZE (ifreund-waylock-v1.4.0_GH0.tar.gz) = 20664
-SHA256 (ifreund-zig-wayland-v0.3.0_GH0.tar.gz) = 8697cb2d056bc88e76e4f44e68e4346bf1ab4b325acd38b52dae7924754ea0ad
-SIZE (ifreund-zig-wayland-v0.3.0_GH0.tar.gz) = 75460
+TIMESTAMP = 1763896589
+SHA256 (ifreund-waylock-v1.5.0_GH0.tar.gz) = 9d537f1685f599b3ca091fc8215be5853891526ce87697936d8904b2163d1d48
+SIZE (ifreund-waylock-v1.5.0_GH0.tar.gz) = 20715
+SHA256 (ifreund-zig-wayland-v0.4.0_GH0.tar.gz) = a001733a3a2a71f64b9cd136b60219bd5d0e870e1974159ae9102951a31bd940
+SIZE (ifreund-zig-wayland-v0.4.0_GH0.tar.gz) = 111961
SHA256 (ifreund-zig-xkbcommon-v0.3.0_GH0.tar.gz) = 492b670d9bddc596184b2ec46d06dbcafdfb9c4b6b6fa7ad9ba98a4d2f921d59
SIZE (ifreund-zig-xkbcommon-v0.3.0_GH0.tar.gz) = 22520
diff --git a/x11/waylock/files/patch-build_zig b/x11/waylock/files/patch-build_zig
new file mode 100644
--- /dev/null
+++ b/x11/waylock/files/patch-build_zig
@@ -0,0 +1,11 @@
+--- build.zig.orig 2025-09-10 10:23:50.000000000 +0200
++++ build.zig 2025-11-23 12:24:23.792357000 +0100
+@@ -10,7 +10,7 @@
+ /// development with the "-dev" suffix.
+ /// When a release is tagged, the "-dev" suffix should be removed for the commit that gets tagged.
+ /// Directly after the tagged commit, the version should be bumped and the "-dev" suffix added.
+-const version = "1.4.0-dev";
++const version = "1.5.0";
+
+ pub fn build(b: *Build) !void {
+ const target = b.standardTargetOptions(.{});

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 9, 11:40 PM (9 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31178667
Default Alt Text
D54132.diff (14 KB)

Event Timeline