From ohauer@FreeBSD.org  Sat Feb 19 01:11:30 2011
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E6F01065673;
	Sat, 19 Feb 2011 01:11:30 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from u18-124.dslaccess.de (unknown [194.231.39.124])
	by mx1.freebsd.org (Postfix) with ESMTP id 42AB88FC14;
	Sat, 19 Feb 2011 01:11:30 +0000 (UTC)
Message-Id: <20110219011130.8E6F01065673@hub.freebsd.org>
Date: Sat, 19 Feb 2011 02:11:28 +0100 (CET)
From: olli hauer <ohauer@FreeBSD.org>
Reply-To: olli hauer <ohauer@FreeBSD.org>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc: <ohauer@FreeBSD.org>
Subject: [patch] port www/p5-Apache-AuthCookie depends on wrong mod_perl if apache22 is default
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         154871
>Category:       ports
>Synopsis:       [patch] port www/p5-Apache-AuthCookie depends on wrong mod_perl if apache22 is default
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 19 01:20:11 UTC 2011
>Closed-Date:    Mon Feb 21 23:11:25 UTC 2011
>Last-Modified:  Mon Feb 21 23:20:09 UTC 2011
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:


>Description:
If the port is build on a fresh system where apache22 is the default 
it choose the wrong mod_perl version

Note: Apache22 will be the default in near time.

>How-To-Repeat:
Build the port against apache22

Reference: 
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147009
http://pointyhat.freebsd.org/errorlogs/amd64-errorlogs/a.8-exp.20110129080700/p5-Apache-AuthCookie-3.15.log

>Fix:

--- p5-Apache-AuthCookie.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Apache-AuthCookie/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	17 Dec 2010 20:16:44 -0000	1.24
+++ Makefile	18 Feb 2011 23:41:13 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	Apache-AuthCookie
 PORTVERSION=	3.15
+PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,15 +15,16 @@
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A perl module to provide custom forms for reauthentication
 
-.if defined(WITH_MODPERL2)
+USE_APACHE=	13+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_MODPERL2) || ${APACHE_VERSION} > 13
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
-USE_APACHE=	2.0+
 .else
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
-USE_APACHE=	1.3
 .endif
 
 CURUSER?=	`whoami`
@@ -36,4 +38,4 @@
 
 MAN3=		Apache::AuthCookie.3 Apache2::AuthCookie.3 Apache::AuthCookie::Util.3 Apache::AuthCookie::FAQ.3
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- p5-Apache-AuthCookie.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Feb 19 01:20:23 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

Date: Fri, 18 Feb 2011 22:39:41 -0500
From: "Philip M. Gollucci" <pgollucci@p6m7g8.com>
To: olli hauer <ohauer@freebsd.org>
Subject: Re: [patch] port www/p5-Apache-AuthCookie depends on wrong mod_perl if apache22 is default

 'approved'
 
 -- 
 ------------------------------------------------------------------------
 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
 Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
 VP Apache Infrastructure; Member, Apache Software Foundation
 Committer,                        FreeBSD Foundation
 Consultant,                       P6M7G8 Inc.
 Sr. System Admin,                 Ridecharge Inc.
 
 Work like you don't need the money,
 love like you'll never get hurt,
 and dance like nobody's watching.
Responsible-Changed-From-To: perl->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Mon Feb 21 22:31:38 UTC 2011 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154871 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Mon Feb 21 23:11:03 UTC 2011 
State-Changed-Why:  
Committed 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154871: commit references a PR
Date: Mon, 21 Feb 2011 23:10:58 +0000 (UTC)

 ohauer      2011-02-21 23:10:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/p5-Apache-AuthCookie Makefile 
   Log:
   - add additional check for APACHE_VERSION, else
     the port will build wrong if MODPERL2 is not
     defined amd apache20 or apache22 is the default.
   - no PORTREVISION bump!
   
   PR:             ports/154871
   Submitted by:   myself
   Approved by:    pgollucci
   
   Revision  Changes    Path
   1.25      +5 -4      ports/www/p5-Apache-AuthCookie/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
