Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1710104541269740"
MIME-Version: 1.0
Date: Sun, 10 Mar 2024 21:02:21 +0000
From: "Paolo Vincenzo Olivo" <vins@netbsd.org>
Subject: CVS commit: pkgsrc/wm/sdorfehs
To: pkgsrc-changes@NetBSD.org
Reply-To: vins@netbsd.org
Message-Id: <20240310210221.95C41FA2A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1710104541269740
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	vins
Date:		Sun Mar 10 21:02:21 UTC 2024

Modified Files:
	pkgsrc/wm/sdorfehs: Makefile distinfo
Added Files:
	pkgsrc/wm/sdorfehs/patches: patch-Makefile patch-actions.c
	    patch-communications.c

Log Message:
wm/sdorfehs: fix build on SunOS

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/wm/sdorfehs/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/sdorfehs/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/wm/sdorfehs/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/sdorfehs/patches/patch-actions.c \
    pkgsrc/wm/sdorfehs/patches/patch-communications.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1710104541269740
Content-Disposition: inline
Content-Length: 7453
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/wm/sdorfehs/Makefile
diff -u pkgsrc/wm/sdorfehs/Makefile:1.11 pkgsrc/wm/sdorfehs/Makefile:1.12
--- pkgsrc/wm/sdorfehs/Makefile:1.11	Sun Nov 12 13:23:50 2023
+++ pkgsrc/wm/sdorfehs/Makefile	Sun Mar 10 21:02:21 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2023/11/12 13:23:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/03/10 21:02:21 vins Exp $
 
 DISTNAME=	sdorfehs-1.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jcs/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -11,15 +11,18 @@ HOMEPAGE=	https://github.com/jcs/sdorfeh
 COMMENT=	Tiling window manager descended from ratpoison
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	pkg-config
+LIBS.SunOS+=	-lsocket
+
+MAKE_ENV+=	CC=${CC:Q}
+MAKE_ENV+=	CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=	LDFLAGS=${LDFLAGS:Q}
+MAKE_ENV+=	LIBS=${LIBS:Q}
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing paths.
 SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix+=	Makefile
-SUBST_SED.prefix+=	-e 's,/usr/local,${PREFIX},g'
-SUBST_SED.prefix+=	-e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.prefix+=	-e 's,/etc,${PKG_SYSCONFDIR}/,g'
+SUBST_VARS.prefix=	PKGMANDIR PREFIX
 
 INSTALLATION_DIRS=	bin/ ${PKGMANDIR}/man1/
 

Index: pkgsrc/wm/sdorfehs/distinfo
diff -u pkgsrc/wm/sdorfehs/distinfo:1.7 pkgsrc/wm/sdorfehs/distinfo:1.8
--- pkgsrc/wm/sdorfehs/distinfo:1.7	Sat Jan 28 12:46:30 2023
+++ pkgsrc/wm/sdorfehs/distinfo	Sun Mar 10 21:02:21 2024
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2023/01/28 12:46:30 pin Exp $
+$NetBSD: distinfo,v 1.8 2024/03/10 21:02:21 vins Exp $
 
 BLAKE2s (sdorfehs-1.5.tar.gz) = 270d21d0f5eec9401273654b1cc87dbf224f8e8b2b829bbb6552a20ce1f692af
 SHA512 (sdorfehs-1.5.tar.gz) = 2bbb354d186e06b95b1d01e04bc97585121630dd9544ea8b10299dc5f15bc94bbd5cd55cbb72d6f04a3abf930652731b2070810fe908532953af87f02ec06687
 Size (sdorfehs-1.5.tar.gz) = 122223 bytes
-SHA1 (patch-Makefile) = d8e18bb85595776540647e3477cec6c7c94c4432
+SHA1 (patch-Makefile) = 1a9fbef21cada05f2a1bbe2f1788b906fa933af5
+SHA1 (patch-actions.c) = 7abd557982f896e2e4dadbaf94d752336046675a
+SHA1 (patch-communications.c) = 53e710277415d2d38179a1a1419b024ef0e7dbac

