- Update to 0.6.2

- Install script via port's Makefile instead of USE_PYDISTUTILS
- Manual page is no longer included in the distribution;
  building it from SGML source requires Jade and docbook2man;
  in order to avoid adding quite heavy dependecies for this simple
  utility, we now install SGML and associated Makefile to DOCSDIR
  for those who want to build the man page manually

4 files changed, 13 insertions, 25 deletions

diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index 5b4929d7e463..67caf522d554 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	archivemail
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,20 +15,18 @@ MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Search mailbox files and archive or delete mail older than N days
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
+NO_BUILD=	yes
 
-MAN1=		archivemail.1
-DOCS=		CHANGELOG FAQ README TODO
+DOCS=		CHANGELOG FAQ Makefile README TODO archivemail.sgml
+EXAMPLES=	test_archivemail.py examples/archivemail_all
 
-post-install:
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/archivemail.py ${PREFIX}/bin/archivemail
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/archivemail_all ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/test_archivemail.py ${EXAMPLESDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/archivemail/distinfo b/mail/archivemail/distinfo
index caf082447dc4..51ae44e966a2 100644
--- a/mail/archivemail/distinfo
+++ b/mail/archivemail/distinfo
@@ -1,3 +1,3 @@
-MD5 (archivemail-0.6.1.tar.gz) = aaf071effc9576cc14f3b0eee1d2321e
-SHA256 (archivemail-0.6.1.tar.gz) = a2f7fa9cf021ca266850f9ef2700fe7d8d01550f17930f479d17e304b94c610a
-SIZE (archivemail-0.6.1.tar.gz) = 34874
+MD5 (archivemail-0.6.2.tar.gz) = 1675f76b6415b046b85cff4e7ce69a3d
+SHA256 (archivemail-0.6.2.tar.gz) = 70d44fef33290679b461b5475445ab33e55f8700e1d20d842b861eddb845d359
+SIZE (archivemail-0.6.2.tar.gz) = 34995
diff --git a/mail/archivemail/files/patch-archivemail b/mail/archivemail/files/patch-archivemail
deleted file mode 100644
index 95a3c1a1daac..000000000000
--- a/mail/archivemail/files/patch-archivemail
+++ /dev/null
@@ -1,11 +0,0 @@
---- archivemail.orig	Wed Mar 17 01:31:23 2004
-+++ archivemail	Wed Mar 17 01:46:48 2004
-@@ -757,7 +757,7 @@
- 
-     # files in the maildir 'cur' directory are no longer new,
-     # they are the same as messages with 'Status: O' headers in mbox
--    (None, last_dir) = os.path.split(os.path.dirname(message.fp.name))
-+    (foo, last_dir) = os.path.split(os.path.dirname(message.fp.name))
-     if last_dir == "cur":
-         status = status + "O" 
- 
diff --git a/mail/archivemail/pkg-plist b/mail/archivemail/pkg-plist
index 82cb9eece6a1..d066e41472cc 100644
--- a/mail/archivemail/pkg-plist
+++ b/mail/archivemail/pkg-plist
@@ -2,8 +2,10 @@
 bin/archivemail
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/archivemail.sgml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/archivemail_all
 %%EXAMPLESDIR%%/test_archivemail.py