Date: Mon, 8 Sep 2014 01:39:09 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Olli Hauer <ohauer@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r367561 - head/Mk Message-ID: <20140907233909.GB6096@ivaldir.etoilebsd.net> In-Reply-To: <20140907223442.GA6096@ivaldir.etoilebsd.net> References: <201409071558.s87Fw5q7056440@svn.freebsd.org> <20140907223442.GA6096@ivaldir.etoilebsd.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--SkvwRMAIpAhPCcCJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 08, 2014 at 12:34:42AM +0200, Baptiste Daroussin wrote: > On Sun, Sep 07, 2014 at 03:58:05PM +0000, Olli Hauer wrote: > > Author: ohauer > > Date: Sun Sep 7 15:58:05 2014 > > New Revision: 367561 > > URL: http://svnweb.freebsd.org/changeset/ports/367561 > > QAT: https://qat.redports.org/buildarchive/r367561/ > >=20 > > Log: > > - fix build for ports defining USE_APACHE=3D22, USE_APACHE_(BUILD|RUN= )=3D22 > > =20 > > spotted by adam@ > >=20 > > Modified: > > head/Mk/bsd.apache.mk > >=20 > > Modified: head/Mk/bsd.apache.mk > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/Mk/bsd.apache.mk Sun Sep 7 15:56:30 2014 (r367560) > > +++ head/Mk/bsd.apache.mk Sun Sep 7 15:58:05 2014 (r367561) > > @@ -288,8 +288,9 @@ APACHE_MPM!=3D ${APXS} -q MPM_NAME > > . endif > > .elif defined(APACHE_PORT) > > _APACHE_VERSION!=3D ${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apac= he\([0-9]*\).*,\1,p' > > -.else > > -_APACHE_VERSION:=3D ${DEFAULT_APACHE_VERSION} > > +#.else > > +# the next line breaks ports with USE_APACHE(_RUN|_BUILD)=3D22 > > +#_APACHE_VERSION:=3D ${DEFAULT_APACHE_VERSION} > > .endif > > =20 > > .if defined(USE_APACHE) > >=20 >=20 > This breaks DEFAULT_VERSIONS=3Dapache=3D2.2 which now always default on 2= =2E4 Here is a patch that works with all cases I have been able to test: https://people.freebsd.org/~bapt/apache-version.diff Modeled a bit on Mk/Uses/lua.mk (which has the commend on why each loop :)) regards, Bapt --SkvwRMAIpAhPCcCJ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlQM7J0ACgkQ8kTtMUmk6Ew+5QCggQij4xKmtqX5R2eIFgfxXx0E UzwAnim/EJ6DYVwfEQqT456RYkrJAd9j =Wtre -----END PGP SIGNATURE----- --SkvwRMAIpAhPCcCJ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140907233909.GB6096>