Upgrade to version 3.1

A few notes I changed in Makefile:
- Remove USE_PERL5
- Add MAN1

PR: 26133
Submitted by: MAINTAINER

4 files changed, 19 insertions, 21 deletions

diff --git a/mail/cmail/Makefile b/mail/cmail/Makefile
index 466a59fc44a7..491694965cac 100644
--- a/mail/cmail/Makefile
+++ b/mail/cmail/Makefile
@@ -1,27 +1,25 @@
 # New ports collection makefile for:	cmail
 # Date created:		31 Dec 1998
-# Whom:			Chip Marshall <chip@eboai.org>
+# Whom:			Chip Marshall <chip@chocobo.cx>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cmail
-PORTVERSION=	2.10
+PORTVERSION=	3.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.eboai.org/pub/users/chip/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	chip@eboai.org
+MAINTAINER=	chip@chocobo.cx
 
-NO_BUILD=	yes
+USE_BZIP2=	yes
 
-USE_PERL5=	yes
+PERL_CONFIGURE=	yes
 
-pre-configure:
-	@${SED} -e '1,1s:/usr/local/bin/perl:${PERL5}:' \
-		${WRKSRC}/cmail.pl > ${WRKSRC}/cmail
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/cmail ${PREFIX}/bin/cmail
-	${INSTALL_MAN} ${WRKSRC}/cmail.rc ${PREFIX}/share/examples/cmail.rc
+MAN1=		cmail.1
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/cmailrc.sample ${PREFIX}/share/examples/cmailrc.sample
 
 .include <bsd.port.mk>
diff --git a/mail/cmail/distinfo b/mail/cmail/distinfo
index 8b0e83a7f67c..1b179ee82813 100644
--- a/mail/cmail/distinfo
+++ b/mail/cmail/distinfo
@@ -1 +1 @@
-MD5 (cmail-2.10.tgz) = 6be2b563ecfe127a966f2a90fbb197ff
+MD5 (cmail-3.1.tar.bz2) = 698c1e069f50648f0804698bddd478e5
diff --git a/mail/cmail/pkg-descr b/mail/cmail/pkg-descr
index b187adced7d2..a2da58860583 100644
--- a/mail/cmail/pkg-descr
+++ b/mail/cmail/pkg-descr
@@ -1,5 +1,4 @@
-cmail is a simple mail counting tool written in perl. It reads in a config file
-and returns which mailfiles contain mail, how much mail, and how many new
+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)
@@ -10,10 +9,9 @@ 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.eboai.org/~chip/scripts.html
+WWW: http://www.chocobo.cx/chip/projects.html
 
 --
-Chip Marshall <chip@eboai.org>
-http://www.eboai.org/~chip/                     InterNIC handle - CLM21
-PGP key available on my web page              On IRC via EFnet as Magus
-PGP Key fingerprint =  6B 35 3B 72 AC 37 90 04  E5 79 EE 71 18 95 4A 84 
+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-
diff --git a/mail/cmail/pkg-plist b/mail/cmail/pkg-plist
index 3cccf7c861d1..31761ddcc4f5 100644
--- a/mail/cmail/pkg-plist
+++ b/mail/cmail/pkg-plist
@@ -1,2 +1,4 @@
 bin/cmail
-share/examples/cmail.rc
+share/examples/cmailrc.sample
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/cmail