From owner-freebsd-ports-bugs Wed Feb 5 12:20:27 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3FB337B401 for ; Wed, 5 Feb 2003 12:20:21 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9B7243F9B for ; Wed, 5 Feb 2003 12:20:20 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h15KKKNS098101 for ; Wed, 5 Feb 2003 12:20:20 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h15KKKZ2098100; Wed, 5 Feb 2003 12:20:20 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EC8A37B401 for ; Wed, 5 Feb 2003 12:11:18 -0800 (PST) Received: from lemur.droso.net (lemur.droso.net [62.79.38.253]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E26443F75 for ; Wed, 5 Feb 2003 12:11:17 -0800 (PST) (envelope-from erwin@lemur.droso.net) Received: from lemur.droso.net (lemur.droso.net [62.79.38.253]) by lemur.droso.net (8.12.6/8.12.6) with ESMTP id h15KBEVd089895 for ; Wed, 5 Feb 2003 21:11:14 +0100 (CET) (envelope-from erwin@lemur.droso.net) Received: (from root@localhost) by lemur.droso.net (8.12.6/8.12.6/Submit) id h15KB9m4089894; Wed, 5 Feb 2003 21:11:09 +0100 (CET) Message-Id: <200302052011.h15KB9m4089894@lemur.droso.net> Date: Wed, 5 Feb 2003 21:11:09 +0100 (CET) From: Erwin Lansing Reply-To: Erwin Lansing To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47975: fix mail/p5-Mail-Procmailrc on 4.x and PLIST Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47975 >Category: ports >Synopsis: fix mail/p5-Mail-Procmailrc on 4.x and PLIST >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Feb 05 12:20:19 PST 2003 >Closed-Date: >Last-Modified: >Originator: Erwin Lansing >Release: FreeBSD 4.7-STABLE i386 >Organization: pil.dk >Environment: System: FreeBSD lemur.droso.net 4.7-STABLE FreeBSD 4.7-STABLE #13: Tue Jan 7 21:26:37 CET 2003 root@panda.droso.net:/usr/obj/usr/src/sys/PANDA i386 >Description: This patch fixes this module for perl < 5.6 so remove the conditional BROKEN tag. Also added a man page and PLIST missed in previous commit, thus bump PORTREVISION. Now I used so much time on this one, I might as well take maintainership :) The documentation fix included in this patch has been forwarded to the author. >How-To-Repeat: >Fix: --- p5-Mail-Procmailrc.diff begins here --- diff -ruN p5-Mail-Procmailrc.orig/Makefile p5-Mail-Procmailrc/Makefile --- p5-Mail-Procmailrc.orig/Makefile Tue Feb 4 14:16:56 2003 +++ p5-Mail-Procmailrc/Makefile Wed Feb 5 20:50:08 2003 @@ -8,20 +8,18 @@ PORTNAME= Mail-Procmailrc PORTVERSION= 1.03 +PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \ http://scott.wiersdorf.org/perl/ MASTER_SITE_SUBDIR= Mail PKGNAMEPREFIX= p5- -MAINTAINER= ports@FreeBSD.org +MAINTAINER= erwin@lansing.dk PERL_CONFIGURE= YES -.include +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} +MAN3= Mail::Procmailrc.3 -.if ${PERL_LEVEL} < 500600 -BROKEN= This port requires perl 5.6.0 -.endif - -.include +.include diff -ruN p5-Mail-Procmailrc.orig/files/patch-Makefile.PL p5-Mail-Procmailrc/files/patch-Makefile.PL --- p5-Mail-Procmailrc.orig/files/patch-Makefile.PL Thu Jan 1 01:00:00 1970 +++ p5-Mail-Procmailrc/files/patch-Makefile.PL Tue Feb 4 17:45:45 2003 @@ -0,0 +1,11 @@ +--- Makefile.PL.orig Wed Jan 22 15:53:59 2003 ++++ Makefile.PL Wed Jan 22 15:54:17 2003 +@@ -3,7 +3,7 @@ + # the contents of the Makefile that is written. + WriteMakefile( + 'NAME' => 'Mail::Procmailrc', +- 'VERSION_FROM' => 'Procmailrc.pm', # finds $VERSION ++ 'VERSION' => '1.03', + 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1 + ($] >= 5.005 ? ## Add these new keywords supported since 5.005 + (ABSTRACT_FROM => 'Procmailrc.pm', # retrieve abstract from module diff -ruN p5-Mail-Procmailrc.orig/files/patch-Procmailrc.pm p5-Mail-Procmailrc/files/patch-Procmailrc.pm --- p5-Mail-Procmailrc.orig/files/patch-Procmailrc.pm Thu Jan 1 01:00:00 1970 +++ p5-Mail-Procmailrc/files/patch-Procmailrc.pm Wed Feb 5 20:48:43 2003 @@ -0,0 +1,120 @@ +--- Procmailrc.pm.orig Wed Nov 20 22:15:55 2002 ++++ Procmailrc.pm Wed Feb 5 20:48:22 2003 +@@ -6,14 +6,12 @@ + package Mail::Procmailrc; + ################################## + +-use 5.006; + use strict; +-use warnings; + use Carp qw(confess); + +-our $VERSION = '1.03'; +-our $Debug = 0; +-our %RE = ( ++use vars qw($VERSION); $VERSION = '1.03'; ++use vars qw($Debug); $Debug = 0; ++use vars qw( %RE); %RE = ( + 'flags' => qr/^\s*:0/o, + 'flagsm' => qr/^\s*(:0.*)$/o, + 'var' => qr/^\s*[^#\$=]+=.+/o, +@@ -389,7 +387,7 @@ + + ## FIXME: handle comments on the assignment line + +-our $Debug = 0; ++use vars qw($Debug);$Debug = 0; + + sub new { + my $self = bless { }, shift; +@@ -435,10 +433,10 @@ + $line .= shift @$data; + + ## check assignment +- confess "Could not init: bad pattern in '$line'\n" unless $line =~ /$RE{'var'}/; ++ confess "Could not init: bad pattern in '$line'\n" unless $line =~ /$Mail::Procmailrc::RE{'var'}/; + + ## check for continuation +- while( $line =~ /$RE{'cont'}/ ) { ++ while( $line =~ /$Mail::Procmailrc::RE{'cont'}/ ) { + $line .= "\n"; + $line .= shift @$data; + } +@@ -571,7 +569,7 @@ + FLAGS: { + $line = shift @$data; + $line =~ s/^\s*//; +- confess( "Not a recipe: $line\n" ) unless $line =~ /$RE{'flags'}/; ++ confess( "Not a recipe: $line\n" ) unless $line =~ /$Mail::Procmailrc::RE{'flags'}/; + $self->flags($line); + } + +@@ -582,13 +580,13 @@ + $line =~ s/^\s*//; + + ## comment/info +- if( $line =~ s/$RE{'comm'}/$1/ ) { ++ if( $line =~ s/$Mail::Procmailrc::RE{'comm'}/$1/ ) { + push @{$self->info}, $line; + redo INFO; + } + + ## skip empty lines +- if( $line =~ /$RE{'blank'}/ ) { ++ if( $line =~ /$Mail::Procmailrc::RE{'blank'}/ ) { + redo INFO; + } + +@@ -603,8 +601,8 @@ + $line =~ s/^\s*//; + + ## check for condition +- if( $line =~ s/$RE{'condm'}/$1/ ) { +- while( $line =~ /$RE{'cont'}/ ) { ++ if( $line =~ s/$Mail::Procmailrc::RE{'condm'}/$1/ ) { ++ while( $line =~ /$Mail::Procmailrc::RE{'cont'}/ ) { + $line .= "\n"; ## tack on the newline for quoted lines + $line .= shift @$data; + } +@@ -614,12 +612,12 @@ + } + + ## check for embedded comments and skip them +- if( $line =~ /$RE{'comt'}/ ) { ++ if( $line =~ /$Mail::Procmailrc::RE{'comt'}/ ) { + redo CONDITIONS; + } + + ## check for empty lines and skip them +- if( $line =~ /$RE{'blank'}/ ) { ++ if( $line =~ /$Mail::Procmailrc::RE{'blank'}/ ) { + redo CONDITIONS; + } + +@@ -634,7 +632,7 @@ + $line =~ s/^\s*//; + + ## if contains a '{' we pass it to Procmailrc +- if( $line =~ /$RE{'blkopen'}/ ) { ++ if( $line =~ /$Mail::Procmailrc::RE{'blkopen'}/ ) { + unshift @$data, $line; + $self->action( Mail::Procmailrc->new( { 'data' => $data, + 'level' => $self->defaults('level') } )); +@@ -642,7 +640,7 @@ + + ## this is a plain old action line + else { +- while( $line =~ /$RE{'cont'}/ ) { ++ while( $line =~ /$Mail::Procmailrc::RE{'cont'}/ ) { + $line .= "\n"; + $line .= shift @$data; + } +@@ -761,7 +759,7 @@ + $pmrc = new Mail::Procmailrc("$HOME/.procmail/rc.spam"); + + ## add a new variable +- $pmrc->push( new Mail::Procmailrc::Variable("FOO=bar") ); ++ $pmrc->push( new Mail::Procmailrc::Variable(["FOO=bar"]) ); + + ## add a new recipe + $recipe =<<'_RECIPE_'; diff -ruN p5-Mail-Procmailrc.orig/pkg-plist p5-Mail-Procmailrc/pkg-plist --- p5-Mail-Procmailrc.orig/pkg-plist Fri Sep 13 10:25:03 2002 +++ p5-Mail-Procmailrc/pkg-plist Wed Feb 5 20:50:29 2003 @@ -1,5 +1,5 @@ lib/perl5/site_perl/%%PERL_VER%%/Mail/Procmailrc.pm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Procmailrc/.packlist -@unexec rmdir -f %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true +@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/Procmailrc @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true --- p5-Mail-Procmailrc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message