diff options
author | pgollucci <pgollucci@FreeBSD.org> | 2010-05-26 04:17:37 +0800 |
---|---|---|
committer | pgollucci <pgollucci@FreeBSD.org> | 2010-05-26 04:17:37 +0800 |
commit | ed479ecfa1bf3c8639f00ee2604be504c6171de1 (patch) | |
tree | a49f44fffb995e0175cb118a77aeb906fba32a53 /Mk | |
parent | bfed6084eddefc820801dfd6e14e3e7f30096aa0 (diff) | |
download | freebsd-ports-gnome-ed479ecfa1bf3c8639f00ee2604be504c6171de1.tar.gz freebsd-ports-gnome-ed479ecfa1bf3c8639f00ee2604be504c6171de1.tar.zst freebsd-ports-gnome-ed479ecfa1bf3c8639f00ee2604be504c6171de1.zip |
Mk/bsd.apache.mk can not sufficiently alter things before Mk/bsd.options.mk
in Mk/bsd.ports.mk due to ordering in Mk/bsd.port.mk. This causes OPTIONSFILE
to be incorrectly set during some make phases as a result of the recent
PKGNAMEPREFIX for apache ports.
'Revert' some of the PKGNAMEPREFIX changes for apXX-.
- Must be manually requested in tbe port Makefile either by
a) AP_FAST_BUILD=yes
b) PKGNAMEPREFIX=${APACHE_PKGNAMEPREFIX}
- Going forward, we will only do this for ports where WITH_APACHE
is NOT optional, but required. mod_* ports are a good fit.
141 ports are mod_ ports
80 of those use AP_FAST_BUILD and thus are auto hooked by this patch [a].
61 remaining are then patched to mirror the other $lang frameworks [b].
PR: ports/146956
Reported by: Hans F. Nordhaug <Hans.F.Nordhaug@hiMolde.no>, several
Discussed with: pav, itectu on #bsdports
Tested by: P6 TB run
Approved by: portmgr (pav)
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.apache.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index b8cd6d68c4cd..33b18d458f05 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -302,7 +302,10 @@ ${VAR} =${AP${APACHE_VERSION}_${VAR}} . endif .endfor -PKGNAMEPREFIX?= ap${APACHE_VERSION}- +APACHE_PKGNAMEPREFIX= $ap${APACHE_VERSION}- +.if defined(AP_FAST_BUILD) +PKGNAMEPREFIX?= ${APACHE_PKGNAMEPREFIX} +.endif BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} |