Re: update: wayland/havoc 0.7.0

On Wed Jul 30, 2025 at 05:14:13PM +0200, Matthieu Herrb wrote:
> relatively straightforward. Upstream has improved portability, so 2
> patches can go away.
>
> ok ?
>
> Index: Makefile
> ===================================================================
> RCS file: /local/cvs/ports/wayland/havoc/Makefile,v
> diff -u -p -u -r1.5 Makefile
> --- Makefile 5 Nov 2024 17:43:45 -0000 1.5
> +++ Makefile 30 Jul 2025 15:10:58 -0000
> @@ -2,7 +2,7 @@ COMMENT = minimal terminal emulator for
>
> GH_ACCOUNT = ii8
> GH_PROJECT = havoc
> -GH_TAGNAME = 0.6.0
> +GH_TAGNAME = 0.7.0
>
>
> CATEGORIES = wayland
> Index: distinfo
> ===================================================================
> RCS file: /local/cvs/ports/wayland/havoc/distinfo,v
> diff -u -p -u -r1.3 distinfo
> --- distinfo 5 Nov 2024 17:43:45 -0000 1.3
> +++ distinfo 30 Jul 2025 15:10:58 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (havoc-0.6.0.tar.gz) = P2U464orWEZFnzjCg+7yyBUohqTtB54QOLAtDDGjJHw=
> -SIZE (havoc-0.6.0.tar.gz) = 95645
> +SHA256 (havoc-0.7.0.tar.gz) = tPgZv8Ow+OqWcBiUjb86cfF0oCiG0A7hYSFzn80UDW8=
> +SIZE (havoc-0.7.0.tar.gz) = 93445
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /local/cvs/ports/wayland/havoc/patches/patch-Makefile,v
> diff -u -p -u -r1.3 patch-Makefile
> --- patches/patch-Makefile 5 Nov 2024 17:43:45 -0000 1.3
> +++ patches/patch-Makefile 30 Jul 2025 15:10:58 -0000
> @@ -1,29 +1,23 @@
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -6,7 +6,7 @@ BINDIR ?= $(PREFIX)/bin
> +@@ -11,7 +11,7 @@ CDEFS = -DVERSION='$(VERSION)' -D_XOPEN_SOURCE=700
>
> - VERSION="0.6.0"
> + WAYLAND_PROTOCOLS_DIR != $(PKG_CONFIG) --variable=pkgdatadir wayland-protocols
>
> --CFLAGS ?= -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-format-overflow
> -+CFLAGS += -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -I/usr/local/include -I/usr/local/include/libepoll-shim

Replace /usr/local with ${LOCALBASE} and setup

pre-configure:
${SUBST_CMD} ${WRKSRC}/....

> - override CFLAGS += -DVERSION=\"$(VERSION)\"
> +-LIBRARIES = wayland-client wayland-cursor xkbcommon
> ++LIBRARIES = wayland-client wayland-cursor xkbcommon epoll-shim
> + PKG_CFLAGS != $(PKG_CONFIG) --cflags $(LIBRARIES)
> + PKG_LIBS != $(PKG_CONFIG) --libs $(LIBRARIES)
>
> - VPATH = $(WAYLAND_PROTOCOLS_DIR)/stable/xdg-shell \
> -@@ -17,14 +17,14 @@ GEN = xdg-shell.h xdg-shell.c \
> - xdg-decoration-unstable-v1.h xdg-decoration-unstable-v1.c \
> - primary-selection-unstable-v1.h primary-selection-unstable-v1.c
> -
> --LIBS=-lrt -lm -lutil -lwayland-client -lwayland-cursor -lxkbcommon -Ltsm -lhtsm
> -+LIBS=-L/usr/local/lib -R/usr/local/lib -lm -lutil -lwayland-client -lwayland-cursor -lxkbcommon -Ltsm -lhtsm -lepoll-shim

See above

> - OBJ=xdg-shell.o xdg-decoration-unstable-v1.o primary-selection-unstable-v1.o glyph.o main.o
> -
> - havoc: tsm $(OBJ)
> - $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
> +@@ -72,8 +72,8 @@ primary-selection-unstable-v1.xml:
> + cp $(WAYLAND_PROTOCOLS_DIR)/unstable/primary-selection/$@ $@
>
> install: havoc
> -- install -D -t $(DESTDIR)$(BINDIR) havoc
> -+ install -m 755 havoc $(BINDIR)
> +- mkdir -p $(DESTDIR)$(BINDIR)
> +- install -m 755 havoc $(DESTDIR)$(BINDIR)/havoc
> ++ mkdir -p $(BINDIR)
> ++ install -m 755 havoc $(BINDIR)/havoc
>
> uninstall:
> - rm -f $(DESTDIR)$(BINDIR)/havoc
> + rm $(DESTDIR)$(BINDIR)/havoc
> Index: patches/patch-main_c
> ===================================================================
> RCS file: patches/patch-main_c
> diff -N patches/patch-main_c
> --- patches/patch-main_c 5 Nov 2024 17:43:45 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,162 +0,0 @@
> -Index: main.c
> ---- main.c.orig
> -+++ main.c
> -@@ -13,7 +13,13 @@
> - #include <sys/timerfd.h>
> - #include <fcntl.h>
> - #include <unistd.h>
> -+#ifndef __OpenBSD__
> - #include <pty.h>
> -+#else
> -+#include <sys/ioctl.h>
> -+#include <sys/ttycom.h>
> -+#include <util.h>
> -+