Date: Fri, 28 Jul 2006 07:57:42 GMT From: skv@FreeBSD.org To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/100967: [PATCH] bsd.apache.mk: allow use private APACHE_PORT Message-ID: <200607280757.k6S7vgt5041255@freefall.freebsd.org> Resent-Message-ID: <200607280800.k6S80cv1041360@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100967
>Category: ports
>Synopsis: [PATCH] bsd.apache.mk: allow use private APACHE_PORT
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 28 08:00:37 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Sergey Skvortsov
>Release: FreeBSD 6.1-STABLE i386
>Organization:
<Organization of PR author (multiple lines)>
>Environment:
<Relevant environment information (multiple lines)>
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607280757.k6S7vgt5041255>