Update mail/mairix to 0.20 (ok simonb@)

Changelog:
Version 0.20 	20 March 2007
    * Cache uncompressed mbox data (Chris Mason, further work by me)
    * Fix gaps in date ranges for search
    * Unlock database if mairix is interrupted (Paul Fox)
    * Add fast index option (-F)
    * Fix conditional compilation errors for compressed mbox
    * Reimplement MIME header parsing
    * Add capability to search on names of attachments
    * Add capability to search on state of message flags
    * Create maildir-format mfolder filenames correctly with regard to flags
    * Various bug fixes (Oliver Braun, Matthias Teege)
Version 0.19 	15 July 2006
    * mairix.spec fixes (André Costa)
    * bug fix: freeing of message structures (Karsten Petersen)
    * Add new -x (--excerpt-output) option, an alternative mode for searching. This displays the key headers from the matching messages on stdout.
    * Add notes about the mairix-users mailing list and the SourceForge page to README.
    * Fix configuration + compilation to allow building with gzip support but without bzlib support.
    * Rename internal functions like zopen() to avoid name conflicts on MacOS X. (Vincent Lefevre)
    * Remove a spurious ; in bison input file (Vincent Lefevre)
    * Improve output given in various error conditions (based on patch by Karsten Petersen)
Version 0.18 	10 March 2006
    * Support bzip2'd mbox folders
    * Fix bugs in parsing mbox folders containing unquoted 'From ' lines inside MIME body parts
    * Fix bug in parsing content-type data containing quotes with whitespace before
    * Clone the message flags (when both the source folder and mfolder are both of maildir type)
    * New manpages mairix.1 and mairixrc.5 are included, and the old texinfo-based documentation is deprecated into the old_docs/ directory.
    * Upgrade scanners to new version of dfasyn
    * Support Mew's MH folder subtype
Version 0.17.1 	16 December 2005
    * Fix detection of MH folder subtype used by nnml (Gnus)
    * Fix filename format generated in the /cur/ directory for maildir mfolders.
    * Syntax fix in configure script
Version 0.17 	14 November 2005
    * Support gzipped mbox folders (any file matched by a mbox= line in the config file is considered as a gzipped mbox if its name ends in .gz)
    * Rework directory traversal for the '...' construct to speed up indexing and the check that mfolder isn't going to overwrite a real folder when searching.
    * Check whether database exists before attempting to do searching.
    * Matched new maildir messages go in /new/ subdirectory of maildir mfolder.
    * Fix lots of compiler warnings generated by gcc4.x
    * Don't create and immediately scrub database entries for empty mbox folders.
    * Fix usage() info for bare word in searching
    * Allow '.' on the ends of numeric filenames in MH folders (to work with Evolution)
    * Update .PHONY target so that 'make install' etc are more reliable.
    * Add --version switch
    * Fix bug with size argument passed to memset
    * Add X-source-folder header to indicate the original folder of a match found in an mbox.

4 files changed, 41 insertions, 31 deletions

diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index cd884881a8b..b66bb647ed3 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/06/09 16:04:00 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2007/06/12 15:23:48 tonio Exp $
 #
 
-DISTNAME=		mairix-0.16.1
+DISTNAME=		mairix-0.20
 CATEGORIES=		mail
-MASTER_SITES=		http://www.rpcurnow.force9.co.uk/mairix/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mairix/}
 
 MAINTAINER=		simonb@NetBSD.org
 HOMEPAGE=		http://www.rc0.org.uk/mairix/
