Update multitail to 4.0.6. Fixes PR 33817.

Changes: too many to list; most importantly the distfile's available
from the master site.

8 files changed, 53 insertions, 57 deletions

diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index af3b49ce2b1..1516075eb95 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:12 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/06/25 00:01:44 hubertf Exp $
 #
 
-DISTNAME=	multitail-3.8.6
+DISTNAME=	multitail-4.0.6
 CATEGORIES=	misc sysutils
 MASTER_SITES=	http://www.vanheusden.com/multitail/
 EXTRACT_SUFX=	.tgz
diff --git a/misc/multitail/distinfo b/misc/multitail/distinfo
index 97dc198e7a3..453ce44a306 100644
--- a/misc/multitail/distinfo
+++ b/misc/multitail/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2006/02/24 19:05:40 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/06/25 00:01:44 hubertf Exp $
 
-SHA1 (multitail-3.8.6.tgz) = 993e40191a21ceb00470322124d589f9628d0a62
-RMD160 (multitail-3.8.6.tgz) = e2f076ae7a695885a83d58129e0f4c62d6142c74
-Size (multitail-3.8.6.tgz) = 75711 bytes
-SHA1 (patch-aa) = 732b99c9efebecb2224d45520eb31bc4ec6314d6
-SHA1 (patch-ab) = cc943ce263a2d9ae567bcb4917f32249e441f924
-SHA1 (patch-ac) = 9a5ad3be1c7f68a7364d65260afa5a9f1d21993a
-SHA1 (patch-ad) = 43b8e33a970aa26f1f77565266314e1f512ca3fc
-SHA1 (patch-ae) = 1c8ec906c54cc0d7834fcd8f151dccd5ebe30398
+SHA1 (multitail-4.0.6.tgz) = f8c52ab48e85411c7cd1540509995bf2f4cfee25
+RMD160 (multitail-4.0.6.tgz) = 9d1f6d4e705c09b6e69afc965d48428331721bcc
+Size (multitail-4.0.6.tgz) = 124429 bytes
+SHA1 (patch-aa) = 2332d9ca96773becf21a1cb4f31998cb725cd586
+SHA1 (patch-ab) = 322dd8a1be8565f4038340986a483bfcc08e88df
+SHA1 (patch-ac) = 67d4dd4c3a726c815c2044fe554262bb7fb094da
+SHA1 (patch-ad) = 408bcae6f646c4dee713f3061f84ee4691daa123
+SHA1 (patch-ae) = b8860c63f2f609e13aa91e388efcd627f8e56fcf
+SHA1 (patch-af) = c5b0529557464d161acc365075f26d95a2f74fda
diff --git a/misc/multitail/patches/patch-aa b/misc/multitail/patches/patch-aa
index 31273410d1b..c5ef7bf1c05 100644
--- a/misc/multitail/patches/patch-aa
+++ b/misc/multitail/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2006/02/23 18:03:57 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2006/06/25 00:01:44 hubertf Exp $
 
---- Makefile.orig	2006-02-17 11:44:46.000000000 +0100
-+++ Makefile	2006-02-23 18:57:30.000000000 +0100
-@@ -1,7 +1,7 @@
- include version
+--- Makefile.orig	2006-06-12 21:45:57.000000000 +0200
++++ Makefile
+@@ -4,7 +4,7 @@ DESTDIR=/
+ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
  
- DEBUG=-g # -D_DEBUG # -W -pedantic #-pg #-fprofile-arcs
+ DEBUG=-g #  -D_DEBUG  -W -pedantic # -pg #-fprofile-arcs
 -LDFLAGS=-lpanel -lncurses -lutil -lm $(DEBUG)
 +LDFLAGS+=-lpanel -lncurses -lutil -lm $(DEBUG)
- CFLAGS+=-D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
+ CFLAGS+=-D`uname` -O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
  
- OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o
+ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o
diff --git a/misc/multitail/patches/patch-ab b/misc/multitail/patches/patch-ab
index b57d703c5d5..e6e77d6a0c5 100644
--- a/misc/multitail/patches/patch-ab
+++ b/misc/multitail/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2006/02/24 19:05:40 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2006/06/25 00:01:44 hubertf Exp $
 
