pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/wm/sdorfehs
Module Name: pkgsrc
Committed By: pin
Date: Thu Oct 31 10:50:55 UTC 2024
Modified Files:
pkgsrc/wm/sdorfehs: Makefile distinfo
pkgsrc/wm/sdorfehs/patches: patch-Makefile patch-actions.c
patch-communications.c
Log Message:
wm/sdorfehs: update to 1.6
No release notes provided.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/wm/sdorfehs/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/wm/sdorfehs/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/sdorfehs/patches/patch-Makefile
cvs rdiff -u -r1.1 -r1.2 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.
Modified files:
Index: pkgsrc/wm/sdorfehs/Makefile
diff -u pkgsrc/wm/sdorfehs/Makefile:1.13 pkgsrc/wm/sdorfehs/Makefile:1.14
--- pkgsrc/wm/sdorfehs/Makefile:1.13 Mon Mar 11 14:01:13 2024
+++ pkgsrc/wm/sdorfehs/Makefile Thu Oct 31 10:50:54 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2024/03/11 14:01:13 vins Exp $
+# $NetBSD: Makefile,v 1.14 2024/10/31 10:50:54 pin Exp $
-DISTNAME= sdorfehs-1.5
-PKGREVISION= 3
+DISTNAME= sdorfehs-1.6
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_GITHUB:=jcs/}
GITHUB_TAG= v${PKGVERSION_NOREV}
Index: pkgsrc/wm/sdorfehs/distinfo
diff -u pkgsrc/wm/sdorfehs/distinfo:1.8 pkgsrc/wm/sdorfehs/distinfo:1.9
--- pkgsrc/wm/sdorfehs/distinfo:1.8 Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/distinfo Thu Oct 31 10:50:54 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2024/03/10 21:02:21 vins Exp $
+$NetBSD: distinfo,v 1.9 2024/10/31 10:50:54 pin 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) = 1a9fbef21cada05f2a1bbe2f1788b906fa933af5
-SHA1 (patch-actions.c) = 7abd557982f896e2e4dadbaf94d752336046675a
-SHA1 (patch-communications.c) = 53e710277415d2d38179a1a1419b024ef0e7dbac
+BLAKE2s (sdorfehs-1.6.tar.gz) = 2a9f460a3a0791423beeae49e63194d2ca3e373e9fe8d1931b29ab693a2e9fcb
+SHA512 (sdorfehs-1.6.tar.gz) = 0f9d873f349783bd000f3f3fe80216157550fdfdd3ce20831a932fd743c03b02de592279bd676416d27c5ff57ed85e1c62f6c5cde1cc717394d52b028e5955cb
+Size (sdorfehs-1.6.tar.gz) = 122042 bytes
+SHA1 (patch-Makefile) = 12f2f98ab14e527578551df5e0f82fe2c5bd4e0a
+SHA1 (patch-actions.c) = 16db4e7dcf383fa91e605d6a0a6c6572ca7a22cc
+SHA1 (patch-communications.c) = 8ab29408c4a4f16927db18382b6faaf9828459b1
Index: pkgsrc/wm/sdorfehs/patches/patch-Makefile
diff -u pkgsrc/wm/sdorfehs/patches/patch-Makefile:1.3 pkgsrc/wm/sdorfehs/patches/patch-Makefile:1.4
--- pkgsrc/wm/sdorfehs/patches/patch-Makefile:1.3 Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/patches/patch-Makefile Thu Oct 31 10:50:55 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.3 2024/03/10 21:02:21 vins Exp $
+$NetBSD: patch-Makefile,v 1.4 2024/10/31 10:50:55 pin 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.orig 2024-10-31 10:21:15.297220936 +0000
+++ Makefile
@@ -4,14 +4,11 @@ VERSION!= [ -d .git ] && \
echo "git-`git rev-list --abbrev-commit --tags --max-count=1`" || \
@@ -12,16 +12,17 @@ $NetBSD: patch-Makefile,v 1.3 2024/03/10
-CC?= cc
-PREFIX?= /usr/local
--PKGLIBS= x11 xft xrandr xtst xres
+-PKGLIBS= x11 xft xrandr xtst xres freetype2
-CFLAGS+= -O2 -Wall \
- -Wunused -Wmissing-prototypes -Wstrict-prototypes \
- `pkg-config --cflags ${PKGLIBS}` \
+- -DVERSION=\"${VERSION}\"
+-LDFLAGS+= `pkg-config --libs ${PKGLIBS}`
+CC?= @CC@
+PREFIX?= @PREFIX@
++LIBS+= -lX11 -lXft -lXrandr -lXtst -lXRes -lfreetype
+CFLAGS+= -Wall -Wunused -Wmissing-prototypes -Wstrict-prototypes \
- -DVERSION=\"${VERSION}\"
--LDFLAGS+= `pkg-config --libs ${PKGLIBS}`
-+LIBS+= -lX11 -lXft -lXrandr -lXtst -lXRes
++ -DVERSION=\"${VERSION}\"
# uncomment to enable debugging
#CFLAGS+= -g -DDEBUG=1
@@ -29,8 +30,8 @@ $NetBSD: patch-Makefile,v 1.3 2024/03/10
#CFLAGS+= -DSENDCMD_DEBUG=1
BINDIR= ${DESTDIR}$(PREFIX)/bin
--MANDIR= ${DESTDIR}$(PREFIX)/man/man1
-+MANDIR= ${DESTDIR}$(PREFIX)/@PKGMANDIR@/man1
+-MANDIR?= ${DESTDIR}$(PREFIX)/man/man1
++MANDIR?= ${DESTDIR}$(PREFIX)/@PKGMANDIR@/man1
SRC!= ls *.c
OBJ= ${SRC:.c=.o}
Index: pkgsrc/wm/sdorfehs/patches/patch-actions.c
diff -u pkgsrc/wm/sdorfehs/patches/patch-actions.c:1.1 pkgsrc/wm/sdorfehs/patches/patch-actions.c:1.2
--- pkgsrc/wm/sdorfehs/patches/patch-actions.c:1.1 Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/patches/patch-actions.c Thu Oct 31 10:50:55 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-actions.c,v 1.1 2024/03/10 21:02:21 vins Exp $
+$NetBSD: patch-actions.c,v 1.2 2024/10/31 10:50:55 pin Exp $
Define `TIOCNOTTY' ioctl on SunOS using TTCOMPAT(4M).
---- actions.c.orig 2024-03-10 19:16:37.092649863 +0000
+--- actions.c.orig 2024-10-31 10:28:41.500126111 +0000
+++ actions.c
@@ -28,6 +28,10 @@
#include <limits.h>
Index: pkgsrc/wm/sdorfehs/patches/patch-communications.c
diff -u pkgsrc/wm/sdorfehs/patches/patch-communications.c:1.1 pkgsrc/wm/sdorfehs/patches/patch-communications.c:1.2
--- pkgsrc/wm/sdorfehs/patches/patch-communications.c:1.1 Sun Mar 10 21:02:21 2024
+++ pkgsrc/wm/sdorfehs/patches/patch-communications.c Thu Oct 31 10:50:55 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-communications.c,v 1.1 2024/03/10 21:02:21 vins Exp $
+$NetBSD: patch-communications.c,v 1.2 2024/10/31 10:50:55 pin Exp $
Rename local variables to avoid name clash on SunOS.
---- communications.c.orig 2024-03-10 19:07:49.914451195 +0000
+--- communications.c.orig 2024-10-31 10:29:35.665002807 +0000
+++ communications.c
-@@ -49,26 +49,26 @@ init_control_socket_path(void)
+@@ -49,27 +49,27 @@ init_control_socket_path(void)
void
listen_for_commands(void)
{
@@ -21,10 +21,12 @@ Rename local variables to avoid name cla
rp_glob_screen.control_socket_path);
- strncpy(sun.sun_path, rp_glob_screen.control_socket_path,
-- sizeof(sun.sun_path));
+- sizeof(sun.sun_path)-1);
+- sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
- sun.sun_family = AF_UNIX;
+ strncpy(lsun.sun_path, rp_glob_screen.control_socket_path,
-+ sizeof(lsun.sun_path));
++ sizeof(lsun.sun_path)-1);
++ lsun.sun_path[sizeof(lsun.sun_path) - 1] = '\0';
+ lsun.sun_family = AF_UNIX;
if (unlink(rp_glob_screen.control_socket_path) == -1 &&
@@ -38,7 +40,7 @@ Rename local variables to avoid name cla
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)
+@@ -85,7 +85,7 @@ listen_for_commands(void)
int
send_command(int interactive, unsigned char *cmd)
{
@@ -47,7 +49,7 @@ Rename local variables to avoid name cla
char *wcmd, *bufstart;
char ret[BUFSZ+1];
char success = 0;
-@@ -108,15 +108,15 @@ send_command(int interactive, unsigned c
+@@ -109,16 +109,16 @@ send_command(int interactive, unsigned c
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
err(1, "socket");
@@ -57,10 +59,12 @@ Rename local variables to avoid name cla
rp_glob_screen.control_socket_path);
- strncpy(sun.sun_path, rp_glob_screen.control_socket_path,
-- sizeof(sun.sun_path));
+- sizeof(sun.sun_path)-1);
+- sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
- sun.sun_family = AF_UNIX;
+ strncpy(lsun.sun_path, rp_glob_screen.control_socket_path,
-+ sizeof(lsun.sun_path));
++ sizeof(lsun.sun_path)-1);
++ lsun.sun_path[sizeof(lsun.sun_path) - 1] = '\0';
+ lsun.sun_family = AF_UNIX;
- if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1)
Home |
Main Index |
Thread Index |
Old Index