Upgrade to version 4.11 of grepmail, an mbox formatted file search

utility.  Install both versions, as grepmail-quick and grepmail-full,
and create a symlink to grepmail-full called grepmail.

New in version 4.11:
- Fixed a bug where an ASCII file would not be recognized as a mailbox when
  the first couple emails did not have a "From:" line. (Thanks to Jeff Flowers
  <jeff.flowers@npl.co.uk>)
- Added standard Perl testing.

New in version 4.1:
- Stripped auto-perl execution code, since it never works on all platforms.
  (Installation instructions modified to require the user to fix the #! line.)
- Minor changes to allow grepmail to run without -w complaints.

New in version 4.0:
- Fixed a bug where shell characters needed to be escaped for compressed
  files. (Bug found by Richard Clamp <richardc@tw2.com>
- Added #!/bin/sh as first line to make the rest compatible with csh/tcsh
  users. (Bug found by Ed Arnold <era@ucar.edu>)

New in version 3.9:
- Took out specialization engine because there wasn't enough support to
  program in that style.
- Offering 2 main versions now -- Date::Manip and Date::Parse
- Added -R option, which causes grepmail to recurse any directories
  encountered. (Thanks to Emil Tiller <etiller@asc.corp.mot.com> for the
  initial code.)
- Fixed a small bug that would cause some attachments not to be identified.

3 files changed, 18 insertions, 13 deletions

diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 231906f677e..ba1605cc33a 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/08 12:01:13 bad Exp $
+# $NetBSD: Makefile,v 1.2 2000/01/24 14:19:56 agc Exp $
 #
 
-DISTNAME=	grepmail-3.8
+DISTNAME=	grepmail-4.11
 CATEGORIES=	mail
 MASTER_SITES=	http://www.cs.virginia.edu/~dwc3q/code/
 
@@ -12,16 +12,19 @@ CONFIGURE_ENV=	PERL=${PREFIX}/bin/perl
 
 USE_PERL5=	yes
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl specialize grepmail.in < /dev/null
-
 do-build:
-	@cd ${WRKSRC} && \
-	${SED} -e '1s,.*,#!'${PREFIX}/bin/perl',' grepmail >grepmail.perl && \
-	${MV} -f grepmail.perl grepmail
-	@echo Build done.
+	@cd ${WRKSRC} ;						\
+	for i in 1 2 ; do					\
+		${ECHO} "$$i" | ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL; \
+		${MAKE};					\
+		${RM} -f grepmail-$$i;				\
+		${SED} -e '1s|.*|#! ${PREFIX}/bin/perl|' grepmail > grepmail-$$i; \
+	done
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/grepmail ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/grepmail-1 ${PREFIX}/bin/grepmail-quick
+	${INSTALL_SCRIPT} ${WRKSRC}/grepmail-2 ${PREFIX}/bin/grepmail-full
+	${RM} -f ${PREFIX}/bin/grepmail
+	${LN} -s grepmail-full ${PREFIX}/bin/grepmail
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/grepmail/files/md5 b/mail/grepmail/files/md5
index b912ffa2a98..1eb8beefb4c 100644
--- a/mail/grepmail/files/md5
+++ b/mail/grepmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/06/08 12:01:13 bad Exp $
+$NetBSD: md5,v 1.2 2000/01/24 14:19:57 agc Exp $
 
-MD5 (grepmail-3.8.tar.gz) = 20bc286e31aa6921f5bae04c48a8c814
+MD5 (grepmail-4.11.tar.gz) = d279a94b01c0b277b3d51907d0d6115f
diff --git a/mail/grepmail/pkg/PLIST b/mail/grepmail/pkg/PLIST
index 683bced7479..7394f25964d 100644
--- a/mail/grepmail/pkg/PLIST
+++ b/mail/grepmail/pkg/PLIST
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/08 12:01:14 bad Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/01/24 14:19:58 agc Exp $
+bin/grepmail-quick
+bin/grepmail-full
 bin/grepmail