Update to 4.0.2. The changelog is lengthy. The author's summary of

differences from previous versions:

getmail version 4 has been completely rewritten. It is designed to
closely mimic the interface and user experience of getmail version
3, but the new architecture necessitates some differences you will
notice:

* the getmail rc file (configuration file) format has changed. If
  you are upgrading from version 3, you will need to write a new
  configuration file based on the contents of your old one. The
  new file format resembles the old in many ways. Each account you
  retrieve mail from will require a separate rc file, but getmail
  can operate with multiple rc files simultaneously if you wish to
  retrieve mail from multiple accounts.

* support for protocols other than POP3/SPDS. IMAP support is now
  included, and other protocols can be added with relative ease.

* support for SSL-encrypted protocols. The included POP3 and IMAP
  retriever classes are complemented by SSL-enabled counterparts.

* messages can be filtered or annotated by external programs like
  spam filters and anti-Microsoft-worm programs. Filters can cause
  messages to be dropped completely.

* a flexible, extensible architecture. Additional classes for
  handling new mail protocols, filter types, or destination mailstores
  can be added without needing to modify the main script at all.
  Feel free to contact me if you need a custom retriever, filter,
  or destination class written, or if you want commercial support
  for getmail.

6 files changed, 96 insertions, 92 deletions

diff --git a/mail/getmail/DESCR b/mail/getmail/DESCR
index d02d6832a19..44aebadb54a 100644
--- a/mail/getmail/DESCR
+++ b/mail/getmail/DESCR
@@ -1,5 +1,5 @@
-getmail is intended as a simple replacement for fetchmail. It retrieves mail
-(either all messages, or only unread messages) from one or more POP3 servers
-for one or more email accounts, and reliably delivers into a qmail-style
-Maildir (or mbox file) specified on a per-account basis. It also has support
-for domain (multidrop) mailboxes.
+getmail is a mail retriever designed to allow you to get your mail
+from one or more mail accounts on various mail servers to your
+local machine for reading with a minimum of fuss. getmail is designed
+to be secure, flexible, reliable, and easy-to-use. getmail is
+designed to replace other mail retrievers such as fetchmail.
diff --git a/mail/getmail/MESSAGE b/mail/getmail/MESSAGE
index bbff46aa601..abe4be2aa13 100644
--- a/mail/getmail/MESSAGE
+++ b/mail/getmail/MESSAGE
@@ -1,13 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2003/03/22 03:40:21 wiz Exp $
-
-There are two incompatible changes from 2.x.
-
-	Mbox delivery is now accomplished via an external MDA including
-	getmail_mbox, which is included in this version of getmail.
-	It assumes mboxrd format and flock locking. Use with care.
-
-	The recipient_header directive is renamed to "envelope_recipient".
-	You might have to update your getmailrc.
+$NetBSD: MESSAGE,v 1.2 2004/08/01 08:29:56 schmonz Exp $
+
+The getmail rc file (configuration file) format has changed since
+version 3.x. If you are upgrading from version 3, you will need to
+write a new configuration file based on the contents of your old
+one. The new file format resembles the old in many ways. Each
+account you retrieve mail from will require a separate rc file,
+but getmail can operate with multiple rc files simultaneously if
+you wish to retrieve mail from multiple accounts.
 
 ===========================================================================
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index b307676f466..1440a693cec 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,65 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2004/05/01 16:04:38 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2004/08/01 08:29:56 schmonz Exp $
 
-DISTNAME=	getmail-3.2.2
-PKGREVISION=	1
+DISTNAME=	getmail-4.0.2
 CATEGORIES=	mail
-MASTER_SITES=	http://www.qcc.ca/~charlesc/software/getmail-3.0/ \
-		http://www.qcc.ca/~charlesc/software/getmail-3.0/old-versions/
+MASTER_SITES=	${HOMEPAGE} ${HOMEPAGE}/old-versions/
 
 MAINTAINER=	zuntum@NetBSD.org
-HOMEPAGE=	http://www.qcc.ca/~charlesc/software/getmail-3.0/
-COMMENT=	POP3 mail retriever with reliable Maildir and command delivery
+HOMEPAGE=	http://www.qcc.ca/~charlesc/software/getmail-4/
+COMMENT=	Secure, flexible, reliable, easy-to-use fetchmail replacement
 
-NO_BUILD=	YES
+USE_BUILDLINK3=	yes
 
