Upgrade this to 2.4 (as 2.0 no longer exists for download).

Changes since 2.0:

Version 2.1: this release features filename completion when adding files through
 the menu
Version 2.2: fileselectors now shows the files sorted, has page up/down support
and actually works :-) Also the windows are now initially filled as much as poss
ible.
Version 2.3: field delimiters (for -cf) can be any size now (not just one charac
ter), statuslines are now optional, if a window closes, a popup-box is displayed
 (can be switched off), fixed a small memory-leak, fixed a potential segfault, f
ixed a couple of (sp)lint-warnings, radically changed the errorhandling, some fi
xes to get thing work (again) on MacOS-X. WARNING: the installationlocation has
been changed to /usr/bin! So first do make uninstall on the previous release!
Version 2.4: --retry now also works on platforms where tail does not support --r
etry, MultiTail works again on Solaris, added merge-mode: all files are merged
 into one window, made window-selection into a scrollable window, fixed compilat
ion-warnings, windows are filled as much as possible again on Solaris

4 files changed, 19 insertions, 38 deletions

diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index f62f9e09bcc..d9717eef1e8 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/04/23 11:56:33 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/12 04:16:15 jmc Exp $
 #
 
-DISTNAME=	multitail-2.0
+DISTNAME=	multitail-2.4
 CATEGORIES=	misc sysutils
 MASTER_SITES=	http://www.vanheusden.com/multitail/
 EXTRACT_SUFX=	.tgz
@@ -10,11 +10,11 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.vanheusden.com/multitail/
 COMMENT=	view one or multiple files
 
-CFLAGS+=	-DUSE_CURSES=1 -DKEY_RESIZE=-1
-LDFLAGS+=	-lutil
+USE_BUILDLINK2=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/multitail ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${PREFIX}/man/man1/
 
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/multitail/distinfo b/misc/multitail/distinfo
index 712fa9e2690..4d7acc41384 100644
--- a/misc/multitail/distinfo
+++ b/misc/multitail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/04/23 11:56:33 mjl Exp $
+$NetBSD: distinfo,v 1.3 2003/05/12 04:16:15 jmc Exp $
 
-SHA1 (multitail-2.0.tgz) = e83251af642072aeff48e414e113ae8e0652bcfa
-Size (multitail-2.0.tgz) = 15727 bytes
-SHA1 (patch-aa) = 4fe2321d04a09f36dfb4b0cccefe2a31e794ae0c
-SHA1 (patch-ab) = 2beacedc3279f386480bbe22b7c61a87795bdda1
+SHA1 (multitail-2.4.tgz) = 2d8c6387546b4cb9631a975f70586c4143499a03
+Size (multitail-2.4.tgz) = 22504 bytes
+SHA1 (patch-aa) = e8d5f0e317cbd97a329a1254e362dd6416041544
diff --git a/misc/multitail/patches/patch-aa b/misc/multitail/patches/patch-aa
index ef893e53b52..21ca38d778c 100644
--- a/misc/multitail/patches/patch-aa
+++ b/misc/multitail/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/04/23 11:56:33 mjl Exp $
+$NetBSD: patch-aa,v 1.3 2003/05/12 04:16:15 jmc Exp $
 
---- Makefile.orig	Tue Apr 22 18:47:56 2003
-+++ Makefile	Wed Apr 23 13:48:18 2003
-@@ -5,2 +5,2 @@
+--- Makefile.orig	Sun May 11 22:48:33 2003
++++ Makefile	Sun May 11 22:48:41 2003
+@@ -2,7 +2,7 @@
+ 
+ CC=gcc
+ 
 -CFLAGS=-O2 -Wall
--LDFLAGS=-lncurses -lutil
-+CFLAGS+=-O2 -Wall -DKEY_RESIZE=-1
-+LDFLAGS+=-lcurses
-@@ -15 +15 @@
--	strip multitail
-+	# strip multitail
++CFLAGS=-O2 -Wall -DKEY_RESIZE=-1
+ 
+ # Mac OS X/IRIX/SCO/Solaris users: use the following line
+ #LDFLAGS=-lcurses
diff --git a/misc/multitail/patches/patch-ab b/misc/multitail/patches/patch-ab
deleted file mode 100644
index 8833e92ac20..00000000000
--- a/misc/multitail/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/04/23 11:56:33 mjl Exp $
-
---- mt.c.orig	Tue Apr 22 18:47:56 2003
-+++ mt.c	Wed Apr 23 13:44:55 2003
-@@ -5,9 +5,13 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#if defined(USE_CURSES)
-+#include <curses.h>
-+#else
- #include <ncurses.h>
-+#endif
- 
--#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <util.h>
- #endif
- #ifdef linux