---- mt.c.orig	2006-02-24 19:01:46.000000000 +0000
-+++ mt.c
-@@ -624,7 +624,7 @@ int start_tail(char *filename, char retr
+--- exec.c.orig	2006-06-12 21:45:57.000000000 +0200
++++ exec.c
+@@ -75,7 +75,7 @@ int start_tail(char *filename, char retr
  		posix_version = getenv("_POSIX2_VERSION");
  
  		/* follow filename is only supported on *BSD and Linux */
@@ -11,12 +11,3 @@ $NetBSD: patch-ab,v 1.4 2006/02/24 19:05:40 joerg Exp $
  		if (follow_filename)
  		{
  #if defined(linux) || defined(__CYGWIN__) || defined(__GNU__)
-@@ -2787,7 +2787,7 @@ void info(void)
- 
- 	mvwprintw(mywin -> win, 14, 1, "Press any key to exit this screen");
- 
--#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__GNU__)
-+#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(sun) || defined(__GNU__) || defined(__DragonFly__)
- 	for(;;)
- 	{
- 		char *dummy = get_load();
diff --git a/misc/multitail/patches/patch-ac b/misc/multitail/patches/patch-ac
index 755b8c6c895..adae2b5c0b4 100644
--- a/misc/multitail/patches/patch-ac
+++ b/misc/multitail/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2006/02/24 19:05:40 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/25 00:01:44 hubertf Exp $
 
---- mt.h.orig	2006-02-24 19:02:23.000000000 +0000
+--- mt.h.orig	2006-06-12 21:45:57.000000000 +0200
 +++ mt.h
-@@ -35,7 +35,7 @@
+@@ -58,7 +58,7 @@ typedef enum { TERM_IGNORE = 0, TERM_XTE
  	#define getmaxyx(w,y,x) y = w->_maxy;  x = w->_maxx
  #endif
  
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__DragonFly__)
  #define off64_t off_t
  #define stat64 stat
  #define open64 open
diff --git a/misc/multitail/patches/patch-ad b/misc/multitail/patches/patch-ad
index 31e65414a0a..63e5fa2bdc1 100644
--- a/misc/multitail/patches/patch-ad
+++ b/misc/multitail/patches/patch-ad
@@ -1,22 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2006/02/24 19:05:40 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2006/06/25 00:01:44 hubertf Exp $
 
---- my_pty.c.orig	2006-02-24 19:02:44.000000000 +0000
+--- my_pty.c.orig	2006-06-12 21:45:57.000000000 +0200
 +++ my_pty.c
-@@ -29,7 +29,7 @@
- #if defined(linux) || defined(__CYGWIN__) || defined(__GNU__)
- #include <pty.h>
- #endif
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <libutil.h>
- #endif
- #ifdef sun
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,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__)
-+#if defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(__DragonFly__)
+-#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 (openpty(fd_master, fd_slave, NULL, NULL, NULL) == -1)
  	{
diff --git a/misc/multitail/patches/patch-ae b/misc/multitail/patches/patch-ae
index 89bbe13e3e6..6704fad3bed 100644
--- a/misc/multitail/patches/patch-ae
+++ b/misc/multitail/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2006/02/24 19:05:40 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2006/06/25 00:01:44 hubertf Exp $
 
---- utils.c.orig	2006-02-24 19:03:20.000000000 +0000
+--- utils.c.orig	2006-06-12 21:45:57.000000000 +0200
 +++ utils.c
-@@ -195,7 +195,7 @@ ssize_t WRITE(int fd, char *whereto, siz
+@@ -95,7 +95,7 @@ ssize_t WRITE(int fd, char *whereto, siz
   */
  char *get_load(void)
  {
--#if !defined(__UCLIBC__) && (defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(sun))
-+#if !defined(__UCLIBC__) && (defined(__FreeBSD__) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__GNU__) || defined(sun) || defined(__DragonFly__))
+-#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, "loadavg string");
+ 	char *str = (char *)mymalloc(LOADAVG_STR_LEN, "get_load: loadavg string");
  
diff --git a/misc/multitail/patches/patch-af b/misc/multitail/patches/patch-af
new file mode 100644
index 00000000000..4486461978f
--- /dev/null
+++ b/misc/multitail/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/06/25 00:01:44 hubertf Exp $
+
+--- misc.c.orig	2006-06-12 21:45:57.000000000 +0200
++++ misc.c
+@@ -63,7 +63,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__)
+ 	for(;;)
+ 	{
+ 		int run_time = time(NULL) - mt_started;