Update to 4.0.1

PR:		42325
Submitted by:	Sergei Kolobov <sergei@kolobov.com>
Approved by:	maintainer timeout

4 files changed, 35 insertions, 13 deletions

diff --git a/mail/cmail/Makefile b/mail/cmail/Makefile
index 491694965cac..e0d0179493ed 100644
--- a/mail/cmail/Makefile
+++ b/mail/cmail/Makefile
@@ -6,20 +6,28 @@
 #
 
 PORTNAME=	cmail
-PORTVERSION=	3.1
+PORTVERSION=	4.01
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.eboai.org/pub/users/chip/
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	chip@chocobo.cx
 
-USE_BZIP2=	yes
+RUN_DEPENDS=	${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
 
+USE_BZIP2=	yes
 PERL_CONFIGURE=	yes
 
 MAN1=		cmail.1
+DOCS=		LICENSE README
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/cmailrc.sample ${PREFIX}/share/examples/cmailrc.sample
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/cmail.rc ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/cmail/distinfo b/mail/cmail/distinfo
index 1b179ee82813..04c7387d7567 100644
--- a/mail/cmail/distinfo
+++ b/mail/cmail/distinfo
@@ -1 +1 @@
-MD5 (cmail-3.1.tar.bz2) = 698c1e069f50648f0804698bddd478e5
+MD5 (cmail-4.01.tar.bz2) = 7ce5ef0ccd11744f304d9a52df0d059d
diff --git a/mail/cmail/pkg-descr b/mail/cmail/pkg-descr
index a2da58860583..4a20d3daded2 100644
--- a/mail/cmail/pkg-descr
+++ b/mail/cmail/pkg-descr
@@ -1,5 +1,6 @@
-cmail is a simple mail counting tool written in perl. It reads in a config fileXand returns which mailfiles contain mail, how much mail, and how many new
-messages. Example of output -
+cmail is a simple mail counting tool written in perl. It reads in a config
+fileXand returns which mailfiles contain mail, how much mail, and how many 
+new messages. Example of output -
             Personal mail    1 message
                  JLC mail   20 messages (2 new)
                 EXPI mail    2 messages
@@ -9,9 +10,6 @@ This may be useful if you split your mail into multiple files using something
 like procmail. I'm not sure if the new/old mail determination works with
 anything other than mutt.
 
-WWW: http://www.chocobo.cx/chip/projects.html
+WWW:	http://www.chocobo.cx/chip/projects.html
 
---
-Chip Marshall <chip@chocobo.cx> http://www.chocobo.cx/chip/ Finger for PGP
-GCM/CS d+(-) s+:++ a19>? C++ UB++++$ P+++$ L- E--- W++ N+@ o K- w O M+ V--
-PS PE Y? PGP++ t+@ 5 X R>+ tv+() b++>+++ DI++++ D(-) G++ e>++ h!>++ r-- y-
+Chip Marshall <chip@chocobo.cx> 
diff --git a/mail/cmail/pkg-plist b/mail/cmail/pkg-plist
index 31761ddcc4f5..7cfa9da4ea48 100644
--- a/mail/cmail/pkg-plist
+++ b/mail/cmail/pkg-plist
@@ -1,4 +1,20 @@
 bin/cmail
-share/examples/cmailrc.sample
+%%PORTDOCS%%share/doc/cmail/LICENSE
+%%PORTDOCS%%share/doc/cmail/README
+%%PORTDOCS%%@dirrm share/doc/cmail
+share/examples/cmail/cmail.rc
+@dirrm share/examples/cmail
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail
+lib/perl5/site_perl/%%PERL_VER%%/CMail/In/Base.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/In/file.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/In/pop3.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/In/maildir.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/In/mbox.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/In/imap.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/Base.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/color.pm
+lib/perl5/site_perl/%%PERL_VER%%/CMail/Out/plain.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail/In
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail/Out
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/CMail