Added files:

Index: pkgsrc/wm/sdorfehs/patches/patch-Makefile
diff -u /dev/null pkgsrc/wm/sdorfehs/patches/patch-Makefile:1.3
--- /dev/null	Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/patches/patch-Makefile	Sun Mar 10 21:02:21 2024
@@ -0,0 +1,54 @@
+$NetBSD: patch-Makefile,v 1.3 2024/03/10 21:02:21 vins Exp $
+
+* Honour pkgsrc compiler/linker flags.
+* Do not require pkg-config.
+* Provide a pkgsrc-compliant install target.
+
+--- Makefile.orig	2023-01-27 20:35:24.000000000 +0000
++++ Makefile
+@@ -4,14 +4,11 @@ VERSION!=	[ -d .git ] && \
+ 		echo "git-`git rev-list --abbrev-commit --tags --max-count=1`" || \
+ 		echo "${VERSION}"
+ 
+-CC?=		cc
+-PREFIX?=	/usr/local
+-PKGLIBS=	x11 xft xrandr xtst xres
+-CFLAGS+=	-O2 -Wall \
+-		-Wunused -Wmissing-prototypes -Wstrict-prototypes \
+-		`pkg-config --cflags ${PKGLIBS}` \
++CC?=		@CC@
++PREFIX?=	@PREFIX@
++CFLAGS+=	-Wall -Wunused -Wmissing-prototypes -Wstrict-prototypes \
+ 		-DVERSION=\"${VERSION}\"
+-LDFLAGS+=	`pkg-config --libs ${PKGLIBS}`
++LIBS+=		-lX11 -lXft -lXrandr -lXtst -lXRes
+ 
+ # uncomment to enable debugging
+ #CFLAGS+=	-g -DDEBUG=1
+@@ -20,7 +17,7 @@ LDFLAGS+=	`pkg-config --libs ${PKGLIBS}`
+ #CFLAGS+=	-DSENDCMD_DEBUG=1
+ 
+ BINDIR=		${DESTDIR}$(PREFIX)/bin
+-MANDIR=		${DESTDIR}$(PREFIX)/man/man1
++MANDIR=		${DESTDIR}$(PREFIX)/@PKGMANDIR@/man1
+ 
+ SRC!=		ls *.c
+ OBJ=		${SRC:.c=.o}
+@@ -31,12 +28,13 @@ MAN=		sdorfehs.1
+ all: sdorfehs
+ 
+ sdorfehs: $(OBJ)
+-	$(CC) -o $@ $(OBJ) $(LDFLAGS)
++	$(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS)
+ 
+ install: all
+-	mkdir -p $(BINDIR) $(MANDIR)
+-	install -s $(BIN) $(BINDIR)
+-	install -m 644 $(MAN) $(MANDIR)
++	$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
++	$(BSD_INSTALL_PROGRAM) $(BIN) $(BINDIR)
++	$(BSD_INSTALL_MAN_DIR) $(MANDIR)
++	$(BSD_INSTALL_MAN) $(MAN) $(MANDIR)
+ 
+ regress:
+ 	scan-build $(MAKE)

