5 files changed, 138 insertions, 9 deletions

diff --git a/mail/p5-Mail-Procmailrc/Makefile b/mail/p5-Mail-Procmailrc/Makefile
index 1ea097f2b873..746a44a80de6 100644
--- a/mail/p5-Mail-Procmailrc/Makefile
+++ b/mail/p5-Mail-Procmailrc/Makefile
@@ -8,20 +8,19 @@
 
 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
+COMMENT=	A Perl OO interface to procmail rc files
 
 PERL_CONFIGURE=	YES
 
-.include <bsd.port.pre.mk>
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		Mail::Procmailrc.3
 
-.if ${PERL_LEVEL} < 500600
-BROKEN=		This port requires perl 5.6.0
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-Procmailrc/files/patch-Makefile.PL b/mail/p5-Mail-Procmailrc/files/patch-Makefile.PL
new file mode 100644
index 000000000000..0b6bb642c688
--- /dev/null
+++ b/mail/p5-Mail-Procmailrc/files/patch-Makefile.PL
@@ -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 --git a/mail/p5-Mail-Procmailrc/files/patch-Procmailrc.pm b/mail/p5-Mail-Procmailrc/files/patch-Procmailrc.pm
new file mode 100644
index 000000000000..3171f5ac3c88
--- /dev/null
+++ b/mail/p5-Mail-Procmailrc/files/patch-Procmailrc.pm
@@ -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 --git a/mail/p5-Mail-Procmailrc/pkg-comment b/mail/p5-Mail-Procmailrc/pkg-comment
deleted file mode 100644
index 60ebd9eb7a13..000000000000
--- a/mail/p5-Mail-Procmailrc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl OO interface to procmail rc files
diff --git a/mail/p5-Mail-Procmailrc/pkg-plist b/mail/p5-Mail-Procmailrc/pkg-plist
index 07878168b1da..1d7c97944e16 100644
--- a/mail/p5-Mail-Procmailrc/pkg-plist
+++ b/mail/p5-Mail-Procmailrc/pkg-plist
@@ -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