Update to 3.1.1, based on Toru TAKAMIZU's patches in PR 19707.

Changes:
Version 3.1.1
14 March 2003

  -Add additional info to message log (msg #, msg count, size) "new msg"
  status line.  Thanks to Payal Rathod for the feature request.

Version 3.1.0
21 February 2003

  -Rename the recipient_header directive to "envelope_recipient".  There was
  simply too much confusion about it.  Sorry, but you'll have to update
  your getmailrc file and rename this directive if you're using it.  This
  version was going to be 3.0.5, but this change necessitates bumping the
  version up to 3.1.0.
  -Include separate callable program for mbox delivery.  The program,
  getmail_mbox, is based on the mbox delivery code in getmail version
  2.3.  It assumes mboxrd format and flock locking; if other programs
  on your system expect a different subtype of mbox format or use a different
  locking method, you can corrupt your mbox file.  Use at your own risk.
  You can use this in a command delivery target from getmail
  as "|/path/to/getmail_mbox /path/to/mboxfile" .
  -In a similar vein, include separate callable program for maildir delivery.
  The program, getmail_maildir, uses the same maildir delivery code as
  getmail.  You can use this in a command delivery target from getmail
  as "|/path/to/getmail_maildir /path/to/maildir/" .  This is mostly useful
  if you want to deliver to a maildir after doing something else to the message,
  and can be used in place of safecat.
  -Add message filtering.  You can now pass messages through arbitrary
  filters before delivery; specify one or more message_filter directives,
  each of which is a command and arguments.  The filter(s) should read the
  message from stdin, write to stdout, and exit 0 for success, 99 to drop
  the message in the bitbucket, and anything else to indicate an error.
  No docs for this yet.
  -getmail could drop the final newline when delivering to Maildirs in
  some circumstances.  Thanks to Jason Mastaler for the report and testing.

Version 3.0.4
20 February 2003

  -Catch a user incorrectly specifying two values for recipient_header.
  Thanks to Francisco Stefano Wechsler for the report.
  -Update ConfParser to version 3.3, designed to make it easier to catch
  user configuration errors.
  -Update configuration-handling code to use new features of ConfParser 3.3
  above, report configuration errors more clearly.  Thanks to Francisco
  Stefano Wechsler for the report which got me looking at this.
  -Add explicit check for recipient_header specifying a known-incorrect
  value.  Thanks to Edward Davis for the report that got me looking at this.
  -Move some sanity checks around to report errors earlier.

Version 3.0.3
14 February 2003

  -Missing import in getmail_utilities.py affected those who let getmail
  prompt them for a password.  Thanks to Francisco Stefano Wechsler for the
  report.

Version 3.0.2
14 February 2003

  -My editor let CR LF line endings into getmail_utilities.py ; this caused
  problems for at least one person.  Thanks to Francisco Stefano Wechsler
  for the report.  Now fixed.

Version 3.0.1
13 February 2003

  -Have getmail report an error if local directives are specified but getmail
  is not operating in multidrop mode (through either of the "use_*env" or
  "recipient_header" directives).  Thanks to Gerwin Krist for reporting that
  this was not obvious.

Version 3.0.0
10 February 2003

  -Updated to version 1.23 of Timothy O'Malley's timeoutsocket.py
  from http://www.timo-tasi.org/python/timeoutsocket.py
  -not all configuration errors were being caught in ConfParser.  Updated
  ConfParser as a result; thanks to Christian Pelster for reporting and testing
  this.
  -Move lots of code around.  Much has been moved into separate files.
  Much other code has been cleaned up.
  -Add support for Demon's SPDS "*ENV" command for domain mailboxes.
  Thanks to Paul Clifford for the request and the pointer to Demon's
  explanation of this protocol extension, submission of a patch to
  getmail 2.3.x for this feature, and for a testing 3.0 in its pre-release
  state.  Paul also submitted several patches during pre-release testing
  which I accepted.
  -Change main delivery loop; individual message delivery failures are
  not considered fatal errors any more.  The messages will be left on the
  server and retried.
  -Remove mbox delivery code.  Use an external MDA for this; for safety
  and reliability, all mbox-delivery programs on a system have to be compiled
  to use the same method of mbox locking in any case.  I don't use mbox
  files at all.
  -Simplify handling of oldmail data files.
  -Domain mailboxes are now only supported with explicit configuration of
  a header field which records the envelope recipient address or with *ENV.
  This removes a lot of code and makes the logic simpler.
  -Remove duplicate filtering option.  Use an external MDA for this.
  -Change maildir delivery algorithm; getmail will now try up to three times
  to generate a valid, unique name in maildir/tmp/, sleeping two seconds
  between tries as recommended by djb.  This code is also now moved into
  an independant function in getmail_utilities.py for easier use by others.
  The file naming convention has changed to djb's "modern delivery
  identifiers".

3 files changed, 56 insertions, 19 deletions

diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index b0f71d203ab..0c1ee3993a0 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,18 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2002/09/21 23:46:52 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/22 03:39:48 wiz Exp $
 #
 
-DISTNAME=	getmail-2.1.3
+DISTNAME=	getmail-3.1.1
 CATEGORIES=	mail
-MASTER_SITES=	http://www.qcc.sk.ca/~charlesc/software/getmail-2.0/
+MASTER_SITES=	http://www.qcc.ca/~charlesc/software/getmail-3.0/ \
+		http://www.qcc.ca/~charlesc/software/getmail-3.0/old-versions/
 
 MAINTAINER=	zuntum@netbsd.org
-HOMEPAGE=	http://www.qcc.sk.ca/~charlesc/software/getmail-2.0/
-COMMENT=	POP3 mail retriever with reliable Maildir and mbox delivery
+HOMEPAGE=	http://www.qcc.ca/~charlesc/software/getmail-3.0/
+COMMENT=	POP3 mail retriever with reliable Maildir and command delivery
 
 NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
-PYTHON_PATCH_SCRIPTS=	ConfParser.py getmail.py
+PYTHON_PATCH_SCRIPTS=	ConfParser.py getmail.py getmail_classes.py
+PYTHON_PATCH_SCRIPTS+=	getmail_constants.py getmail_defaults.py
+PYTHON_PATCH_SCRIPTS+=	getmail_utilities.py
+PYTHON_PATCH_SCRIPTS+=	getmail_maildir
+PYTHON_PATCH_SCRIPTS+=	getmail_mbox getmail_mbox.py
+
+OWN_DIRS=	${PREFIX}/share/doc/getmail
+OWN_DIRS+=	${PREFIX}/share/doc/html/getmail
+OWN_DIRS+=	${PREFIX}/libexec/getmail
 
 post-patch:
 	${SED} "s,/usr/lib,${PREFIX}/libexec," ${WRKSRC}/getmail	\
@@ -20,19 +29,37 @@ post-patch:
 	${SED} "s,\`which python\`,${PYTHONBIN}," <${WRKSRC}/getmail.done1 \
 		> ${WRKSRC}/getmail.done2
 	${MV} ${WRKSRC}/getmail.done2 ${WRKSRC}/getmail
+	${MV} ${WRKSRC}/getmail_maildir ${WRKSRC}/getmail_maildir.tmp
+	${SED} "s,/usr/lib,${PREFIX}/libexec," ${WRKSRC}/getmail_maildir.tmp \
+		> ${WRKSRC}/getmail_maildir
+	${MV} ${WRKSRC}/getmail_mbox ${WRKSRC}/getmail_mbox.tmp
+	${SED} "s,/usr/lib,${PREFIX}/libexec," ${WRKSRC}/getmail_mbox.tmp \
+		> ${WRKSRC}/getmail_mbox
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/getmail
-	cd ${WRKSRC} &&							\
-	${INSTALL_DATA} TODO BUGS CHANGELOG getmailrc-example faq.txt	\
-		getmail.txt docs.txt COPYING ${PREFIX}/share/doc/getmail
-	${INSTALL_DATA} ${WRKSRC}/getmailrc-example 			\
-		${PREFIX}/share/examples/getmailrc
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/getmail
 	cd ${WRKSRC} &&							\
-	${INSTALL_SCRIPT} ConfParser.py timeoutsocket.py getmail.py	\
+	${INSTALL_SCRIPT} ConfParser.py getmail.py getmail_classes.py	\
+		getmail_constants.py getmail_defaults.py		\
+		getmail_utilities.py timeoutsocket.py			\
+		getmail_maildir getmail_mbox getmail_mbox.py		\
 		${PREFIX}/libexec/getmail
 	${INSTALL_SCRIPT} ${WRKSRC}/getmail ${PREFIX}/bin
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/getmail.1 ${PREFIX}/man/man1
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/getmail
+	cd ${WRKSRC} &&						\
+	${INSTALL_DATA} BUGS CHANGELOG COPYING THANKS TODO	\
+		getmailrc-example faq.txt getmail.txt docs.txt	\
+		${PREFIX}/share/doc/getmail
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/getmail
+	cd ${WRKSRC} &&					\
+	${INSTALL_DATA} docs.html faq.html		\
+		${PREFIX}/share/doc/html/getmail
+	${INSTALL_DATA} ${WRKSRC}/getmailrc-example 	\
+		${PREFIX}/share/examples/getmailrc
 
 .include "../../lang/python/application.mk"
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/getmail/PLIST b/mail/getmail/PLIST
index a49c505b5ca..0d31701bd38 100644
--- a/mail/getmail/PLIST
+++ b/mail/getmail/PLIST
@@ -1,16 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/22 03:39:48 wiz Exp $
 bin/getmail
 libexec/getmail/ConfParser.py
 libexec/getmail/getmail.py
+libexec/getmail/getmail_classes.py
+libexec/getmail/getmail_constants.py
+libexec/getmail/getmail_defaults.py
+libexec/getmail/getmail_utilities.py
+libexec/getmail/getmail_maildir
+libexec/getmail/getmail_mbox
+libexec/getmail/getmail_mbox.py
 libexec/getmail/timeoutsocket.py
+man/man1/getmail.1
 share/doc/getmail/BUGS
 share/doc/getmail/CHANGELOG
 share/doc/getmail/COPYING
+share/doc/getmail/THANKS
 share/doc/getmail/TODO
 share/doc/getmail/docs.txt
 share/doc/getmail/faq.txt
 share/doc/getmail/getmail.txt
 share/doc/getmail/getmailrc-example
+share/doc/html/getmail/docs.html
+share/doc/html/getmail/faq.html
 share/examples/getmailrc
-@dirrm libexec/getmail
-@dirrm share/doc/getmail
+@unexec ${RM} -f %D/libexec/getmail/*.pyc 2>/dev/null || ${TRUE}
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
index 969852485e2..635e0aefda2 100644
--- a/mail/getmail/distinfo
+++ b/mail/getmail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/08/07 14:42:27 zuntum Exp $
+$NetBSD: distinfo,v 1.6 2003/03/22 03:39:48 wiz Exp $
 
-SHA1 (getmail-2.1.3.tar.gz) = 9cc98662d819bb15c1035e659e9e1f3d5a3d8932
-Size (getmail-2.1.3.tar.gz) = 39447 bytes
+SHA1 (getmail-3.1.1.tar.gz) = a4c3290b90d8b530850671a903647511e56b7448
+Size (getmail-3.1.1.tar.gz) = 64046 bytes