Index: pkgsrc/wm/sdorfehs/patches/patch-actions.c
diff -u /dev/null pkgsrc/wm/sdorfehs/patches/patch-actions.c:1.1
--- /dev/null	Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/patches/patch-actions.c	Sun Mar 10 21:02:21 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-actions.c,v 1.1 2024/03/10 21:02:21 vins Exp $
+
+Define `TIOCNOTTY' ioctl on SunOS using TTCOMPAT(4M).
+
+--- actions.c.orig	2024-03-10 19:16:37.092649863 +0000
++++ actions.c
+@@ -28,6 +28,10 @@
+ #include <limits.h>
+ #include <X11/Xproto.h>
+ #include <X11/extensions/XTest.h>
++#if defined(__sun)
++# define BSD_COMP
++# include <sys/stropts.h>
++#endif
+ #include <sys/ioctl.h>
+ 
+ #include "sdorfehs.h"
Index: pkgsrc/wm/sdorfehs/patches/patch-communications.c
diff -u /dev/null pkgsrc/wm/sdorfehs/patches/patch-communications.c:1.1
--- /dev/null	Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/patches/patch-communications.c	Sun Mar 10 21:02:21 2024
@@ -0,0 +1,70 @@
+$NetBSD: patch-communications.c,v 1.1 2024/03/10 21:02:21 vins Exp $
+
+Rename local variables to avoid name clash on SunOS.
+
+--- communications.c.orig	2024-03-10 19:07:49.914451195 +0000
++++ communications.c
+@@ -49,26 +49,26 @@ init_control_socket_path(void)
+ void
+ listen_for_commands(void)
+ {
+-	struct sockaddr_un sun;
++	struct sockaddr_un lsun;
+ 
+ 	if ((rp_glob_screen.control_socket_fd = socket(AF_UNIX,
+ 	    SOCK_STREAM | SOCK_NONBLOCK, 0)) == -1)
+ 		err(1, "socket");
+ 
+-	if (strlen(rp_glob_screen.control_socket_path) >= sizeof(sun.sun_path))
++	if (strlen(rp_glob_screen.control_socket_path) >= sizeof(lsun.sun_path))
+ 		err(1, "control socket path too long: %s",
+ 		    rp_glob_screen.control_socket_path);
+ 
+-	strncpy(sun.sun_path, rp_glob_screen.control_socket_path,
+-	    sizeof(sun.sun_path));
+-	sun.sun_family = AF_UNIX;
++	strncpy(lsun.sun_path, rp_glob_screen.control_socket_path,
++	    sizeof(lsun.sun_path));
++	lsun.sun_family = AF_UNIX;
+ 
+ 	if (unlink(rp_glob_screen.control_socket_path) == -1 &&
+ 	    errno != ENOENT)
+ 		err(1, "unlink %s",rp_glob_screen.control_socket_path);
+ 
+-	if (bind(rp_glob_screen.control_socket_fd, (struct sockaddr *)&sun,
+-	    sizeof(sun)) == -1)
++	if (bind(rp_glob_screen.control_socket_fd, (struct sockaddr *)&lsun,
++	    sizeof(lsun)) == -1)
+ 		err(1, "bind %s", rp_glob_screen.control_socket_path);
+ 
+ 	if (chmod(rp_glob_screen.control_socket_path, 0600) == -1)
+@@ -84,7 +84,7 @@ listen_for_commands(void)
+ int
+ send_command(int interactive, unsigned char *cmd)
+ {
+-	struct sockaddr_un sun;
++	struct sockaddr_un lsun;
+ 	char *wcmd, *bufstart;
+ 	char ret[BUFSZ+1];
+ 	char success = 0;
+@@ -108,15 +108,15 @@ send_command(int interactive, unsigned c
+ 	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+ 		err(1, "socket");
+ 
+-	if (strlen(rp_glob_screen.control_socket_path) >= sizeof(sun.sun_path))
++	if (strlen(rp_glob_screen.control_socket_path) >= sizeof(lsun.sun_path))
+ 		err(1, "control socket path too long: %s",
+ 		    rp_glob_screen.control_socket_path);
+ 
+-	strncpy(sun.sun_path, rp_glob_screen.control_socket_path,
+-	    sizeof(sun.sun_path));
+-	sun.sun_family = AF_UNIX;
++	strncpy(lsun.sun_path, rp_glob_screen.control_socket_path,
++	    sizeof(lsun.sun_path));
++	lsun.sun_family = AF_UNIX;
+ 
+-	if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1)
++	if (connect(fd, (struct sockaddr *)&lsun, sizeof(lsun)) == -1)
+ 		err(1, "failed to connect to control socket at %s",
+ 		    rp_glob_screen.control_socket_path);
+ 


--_----------=_1710104541269740--