CVS commit: pkgsrc/misc/multitail

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

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Sep  8 07:43:34 UTC 2025

Modified Files:
        pkgsrc/misc/multitail: DESCR Makefile distinfo
        pkgsrc/misc/multitail/patches: patch-ac patch-ad

Log Message:
misc/multitail: fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/multitail/DESCR
cvs rdiff -u -r1.33 -r1.34 pkgsrc/misc/multitail/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/multitail/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/multitail/patches/patch-ac \
    pkgsrc/misc/multitail/patches/patch-ad

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

Modified files:

Index: pkgsrc/misc/multitail/DESCR
diff -u pkgsrc/misc/multitail/DESCR:1.3 pkgsrc/misc/multitail/DESCR:1.4
--- pkgsrc/misc/multitail/DESCR:1.3     Tue May 27 19:15:11 2025
+++ pkgsrc/misc/multitail/DESCR Mon Sep  8 07:43:33 2025
@@ -14,4 +14,3 @@ console (with curses). It can also:
 * Have windows with the output of shell scripts and other software. When
   viewing the output of external software, MultiTail can mimic the
   functionality of tools like 'watch' and such.
-

Index: pkgsrc/misc/multitail/Makefile
diff -u pkgsrc/misc/multitail/Makefile:1.33 pkgsrc/misc/multitail/Makefile:1.34
--- pkgsrc/misc/multitail/Makefile:1.33 Tue May 27 19:15:11 2025
+++ pkgsrc/misc/multitail/Makefile      Mon Sep  8 07:43:33 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2025/05/27 19:15:11 vins Exp $
+# $NetBSD: Makefile,v 1.34 2025/09/08 07:43:33 vins Exp $
 #
 
 DISTNAME=      multitail-7.1.5
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=folkertvanheusden/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}

Index: pkgsrc/misc/multitail/distinfo
diff -u pkgsrc/misc/multitail/distinfo:1.16 pkgsrc/misc/multitail/distinfo:1.17
--- pkgsrc/misc/multitail/distinfo:1.16 Tue May 27 19:15:11 2025
+++ pkgsrc/misc/multitail/distinfo      Mon Sep  8 07:43:33 2025
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.16 2025/05/27 19:15:11 vins Exp $
+$NetBSD: distinfo,v 1.17 2025/09/08 07:43:33 vins Exp $
 
 BLAKE2s (multitail-7.1.5.tar.gz) = d7f52eb5c9c48407ec169bd143f2d7a6cba12b5f11b4de46f6dece833a19290a
 SHA512 (multitail-7.1.5.tar.gz) = 7b52eaa9c99e8747f841b23ad3f7154d8cb65c5f4bd2f89fc80d37b6a2fecdacfd7657c5ba37356e67fd03f7992556af648b7d26bb730f7e8966d0230182a8a6
 Size (multitail-7.1.5.tar.gz) = 152590 bytes
 SHA1 (patch-CMakeLists.txt) = f46c86c6fa51ffc967e06ea5da9823d301bd50bd
 SHA1 (patch-ab) = e2cb5531abac35336063f7dd691ffc6574c126c4
-SHA1 (patch-ac) = 364ce3d7ad8f7f0721db6672c2627b947a79c151
-SHA1 (patch-ad) = d0560d34c7fdda1c0548b2a0d10aa7104fe2624f
+SHA1 (patch-ac) = 067600fcc9b4afe58e13a5b30a7bb08ed1900b74
+SHA1 (patch-ad) = 669d13fb40cb09a02d769224e8170990f72cdf2b
 SHA1 (patch-ae) = c3955919b99c867a5ea59ad0824b3c0511b817f0
 SHA1 (patch-af) = 944ae329f9ad7e6f35570a9d881d1c3ff7803ccc
 SHA1 (patch-config.c) = 20d7b5ce2aa35fc014a2e74daf1ac7a60af02588

Index: pkgsrc/misc/multitail/patches/patch-ac
diff -u pkgsrc/misc/multitail/patches/patch-ac:1.3 pkgsrc/misc/multitail/patches/patch-ac:1.4
--- pkgsrc/misc/multitail/patches/patch-ac:1.3  Tue May 27 19:15:12 2025
+++ pkgsrc/misc/multitail/patches/patch-ac      Mon Sep  8 07:43:34 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2025/05/27 19:15:12 vins Exp $
+$NetBSD: patch-ac,v 1.4 2025/09/08 07:43:34 vins Exp $
 
 * Support NetBSD curses.
 * Do not look for ncursesw.
@@ -6,7 +6,17 @@ $NetBSD: patch-ac,v 1.3 2025/05/27 19:15
 
 --- mt.h.orig  2024-08-13 10:49:48.000000000 +0000
 +++ mt.h
-@@ -60,12 +60,12 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
+@@ -1,7 +1,9 @@
+ #ifndef __MT_H__
+ #define __MT_H__
+ 
++#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE   /* required for GLIBC to enable stat64 and friends */
++#endif
+ #include <regex.h>
+ #include <stdint.h>
+ #include <stdio.h>
+@@ -60,12 +62,12 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
  #endif
  
  #if defined(UTF8_SUPPORT) && !defined(__APPLE__)
@@ -22,7 +32,7 @@ $NetBSD: patch-ac,v 1.3 2025/05/27 19:15
          #endif
  #else
        #if defined(__APPLE__)
-@@ -102,7 +102,7 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
+@@ -102,7 +104,7 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
        #define getmaxyx(w,y,x) y = w->_maxy;  x = w->_maxx
  #endif
  
Index: pkgsrc/misc/multitail/patches/patch-ad
diff -u pkgsrc/misc/multitail/patches/patch-ad:1.3 pkgsrc/misc/multitail/patches/patch-ad:1.4
--- pkgsrc/misc/multitail/patches/patch-ad:1.3  Tue May 27 19:15:12 2025
+++ pkgsrc/misc/multitail/patches/patch-ad      Mon Sep  8 07:43:34 2025
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2025/05/27 19:15:12 vins Exp $
+$NetBSD: patch-ad,v 1.4 2025/09/08 07:43:34 vins Exp $
 
 * Support openpty() on NetBSD. 
+* The local utils.h header is required for myopen().
 * Add DragonFly
 
 --- my_pty.c.orig      2024-08-13 10:49:48.000000000 +0000
@@ -14,7 +15,18 @@ $NetBSD: patch-ad,v 1.3 2025/05/27 19:15
  #include <util.h>
  #endif
  #if defined(linux) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__)
-@@ -78,7 +78,7 @@
+@@ -56,7 +56,9 @@
+ #include <sys/socket.h>
+ 
+ #include "error.h"
+-
++#if defined(__sun) || defined(AIX) || defined(_HPUX_SOURCE)
++#include "utils.h"
++#endif
+ 
+ /* the following code was mostly taken from: */
+ 
+@@ -78,7 +80,7 @@
  
  int get_pty_and_fork(int *fd_master, int *fd_slave)
  {