Updated multitail to 3.8.5.

Changes include:
- Many bug fixes.
- Many portability improvements.
- Interactive mode for adding/removing log files on-the-fly.

5 files changed, 35 insertions, 28 deletions

diff --git a/misc/multitail/DESCR b/misc/multitail/DESCR
index b11ef5ae6a8..f0e391152ab 100644
--- a/misc/multitail/DESCR
+++ b/misc/multitail/DESCR
@@ -1,5 +1,14 @@
-multitail lets you view one or multiple files like the original tail
-program. The difference is that this program creates multiple windows
-on your console (with ncurses). It can also use colors while displaying
-the logfiles for faster recognizing which lines are important and which
-are not. It is optimized for terminal-sessions through slow links.
+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.
diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index 7a17e48970d..7f5a16d10e0 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:22 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/16 06:05:31 rillig Exp $
 #
 
-DISTNAME=	multitail-2.4
-PKGREVISION=	2
+DISTNAME=	multitail-3.8.5
 CATEGORIES=	misc sysutils
 MASTER_SITES=	http://www.vanheusden.com/multitail/
 EXTRACT_SUFX=	.tgz
@@ -11,11 +10,17 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.vanheusden.com/multitail/
 COMMENT=	View one or multiple files
 
-INSTALLATION_DIRS=	bin man/man1
+USE_NCURSES=		yes	# Needs the <panel> library.
+INSTALLATION_DIRS=	bin man/man1 share/doc/multitail share/examples/multitail
+
+CONF_FILES=	${PREFIX:Q}/share/examples/multitail/multitail.conf	\
+		${PKG_SYSCONFDIR:Q}/multitail.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/multitail ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/multitail.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} ${WRKSRC:Q}/multitail.conf ${PREFIX:Q}/share/examples/multitail/
+	cd ${WRKSRC} && ${INSTALL_DATA} *.txt manual*.html ${PREFIX}/share/doc/multitail/
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/multitail/PLIST b/misc/multitail/PLIST
index ccf9ae47d0a..1aa99d4a0ee 100644
--- a/misc/multitail/PLIST
+++ b/misc/multitail/PLIST
@@ -1,3 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/18 08:44:16 mjl Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/16 06:05:31 rillig Exp $
 bin/multitail
 man/man1/multitail.1
+share/doc/multitail/license.txt
+share/doc/multitail/manual-nl.html
+share/doc/multitail/manual.html
+share/doc/multitail/readme.txt
+share/examples/multitail/multitail.conf
+@dirrm share/examples/multitail
+@dirrm share/doc/multitail
diff --git a/misc/multitail/distinfo b/misc/multitail/distinfo
index 8c3796e53fc..4685fb4943b 100644
--- a/misc/multitail/distinfo
+++ b/misc/multitail/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:02:56 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/02/16 06:05:31 rillig Exp $
 
-SHA1 (multitail-2.4.tgz) = 2d8c6387546b4cb9631a975f70586c4143499a03
-RMD160 (multitail-2.4.tgz) = 24faf18baafedb0740a6e8c0750d726df76b6856
-Size (multitail-2.4.tgz) = 22504 bytes
-SHA1 (patch-aa) = e8d5f0e317cbd97a329a1254e362dd6416041544
+SHA1 (multitail-3.8.5.tgz) = 999bb493ff030fe0ab99985ababf0b6a70decc97
+RMD160 (multitail-3.8.5.tgz) = ceaf5862124fc48760fb79d4066a101b10160867
+Size (multitail-3.8.5.tgz) = 75200 bytes
diff --git a/misc/multitail/patches/patch-aa b/misc/multitail/patches/patch-aa
deleted file mode 100644
index 21ca38d778c..00000000000
--- a/misc/multitail/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/05/12 04:16:15 jmc Exp $
-
---- 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
-+CFLAGS=-O2 -Wall -DKEY_RESIZE=-1
- 
- # Mac OS X/IRIX/SCO/Solaris users: use the following line
- #LDFLAGS=-lcurses