CVS commit: pkgsrc/comms/xtel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/comms/xtel
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 13 Dec 2025 12:38:10 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 13 12:38:10 UTC 2025

Modified Files:
        pkgsrc/comms/xtel: Makefile PLIST distinfo
        pkgsrc/comms/xtel/patches: patch-mdmdetect.c
Added Files:
        pkgsrc/comms/xtel/patches: patch-Xsra_SFinternal.h
Removed Files:
        pkgsrc/comms/xtel/patches: patch-ae

Log Message:
xtel: fix build on NetBSD 11

While here:
- fix pkglint
- merge two patches for same file into one patch


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/comms/xtel/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/comms/xtel/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/comms/xtel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/comms/xtel/patches/patch-Xsra_SFinternal.h
cvs rdiff -u -r1.3 -r0 pkgsrc/comms/xtel/patches/patch-ae
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/xtel/patches/patch-mdmdetect.c

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

Modified files:

Index: pkgsrc/comms/xtel/Makefile
diff -u pkgsrc/comms/xtel/Makefile:1.32 pkgsrc/comms/xtel/Makefile:1.33
--- pkgsrc/comms/xtel/Makefile:1.32     Thu Apr 24 14:13:24 2025
+++ pkgsrc/comms/xtel/Makefile  Sat Dec 13 12:38:09 2025
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.32 2025/04/24 14:13:24 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2025/12/13 12:38:09 wiz Exp $
 
-DISTNAME=      xtel-3.3.0
-PKGREVISION=   15
-CATEGORIES=    comms x11
-MASTER_SITES=  http://pficheux.free.fr/xtel/download/ # https times out
+DISTNAME=              xtel-3.3.0
+PKGREVISION=           15
+CATEGORIES=            comms x11
+MASTER_SITES=          http://pficheux.free.fr/xtel/download/ # https times out
 
-PATCHFILES=            xtel-jumbo-patch-20111008.gz
 PATCH_SITES=           http://www.NetBSD.org/~dholland/patchkits/xtel/
+PATCHFILES=            xtel-jumbo-patch-20111008.gz
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
@@ -26,7 +26,7 @@ SUBST_CLASSES+=               fontdir
 SUBST_STAGE.fontdir=   post-configure
 SUBST_MESSAGE.fontdir= Fixing imake font directory.
 SUBST_FILES.fontdir=   fonts/Makefile
-SUBST_SED.fontdir=     's,^[^A-Z]*FONTDIR =.*,FONTDIR = '${FONTDIR:Q},
+SUBST_SED.fontdir=     -e 's,^[^A-Z]*FONTDIR =.*,FONTDIR = '${FONTDIR:Q},
 
 INSTALLATION_DIRS=     share/examples/xtel
 INSTALL_MAKE_FLAGS=    PPPDIR=${PREFIX}/share/examples/xtel

Index: pkgsrc/comms/xtel/PLIST
diff -u pkgsrc/comms/xtel/PLIST:1.9 pkgsrc/comms/xtel/PLIST:1.10
--- pkgsrc/comms/xtel/PLIST:1.9 Sun Jun  1 16:44:38 2014
+++ pkgsrc/comms/xtel/PLIST     Sat Dec 13 12:38:09 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/06/01 16:44:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/12/13 12:38:09 wiz Exp $
 bin/install_iminitel
 bin/make_xtel_lignes
 bin/mdmdetect
@@ -6,6 +6,14 @@ bin/xtel
 bin/xteld
 lib/X11/app-defaults/XTel
 lib/X11/app-defaults/XTel-msg
+lib/X11/xtel/connect_iminitel
+lib/X11/xtel/modem.list
+lib/X11/xtel/xtel.lignes
+lib/X11/xtel/xtel.services
+share/examples/xtel/chat-iminitel
+share/examples/xtel/ip-down.iminitel
+share/examples/xtel/ip-up.iminitel
+share/examples/xtel/peers/iminitel
 share/fonts/X11/xtel/fonts.alias
 share/fonts/X11/xtel/fonts.scale
 share/fonts/X11/xtel/g016x10.pcf.gz
@@ -27,13 +35,5 @@ share/fonts/X11/xtel/g18x10.pcf.gz
 share/fonts/X11/xtel/g1s16x20.pcf.gz
 share/fonts/X11/xtel/g1s8x10.pcf.gz
 share/fonts/X11/xtel/xteldigit.pcf.gz
-lib/X11/xtel/connect_iminitel
-lib/X11/xtel/modem.list
-lib/X11/xtel/xtel.lignes
-lib/X11/xtel/xtel.services
 ${IMAKE_MAN_DIR}/xtel.${IMAKE_MANNEWSUFFIX}
 ${IMAKE_MAN_DIR}/xteld.${IMAKE_MANNEWSUFFIX}
-share/examples/xtel/chat-iminitel
-share/examples/xtel/ip-down.iminitel
-share/examples/xtel/ip-up.iminitel
-share/examples/xtel/peers/iminitel

