Date: Mon, 8 Sep 2014 00:34:42 +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: <20140907223442.GA6096@ivaldir.etoilebsd.net> In-Reply-To: <201409071558.s87Fw5q7056440@svn.freebsd.org> References: <201409071558.s87Fw5q7056440@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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,.*/apache= \([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 This breaks DEFAULT_VERSIONS=3Dapache=3D2.2 which now always default on 2.4 regards, Bapt --9jxsPFA5p3P2qPhR Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEUEARECAAYFAlQM3YIACgkQ8kTtMUmk6EyFnACYhpNAcwX4Smk42AhphlZ9336B wwCfR8FUqf2hEKVFx2EyDY5APKpA05o= =XaPm -----END PGP SIGNATURE----- --9jxsPFA5p3P2qPhR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140907223442.GA6096>