@@ -12,25 +12,6 @@ COMMENT=		Program for indexing and searching email messages
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
-USE_TOOLS+=		bison flex makeinfo
-INFO_FILES=		# PLIST
-
-BINDIR=			${PREFIX}/bin
-INFODIR=		${PREFIX}/${PKGINFODIR}
-HTMLDIR=		${PREFIX}/share/doc/html/mairix
-
-INSTALLATION_DIRS=	${BINDIR} ${INFODIR} ${HTMLDIR}
-
-pre-build:
-	cd ${WRKSRC} && makeinfo mairix.texi
-	cd ${WRKSRC} && makeinfo --no-split --number-sections --html	\
-		mairix.texi > mairix.html
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mairix ${BINDIR}
-	${INSTALL_DATA} ${WRKSRC}/mairix.html ${HTMLDIR}
-	cd ${WRKSRC}; for f in mairix.info mairix.info-[0-9]; do	\
-		${TEST} ! -f "$$f" || ${INSTALL_DATA} "$$f" ${INFODIR};	\
-	done
+USE_TOOLS+=		bison flex
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mairix/PLIST b/mail/mairix/PLIST
index cc6a4b3bfa5..2ec3d29c8d5 100644
--- a/mail/mairix/PLIST
+++ b/mail/mairix/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/05 16:41:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/06/12 15:23:48 tonio Exp $
 bin/mairix
-info/mairix.info
-share/doc/html/mairix/mairix.html
-@dirrm share/doc/html/mairix
+man/man1/mairix.1
+man/man5/mairixrc.5
diff --git a/mail/mairix/distinfo b/mail/mairix/distinfo
index 74b247e5191..9f1b0c28da2 100644
--- a/mail/mairix/distinfo
+++ b/mail/mairix/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/10/18 01:22:27 simonb Exp $
+$NetBSD: distinfo,v 1.4 2007/06/12 15:23:48 tonio Exp $
 
-SHA1 (mairix-0.16.1.tar.gz) = 3fe6e15ec34d903a3fce6299c283b8a0c3d98a02
-RMD160 (mairix-0.16.1.tar.gz) = 8f26d7b1fe94a8a9f645c96c9efdc2acbc37e43a
-Size (mairix-0.16.1.tar.gz) = 126356 bytes
+SHA1 (mairix-0.20.tar.gz) = 7e7b64d76a4804d9e4ab59157e55bf9ae892f25e
+RMD160 (mairix-0.20.tar.gz) = d5547f4b05da5e06df21293a032c2ec5ba5238ad
+Size (mairix-0.20.tar.gz) = 158336 bytes
+SHA1 (patch-aa) = bc87571018a2470b09dd7f096794439ba8244025
diff --git a/mail/mairix/patches/patch-aa b/mail/mairix/patches/patch-aa
new file mode 100644
index 00000000000..322ac43db33
--- /dev/null
+++ b/mail/mairix/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1 2007/06/12 15:23:48 tonio Exp $
+
+--- Makefile.in.orig	2007-02-09 00:03:48.000000000 +0100
++++ Makefile.in
+@@ -90,17 +90,13 @@ distclean: clean
+ 	-rm -f Makefile config.log
+ 
+ install:
+-	[ -d $(prefix) ] || mkdir -p $(prefix)
+-	[ -d $(bindir) ] || mkdir -p $(bindir)
+-	[ -d $(mandir) ] || mkdir -p $(mandir)
+-	[ -d $(man1dir) ] || mkdir -p $(man1dir)
+-	[ -d $(man5dir) ] || mkdir -p $(man5dir)
+-	cp -f mairix $(bindir)
+-	chmod 555 $(bindir)/mairix
+-	cp -f mairix.1 $(man1dir)
+-	chmod 444 $(man1dir)/mairix.1
+-	cp -f mairixrc.5 $(man5dir)
+-	chmod 444 $(man5dir)/mairixrc.5
++	${BSD_INSTALL_PROGRAM_DIR} $(bindir)
++	${BSD_INSTALL_MAN_DIR} $(mandir)
++	${BSD_INSTALL_MAN_DIR} $(man1dir)
++	${BSD_INSTALL_MAN_DIR} $(man5dir)
++	${BSD_INSTALL_PROGRAM} mairix $(bindir)
++	${BSD_INSTALL_MAN} mairix.1 $(man1dir)
++	${BSD_INSTALL_MAN} mairixrc.5 $(man5dir)
+ 
+ .PHONY : all install clean distclean
+