CVS commit: pkgsrc/ham/7plus

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jul 23 19:14:04 UTC 2026

Modified Files:
        pkgsrc/ham/7plus: Makefile distinfo
        pkgsrc/ham/7plus/patches: patch-aa patch-ac

Log Message:
ham/7plus: Extend patches to catch up with modern Linux

>From Chris Maness via email.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/ham/7plus/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/ham/7plus/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/ham/7plus/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/ham/7plus/patches/patch-ac

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

Modified files:

Index: pkgsrc/ham/7plus/Makefile
diff -u pkgsrc/ham/7plus/Makefile:1.18 pkgsrc/ham/7plus/Makefile:1.19
--- pkgsrc/ham/7plus/Makefile:1.18      Thu Jan 25 14:15:16 2024
+++ pkgsrc/ham/7plus/Makefile   Thu Jul 23 19:14:03 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2024/01/25 14:15:16 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2026/07/23 19:14:03 gdt Exp $
 #
 
 DISTNAME=      7pl225sr
 PKGNAME=       7plus-225
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    ham
 MASTER_SITES=  https://www.aydogan.net/distfiles/ham/
 DISTFILES=     7pl225sr.tgz \

Index: pkgsrc/ham/7plus/distinfo
diff -u pkgsrc/ham/7plus/distinfo:1.10 pkgsrc/ham/7plus/distinfo:1.11
--- pkgsrc/ham/7plus/distinfo:1.10      Tue Oct 26 10:48:37 2021
+++ pkgsrc/ham/7plus/distinfo   Thu Jul 23 19:14:03 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:48:37 nia Exp $
+$NetBSD: distinfo,v 1.11 2026/07/23 19:14:03 gdt Exp $
 
-BLAKE2s (7pl225sr.tgz) = f60715b150f044974d04ec7719cfe206575010e790c4e5591638327350b9b4bf
-SHA512 (7pl225sr.tgz) = c1c303b19ed14b3398a8a0c58eb505f03f27e957cfe3cbf2432db115a1efaf6a637e657490079791d245aebf6d2b14497e111b5d5cfd52637f25f135e5008476
-Size (7pl225sr.tgz) = 65122 bytes
 BLAKE2s (7pl210mg.tgz) = 6fe22e846b3478dfa67a6582ace82af53b839655afa22def15a9d8e15978822a
 SHA512 (7pl210mg.tgz) = 579a18b734dd719dc0a8f1074af3f9ebeb0a42c7219c7d79c6a92cc956a64a00b241d9a2d6e9fc176e3649fa96e127fd08a8d09d2ff7b7afa92237f16e932014
 Size (7pl210mg.tgz) = 31095 bytes
-SHA1 (patch-aa) = 62fa52455c8225cbd4465bbd5e1565e7eaae3421
+BLAKE2s (7pl225sr.tgz) = f60715b150f044974d04ec7719cfe206575010e790c4e5591638327350b9b4bf
+SHA512 (7pl225sr.tgz) = c1c303b19ed14b3398a8a0c58eb505f03f27e957cfe3cbf2432db115a1efaf6a637e657490079791d245aebf6d2b14497e111b5d5cfd52637f25f135e5008476
+Size (7pl225sr.tgz) = 65122 bytes
+SHA1 (patch-aa) = aa706bef96921b94d37a969a249a45ea4f228de3
 SHA1 (patch-ab) = 4bf37d21aceced7b8faaeb67dffb8280b220fc16
-SHA1 (patch-ac) = 286a5f9f8bf7066948735e646e8138e820f84a68
+SHA1 (patch-ac) = 5f264886a7cf327f1739d9dc5a12b47d1b266318
 SHA1 (patch-ad) = b55e4b7d5f416f4363f8457f244ce21a0e19e1eb
 SHA1 (patch-ae) = d52190c471cebd4c4fc5debb33a342aa3e852928
 SHA1 (patch-af) = 499fd3c8d56bec7c5e52c4e131eadadb837506d9

Index: pkgsrc/ham/7plus/patches/patch-aa
diff -u pkgsrc/ham/7plus/patches/patch-aa:1.2 pkgsrc/ham/7plus/patches/patch-aa:1.3
--- pkgsrc/ham/7plus/patches/patch-aa:1.2       Mon Jan  9 20:02:02 2006
+++ pkgsrc/ham/7plus/patches/patch-aa   Thu Jul 23 19:14:04 2026
@@ -1,4 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2006/01/09 20:02:02 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2026/07/23 19:14:04 gdt Exp $
+
+Support modern 64-bit Linux (amd64 etc).
+
+The terminal struct-selection fell through to <sgtty.h> / struct sgttyb
+on Linux: SYSV is only set for __i386__, and the termios branch tested
+only __NetBSD__ / __DragonFly__. glibc removed <sgtty.h>, breaking the
+64-bit Linux build (i386 worked via the SYSV termio path). Add __linux__
+to the termios branch.
+
 
 --- 7plus.h.orig       2000-01-10 15:03:02.000000000 +0000
 +++ 7plus.h
@@ -33,7 +42,7 @@ $NetBSD: patch-aa,v 1.2 2006/01/09 20:02
    struct termio sg[2];
   #else
 -  #ifdef __NetBSD__
-+  #if defined(__NetBSD__) || defined(__DragonFly__)
++  #if defined(__NetBSD__) || defined(__DragonFly__) || defined(__linux__)
      #include <unistd.h>
      #include <termios.h>
      struct termios sg[2];

Index: pkgsrc/ham/7plus/patches/patch-ac
diff -u pkgsrc/ham/7plus/patches/patch-ac:1.1 pkgsrc/ham/7plus/patches/patch-ac:1.2
--- pkgsrc/ham/7plus/patches/patch-ac:1.1       Mon Jan  9 20:02:02 2006
+++ pkgsrc/ham/7plus/patches/patch-ac   Thu Jul 23 19:14:04 2026
@@ -1,4 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2006/01/09 20:02:02 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2026/07/23 19:14:04 gdt Exp $
+
+Support modern 64-bit Linux (amd64 etc): add __linux__ to the _IOCTL_
+definition so Linux uses the ioctl() terminal path. Inner ioctl selectors
+stay NetBSD/DragonFly-only, so Linux takes the TCGETA/TCSETAW branch
+(glibc lacks the BSD TIOCGETA/TIOCSETAW names).
+
 
 --- utils.c.orig       2006-01-09 19:56:59.000000000 +0000
 +++ utils.c
@@ -16,7 +22,7 @@ $NetBSD: patch-ac,v 1.1 2006/01/09 20:02
  #ifndef _HAVE_GETCH
  
 - #if defined(SYSV) || defined(__EMX__) || defined(__NetBSD__)/* use ioctl() */
-+ #if defined(SYSV) || defined(__EMX__) || defined(__NetBSD__) || defined(__DragonFly__) /* use ioctl() */
++ #if defined(SYSV) || defined(__EMX__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__linux__) /* use ioctl() */
    #define _IOCTL_
   #endif