From ohauer@FreeBSD.org  Wed Mar  2 23:13:57 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 208CF1065674;
	Wed,  2 Mar 2011 23:13:57 +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 CAF178FC22;
	Wed,  2 Mar 2011 23:13:56 +0000 (UTC)
Message-Id: <20110302231357.208CF1065674@hub.freebsd.org>
Date: Thu,  3 Mar 2011 00:13:51 +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-Bundle-Sledge fix depends if apache22 is default
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         155216
>Category:       ports
>Synopsis:       [patch] port www/p5-Bundle-Sledge fix depends 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:   Wed Mar 02 23:20:05 UTC 2011
>Closed-Date:    Wed Mar 30 13:28:32 UTC 2011
>Last-Modified:  Wed Mar 30 13:28:32 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 p5-libapreq 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-Bundle-Slash-2.52_3.log

>Fix:

--- p5-Bundle-Sledge.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Bundle-Sledge/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	25 Dec 2009 00:33:23 -0000	1.15
+++ Makefile	2 Mar 2011 23:07:05 -0000
@@ -18,7 +18,14 @@
 BUILD_DEPENDS=	${PM_DEPENDS}
 RUN_DEPENDS=	${PM_DEPENDS}
 
+USE_APACHE=	13+
+.include <bsd.port.pre.mk>
+
+.if ${APACHE_VERSION} == 13
 PM_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
+.else
+PM_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache2/Request.pm:${PORTSDIR}/www/p5-libapreq2
+.endif
 PM_DEPENDS+=	${SITE_PERL}/Apache/Reload.pm:${PORTSDIR}/www/p5-Apache-Reload
 PM_DEPENDS+=	${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline
 PM_DEPENDS+=	${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert
@@ -45,4 +52,4 @@
 
 JCODE=	${SITE_PERL}/Jcode.pm
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/p5-Bundle-Sledge/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	19 Feb 2006 10:47:06 -0000	1.5
+++ distinfo	2 Mar 2011 23:07:05 -0000
@@ -1,3 +1,2 @@
-MD5 (Bundle-Sledge-0.04.tar.gz) = 487e4b67139595f71ef936034f8448b9
 SHA256 (Bundle-Sledge-0.04.tar.gz) = 454a503cc9060df664de00e6db701275904a7f4befa99fcc136e119093861282
 SIZE (Bundle-Sledge-0.04.tar.gz) = 2108
--- p5-Bundle-Sledge.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Mar 2 23:20:27 UTC 2011 
Responsible-Changed-Why:  
perl@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155216 
Responsible-Changed-From-To: perl->ohauer 
Responsible-Changed-By: ohauer 
Responsible-Changed-When: Wed Mar 2 23:23:32 UTC 2011 
Responsible-Changed-Why:  
I'll take it 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155216: commit references a PR
Date: Wed,  2 Mar 2011 23:26:56 +0000 (UTC)

 ohauer      2011-03-02 23:26:47 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/p5-Bundle-Sledge Makefile distinfo 
   Log:
    - fix depends if apache22 is the default
    - remove MD5 from distinfo
    - followup for PR ports/147009 [1]
   
   PR:             ports/155216 ports/147009 [1]
   Submitted by:   ohauer
   
   Revision  Changes    Path
   1.16      +8 -1      ports/www/p5-Bundle-Sledge/Makefile
   1.6       +0 -1      ports/www/p5-Bundle-Sledge/distinfo
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: ohauer 
State-Changed-When: Wed Mar 30 13:27:36 UTC 2011 
State-Changed-Why:  
Committed, but forgot to close the PR. Done NOW 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155216 
>Unformatted:
