CVS commit: pkgsrc/misc/screen

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Feb 13 19:43:02 UTC 2025

Modified Files:
        pkgsrc/misc/screen: Makefile distinfo
        pkgsrc/misc/screen/patches: patch-Makefile.in patch-socket.c

Log Message:
misc/screen: fix location to the system-wide screenrc


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 pkgsrc/misc/screen/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/misc/screen/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/screen/patches/patch-Makefile.in
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/screen/patches/patch-socket.c

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

Modified files:

Index: pkgsrc/misc/screen/Makefile
diff -u pkgsrc/misc/screen/Makefile:1.125 pkgsrc/misc/screen/Makefile:1.126
--- pkgsrc/misc/screen/Makefile:1.125   Tue Jan 14 18:36:16 2025
+++ pkgsrc/misc/screen/Makefile Thu Feb 13 19:43:02 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.125 2025/01/14 18:36:16 ktnb Exp $
+# $NetBSD: Makefile,v 1.126 2025/02/13 19:43:02 rillig Exp $
 
 DISTNAME=      screen-5.0.0
+PKGREVISION=   1
 CATEGORIES=    misc shells
 MASTER_SITES=  ${MASTER_SITE_GNU:=screen/}
 
@@ -25,7 +26,7 @@ NOT_FOR_PLATFORM=     Interix-*-* # user aut
 PLIST_SUBST+=          DISTNAME=${DISTNAME}
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-sys_screenrc=${PKG_SYSCONFDIR}/screenrc
+CONFIGURE_ARGS+=       --with-system_screenrc=${PKG_SYSCONFDIR}/screenrc
 CONFIGURE_ARGS+=       --enable-telnet
 
 PKG_SHELL=             bin/screen

Index: pkgsrc/misc/screen/distinfo
diff -u pkgsrc/misc/screen/distinfo:1.65 pkgsrc/misc/screen/distinfo:1.66
--- pkgsrc/misc/screen/distinfo:1.65    Thu Jan  9 20:07:03 2025
+++ pkgsrc/misc/screen/distinfo Thu Feb 13 19:43:02 2025
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.65 2025/01/09 20:07:03 ktnb Exp $
+$NetBSD: distinfo,v 1.66 2025/02/13 19:43:02 rillig Exp $
 
 BLAKE2s (screen-5.0.0.tar.gz) = b2d41befdfd7b641bddef5d1eb4a919bcb76f971e79a145ea4a2e3ba55db28d1
 SHA512 (screen-5.0.0.tar.gz) = 18a163313025c58950ec65fa83037ba1df0fa8e2346925593217fb0a6596f2f51914a4f0aec7f0e1c280d3d3ef964e7a886521f41f4b96f4ff08935be7f62117
 Size (screen-5.0.0.tar.gz) = 895882 bytes
-SHA1 (patch-Makefile.in) = c2cc82b4f3b3968053d5e778ad39cf02217807e3
+SHA1 (patch-Makefile.in) = 9a536678040bb6a47e5c7fbeedfecc0aa5c870e2
 SHA1 (patch-doc_screen.1) = 858df8ed65c8fa8044075f4066832f79ba77b3a2
 SHA1 (patch-doc_screen.texinfo) = e35f936f307fc6162824c3090221745ba38f6aba
 SHA1 (patch-etc_etcscreenrc) = a45ae3186cd9bddeb915bad890f1be5abc315dd3
-SHA1 (patch-socket.c) = 4f14a790a0d5048b6638457ad42a63df004d04b7
+SHA1 (patch-socket.c) = 51a7cbc2053925132f890a8585489529c5d6da99
 SHA1 (patch-termcap.c) = f06432d06405daac0064296d2cfa3246a2621e4f
 SHA1 (patch-utmp-netbsd.c) = a721e311e7dde7938de0e9546a7892bfd104ebd1
 SHA1 (patch-window.h) = b0fe8f7105a906c6d9a8908ade8d34e5f7da0dd1

Index: pkgsrc/misc/screen/patches/patch-Makefile.in
diff -u pkgsrc/misc/screen/patches/patch-Makefile.in:1.1 pkgsrc/misc/screen/patches/patch-Makefile.in:1.2
--- pkgsrc/misc/screen/patches/patch-Makefile.in:1.1    Thu Jan  9 20:07:03 2025
+++ pkgsrc/misc/screen/patches/patch-Makefile.in        Thu Feb 13 19:43:02 2025
@@ -1,8 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.1 2025/01/09 20:07:03 ktnb Exp $
-
-Remove GNU Make conditional.  @ETCSCREENRC@ appears to get
-replaced always. If it doesn't in some cases, please fix
-configure.ac instead (and regen patch for configure as well).
+$NetBSD: patch-Makefile.in,v 1.2 2025/02/13 19:43:02 rillig Exp $
 
 Add utmp-netbsd.c (created in patch-am) and utmp-netbsd.o.
 Setting the setuid bit is handled by the package Makefile.

Index: pkgsrc/misc/screen/patches/patch-socket.c
diff -u pkgsrc/misc/screen/patches/patch-socket.c:1.5 pkgsrc/misc/screen/patches/patch-socket.c:1.6
--- pkgsrc/misc/screen/patches/patch-socket.c:1.5       Thu Jan  9 20:07:04 2025
+++ pkgsrc/misc/screen/patches/patch-socket.c   Thu Feb 13 19:43:02 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-socket.c,v 1.5 2025/01/09 20:07:04 ktnb Exp $
+$NetBSD: patch-socket.c,v 1.6 2025/02/13 19:43:02 rillig Exp $
 
-Include <uio.h> for iovec. 
+Include <uio.h> for iovec.
 
 --- socket.c.orig      2025-01-09 02:58:51.269455114 +0000
 +++ socket.c