CVS commit: pkgsrc/misc/multitail

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/misc/multitail
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Tue, 27 May 2025 19:15:12 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Tue May 27 19:15:12 UTC 2025

Modified Files:
        pkgsrc/misc/multitail: DESCR Makefile PLIST distinfo
        pkgsrc/misc/multitail/patches: patch-ab patch-ac patch-ad patch-ae
            patch-af patch-ui.c
Added Files:
        pkgsrc/misc/multitail/patches: patch-CMakeLists.txt patch-config.c
            patch-error.h patch-multitail.conf
Removed Files:
        pkgsrc/misc/multitail/patches: patch-aa

Log Message:
misc/multitail: update to 7.1.5

# pkgsrc changes

* Switch to Github hosting.
* Switch to build with CMake.
* Allow to use NetBSD curses.
* Install conversion scripts.
* Add LICENSE.
* Take maintainership.

# upstream changes

No changelog provided.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/multitail/DESCR
cvs rdiff -u -r1.32 -r1.33 pkgsrc/misc/multitail/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/multitail/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/misc/multitail/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/multitail/patches/patch-CMakeLists.txt \
    pkgsrc/misc/multitail/patches/patch-config.c \
    pkgsrc/misc/multitail/patches/patch-error.h \
    pkgsrc/misc/multitail/patches/patch-multitail.conf
cvs rdiff -u -r1.7 -r0 pkgsrc/misc/multitail/patches/patch-aa
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/multitail/patches/patch-ab
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/multitail/patches/patch-ac \
    pkgsrc/misc/multitail/patches/patch-ad \
    pkgsrc/misc/multitail/patches/patch-ae
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/multitail/patches/patch-af \
    pkgsrc/misc/multitail/patches/patch-ui.c

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.2 pkgsrc/misc/multitail/DESCR:1.3
--- pkgsrc/misc/multitail/DESCR:1.2     Thu Feb 16 06:05:31 2006
+++ pkgsrc/misc/multitail/DESCR Tue May 27 19:15:11 2025
@@ -1,14 +1,17 @@
 MultiTail lets you view one or multiple files like the original tail
 program. The difference is that it creates multiple windows on your
-console (with ncurses). It can also monitor wildcards: if another file
-matching the wildcard has a more recent modification date, it will
-automatically switch to that file. That way you can, for example,
-monitor a complete directory of files. Merging of 2 or even more
-logfiles is possible. It can also use colors while displaying the
-logfiles (through regular expressions), for faster recognition of what
-is important and what not. It can also filter lines (again with regular
-expressions). It has interactive menus for editing given regular
-expressions and deleting and adding windows. One 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.
+console (with curses). It can also:
+
+* Monitor wildcards: if another file matching the wildcard has a more
+  recent modification date, it will automatically switch to that file.
+  That way you can, for example, monitor a complete directory of files.
+* Merge 2 or more logfiles.
+* Use colors while displaying the logfiles (through regular
+  expressions), for faster recognition of what is important and what not.
+* Filter lines (again with regular expressions) and has interactive
+  menus for editing given regular expressions and deleting and adding
+  windows.
+* 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.32 pkgsrc/misc/multitail/Makefile:1.33
--- pkgsrc/misc/multitail/Makefile:1.32 Tue Mar 19 01:51:17 2024
+++ pkgsrc/misc/multitail/Makefile      Tue May 27 19:15:11 2025
@@ -1,42 +1,45 @@
-# $NetBSD: Makefile,v 1.32 2024/03/19 01:51:17 nia Exp $
+# $NetBSD: Makefile,v 1.33 2025/05/27 19:15:11 vins Exp $
 #
 
-DISTNAME=      multitail-4.0.6
-PKGREVISION=   5
-CATEGORIES=    misc sysutils
-MASTER_SITES=  http://www.vanheusden.com/multitail/
-EXTRACT_SUFX=  .tgz
+DISTNAME=      multitail-7.1.5
+CATEGORIES=    misc
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=folkertvanheusden/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    vins%NetBSD.org@localhost
 HOMEPAGE=      https://www.vanheusden.com/multitail/
 COMMENT=       View one or multiple files
+LICENSE=       mit
 
