ports/63856: update ports/www/p5-Apache-AuthCookie to 3.05

[Alex Varju]

>Number:         63856
>Category:       ports
>Synopsis:       update ports/www/p5-Apache-AuthCookie to 3.05
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 06 14:10:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Alex Varju
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
WebCT
>Environment:
System: FreeBSD alex.madd.tnmc.ca 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Tue Mar 2 22:25:19 PST 2004 varju at alex.madd.tnmc.ca:/home/freebsd/obj/home/freebsd/src.HEAD/sys/ALEX i386
>Description:
- Update www/p5-Apache-AuthCookie port to version 3.05
- Fix build for mod_perl2

>How-To-Repeat:
>Fix:

Index: ports/www/p5-Apache-AuthCookie/Makefile
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/p5-Apache-AuthCookie/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- ports/www/p5-Apache-AuthCookie/Makefile	7 Nov 2003 09:12:57 -0000	1.12
+++ ports/www/p5-Apache-AuthCookie/Makefile	6 Mar 2004 20:09:32 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Apache-AuthCookie
-PORTVERSION=	3.04
+PORTVERSION=	3.05
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
@@ -15,8 +15,12 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A perl module to provide custom forms for reauthentication
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
-		${APXS}:${PORTSDIR}/${APACHE_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+.if defined(WITH_MODPERL2)
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
+.else
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+.endif
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CURUSER?=	`whoami`
Index: ports/www/p5-Apache-AuthCookie/distinfo
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/p5-Apache-AuthCookie/distinfo,v
retrieving revision 1.3
diff -u -u -r1.3 distinfo
--- ports/www/p5-Apache-AuthCookie/distinfo	29 Jan 2004 16:12:24 -0000	1.3
+++ ports/www/p5-Apache-AuthCookie/distinfo	6 Mar 2004 20:03:48 -0000
@@ -1,2 +1,2 @@
-MD5 (Apache-AuthCookie-3.04.tar.gz) = 7bf9d7b7cc74f22d48c4f598adcd3bfb
-SIZE (Apache-AuthCookie-3.04.tar.gz) = 29851
+MD5 (Apache-AuthCookie-3.05.tar.gz) = 4288575a1eedb52b2fb774324cd63ec8
+SIZE (Apache-AuthCookie-3.05.tar.gz) = 31025
Index: ports/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm,v
retrieving revision 1.1
diff -u -u -r1.1 patch-t::lib::Apache::test.pm
--- ports/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm	6 Jun 2003 12:18:45 -0000	1.1
+++ ports/www/p5-Apache-AuthCookie/files/patch-t::lib::Apache::test.pm	6 Mar 2004 20:04:25 -0000
@@ -1,10 +0,0 @@
---- 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.");
Index: ports/www/p5-Apache-AuthCookie/files/patch-Makefile.PL
===================================================================
--- /dev/null	Sat Mar  6 12:24:41 2004
+++ ports/www/p5-Apache-AuthCookie/files/patch-Makefile.PL	Sat Mar  6 12:23:50 2004
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig	Fri Aug  1 17:10:09 2003
++++ Makefile.PL	Sat Mar  6 12:23:30 2004
+@@ -89,6 +89,7 @@
+ }
+ 
+ sub mod_perl_version {
++    eval { require Apache2 };
+     eval {
+         require mod_perl
+     };

>Release-Note:
>Audit-Trail:
>Unformatted: