From owner-svn-ports-head@FreeBSD.ORG Sun Sep 7 23:39:15 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83A2CFB5; Sun, 7 Sep 2014 23:39:15 +0000 (UTC) Received: from mail-wg0-x22e.google.com (mail-wg0-x22e.google.com [IPv6:2a00:1450:400c:c00::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A12E51BAD; Sun, 7 Sep 2014 23:39:14 +0000 (UTC) Received: by mail-wg0-f46.google.com with SMTP id n12so2941819wgh.5 for ; Sun, 07 Sep 2014 16:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=9O7wywhrX4AHgMVP7pcxYpBjv7F550BqOKZNcwmpOMQ=; b=zKWqg6IcyK5tvqTzrVgHA3TRWWmAm74BNA3LYn2kTQ4UVziGcf/7cK7bKVq5ODFlC0 YVIWLLsDPT1Y9f2wD3iV76kG6vt8Sgf6MrgDeWmC8/jCNH/bcZI4wAZVhP81FJLNg1Zh oCKUQNgGM+8iZRcVgSTqI8HzdR3V/LjSQFTLef+J5N9yrRVlB1ZW07mU6eo+WQXGXX2f deXe8VmD/FQHVsMxl5ugMBdJY6NbpLWtWcRosv1MhxRDeujwJEoUlr6JsJyBYQ1uvIal nVmWOSyn5F8DYIAViTTKivGHACZw8fdKESZfKWXuaNoTYzj5WtaaEJO85LLsg9BQeuAg FCrQ== X-Received: by 10.180.98.97 with SMTP id eh1mr18239670wib.14.1410133152844; Sun, 07 Sep 2014 16:39:12 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id fh5sm9781193wib.5.2014.09.07.16.39.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Sep 2014 16:39:11 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 8 Sep 2014 01:39:09 +0200 From: Baptiste Daroussin To: Olli Hauer Subject: Re: svn commit: r367561 - head/Mk Message-ID: <20140907233909.GB6096@ivaldir.etoilebsd.net> References: <201409071558.s87Fw5q7056440@svn.freebsd.org> <20140907223442.GA6096@ivaldir.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SkvwRMAIpAhPCcCJ" Content-Disposition: inline In-Reply-To: <20140907223442.GA6096@ivaldir.etoilebsd.net> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Sep 2014 23:39:15 -0000 --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--