-INCOMPAT_CURSES+=      NetBSD-[0-6].*-* NetBSD-7.[0-9].* # needs libpanel
-FAKE_NCURSES=          yes
+USE_CC_FEATURES=       c99
 
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/multitail       \
-                       share/examples/multitail
+USE_TOOLS+=    perl:run
+USE_CURSES=    resize_term wide
+FAKE_NCURSES=  yes
 
-CONF_FILES=    ${PREFIX:Q}/share/examples/multitail/multitail.conf     \
-               ${PKG_SYSCONFDIR:Q}/multitail.conf
+REPLACE_PERL+= conversion-scripts/*.pl
 
-BUILDLINK_TRANSFORM.SunOS+=    rm:-lutil
-LDFLAGS.SunOS+=                        -lsocket -lnsl
+SUBST_CLASSES+=                prefix
+SUBST_MESSAGE.prefix=  Adjust conf file for pkgsrc PREFIX
+SUBST_FILES.prefix=    multitail.conf
+SUBST_STAGE.prefix=    pre-configure
+SUBST_VARS.prefix=     PREFIX
+
+CONF_FILES=    ${PREFIX}/share/examples/multitail/multitail.conf       \
+               ${PKG_SYSCONFDIR}/multitail.conf
+
+CMAKE_CONFIGURE_ARGS+= -DCONFIG_FILE=${PKG_SYSCONFDIR}/multitail.conf \
+                       -DCURSES_INCLUDE_PATH=${BUILDLINK_INCDIRS.curses:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 100500
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+=  rm:-lutil
+LDFLAGS+=              -lsocket -lnsl
+.elif ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 100500
 BUILDLINK_TRANSFORM+=  rm:-lutil
 .endif
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC:Q}/multitail ${DESTDIR}${PREFIX:Q}/bin/
-       ${INSTALL_MAN} ${WRKSRC:Q}/multitail.1 \
-               ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man1/
-       ${INSTALL_DATA} ${WRKSRC:Q}/multitail.conf \
-               ${DESTDIR}${PREFIX:Q}/share/examples/multitail/
-       cd ${WRKSRC:Q} && ${INSTALL_DATA} *.txt manual*.html \
-               ${DESTDIR}${PREFIX:Q}/share/doc/multitail/
-
+.include "../../devel/cmake/build.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/multitail/PLIST
diff -u pkgsrc/misc/multitail/PLIST:1.3 pkgsrc/misc/multitail/PLIST:1.4
--- pkgsrc/misc/multitail/PLIST:1.3     Sun Jun 14 18:07:27 2009
+++ pkgsrc/misc/multitail/PLIST Tue May 27 19:15:11 2025
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/05/27 19:15:11 vins Exp $
 bin/multitail
+libexec/multitail/colors-example.pl
+libexec/multitail/colors-example.sh
+libexec/multitail/convert-geoip.pl
+libexec/multitail/convert-simple.pl
 man/man1/multitail.1
-share/doc/multitail/license.txt
-share/doc/multitail/manual-nl.html
+share/doc/multitail/README.md
 share/doc/multitail/manual.html
-share/doc/multitail/readme.txt
+share/doc/multitail/thanks.txt
 share/examples/multitail/multitail.conf

Index: pkgsrc/misc/multitail/distinfo
diff -u pkgsrc/misc/multitail/distinfo:1.15 pkgsrc/misc/multitail/distinfo:1.16
--- pkgsrc/misc/multitail/distinfo:1.15 Tue Oct 26 10:59:16 2021
+++ pkgsrc/misc/multitail/distinfo      Tue May 27 19:15:11 2025
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:59:16 nia Exp $
+$NetBSD: distinfo,v 1.16 2025/05/27 19:15:11 vins Exp $
 
-BLAKE2s (multitail-4.0.6.tgz) = 66d5211d9815291ada7185b72a4930a4bd843cfeee43c932cad958b0b53b296f
-SHA512 (multitail-4.0.6.tgz) = b8ef7dda4e0e76b431c3ea3721284cdf7c45b5a8b93bd0f72ba64304530fe549dfc0416ace4b37070fd6a838b1c6bea44a91e1965bb12c433e1c9de5136e8ce4
-Size (multitail-4.0.6.tgz) = 124429 bytes
-SHA1 (patch-aa) = cbb4882495421e2d6841fe95388bc2df3e7e8972
-SHA1 (patch-ab) = 322dd8a1be8565f4038340986a483bfcc08e88df
-SHA1 (patch-ac) = 67d4dd4c3a726c815c2044fe554262bb7fb094da
-SHA1 (patch-ad) = 408bcae6f646c4dee713f3061f84ee4691daa123
-SHA1 (patch-ae) = b8860c63f2f609e13aa91e388efcd627f8e56fcf
-SHA1 (patch-af) = c5b0529557464d161acc365075f26d95a2f74fda
-SHA1 (patch-ui.c) = 2279026bf89921c46bd54597e006b24b5b2687bb
+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-ae) = c3955919b99c867a5ea59ad0824b3c0511b817f0
+SHA1 (patch-af) = 944ae329f9ad7e6f35570a9d881d1c3ff7803ccc
+SHA1 (patch-config.c) = 20d7b5ce2aa35fc014a2e74daf1ac7a60af02588
+SHA1 (patch-error.h) = be2ab6e30f553c7a680530e7cb733e79e3e56743
+SHA1 (patch-multitail.conf) = d06174a76d22788bde23263b9a0b7c45799c64e0
+SHA1 (patch-ui.c) = 0d753a4db0626529ba4378b7256b73d5137eac15

Index: pkgsrc/misc/multitail/patches/patch-ab
diff -u pkgsrc/misc/multitail/patches/patch-ab:1.5 pkgsrc/misc/multitail/patches/patch-ab:1.6
--- pkgsrc/misc/multitail/patches/patch-ab:1.5  Sun Jun 25 00:01:44 2006
+++ pkgsrc/misc/multitail/patches/patch-ab      Tue May 27 19:15:12 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2025/05/27 19:15:12 vins Exp $
+
+Add DragonFly
 
 --- exec.c.orig        2006-06-12 21:45:57.000000000 +0200
 +++ exec.c

Index: pkgsrc/misc/multitail/patches/patch-ac
diff -u pkgsrc/misc/multitail/patches/patch-ac:1.2 pkgsrc/misc/multitail/patches/patch-ac:1.3
--- pkgsrc/misc/multitail/patches/patch-ac:1.2  Sun Jun 25 00:01:44 2006
+++ pkgsrc/misc/multitail/patches/patch-ac      Tue May 27 19:15:12 2025
@@ -1,13 +1,33 @@
-$NetBSD: patch-ac,v 1.2 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: patch-ac,v 1.3 2025/05/27 19:15:12 vins Exp $
 
---- mt.h.orig  2006-06-12 21:45:57.000000000 +0200
+* Support NetBSD curses.
+* Do not look for ncursesw.
+* Add DragonFly.
+
+--- mt.h.orig  2024-08-13 10:49:48.000000000 +0000
 +++ mt.h
-@@ -58,7 +58,7 @@ typedef enum { TERM_IGNORE = 0, TERM_XTE
+@@ -60,12 +60,12 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
+ #endif
+ 
+ #if defined(UTF8_SUPPORT) && !defined(__APPLE__)
+-        #if defined(__FreeBSD__) || defined (__linux__)
++        #if defined(__FreeBSD__) || defined (__linux__) || defined(__NetBSD__)
+                 #include <panel.h>
+                 #include <curses.h>
+         #else
+-                #include <ncursesw/panel.h>
+-                #include <ncursesw/ncurses.h>
++                #include <ncurses/panel.h>
++                #include <ncurses/ncurses.h>
+         #endif
+ #else
+       #if defined(__APPLE__)
+@@ -102,7 +102,7 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCH
        #define getmaxyx(w,y,x) y = w->_maxy;  x = w->_maxx
  #endif
  
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__minix)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__minix) || defined(__DragonFly__)
  #define off64_t off_t
  #define stat64 stat
  #define open64 open
Index: pkgsrc/misc/multitail/patches/patch-ad
diff -u pkgsrc/misc/multitail/patches/patch-ad:1.2 pkgsrc/misc/multitail/patches/patch-ad:1.3
--- pkgsrc/misc/multitail/patches/patch-ad:1.2  Sun Jun 25 00:01:44 2006
+++ pkgsrc/misc/multitail/patches/patch-ad      Tue May 27 19:15:12 2025
@@ -1,13 +1,25 @@
-$NetBSD: patch-ad,v 1.2 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: patch-ad,v 1.3 2025/05/27 19:15:12 vins Exp $
 
---- my_pty.c.orig      2006-06-12 21:45:57.000000000 +0200
+* Support openpty() on NetBSD. 
+* Add DragonFly
+
+--- my_pty.c.orig      2024-08-13 10:49:48.000000000 +0000
 +++ my_pty.c
-@@ -75,7 +75,7 @@
+@@ -26,7 +26,7 @@
+ #ifdef __APPLE__
+ #include <util.h>
+ #endif
+-#ifdef __OpenBSD__
++#if defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <util.h>
+ #endif
+ #if defined(linux) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__)
+@@ -78,7 +78,7 @@
  
  int get_pty_and_fork(int *fd_master, int *fd_slave)
  {
--#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__)
-+#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__) || 
defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__) || defined(__minix)
++#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__GLIBC__) || defined(__minix) 
|| defined(__DragonFly__)
  
        if (openpty(fd_master, fd_slave, NULL, NULL, NULL) == -1)
        {
Index: pkgsrc/misc/multitail/patches/patch-ae
diff -u pkgsrc/misc/multitail/patches/patch-ae:1.2 pkgsrc/misc/multitail/patches/patch-ae:1.3
--- pkgsrc/misc/multitail/patches/patch-ae:1.2  Sun Jun 25 00:01:44 2006
+++ pkgsrc/misc/multitail/patches/patch-ae      Tue May 27 19:15:12 2025
@@ -1,13 +1,24 @@
-$NetBSD: patch-ae,v 1.2 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: patch-ae,v 1.3 2025/05/27 19:15:12 vins Exp $
 
---- utils.c.orig       2006-06-12 21:45:57.000000000 +0200
+* stdarg.h required for va_* macros.
+* Add DragonFly.
+
+--- utils.c.orig       2024-08-13 10:49:48.000000000 +0000
 +++ utils.c
-@@ -95,7 +95,7 @@ ssize_t WRITE(int fd, char *whereto, siz
-  */
- char *get_load(void)
+@@ -3,6 +3,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <stdlib.h>
++#include <stdarg.h>
+ #include <limits.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -95,7 +96,7 @@ ssize_t WRITE(int fd, char *whereto, siz
+ 
+ void get_load_values(double *v1, double *v2, double *v3)
  {
 -#if !defined(__UCLIBC__) && (defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(__sun) || defined(sun))
 +#if !defined(__UCLIBC__) && (defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(__sun) || defined(sun)) || 
defined(__DragonFly__)
-       double loadavg[3];
-       char *str = (char *)mymalloc(LOADAVG_STR_LEN, "get_load: loadavg string");
- 
+ #if defined(__GLIBC__) && ( __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
+       /* Older glibc doesn't have getloadavg() - use sysinfo() */
+       /* thanks to Ville Herva for this code! */

Index: pkgsrc/misc/multitail/patches/patch-af
diff -u pkgsrc/misc/multitail/patches/patch-af:1.1 pkgsrc/misc/multitail/patches/patch-af:1.2
--- pkgsrc/misc/multitail/patches/patch-af:1.1  Sun Jun 25 00:01:44 2006
+++ pkgsrc/misc/multitail/patches/patch-af      Tue May 27 19:15:12 2025
@@ -1,13 +1,15 @@
-$NetBSD: patch-af,v 1.1 2006/06/25 00:01:44 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2025/05/27 19:15:12 vins Exp $
 
---- misc.c.orig        2006-06-12 21:45:57.000000000 +0200
-+++ misc.c
-@@ -63,7 +63,7 @@ void info(void)
+Add DragonFly
+
+--- misc.c.orig        2014-05-01 21:54:06.000000000 +0900
++++ misc.c     2016-02-08 12:38:19.000000000 +0900
+@@ -71,7 +71,7 @@ void info(void)
  
        escape_print(mywin, 16, 2, "_Press any key to exit this screen_");
  
--#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun) || defined(__GNU__)
-+#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun) || defined(__GNU__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun) || defined(__GNU__) || defined(__CYGWIN__)
++#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__sun) || defined(__GNU__) || defined(__CYGWIN__) || 
defined(__DragonFly__)
        for(;;)
        {
-               int run_time = time(NULL) - mt_started;
+               dtime_t run_time = get_ts() - mt_started;
Index: pkgsrc/misc/multitail/patches/patch-ui.c
diff -u pkgsrc/misc/multitail/patches/patch-ui.c:1.1 pkgsrc/misc/multitail/patches/patch-ui.c:1.2
--- pkgsrc/misc/multitail/patches/patch-ui.c:1.1        Wed Jan  4 22:26:02 2017
+++ pkgsrc/misc/multitail/patches/patch-ui.c    Tue May 27 19:15:12 2025
@@ -1,6 +1,9 @@
-$NetBSD: patch-ui.c,v 1.1 2017/01/04 22:26:02 roy Exp $
+$NetBSD: patch-ui.c,v 1.2 2025/05/27 19:15:12 vins Exp $
 
---- ui.c.orig  2017-01-04 21:58:51.719680033 +0000
+* stdarg.h required for va_* macros.
+* strncpy() should not depend on the size of the source argument.
+
+--- ui.c.orig  2024-08-13 10:49:48.000000000 +0000
 +++ ui.c
 @@ -12,6 +12,7 @@
  #include <sys/utsname.h>
@@ -8,5 +11,23 @@ $NetBSD: patch-ui.c,v 1.1 2017/01/04 22:
  #include <signal.h>
 +#include <stdarg.h>
  #include <unistd.h>
- 
- #include "mt.h"
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+@@ -1152,7 +1153,7 @@ int edit_regexp(void)
+               /* display them lines */
+               for(loop=0; loop<cur -> n_re; loop++)
+               {
+-                      strncpy(buffer, (cur -> pre)[loop].regex_str, 34);
++                      memcpy(buffer, (cur -> pre)[loop].regex_str, 34);
+                       if (loop == cur_re)
+                               ui_inverse_on(mywin);
+                       mvwprintw(mywin -> win, 4 + loop, 1, "%c%c %s", 
+@@ -1162,7 +1163,7 @@ int edit_regexp(void)
+                       if (toupper((cur -> pre)[loop].use_regex) == 'X')
+                       {
+                               char dummy[18];
+-                              strncpy(dummy, (cur -> pre)[loop].cmd, min(17, strlen((cur -> pre)[loop].cmd)));
++                              memcpy(dummy, (cur -> pre)[loop].cmd, min(17, strlen((cur -> pre)[loop].cmd)));
+                               dummy[17]=0x00;
+                               mvwprintw(mywin -> win, 4 + loop, 42, "%s", dummy);
+                               wmove(mywin -> win, 4 + loop, 41);

Added files:

Index: pkgsrc/misc/multitail/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/misc/multitail/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue May 27 19:15:12 2025
+++ pkgsrc/misc/multitail/patches/patch-CMakeLists.txt  Tue May 27 19:15:12 2025
@@ -0,0 +1,39 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/05/27 19:15:12 vins Exp $
+
+* Do not look for panelw.
+* Compatibility install target fixes for pkgsrc.
+
+--- CMakeLists.txt.orig        2024-08-13 10:49:48.000000000 +0000
++++ CMakeLists.txt
+@@ -66,7 +66,7 @@ message(STATUS "CMAKE_C_PLATFORM_ID=${CM
+ # ``find_package(Curses)`` call if unicode functionality is required.
+ if(UTF8_SUPPORT)
+     set(CURSES_NEED_WIDE TRUE)
+-    find_library(PANEL_LIBRARY panelw REQUIRED)
++    find_library(PANEL_LIBRARY panel REQUIRED)
+     add_definitions(-DUTF8_SUPPORT)
+     add_definitions(-DNCURSES_WIDECHAR)
+ else()
+@@ -185,16 +185,15 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PRO
+ # install the bin
+ install(TARGETS multitail DESTINATION bin)
+ # install the config file
+-install(FILES multitail.conf DESTINATION etc RENAME multitail.conf.new)
++install(FILES multitail.conf DESTINATION share/examples/multitail)
+ # install the manual files
+-install(FILES multitail.1 DESTINATION share/man/man1)
++install(FILES multitail.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ # install doc files
+-install(FILES manual.html DESTINATION share/doc/multitail-${VERSION})
+-install(FILES LICENSE DESTINATION share/doc/multitail-${VERSION})
+-install(FILES README.md DESTINATION share/doc/multitail-${VERSION})
+-install(FILES thanks.txt DESTINATION share/doc/multitail-${VERSION})
++install(FILES manual.html DESTINATION share/doc/multitail)
++install(FILES README.md DESTINATION share/doc/multitail)
++install(FILES thanks.txt DESTINATION share/doc/multitail)
+ # cp conversion-scripts/* etc/multitail/
+-install(DIRECTORY conversion-scripts DESTINATION etc/multitail)
++install(DIRECTORY conversion-scripts/ DESTINATION libexec/multitail)
+ 
+ 
+ if(USE_CPPCHECK)
Index: pkgsrc/misc/multitail/patches/patch-config.c
diff -u /dev/null pkgsrc/misc/multitail/patches/patch-config.c:1.1
--- /dev/null   Tue May 27 19:15:12 2025
+++ pkgsrc/misc/multitail/patches/patch-config.c        Tue May 27 19:15:12 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-config.c,v 1.1 2025/05/27 19:15:12 vins Exp $
+
+stdarg.h required for va_* macros.
+
+--- config.c.orig      2024-08-13 10:49:48.000000000 +0000
++++ config.c
+@@ -8,6 +8,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdarg.h>
+ #include <ctype.h>
+ #include <pwd.h>
+ #include <unistd.h>
Index: pkgsrc/misc/multitail/patches/patch-error.h
diff -u /dev/null pkgsrc/misc/multitail/patches/patch-error.h:1.1
--- /dev/null   Tue May 27 19:15:12 2025
+++ pkgsrc/misc/multitail/patches/patch-error.h Tue May 27 19:15:12 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-error.h,v 1.1 2025/05/27 19:15:12 vins Exp $
+
+Prevent redefinitions.
+
+--- error.h.orig       2024-08-13 10:49:48.000000000 +0000
++++ error.h
+@@ -1,6 +1,10 @@
+ #define BOOL char
++#ifndef TRUE
+ #define TRUE 1
++#endif
++#ifndef FALSE
+ #define FALSE 0
++#endif
+ 
+ void error_exit_(BOOL show_errno, BOOL show_st, char *file, const char *function, int line, char *format, ...);
+ 
Index: pkgsrc/misc/multitail/patches/patch-multitail.conf
diff -u /dev/null pkgsrc/misc/multitail/patches/patch-multitail.conf:1.1
--- /dev/null   Tue May 27 19:15:12 2025
+++ pkgsrc/misc/multitail/patches/patch-multitail.conf  Tue May 27 19:15:12 2025
@@ -0,0 +1,45 @@
+$NetBSD: patch-multitail.conf,v 1.1 2025/05/27 19:15:12 vins Exp $
+
+* Avoid hard-coding non portable utils path.
+* Fix path to conversion scripts.
+
+--- multitail.conf.orig        2024-08-13 10:49:48.000000000 +0000
++++ multitail.conf
+@@ -1179,7 +1179,7 @@ cs_re:magenta:TLS
+ #              end offset: the position AFTER the last character for which the attributes are
+ #              valid
+ #              do NOT use spaces in each line!
+-colorscript:cscriptexample:/etc/multitail/colors-example.pl:this is a barely functional example script
++colorscript:cscriptexample:@PREFIX@/libexec/multitail/colors-example.pl:this is a barely functional example script
+ #
+ #
+ # default colorschemes:
+@@ -1231,7 +1231,7 @@ check_mail:0
+ #
+ # where to find the 'xclip' binary - used to send a buffer
+ # to the X clipboard
+-#xclip:/usr/bin/xclip
++xclip:@PREFIX@/bin/xclip
+ #
+ # where to find the 'pbcopy' binary - used to send a buffer
+ # to the clipboard (OSX-only)
+@@ -1244,8 +1244,8 @@ tab_stop:8
+ # what program to start when the user presses a key
+ # ...:x:...  just that key
+ # ...:^x:... that key with control
+-bind:g:/usr/bin/pine
+-bind:^k:/bin/bash
++bind:g:/usr/bin/mail
++bind:^k:/bin/sh
+ bind:^l:/usr/bin/telnet
+ bind:^s:/bin/su
+ #
+@@ -1336,7 +1336,7 @@ convert:squid:ip4tohost:^[^ ]* *[0-9]* *
+ convert:asterisk:epochtodate:^([0-9]*).([0-9]*)
+ convert:nagios.log:epochtodate:^.([0-9]*). 
+ convert:qmailtimestr:tai64todate:^(@[^ ]*)
+-convert:geoip:script:/etc/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
++convert:geoip:script:@PREFIX@/libexec/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
+ #
+ # shell to invoke
+ shell:/bin/sh

Prev by Date: CVS commit: pkgsrc/devel/glib2/patches
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/glib2/patches
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index