Index: pkgsrc/comms/xtel/distinfo
diff -u pkgsrc/comms/xtel/distinfo:1.11 pkgsrc/comms/xtel/distinfo:1.12
--- pkgsrc/comms/xtel/distinfo:1.11     Tue Oct 26 10:06:07 2021
+++ pkgsrc/comms/xtel/distinfo  Sat Dec 13 12:38:09 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:06:07 nia Exp $
+$NetBSD: distinfo,v 1.12 2025/12/13 12:38:09 wiz Exp $
 
 BLAKE2s (xtel-3.3.0.tar.gz) = 65af396876d5204feffc4eaca04cff3c69e60b60d5f640b59936b9661127ab60
 SHA512 (xtel-3.3.0.tar.gz) = 4a6a691aa8cbe08512c616e1d78065d2578eacf72b54e5f514046892a3eda5a6ffa816a22ab6986345c59494c8dde41c0a78fae5690b0c386cd91e31faa9f72e
@@ -6,11 +6,11 @@ Size (xtel-3.3.0.tar.gz) = 309426 bytes
 BLAKE2s (xtel-jumbo-patch-20111008.gz) = 6d0decaaf4a7f090b9c3d990328ad9f9c1d756ddc1c51f70542a0bbb5156fc25
 SHA512 (xtel-jumbo-patch-20111008.gz) = d40fa21c61c329f64c1d5e98e58ef7582fa156a3f5c0a7f0495d6d0f25005015f97d97905ce8aa6892c223e1c0d3722075cbf88d769b6e1e3871129785505c75
 Size (xtel-jumbo-patch-20111008.gz) = 43856 bytes
+SHA1 (patch-Xsra_SFinternal.h) = 43bd21252432ae5234bd4b2b2f6b342346f3796f
 SHA1 (patch-Xsra_SelFile.c) = f0e9847f2d2793fdc8cbd15ca3c5b1778cde6a40
 SHA1 (patch-ab) = 991cd916bbb4c20c71214d4d74a43736940fd5ce
-SHA1 (patch-ae) = 38a846ba1ece5f4267771a062d9691f24057b4e1
 SHA1 (patch-ai) = 7ee6020f7cbf0f53be43c8aa264958fc1cab6322
-SHA1 (patch-mdmdetect.c) = 02a1ee23571b629939b5da7016a33b60180fb49a
+SHA1 (patch-mdmdetect.c) = 31053e4ad35881c700e8fed6e020ebf346562b6a
 SHA1 (patch-modem.c) = 7349bdcd853a7357ead7b2447e96c64fae457428
 SHA1 (patch-procedure.c) = d5e1016f52ee28754f646ea58a06537ca98bdb57
 SHA1 (patch-teleinfo.c) = 2b20b19d470357a4ac85053bfb6cef19d4ed977f

Index: pkgsrc/comms/xtel/patches/patch-mdmdetect.c
diff -u pkgsrc/comms/xtel/patches/patch-mdmdetect.c:1.1 pkgsrc/comms/xtel/patches/patch-mdmdetect.c:1.2
--- pkgsrc/comms/xtel/patches/patch-mdmdetect.c:1.1     Thu Feb 16 18:00:20 2012
+++ pkgsrc/comms/xtel/patches/patch-mdmdetect.c Sat Dec 13 12:38:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-mdmdetect.c,v 1.1 2012/02/16 18:00:20 hans Exp $
+$NetBSD: patch-mdmdetect.c,v 1.2 2025/12/13 12:38:10 wiz Exp $
 
 --- mdmdetect.c.orig   2012-01-27 10:38:52.533510304 +0100
 +++ mdmdetect.c        2012-01-27 10:46:55.339779068 +0100
@@ -20,3 +20,15 @@ $NetBSD: patch-mdmdetect.c,v 1.1 2012/02
        the_end (1);
    }
    
+@@ -290,7 +290,11 @@ char **av;
+     check_and_lock (cp);
+ 
+     sprintf (buf, "/dev/%s", cp);
++#ifdef __NetBSD
++    if ((fd = open (buf, O_RDWR)) < 0) {
++#else
+     if ((fd = open (buf, O_RDWR|O_NDELAY)) < 0) {
++#endif
+       perror (buf);
+       exit (1);
+     }

Added files:

Index: pkgsrc/comms/xtel/patches/patch-Xsra_SFinternal.h
diff -u /dev/null pkgsrc/comms/xtel/patches/patch-Xsra_SFinternal.h:1.1
--- /dev/null   Sat Dec 13 12:38:10 2025
+++ pkgsrc/comms/xtel/patches/patch-Xsra_SFinternal.h   Sat Dec 13 12:38:10 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-Xsra_SFinternal.h,v 1.1 2025/12/13 12:38:10 wiz Exp $
+
+Add missing header for struct stat.
+
+--- Xsra/SFinternal.h.orig     2025-12-13 12:35:21.607585438 +0000
++++ Xsra/SFinternal.h
+@@ -30,6 +30,7 @@
+ #include <X11/Xos.h>
+ #include <X11/Xaw/Text.h>
+ #include <X11/Xaw/AsciiText.h>
++#include <sys/stat.h>
+ 
+ #define SEL_FILE_CANCEL               -1
+ #define SEL_FILE_OK           0

Prev by Date: CVS commit: pkgsrc/www/py-autobahn
Next by Date: CVS commit: pkgsrc/mail/flowerysong-openarc
Previous by Thread: CVS commit: pkgsrc/www/py-autobahn
Next by Thread: CVS commit: pkgsrc/mail/flowerysong-openarc
Indexes:

Home | Main Index | Thread Index | Old Index