Update archivemail to 0.9.0.

Notable changes in archivemail 0.9.0:

  * IMAP: support for international mailbox names containing non-ASCII
    characters.

Notable changes in archivemail 0.8.0:

  * Removed the feature to setuid to the mailbox owners when run as root.
    This was a bad idea; it's really hard to do safely, if at all possible.
    Obsoletes: patch #2783134.
  * New option --archive-name, or short -a, to hard-code an archive filename.
    Like the --suffix and --prefix options, it is expanded with strftime().
    This option conflicts with archiving multiple mailboxes.  Closes: feature
    request #1306538.
  * New option --prefix, or short -p, to specify an archive name prefix.  Like
    a suffix specified with the --suffix option, the prefix is expanded with
    strftime().  Specifying this option disables the default archive name
    suffix.  Obsoletes: feature request #604281.  (Thanks Serafeim Zanikolas
    for an initial patch)
  * New option --all to archive all messages in a mailbox.  Closes: #1764846.
  * archivemail now expands wildcards in IMAP mailbox names.  For example, the
    url imaps://user@server/foo/* will expand to all subfolders of foo.
    Closes: feature request #1978540. Obsoletes: patch #1918937.
  * To determine the delivery date of a message, archivemail now looks for the
    timestamp of the latest 'Received' header before resorting to
    'Resent-Date' or 'Date'.  This should give much better results when there
    is no 'Delivery-date' header, which is still checked first.
    (Thanks Andrew Ferrier & Christian Brabandt)
    Closes: #1481316, #1764855, Debian bug #272666.
  * We now omit the dotlock if we don't have sufficient permissions to create
    it in the mbox directory. (The file is still locked with lockf.)
    Together with more changes under the hood (see below) this means
    archivemail can now operate on mbox files in the system mail spool.
    Closes: #855269.
  * Replaced some simple minded file operation security checks with more
    decent ones.  This means we can safely operate in /tmp, for example.  The
    price is that we no longer accept symlinked files.  Obsoletes: patch
    #1874868.
  * The archive now also gets locked while archivemail updates it.
  * mbox locking got completely rewritten.  Switched from flock to lockf
    locking, which is NFS-safe and portable, and we now lock with lockf first,
    then with a dotlock, instead of the other way around.  (This is makes
    archivemail compatible with Debian systems. ;)

5 files changed, 37 insertions, 25 deletions

diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index 95c5a9c4608..3385d0cae80 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -1,26 +1,28 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 19:17:40 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2012/01/24 11:49:33 obache Exp $
 #
 
-DISTNAME=		archivemail-0.7.2
-PKGREVISION=		1
+DISTNAME=		archivemail-0.9.0
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=archivemail/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://archivemail.sourceforge.net/
 COMMENT=		Tool for archiving and compressing old email in mailboxes
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=	yes
+USE_LANGUAGES=		# none
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/archivemail
+INSTALLATION_DIRS=	share/archivemail
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} \
 		CHANGELOG FAQ MANIFEST PKG-INFO README TODO \
 		${DESTDIR}${PREFIX}/share/archivemail
-	${INSTALL_MAN} ${WRKSRC}/archivemail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../lang/python/extension.mk"
+do-test:
+	${RUN}cd ${WRKSRC};${SETENV} ${TEST_ENV} ${PYTHONBIN} test_archivemail
+
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/archivemail/PLIST b/mail/archivemail/PLIST
index f0e1f57f86f..0fc22c81be5 100644
--- a/mail/archivemail/PLIST
+++ b/mail/archivemail/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/01/24 11:49:33 obache Exp $
 bin/archivemail
+${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}
 man/man1/archivemail.1
 share/archivemail/CHANGELOG
 share/archivemail/FAQ
diff --git a/mail/archivemail/distinfo b/mail/archivemail/distinfo
index cce1f2c1683..808f03892c9 100644
--- a/mail/archivemail/distinfo
+++ b/mail/archivemail/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/12/17 17:18:15 joerg Exp $
+$NetBSD: distinfo,v 1.5 2012/01/24 11:49:33 obache Exp $
 
-SHA1 (archivemail-0.7.2.tar.gz) = 0ff9b8991b04f09cf9536c45b6f9e05d2427a459
-RMD160 (archivemail-0.7.2.tar.gz) = da85dff5114100d76f8f5ac19172d8a557801455
-Size (archivemail-0.7.2.tar.gz) = 46070 bytes
-SHA1 (patch-aa) = ddea20d303e74416fa2576521ceaa150ee9affa0
+SHA1 (archivemail-0.9.0.tar.gz) = 9b04604c97b12062af897c949f65303c54d7f55e
+RMD160 (archivemail-0.9.0.tar.gz) = 7d524d7c3b4e089cb50a6c3637254931ccb06b72
+Size (archivemail-0.9.0.tar.gz) = 63482 bytes
+SHA1 (patch-setup.py) = b2e79aa27d13d9746b96cce552730de115b9c43b
diff --git a/mail/archivemail/patches/patch-aa b/mail/archivemail/patches/patch-aa
deleted file mode 100644
index bf75ae4925e..00000000000
--- a/mail/archivemail/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/12/17 17:18:15 joerg Exp $
-
---- archivemail.orig	2008-12-17 18:11:58.000000000 +0100
-+++ archivemail
-@@ -1271,7 +1271,6 @@ def _archive_dir(mailbox_name, final_arc
-         original = mailbox.MHMailbox(mailbox_name)
-     else:
-         unexpected_error("unknown type: %s" % type)        
--    assert(original)
- 
-     cache = IdentityCache(mailbox_name)
- 
diff --git a/mail/archivemail/patches/patch-setup.py b/mail/archivemail/patches/patch-setup.py
new file mode 100644
index 00000000000..0ed8cff7b80
--- /dev/null
+++ b/mail/archivemail/patches/patch-setup.py
@@ -0,0 +1,21 @@
+$NetBSD: patch-setup.py,v 1.1 2012/01/24 11:49:33 obache Exp $
+
+* Let not to force Linux FHS compliant for manpath.
+
+--- setup.py.orig	2011-07-09 17:09:57.000000000 +0000
++++ setup.py
+@@ -1,6 +1,7 @@
+ #! /usr/bin/env python
+ 
+ import sys
++import os
+ 
+ def check_python_version(): 
+     """Abort if we are running on python < v2.0"""
+@@ -29,5 +30,5 @@ setup(name="archivemail",
+       maintainer="Nikolaus Schulz, Peter Poeml",
+       maintainer_email="nikosch@users.sourceforge.net, poeml@users.sourceforge.net",
+       scripts=["archivemail"],
+-      data_files=[("share/man/man1", ["archivemail.1"])],
++      data_files=[(os.environ["PKGMANDIR"] + "/man1", ["archivemail.1"])],
+       )