[patch] port www/p5-Apache-AuthCookie depends on wrong mod_perl if apache22 is default

[Philip M. Gollucci]

'approved'

On 2/18/2011 8:11 PM, olli hauer wrote:
>> Submitter-Id:	current-users
>> Originator:	Olli Hauer
>> Organization:
>> Confidential:	no
>> Synopsis:	[patch] port www/p5-Apache-AuthCookie depends on wrong mod_perl if apache22 is default
>> Severity:	non-critical
>> Priority:	low
>> Category:	ports
>> Class:		change-request
>> Release:
>> 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 at 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 ---
> 
> 
> _______________________________________________
> freebsd-perl at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-perl
> To unsubscribe, send any mail to "freebsd-perl-unsubscribe at freebsd.org"
> 


-- 
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci at 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.