From sgk@outpost.globcon.net  Mon Sep  2 08:29:25 2002
Return-Path: <sgk@outpost.globcon.net>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 45E5837B400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Sep 2002 08:29:25 -0700 (PDT)
Received: from outpost.lukarcos.com (outpost.lukarcos.com [195.239.240.132])
	by mx1.FreeBSD.org (Postfix) with SMTP id CB38D43E72
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Sep 2002 08:29:16 -0700 (PDT)
	(envelope-from sgk@outpost.globcon.net)
Received: (qmail 78863 invoked by uid 911); 2 Sep 2002 12:57:18 -0000
Message-Id: <20020902125718.78862.qmail@outpost.globcon.net>
Date: 2 Sep 2002 12:57:18 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: chip@chocobo.cx
Subject: [PATCH] Update mail/cmail to 4.0.1, cleanup
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         42325
>Category:       ports
>Synopsis:       [PATCH] Update mail/cmail to 4.0.1, cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 02 08:30:02 PDT 2002
>Closed-Date:    Wed Jan 08 10:26:32 PST 2003
>Last-Modified:  Wed Jan 08 10:26:32 PST 2003
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Aug 1 02:44:26 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386
>Description:
- Update cmail to 4.0.1
- Remove explicit EXTRACT_SUFX - not needed with USE_BZIP2
- Cleanup pkg-descr (wrap long line, put Tab after WWW:, remove e-mail
  signature that does not delong here)
- Fix pkg-plist to reference all files installed for clean deinstallation
- Install some documentation (LICENSE and README), respect NOPORTDOCS

>How-To-Repeat:
>Fix:

--- cmail-4.0.1.patch begins here ---
diff -urN /usr/ports/mail/cmail/Makefile /home/sgk/ports/mail/cmail/Makefile
--- /usr/ports/mail/cmail/Makefile	Tue Mar 27 17:06:15 2001
+++ /home/sgk/ports/mail/cmail/Makefile	Mon Sep  2 16:42:05 2002
@@ -6,10 +6,9 @@
 #
 
 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
 
@@ -18,8 +17,16 @@
 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 -urN /usr/ports/mail/cmail/distinfo /home/sgk/ports/mail/cmail/distinfo
--- /usr/ports/mail/cmail/distinfo	Tue Mar 27 17:06:15 2001
+++ /home/sgk/ports/mail/cmail/distinfo	Mon Sep  2 16:14:35 2002
@@ -1 +1 @@
-MD5 (cmail-3.1.tar.bz2) = 698c1e069f50648f0804698bddd478e5
+MD5 (cmail-4.01.tar.bz2) = 7ce5ef0ccd11744f304d9a52df0d059d
diff -urN /usr/ports/mail/cmail/pkg-descr /home/sgk/ports/mail/cmail/pkg-descr
--- /usr/ports/mail/cmail/pkg-descr	Tue Mar 27 17:06:15 2001
+++ /home/sgk/ports/mail/cmail/pkg-descr	Mon Sep  2 16:32:45 2002
@@ -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 @@
 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 -urN /usr/ports/mail/cmail/pkg-plist /home/sgk/ports/mail/cmail/pkg-plist
--- /usr/ports/mail/cmail/pkg-plist	Tue Mar 27 17:06:15 2001
+++ /home/sgk/ports/mail/cmail/pkg-plist	Mon Sep  2 16:40:50 2002
@@ -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
--- cmail-4.0.1.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: chip@chocobo.cx
Subject: Re: ports/42325: [PATCH] Update mail/cmail to 4.0.1, cleanup
Date: Mon, 2 Sep 2002 20:08:29 +0400

 The updated port should also have run-time dependency on
 devel/p5-Term-ANSIColor port:
 
 --- Makefile.orig	Mon Sep  2 20:00:53 2002
 +++ Makefile	Mon Sep  2 20:03:22 2002
 @@ -12,9 +12,12 @@
  
  MAINTAINER=	chip@chocobo.cx
  
 +RUN_DEPENDS=${SITE_PERL}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
 +
  USE_BZIP2=	yes
  
  PERL_CONFIGURE=	yes
 +SITE_PERL=      ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
  
  MAN1=		cmail.1
  DOCS=		LICENSE README
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Wed Jan 8 10:26:22 PST 2003 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=42325 
>Unformatted:
