5 files changed, 14 insertions, 36 deletions

diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 17df60cfc3bc..96a114d493b0 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Apache-AuthCookie
-PORTVERSION=	2.011
-PORTREVISION=	1
+PORTVERSION=	3.04
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
diff --git a/www/p5-Apache-AuthCookie/distinfo b/www/p5-Apache-AuthCookie/distinfo
index 3786fec690c6..63fa2abbe645 100644
--- a/www/p5-Apache-AuthCookie/distinfo
+++ b/www/p5-Apache-AuthCookie/distinfo
@@ -1 +1 @@
-MD5 (Apache-AuthCookie-2.011.tar.gz) = b4617ac3ed237e2ae5123e9c7756fc82
+MD5 (Apache-AuthCookie-3.04.tar.gz) = 7bf9d7b7cc74f22d48c4f598adcd3bfb
diff --git a/www/p5-Apache-AuthCookie/files/patch-Makefile.PL b/www/p5-Apache-AuthCookie/files/patch-Makefile.PL
deleted file mode 100644
index 8bb7a67c0794..000000000000
--- a/www/p5-Apache-AuthCookie/files/patch-Makefile.PL
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.PL	Sat Apr 15 10:15:32 2000
-+++ Makefile.PL.new	Mon Jan  1 02:51:49 2001
-@@ -4,14 +4,20 @@
- 
- my $default = $ENV{'APACHE'} || '/usr/lib/httpd/httpd';
- $|=1;
-+if ("" ne "") {
- print("\nFor testing purposes, please give the full path to an httpd\n",
-       "with mod_perl and at least the following hooks enabled: PERL_AUTHEN,\n",
-       "PERL_AUTHZ, PERL_STACKED_HANDLERS, PERL_METHOD_HANDLERS.\n",
-       "The path defaults to \$ENV{APACHE}, if present.\n",
-      );
--
-+}
- my %conf;
-+$conf{httpd} = "/usr/local/sbin/apache"; $conf{httpd} = $ENV{'APACHE'} if ($ENV{'APACHE'} ne "");
-+$conf{user} = "nobody"; $conf{user} = $ENV{'TESTUSER'} if ($ENV{'TESTUSER'} ne "");
-+$conf{group} = "nobody"; $conf{group} = $ENV{'TESTGRP'} if ($ENV{'TESTGRP'} ne "");
-+$conf{port} = 8228; $conf{port} = $ENV{'TESTPORT'} if ($ENV{'TESTPORT'} ne "");
- 
-+if ("" ne "") {
- do {
-   print "\n [$default]: ";
-   chomp ($conf{httpd} = <STDIN>);
-@@ -32,7 +38,7 @@
- print "Port to run tests under [$default]: ";
- chomp ($conf{port} = <STDIN>);
- $conf{port} ||= $default;
--
-+}
- 
- open LOC, ">t/httpd.loc" or die "can't write t/httpd.loc: $!";
- print LOC map {"$_=$conf{$_}\n"} keys %conf;
diff --git a/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm b/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm
new file mode 100644
index 000000000000..72a281022116
--- /dev/null
+++ b/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm
@@ -0,0 +1,10 @@
+--- t/lib/Apache/test.pm.orig	Sun Mar 25 20:35:03 2001
++++ t/lib/Apache/test.pm	Fri Jun  6 05:14:49 2003
+@@ -102,6 +102,7 @@
+ 
+ sub get_test_params {
+     my $pkg = shift;
++return;
+ 
+     print("\nFor testing purposes, please give the full path to an httpd\n",
+ 	  "with mod_perl enabled.  The path defaults to \$ENV{APACHE}, if present.");
diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist
index cd6d9fc63769..27577d6136b6 100644
--- a/www/p5-Apache-AuthCookie/pkg-plist
+++ b/www/p5-Apache-AuthCookie/pkg-plist
@@ -1,4 +1,6 @@
 lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie.pm
+lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie/Util.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Apache/AuthCookie
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/AuthCookie
 @unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Apache 2>/dev/null || true