-USE_PKGINSTALL=	YES
-
-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	\
-		> ${WRKSRC}/getmail.done1
-	@${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_SCRIPT_DIR} ${PREFIX}/libexec/getmail
-	cd ${WRKSRC} &&							\
-	${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
+PYTHON_VERSIONS_ACCEPTED?=	23 23pth
+PYTHON_PATCH_SCRIPTS=		*.py getmailcore/*.py
+PYDISTUTILSPKG=			yes
 
 .include "../../lang/python/application.mk"
-
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/getmail/PLIST b/mail/getmail/PLIST
index 1d5f9c1d817..0084cda1b99 100644
--- a/mail/getmail/PLIST
+++ b/mail/getmail/PLIST
@@ -1,26 +1,61 @@
-@comment $NetBSD: PLIST,v 1.3 2003/10/29 11:55:27 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/08/01 08:29:56 schmonz 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_maildir
-libexec/getmail/getmail_mbox
-libexec/getmail/getmail_mbox.py
-libexec/getmail/getmail_utilities.py
-libexec/getmail/timeoutsocket.py
+bin/getmail_maildir
+bin/getmail_mbox
 man/man1/getmail.1
+man/man1/getmail_maildir.1
+man/man1/getmail_mbox.1
 share/doc/getmail/BUGS
 share/doc/getmail/CHANGELOG
 share/doc/getmail/COPYING
+share/doc/getmail/README
 share/doc/getmail/THANKS
 share/doc/getmail/TODO
-share/doc/getmail/docs.txt
+share/doc/getmail/configuration.html
+share/doc/getmail/configuration.txt
+share/doc/getmail/documentation.html
+share/doc/getmail/documentation.txt
+share/doc/getmail/faq.html
 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
-@unexec ${RM} -f %D/libexec/getmail/*.pyc 2>/dev/null || ${TRUE}
+share/doc/getmail/getmaildocs.css
+share/doc/getmail/getmailrc-examples
+share/doc/getmail/troubleshooting.html
+share/doc/getmail/troubleshooting.txt
+${PYSITELIB}/getmailcore/__init__.py
+${PYSITELIB}/getmailcore/__init__.pyc
+${PYSITELIB}/getmailcore/__init__.pyo
+${PYSITELIB}/getmailcore/_pop3ssl.py
+${PYSITELIB}/getmailcore/_pop3ssl.pyc
+${PYSITELIB}/getmailcore/_pop3ssl.pyo
+${PYSITELIB}/getmailcore/_retrieverbases.py
+${PYSITELIB}/getmailcore/_retrieverbases.pyc
+${PYSITELIB}/getmailcore/_retrieverbases.pyo
+${PYSITELIB}/getmailcore/baseclasses.py
+${PYSITELIB}/getmailcore/baseclasses.pyc
+${PYSITELIB}/getmailcore/baseclasses.pyo
+${PYSITELIB}/getmailcore/constants.py
+${PYSITELIB}/getmailcore/constants.pyc
+${PYSITELIB}/getmailcore/constants.pyo
+${PYSITELIB}/getmailcore/destinations.py
+${PYSITELIB}/getmailcore/destinations.pyc
+${PYSITELIB}/getmailcore/destinations.pyo
+${PYSITELIB}/getmailcore/exceptions.py
+${PYSITELIB}/getmailcore/exceptions.pyc
+${PYSITELIB}/getmailcore/exceptions.pyo
+${PYSITELIB}/getmailcore/filters.py
+${PYSITELIB}/getmailcore/filters.pyc
+${PYSITELIB}/getmailcore/filters.pyo
+${PYSITELIB}/getmailcore/logging.py
+${PYSITELIB}/getmailcore/logging.pyc
+${PYSITELIB}/getmailcore/logging.pyo
+${PYSITELIB}/getmailcore/message.py
+${PYSITELIB}/getmailcore/message.pyc
+${PYSITELIB}/getmailcore/message.pyo
+${PYSITELIB}/getmailcore/retrievers.py
+${PYSITELIB}/getmailcore/retrievers.pyc
+${PYSITELIB}/getmailcore/retrievers.pyo
+${PYSITELIB}/getmailcore/utilities.py
+${PYSITELIB}/getmailcore/utilities.pyc
+${PYSITELIB}/getmailcore/utilities.pyo
+@dirrm share/doc/getmail
+@dirrm ${PYSITELIB}/getmailcore
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
index 3ccd064f4d2..5695e2127eb 100644
--- a/mail/getmail/distinfo
+++ b/mail/getmail/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.9 2004/03/29 08:16:38 snj Exp $
+$NetBSD: distinfo,v 1.10 2004/08/01 08:29:56 schmonz Exp $
 
-SHA1 (getmail-3.2.2.tar.gz) = 16eaebf5641636a838a69771bcea7c5e11cb832b
-Size (getmail-3.2.2.tar.gz) = 69026 bytes
+SHA1 (getmail-4.0.2.tar.gz) = f6dda8cd64d97f90476dde2e9fd4021b138499b7
+Size (getmail-4.0.2.tar.gz) = 101561 bytes
+SHA1 (patch-aa) = 17b035846146f216f5cae435f5a5c9bf01dd8260
diff --git a/mail/getmail/patches/patch-aa b/mail/getmail/patches/patch-aa
new file mode 100644
index 00000000000..9f5485d7bf3
--- /dev/null
+++ b/mail/getmail/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2004/08/01 08:29:56 schmonz Exp $
+
+--- setup.py.orig	2004-07-18 18:47:24.000000000 -0400
++++ setup.py
+@@ -37,8 +37,9 @@ for (pos, arg) in enumerate(args):
+ 
+ GETMAILDOCDIR = os.path.join(
+     datadir or prefix,
++    'share',
+     'doc',
+-    'getmail-%s' % __version__
++    'getmail'
+ )
+ 
+ GETMAILMANDIR = os.path.join(