Update to 4.0.8. From the changelog:

4.0.7:
  -change failure of a message filter to produce at least as many mail headers
  as it was provided from a fatal to a non-fatal error.  The message will
  be skipped.  Thanks: Payal Rathod.
  -a few non-conformant IMAP4 servers don't implement SEARCH, so getmail
  couldn't get a list of UIDs.  Changed to use FETCH instead.
  Thanks: Matthias Andree.
  -prevent traceback if IMAP SSL connection closed during connect().
  Thanks: Payal Rathod.
  -add warning if unknown parameters are supplied to a retriever, filter,
  or destination.
  -write subclasses of Python imaplib classes to work around missing
  UIDVALIDITY select() response.  Add it to the state getmail keeps.
  Thanks:  Matthias Andree.
  -move message state saving to later, so getmail doesn't falsely remember
  having handled a message.  Thanks:  Matthias Andree.
  -change location of documentation/man pages to
  <prefix>/share/{doc/getmail,man}/ to be more comformant with the FHS.
  -documentation updates

4.0.8:
  -add an extra error message if you ask getmail to deliver to a maildir,
  but getmail can't check the contents of it due to permissions.
  Thanks: Clemens Buschmann.
  -fix breakage introduced in 4.0.7: getmail would forget a message was "seen"
  after a cycle of not retrieving it.  Thanks: Payal Rathod.

4 files changed, 20 insertions, 14 deletions

diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 347a77afb38..82f5b255f6f 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/08/05 17:48:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2004/08/06 16:02:50 schmonz Exp $
 
-DISTNAME=	getmail-4.0.6
+DISTNAME=	getmail-4.0.8
 CATEGORIES=	mail
-MASTER_SITES=	${HOMEPAGE}/old-versions/
+MASTER_SITES=	${HOMEPAGE}old-versions/
 
 MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.qcc.ca/~charlesc/software/getmail-4/
diff --git a/mail/getmail/PLIST b/mail/getmail/PLIST
index 0084cda1b99..cc05c015987 100644
--- a/mail/getmail/PLIST
+++ b/mail/getmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/08/01 08:29:56 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/08/06 16:02:50 schmonz Exp $
 bin/getmail
 bin/getmail_maildir
 bin/getmail_mbox
@@ -24,6 +24,9 @@ share/doc/getmail/troubleshooting.txt
 ${PYSITELIB}/getmailcore/__init__.py
 ${PYSITELIB}/getmailcore/__init__.pyc
 ${PYSITELIB}/getmailcore/__init__.pyo
+${PYSITELIB}/getmailcore/_imap4fix.py
+${PYSITELIB}/getmailcore/_imap4fix.pyc
+${PYSITELIB}/getmailcore/_imap4fix.pyo
 ${PYSITELIB}/getmailcore/_pop3ssl.py
 ${PYSITELIB}/getmailcore/_pop3ssl.pyc
 ${PYSITELIB}/getmailcore/_pop3ssl.pyo
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
index ba9f5da8ec7..609d84980a2 100644
--- a/mail/getmail/distinfo
+++ b/mail/getmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2004/08/05 17:48:47 schmonz Exp $
+$NetBSD: distinfo,v 1.15 2004/08/06 16:02:50 schmonz Exp $
 
-SHA1 (getmail-4.0.6.tar.gz) = 04e0a1c05375ee6ce5cc70aa3712410d096c4d40
-Size (getmail-4.0.6.tar.gz) = 103082 bytes
-SHA1 (patch-aa) = 17b035846146f216f5cae435f5a5c9bf01dd8260
+SHA1 (getmail-4.0.8.tar.gz) = cde15feb4029974450b905220458e7ac9bf3a204
+Size (getmail-4.0.8.tar.gz) = 104180 bytes
+SHA1 (patch-aa) = 63bb1a6427f5b129200e7fa4bdd34267d427a2a7
diff --git a/mail/getmail/patches/patch-aa b/mail/getmail/patches/patch-aa
index 9f5485d7bf3..a675d24d03d 100644
--- a/mail/getmail/patches/patch-aa
+++ b/mail/getmail/patches/patch-aa
@@ -1,15 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2004/08/01 08:29:56 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/06 16:02:50 schmonz Exp $
 
---- setup.py.orig	2004-07-18 18:47:24.000000000 -0400
+--- setup.py.orig	2004-08-04 12:41:16.000000000 -0400
 +++ setup.py
-@@ -37,8 +37,9 @@ for (pos, arg) in enumerate(args):
- 
- GETMAILDOCDIR = os.path.join(
+@@ -39,12 +39,11 @@ GETMAILDOCDIR = os.path.join(
      datadir or prefix,
-+    'share',
+     'share',
      'doc',
 -    'getmail-%s' % __version__
 +    'getmail'
  )
  
  GETMAILMANDIR = os.path.join(
+     datadir or prefix,
+-    'share',
+     'man',
+     'man1'
+ )