From skv@FreeBSD.org  Fri Jul 28 07:57:43 2006
Return-Path: <skv@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4912D16A4DA
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Jul 2006 07:57:43 +0000 (UTC)
	(envelope-from skv@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 141FB43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Jul 2006 07:57:43 +0000 (GMT)
	(envelope-from skv@FreeBSD.org)
Received: from freefall.freebsd.org (skv@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6S7vgl2041256
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 28 Jul 2006 07:57:42 GMT
	(envelope-from skv@freefall.freebsd.org)
Received: (from skv@localhost)
	by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6S7vgt5041255;
	Fri, 28 Jul 2006 07:57:42 GMT
	(envelope-from skv)
Message-Id: <200607280757.k6S7vgt5041255@freefall.freebsd.org>
Date: Fri, 28 Jul 2006 07:57:42 GMT
From: skv@freebsd.org
Reply-To: skv@freebsd.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] bsd.apache.mk: allow use private APACHE_PORT
X-Send-Pr-Version: 3.2

>Number:         100967
>Category:       ports
>Synopsis:       [PATCH] bsd.apache.mk: allow use private APACHE_PORT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    clement
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 28 08:00:37 GMT 2006
>Closed-Date:    Tue Sep 18 19:26:49 GMT 2007
>Last-Modified:  Tue Sep 18 19:26:49 GMT 2007
>Originator:     Sergey Skvortsov
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
<Organization of PR author (multiple lines)>
>Environment:
>Description:

For example, we have "vendor/apache-special", based on Apache 2.2.

Offered patch allows to enforce that all packages with USE_APACHE will be
depended on "vendor/apache-special" just by adding two lines to
"/etc/make.conf": 

APACHE_PORT=	vendor/apache-special
APACHE_VERSION=	22

or, if we follow apache ports naming tradition:

APACHE_PORT=	vendor/apache22

Of course we can enforce use standard port:

APACHE_PORT=	www/apache22

>How-To-Repeat:
>Fix:

Index: bsd.apache.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.apache.mk,v
retrieving revision 1.12
diff -u -r1.12 bsd.apache.mk
--- bsd.apache.mk	20 Jun 2006 04:58:12 -0000	1.12
+++ bsd.apache.mk	28 Jul 2006 07:44:58 -0000
@@ -271,7 +271,9 @@
 APACHE_MPM!=		${APXS} -q MPM_NAME
 .   endif 	
 .elif defined(APACHE_PORT)
+.   if !defined(APACHE_VERSION)
 AP_CUR_VERSION!=	${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
+.   endif
 .endif
 
 .if defined(AP_CUR_VERSION)
@@ -303,13 +305,13 @@
 APACHEMODDIR=	libexec/apache2
 APACHEINCLUDEDIR=include/apache2
 APACHEETCDIR=	etc/apache2
-APACHE_PORT=	www/apache${APACHE_VERSION}
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .elif ${APACHE_VERSION} >= 21
 AP_BUILDEXT=	la
 APACHEMODDIR=	libexec/apache${APACHE_VERSION}
 APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHEETCDIR=	etc/apache${APACHE_VERSION}
-APACHE_PORT=	www/apache${APACHE_VERSION}
+APACHE_PORT?=	www/apache${APACHE_VERSION}
 .else
 AP_BUILDEXT=	so
 APACHEMODDIR=	libexec/apache
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: skv 
Responsible-Changed-When: Fri Jul 28 08:08:38 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer(s) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100967 
Responsible-Changed-From-To: portmgr->clement 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Feb 6 22:12:37 UTC 2007 
Responsible-Changed-Why:  
Actually, clement maintains bsd.apache.mk. 

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

From: Sergey Skvortsov <skv@FreeBSD.org>
To: bug-followup@FreeBSD.org,  skv@freebsd.org
Cc:  
Subject: Re: ports/100967: [PATCH] bsd.apache.mk: allow use private APACHE_PORT
Date: Tue, 18 Sep 2007 17:40:20 +0400

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Hi.
 
 Could you please review and(?) commit this patch?
 
 Thanks.
 
 - --
 Sergey Skvortsov
 mailto: skv@FreeBSD.org
 -----BEGIN PGP SIGNATURE-----
 
 iD8DBQFG79VERInQ7WebgRkRAp71AJ9sUxLlewEJXKb7gMjMRH4rpprmzQCeJjx+
 VFPq6s106FCqHo9meWNcOUg=
 =t+95
 -----END PGP SIGNATURE-----
State-Changed-From-To: open->closed 
State-Changed-By: clement 
State-Changed-When: Tue Sep 18 19:23:42 UTC 2007 
State-Changed-Why:  
Hi, 

It was "a bug" of first release of bsd.apache.mk 
I committed the fix (which was exactly your patch) in rev 1.15. 
I forgot to close the PR, sorry. 

Thanks for the reminder and sorry for the late reply. 

clem 


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