- Update to 2.2.01 (distversion is 2.201)

PR:		ports/100418
Submitted by:	Jin-Shan Tseng <tjs at cdpa.nsysu.edu.tw>

4 files changed, 33 insertions, 27 deletions

diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 17a9510c0c42..0976186f4b84 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	Mail-Audit
-PORTVERSION=	2.1
-PORTREVISION=	1
+PORTVERSION=	2.2.01
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]+)$/\1/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl module for creating easy mail filters
 
-BUILD_DEPENDS=	${SITE_PERL}/Net/Config.pm:${PORTSDIR}/net/p5-Net \
+BUILD_DEPENDS=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
+		${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	     	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
 		${SITE_PERL}/Mail/ListDetector.pm:${PORTSDIR}/mail/p5-Mail-ListDetector \
-		${SITE_PERL}/${PERL_ARCH}/Razor2/Client/Agent.pm:${PORTSDIR}/mail/razor-agents
+		${SITE_PERL}/Mail/Mailer.pm:${PORTSDIR}/mail/p5-Mail-Tools \
+		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -28,26 +29,31 @@ PERL_CONFIGURE=	yes
 MAN3=		Mail::Audit.3 \
 		Mail::Audit::KillDups.3 \
 		Mail::Audit::List.3 \
+		Mail::Audit::MailInternet.3 \
+		Mail::Audit::MimeEntity.3 \
 		Mail::Audit::MAPS.3 \
 		Mail::Audit::PGP.3 \
-		Mail::Audit::Razor.3
+		Mail::Audit::Razor.3 \
+		Mail::Audit::Vacation.3
+
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS=	Changes FAQ README
+PORTEXAMPLES=	popread proc2ma
 
 post-patch:
-	@${PERL} -pi -e 's,/var/spool/mail,/var/mail,g' ${WRKSRC}/Audit.pm
+	@${PERL} -pi -e 's,/var/spool/mail,/var/mail,g' ${WRKSRC}/lib/Mail/Audit.pm
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in Changes FAQ README
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
 .endif
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in popread proc2ma
-	@${INSTALL_SCRIPT} ${WRKSRC}/${file} \
-		${EXAMPLESDIR}
+.for i in ${PORTEXAMPLES}
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/${i}  ${EXAMPLESDIR}/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Audit/distinfo b/mail/p5-Mail-Audit/distinfo
index 6baa25a52bca..480ce6e937da 100644
--- a/mail/p5-Mail-Audit/distinfo
+++ b/mail/p5-Mail-Audit/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-Audit-2.1.tar.gz) = b52b1142fa9ed7d847c531186f913ea6
-SHA256 (Mail-Audit-2.1.tar.gz) = 838a7bdbf07ead7c3db81d7d45fd49a9511142a25484da4224d1a0903d877b3b
-SIZE (Mail-Audit-2.1.tar.gz) = 21669
+MD5 (Mail-Audit-2.201.tar.gz) = 22849e2577823b868a3bf59abd0011c7
+SHA256 (Mail-Audit-2.201.tar.gz) = c9f9cadccd147d6e1793c0ba5a2578f828eaa32a29b15a7f4fc3ed74061c1adf
+SIZE (Mail-Audit-2.201.tar.gz) = 36164
diff --git a/mail/p5-Mail-Audit/pkg-descr b/mail/p5-Mail-Audit/pkg-descr
index bca7161bdf97..822f8f677ade 100644
--- a/mail/p5-Mail-Audit/pkg-descr
+++ b/mail/p5-Mail-Audit/pkg-descr
@@ -1,7 +1,10 @@
-Mail::Audit is a Perl module for writing custom mail filters. It's
-aim is to be a tool to help replace procmail.
+Mail::Audit was inspired by Tom Christiansen's audit_mail
+and deliverlib programs. It allows a piece of email to be logged,
+examined, accepted into a mailbox, filtered, resent elsewhere,
+rejected, replied to, and so on. It's designed to allow you to
+easily create filter programs to stick in a .forward file or similar.
 
-WWW: http://search.cpan.org/dist/Mail-Audit/
+Mail::Audit groks MIME; when appropriate, it subclasses MIME::Entity.
+Read the MIME::Tools man page for details.
 
-- Pete
-petef@databits.net
+WWW: http://search.cpan.org/dist/Mail-Audit/
diff --git a/mail/p5-Mail-Audit/pkg-plist b/mail/p5-Mail-Audit/pkg-plist
index ee964d2ab05a..12846d4d49af 100644
--- a/mail/p5-Mail-Audit/pkg-plist
+++ b/mail/p5-Mail-Audit/pkg-plist
@@ -6,14 +6,11 @@
 %%SITE_PERL%%/Mail/Audit/MimeEntity.pm
 %%SITE_PERL%%/Mail/Audit/PGP.pm
 %%SITE_PERL%%/Mail/Audit/Razor.pm
+%%SITE_PERL%%/Mail/Audit/Vacation.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit/.packlist
-%%PORTDOCS%%share/doc/p5-Mail-Audit/Changes
-%%PORTDOCS%%share/doc/p5-Mail-Audit/FAQ
-%%PORTDOCS%%share/doc/p5-Mail-Audit/README
-share/examples/p5-Mail-Audit/popread
-share/examples/p5-Mail-Audit/proc2ma
-@dirrm share/examples/p5-Mail-Audit
-%%PORTDOCS%%@dirrm share/doc/p5-Mail-Audit
+%%EXAMPLESDIR%%/popread
+%%EXAMPLESDIR%%/proc2ma
+@dirrm %%EXAMPLESDIR%%/
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/Audit
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
 @dirrm %%SITE_PERL%%/Mail/Audit