From owner-svn-ports-head@FreeBSD.ORG Sun Sep 7 22:34:48 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 7B0686D4; Sun, 7 Sep 2014 22:34:48 +0000 (UTC) Received: from mail-wg0-x232.google.com (mail-wg0-x232.google.com [IPv6:2a00:1450:400c:c00::232]) (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 912C81578; Sun, 7 Sep 2014 22:34:47 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id x13so2417695wgg.9 for ; Sun, 07 Sep 2014 15:34:45 -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=bOa26GQxfzwPTTQ35ymvdz35PF0nwVTwhQPGTjuS2Ss=; b=VRBY5cRshBhmd2R0lNNgP6b08NGcwbdfTSs1oJK9hpHl579LyZRmwECKYUBjEW3CKv S5Q6m99DHnl7X4XI7DCF3uejLOjTtShTvWLl9YyOwodW6IiCqayPyFTv9oV3Tu2aqNhR dleseTfXrN3L1FFforDthTybENQ/f1e4CoitBu/a7wrl2TVZbNbaKqj3sWGf6a+F0W46 yQQx9TZrhnFIV0k4GBj2ToGM+NaO9P3mEREqKvDKrx2aftCXokR3pd+iDnsIsL74lD62 zoipWG1BAU5IU+uJtWsCef8iuPGG1xYR3YkhHp+MkLH5WQX9bEjlc41oepnm2eP/4cIX WFkA== X-Received: by 10.180.36.165 with SMTP id r5mr18522748wij.73.1410129285744; Sun, 07 Sep 2014 15:34:45 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id s14sm9639403wik.23.2014.09.07.15.34.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Sep 2014 15:34:44 -0700 (PDT) Sender: Baptiste Daroussin Date: Mon, 8 Sep 2014 00:34:42 +0200 From: Baptiste Daroussin To: Olli Hauer Subject: Re: svn commit: r367561 - head/Mk Message-ID: <20140907223442.GA6096@ivaldir.etoilebsd.net> References: <201409071558.s87Fw5q7056440@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9jxsPFA5p3P2qPhR" Content-Disposition: inline In-Reply-To: <201409071558.s87Fw5q7056440@svn.freebsd.org> 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 22:34:48 -0000 --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--