Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 11 May 2026 15:36:40 +0000
From:      Kenneth Raplee <kenrap@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e503f396ac9e - main - x11/waylock: Convert to USES=zig
Message-ID:  <6a01f788.35d2c.569b3a17@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by kenrap:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e503f396ac9e3fc1c061862322ef184c2ae908b1

commit e503f396ac9e3fc1c061862322ef184c2ae908b1
Author:     Kenneth Raplee <kenrap@FreeBSD.org>
AuthorDate: 2026-05-04 15:42:43 +0000
Commit:     Kenneth Raplee <kenrap@FreeBSD.org>
CommitDate: 2026-05-11 15:33:49 +0000

    x11/waylock: Convert to USES=zig
    
    PR:             294741
    Approved by:    arrowd (co-mentor)
---
 x11/waylock/Makefile     | 29 +++++++++--------------------
 x11/waylock/Makefile.zig |  2 ++
 x11/waylock/distinfo     | 14 +++++++-------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/x11/waylock/Makefile b/x11/waylock/Makefile
index 7e6b6fe707f2..fd390f38ecbe 100644
--- a/x11/waylock/Makefile
+++ b/x11/waylock/Makefile
@@ -10,37 +10,26 @@ WWW=		https://codeberg.org/ifreund/waylock
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
-		zig>=0.15.1:lang/zig
+BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	unix-selfauth-helper>0:security/unix-selfauth-helper
 
-USES=		pkgconfig
+# There is an LLVM/zig016 regression which causes waylock to fail to run when
+# using any of the release modes with this error:
+# ld-elf.so.1: /lib/libc.so.7: Undefined symbol "environ"
+USES=		pkgconfig zig:015
 USE_GITHUB=	yes
 GH_ACCOUNT=	ifreund
-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
-CONFIGURE_ARGS=	--prefix "${PREFIX}" \
-		${WITH_DEBUG:D:U-Doptimize=ReleaseFast} \
-		${WITH_PIE:D-Dpie} \
-		${STRIP:C/.+/-Dstrip/} \
-		-Dcpu=${CPUTYPE:Ubaseline} \
-		--verbose
-MAKE_ENV=	DESTDIR="${STAGEDIR}"
-NO_INSTALL=	yes # strip(1) breaks runtime
+
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/pam.d/${PORTNAME}
 
-OPTIONS_DEFINE=	MANPAGES
-OPTIONS_DEFAULT=MANPAGES
+OPTIONS_DEFINE=		MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
-MANPAGES_CONFIGURE_ON=	-Dman-pages=true
-MANPAGES_CONFIGURE_OFF=	-Dman-pages=false
+MANPAGES_ZIG_BOOL=	man-pages
 MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz
 
-do-build:
-	@(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})
-
 .include <bsd.port.mk>
diff --git a/x11/waylock/Makefile.zig b/x11/waylock/Makefile.zig
new file mode 100644
index 000000000000..0be804f22d7b
--- /dev/null
+++ b/x11/waylock/Makefile.zig
@@ -0,0 +1,2 @@
+ZIG_TUPLE=	wayland:codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz:wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27 \
+		xkbcommon:codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz:xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr
diff --git a/x11/waylock/distinfo b/x11/waylock/distinfo
index b57e7262eb95..38007d8b534f 100644
--- a/x11/waylock/distinfo
+++ b/x11/waylock/distinfo
@@ -1,7 +1,7 @@
-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
+TIMESTAMP = 1777907558
+SHA256 (zig/v0.4.0.tar.gz) = 907fdd18c7ede1ab1f249c618ba5dce3b8a72c26e50090b4ae7010033a419ba9
+SIZE (zig/v0.4.0.tar.gz) = 111219
+SHA256 (zig/v0.3.0.tar.gz) = 1e185423e6b23ed9729614e66751ab7522db4487df4e0dcc7a2b06375aacda23
+SIZE (zig/v0.3.0.tar.gz) = 22730
+SHA256 (zig/ifreund-waylock-v1.5.0_GH0.tar.gz) = 9d537f1685f599b3ca091fc8215be5853891526ce87697936d8904b2163d1d48
+SIZE (zig/ifreund-waylock-v1.5.0_GH0.tar.gz) = 20715
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a01f788.35d2c.569b3a17>