CVS commit: pkgsrc/games/sl

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Nov 10 16:23:49 UTC 2024

Modified Files:
        pkgsrc/games/sl: Makefile distinfo
        pkgsrc/games/sl/patches: patch-Makefile
Added Files:
        pkgsrc/games/sl/patches: patch-sl.c

Log Message:
sl: bugfixes for use with NetBSD curses

Bump revision.
>From RVP in PR pkg/58815.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/sl/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/games/sl/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/sl/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/sl/patches/patch-sl.c

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

Modified files:

Index: pkgsrc/games/sl/Makefile
diff -u pkgsrc/games/sl/Makefile:1.23 pkgsrc/games/sl/Makefile:1.24
--- pkgsrc/games/sl/Makefile:1.23       Thu Mar 26 12:46:58 2020
+++ pkgsrc/games/sl/Makefile    Sun Nov 10 16:23:49 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2020/03/26 12:46:58 nia Exp $
+# $NetBSD: Makefile,v 1.24 2024/11/10 16:23:49 bsiegert Exp $
 #
 
 DISTNAME=      sl-5.02
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games
 MASTER_SITES=  -https://github.com/mtoyoda/sl/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
 

Index: pkgsrc/games/sl/distinfo
diff -u pkgsrc/games/sl/distinfo:1.10 pkgsrc/games/sl/distinfo:1.11
--- pkgsrc/games/sl/distinfo:1.10       Tue Oct 26 10:44:25 2021
+++ pkgsrc/games/sl/distinfo    Sun Nov 10 16:23:49 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:44:25 nia Exp $
+$NetBSD: distinfo,v 1.11 2024/11/10 16:23:49 bsiegert Exp $
 
 BLAKE2s (sl-5.02/sl-5.02.tar.gz) = b0f143a0ca7b628a93a85c8ea8284fe8e44bd326819497f97ae53e5bef89238b
 SHA512 (sl-5.02/sl-5.02.tar.gz) = a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
 Size (sl-5.02/sl-5.02.tar.gz) = 5353 bytes
-SHA1 (patch-Makefile) = 4e82d8e3d7a514213d8d2bc806191975f13546d4
+SHA1 (patch-Makefile) = cf28c60a5612e869c7e0e0ec188860d1952b467a
+SHA1 (patch-sl.c) = da4fe59eb9534bf49110992461339956fd3f1321

Index: pkgsrc/games/sl/patches/patch-Makefile
diff -u pkgsrc/games/sl/patches/patch-Makefile:1.1 pkgsrc/games/sl/patches/patch-Makefile:1.2
--- pkgsrc/games/sl/patches/patch-Makefile:1.1  Thu Mar 26 12:46:58 2020
+++ pkgsrc/games/sl/patches/patch-Makefile      Sun Nov 10 16:23:49 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2020/03/26 12:46:58 nia Exp $
+$NetBSD: patch-Makefile,v 1.2 2024/11/10 16:23:49 bsiegert Exp $
 
 Respect LDFLAGS.
 
@@ -14,4 +14,4 @@ Respect LDFLAGS.
 +      $(CC) $(CFLAGS) -c sl.c
 +
 +sl: sl.o
-+      $(CC) $(LDFLAGS) -o sl sl.o -lncurses
++      $(CC) $(LDFLAGS) -o sl sl.o -lcurses

Added files:

Index: pkgsrc/games/sl/patches/patch-sl.c
diff -u /dev/null pkgsrc/games/sl/patches/patch-sl.c:1.1
--- /dev/null   Sun Nov 10 16:23:49 2024
+++ pkgsrc/games/sl/patches/patch-sl.c  Sun Nov 10 16:23:49 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-sl.c,v 1.1 2024/11/10 16:23:49 bsiegert Exp $
+
+Put terminal into a known state. Do not write characters exceeding COLS.
+
+--- sl.c.orig  2024-11-10 16:18:40.738913492 +0000
++++ sl.c
+@@ -58,7 +58,7 @@ int my_mvaddstr(int y, int x, char *str)
+ {
+     for ( ; x < 0; ++x, ++str)
+         if (*str == '\0')  return ERR;
+-    for ( ; *str != '\0'; ++str, ++x)
++    for ( ; *str != '\0' && x < COLS; ++str, ++x)
+         if (mvaddch(y, x, *str) == ERR)  return ERR;
+     return OK;
+ }
+@@ -89,6 +89,7 @@ int main(int argc, char *argv[])
+     }
+     initscr();
+     signal(SIGINT, SIG_IGN);
++    cbreak();
+     noecho();
+     curs_set(0);
+     nodelay(stdscr, TRUE);