CVS commit: pkgsrc/comms/syncterm

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Thu Mar  6 04:33:37 UTC 2025

Modified Files:
        pkgsrc/comms/syncterm: Makefile distinfo options.mk
Added Files:
        pkgsrc/comms/syncterm/patches: patch-src_sbbs3_zmodem.c
            patch-src_syncterm_conn__pty.c patch-src_xpdev_sockwrap.h

Log Message:
comms/syncterm: fix build on SunOS

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/comms/syncterm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/syncterm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/syncterm/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/comms/syncterm/patches/patch-src_sbbs3_zmodem.c \
    pkgsrc/comms/syncterm/patches/patch-src_syncterm_conn__pty.c \
    pkgsrc/comms/syncterm/patches/patch-src_xpdev_sockwrap.h

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

Modified files:

Index: pkgsrc/comms/syncterm/Makefile
diff -u pkgsrc/comms/syncterm/Makefile:1.12 pkgsrc/comms/syncterm/Makefile:1.13
--- pkgsrc/comms/syncterm/Makefile:1.12 Wed Mar  5 18:21:21 2025
+++ pkgsrc/comms/syncterm/Makefile      Thu Mar  6 04:33:36 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2025/03/05 18:21:21 vins Exp $
+# $NetBSD: Makefile,v 1.13 2025/03/06 04:33:36 vins Exp $
 
 DISTNAME=      syncterm-1.6-src
 PKGNAME=       ${DISTNAME:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    comms
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=syncterm/}
 EXTRACT_SUFX=  .tgz
@@ -23,11 +24,23 @@ USE_CC_FEATURES=    c11
 PTHREAD_AUTO_VARS=     yes
 BUILDLINK_TRANSFORM+=  rm:-lpthread
 
-CFLAGS+=       -DUSE_SNPRINTF          # avoid redefinition
+CFLAGS+=       -DUSE_SNPRINTF                    # avoid redefinition
+CFLAGS.SunOS+= -DNEEDS_CFMAKERAW -DNEEDS_FORKPTY # missing on SunOS
 
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=       -D__BIG_ENDIAN__        # build on any big-endian arch
+CFLAGS+=       -D__BIG_ENDIAN__                  # build on any big-endian arch
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+=                ints
+SUBST_MESSAGE.ints=    SunOS stdint(3) doesn't provide `u_int*' typedefs
+SUBST_STAGE.ints=      pre-configure
+SUBST_FILES.ints+=     src/xpdev/xpevent.h
+SUBST_FILES.ints+=     src/xpdev/sockwrap.h
+SUBST_SED.ints=                -e 's|u_int|uint|g'
 .endif
 
 MAKE_FILE=     GNUmakefile

Index: pkgsrc/comms/syncterm/distinfo
diff -u pkgsrc/comms/syncterm/distinfo:1.4 pkgsrc/comms/syncterm/distinfo:1.5
--- pkgsrc/comms/syncterm/distinfo:1.4  Wed Mar  5 19:24:37 2025
+++ pkgsrc/comms/syncterm/distinfo      Thu Mar  6 04:33:36 2025
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.4 2025/03/05 19:24:37 vins Exp $
+$NetBSD: distinfo,v 1.5 2025/03/06 04:33:36 vins Exp $
 
 BLAKE2s (syncterm-1.6-src.tgz) = 443b32af07b992d6a8a55c901c7960d3d15f6ea2a6f058eb91b12c69ce1e57f5
 SHA512 (syncterm-1.6-src.tgz) = 17b7d8ff5707172cb7baf3a2a3f573a38c9ec653d2ab2b5725b60f8fcbd392fefa58c6e57aa41ad89bbcdab98f373d891def6787f836b23eaabde373d82afa8a
 Size (syncterm-1.6-src.tgz) = 10986287 bytes
 SHA1 (patch-src_build_Common.gmake) = daf111dc2742c2d21bdb87ef9250c4dad761f790
+SHA1 (patch-src_sbbs3_zmodem.c) = 0efa8f5a778c23384be2fcbf80ee8413d244930a
 SHA1 (patch-src_syncterm_GNUmakefile) = fb15798bf0fc75482e687b9ee1e2989560578df9
+SHA1 (patch-src_syncterm_conn__pty.c) = b9b97f189ff6a0583488ea6b236ae6a29a76ebfd
 SHA1 (patch-src_syncterm_syncterm.man.in) = 5bab64bccb335b0b80c2b5a7abddb449498e99c6
 SHA1 (patch-src_xpdev_Common.gmake) = a47b4d63fa55f9d467544a4d7f477b500475d014
 SHA1 (patch-src_xpdev_genwrap.h) = 170c70ff745e6cc5dc53b187505e7ff5e0d47417
