Bug 63856

Summary: update ports/www/p5-Apache-AuthCookie to 3.05
Product: Ports & Packages Reporter: Alex Varju <varju>
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Alex Varju 2004-03-06 22:10:17 UTC 
- Update www/p5-Apache-AuthCookie port to version 3.05
- Fix build for mod_perl2
Comment 1 Mathieu Arnold freebsd_committer freebsd_triage 2004-04-01 18:03:46 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->mat

take this
Comment 2 Mathieu Arnold freebsd_committer freebsd_triage 2004-04-02 14:50:03 UTC 
Responsible Changed
From-To: mat->freebsd-ports-bugs

Give it back
Comment 3 Mark Linimon freebsd_committer freebsd_triage 2004-06-24 22:39:18 UTC 
State Changed
From-To: open->feedback

I cannot get the Makefile.PL patch to apply; can the submitter 
confirm this?
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2004-06-26 23:49:38 UTC 
State Changed
From-To: feedback->open

Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=63856 

Adding to audit trail from private email:

Sorry about that.  Here is a better version of the patch:

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	26 Jun 2004 22:34:22 -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,9 +15,14 @@
  MAINTAINER=	ports@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}
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+.if defined(WITH_MODPERL2)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
+.else
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
+.endif
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test

  CURUSER?=	`whoami`
  CURGRP?=	`groups | ${AWK} '{print $$1}'`
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	26 Jun 2004 22:09:01 -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	26 Jun 2004 22:09:01 -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 Jun 26 15:33:01 2004
+++ ports/www/p5-Apache-AuthCookie/files/patch-Makefile.PL	Sat Jun 26 15:29:12 2004
@@ -0,0 +1,10 @@
+--- 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
+     };
Comment 5 Sergey Matveychuk freebsd_committer freebsd_triage 2004-09-02 07:22:28 UTC 
State Changed
From-To: open->closed

Committed, thanks! 
Please, specify files you're added and deleted.