+SHA1 (patch-src_xpdev_sockwrap.h) = 1baa36e682afc8ffd7998925011d1e49a2cc77d6

Index: pkgsrc/comms/syncterm/options.mk
diff -u pkgsrc/comms/syncterm/options.mk:1.1 pkgsrc/comms/syncterm/options.mk:1.2
--- pkgsrc/comms/syncterm/options.mk:1.1        Wed Mar  5 18:21:22 2025
+++ pkgsrc/comms/syncterm/options.mk    Thu Mar  6 04:33:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2025/03/05 18:21:22 vins Exp $
+# $NetBSD: options.mk,v 1.2 2025/03/06 04:33:36 vins Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.syncterm
 PKG_OPTIONS_NONEMPTY_SETS=     display sound
@@ -8,8 +8,6 @@ PKG_OPTIONS_SET.sound=          alsa oss portaud
 PKG_SUPPORTED_OPTIONS= alsa curses jxl oss portaudio pulseaudio sdl2 x11
 PKG_SUGGESTED_OPTIONS= curses sdl2 x11
 
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS:M*BSD} || ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+=        oss
 .elif ${OPSYS} == "Linux"

Added files:

Index: pkgsrc/comms/syncterm/patches/patch-src_sbbs3_zmodem.c
diff -u /dev/null pkgsrc/comms/syncterm/patches/patch-src_sbbs3_zmodem.c:1.1
--- /dev/null   Thu Mar  6 04:33:37 2025
+++ pkgsrc/comms/syncterm/patches/patch-src_sbbs3_zmodem.c      Thu Mar  6 04:33:36 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_sbbs3_zmodem.c,v 1.1 2025/03/06 04:33:36 vins Exp $
+
+Include <limits.h> for UINT_MAX
+
+--- src/sbbs3/zmodem.c.orig    2025-02-11 18:23:24.000000000 +0000
++++ src/sbbs3/zmodem.c
+@@ -35,6 +35,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h> /* va_list */
++#include <limits.h> /* UINT_MAX */
+ #include <sys/stat.h>   /* struct stat */
+ 
+ #include "genwrap.h"
Index: pkgsrc/comms/syncterm/patches/patch-src_syncterm_conn__pty.c
diff -u /dev/null pkgsrc/comms/syncterm/patches/patch-src_syncterm_conn__pty.c:1.1
--- /dev/null   Thu Mar  6 04:33:37 2025
+++ pkgsrc/comms/syncterm/patches/patch-src_syncterm_conn__pty.c        Thu Mar  6 04:33:36 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_syncterm_conn__pty.c,v 1.1 2025/03/06 04:33:36 vins Exp $
+
+cfsetspeed() is a BSD extension.
+
+--- src/syncterm/conn_pty.c.orig       2025-03-05 20:26:19.553091505 +0000
++++ src/syncterm/conn_pty.c
+@@ -487,7 +487,8 @@ pty_connect(struct bbslist *bbs)
+ #ifdef VSTATUS
+       ts.c_cc[VSTATUS] = CSTATUS;
+ #endif
+-      cfsetspeed(&ts, 115200);
++      cfsetispeed(&ts, 115200);
++      cfsetospeed(&ts, 115200);
+ 
+       get_term_win_size(&cols, &rows, &pixelc, &pixelr, &bbs->nostatus);
+       ws.ws_col = cols;
Index: pkgsrc/comms/syncterm/patches/patch-src_xpdev_sockwrap.h
diff -u /dev/null pkgsrc/comms/syncterm/patches/patch-src_xpdev_sockwrap.h:1.1
--- /dev/null   Thu Mar  6 04:33:37 2025
+++ pkgsrc/comms/syncterm/patches/patch-src_xpdev_sockwrap.h    Thu Mar  6 04:33:36 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_xpdev_sockwrap.h,v 1.1 2025/03/06 04:33:36 vins Exp $
+
+Define FIONBIO on illumos. 
+
+--- src/xpdev/sockwrap.h.orig  2025-03-05 22:05:50.777295821 +0000
++++ src/xpdev/sockwrap.h
+@@ -71,9 +71,11 @@ typedef int* socket_ioctl_ptr_t;
+ #include <netinet/tcp.h>      /* TCP_NODELAY */
+ #include <unistd.h>                   /* close */
+ #include <poll.h>
+-#if defined(__solaris__)
++#if defined(__sun)
+       #include <sys/filio.h>  /* FIONBIO */
+-      #define INADDR_NONE -1L
++#ifndef INADDR_NONE
++#define INADDR_NONE -1L
++#endif
+ #else
+       #include <sys/ioctl.h>  /* FIONBIO */
+ #endif