From owner-svn-ports-head@FreeBSD.ORG Thu Apr 10 21:00:00 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C99523A2 for ; Thu, 10 Apr 2014 21:00:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB97513C4 for ; Thu, 10 Apr 2014 21:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AL001b026413 for ; Thu, 10 Apr 2014 21:00:00 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3AL00RC026407 for svn-ports-head@freebsd.org; Thu, 10 Apr 2014 21:00:00 GMT (envelope-from bdrewery) Received: (qmail 83125 invoked from network); 10 Apr 2014 15:59:58 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 10 Apr 2014 15:59:58 -0500 Message-ID: <53470649.9000808@FreeBSD.org> Date: Thu, 10 Apr 2014 15:59:53 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Olli Hauer , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r350852 - head/www/apache22 References: <201404102057.s3AKvavX033606@svn.freebsd.org> In-Reply-To: <201404102057.s3AKvavX033606@svn.freebsd.org> X-Enigmail-Version: 1.6 OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="1cCnpoiHki66W0Dogsl4SIV2jh6s1D5wX" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 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: Thu, 10 Apr 2014 21:00:00 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --1cCnpoiHki66W0Dogsl4SIV2jh6s1D5wX Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 4/10/2014 3:57 PM, Olli Hauer wrote: > Author: ohauer > Date: Thu Apr 10 20:57:35 2014 > New Revision: 350852 > URL: http://svnweb.freebsd.org/changeset/ports/350852 > QAT: https://qat.redports.org/buildarchive/r350852/ >=20 > Log: > - fix build against security/openssl on FreeBSD-10 > in case port is build with tinderbox or poudriere. > =20 > openssl is registered as BUILD/RUN dependency not > as LIB dependency, therefore the check for openssl > fails since it will be installed in a later stage > by tinderbox / poudriere. > =20 > Thanks to Katsuya Higuchi who noted this issue on > the apache@ mailing list. > http://lists.freebsd.org/pipermail/freebsd-apache/2014-April/003490.h= tml > =20 > MFH: 2014Q2 > =20 > Submitted by: Katsuya Higuchi >=20 Commit doesn't match description or link. > Modified: > head/www/apache22/Makefile >=20 > Modified: head/www/apache22/Makefile > =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/www/apache22/Makefile Thu Apr 10 20:56:47 2014 (r350851) > +++ head/www/apache22/Makefile Thu Apr 10 20:57:35 2014 (r350852) > @@ -2,7 +2,7 @@ > =20 > PORTNAME=3D apache22 > PORTVERSION=3D 2.2.27 > -PORTREVISION?=3D 1 > +PORTREVISION?=3D 2 > CATEGORIES=3D www ipv6 > MASTER_SITES=3D ${MASTER_SITE_APACHE_HTTPD} > DISTNAME=3D httpd-${PORTVERSION} > @@ -123,11 +123,6 @@ IGNORE=3D suEXEC UserDir patch requires m > .include > .include "${APACHEDIR}/Makefile.modules" > =20 > -pre-configure:: > - @${ECHO_MSG} "" > - @${ECHO_MSG} " You can check your modules configuration by using mak= e show-modules" > - @${ECHO_MSG} "" > - > show-options: > @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc > =20 > @@ -149,10 +144,17 @@ post-patch: > @${RM} -rf ${WRKSRC}/srclib > @${REINPLACE_CMD} -e 's/srclib//' ${WRKSRC}/Makefile.in > =20 > +pre-configure:: > + @${ECHO_MSG} "" > + @${ECHO_MSG} " You can check your modules configuration by using mak= e show-modules" > + @${ECHO_MSG} "" > + > # Fix build on FreeBSD-10+ with OpenSSL from ports > .if ${PORT_OPTIONS:MSSL} > . if ${OPSYS} =3D=3D FreeBSD && ${OSVERSION} > 1000000 > . if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} !=3D "" > + @${ECHO_MSG} "=3D=3D=3D> apply fix for FreeBSD-${OSREL} (${OSVERSION= }) for usage with ${OPENSSL_INSTALLED}" > + @${ECHO_MSG} "" > ${REINPLACE_CMD} -e "s|(ALL_CFLAGS)|(ALL_CFLAGS) -L${OPENSSLLIB}|" ${= WRKSRC}/build/rules.mk.in > . endif > . endif >=20 --=20 Regards, Bryan Drewery --1cCnpoiHki66W0Dogsl4SIV2jh6s1D5wX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTRwZJAAoJEDXXcbtuRpfPLz8H/itYJKiu4ym5CDjTHhLS0U3H dZ3Diewb5ZN6DAf5t3UsebLbOkmQK9fbzfCq59q3Y5vYb5cMfK1QUjHFZakctEAU pa3XBGzgCY/CH9Mhq1g742oWQZjttOV4JK63jbwSsWy9lnHK1kl1lnNjLoiQDyqf x1mT9e+C+E/JRred+0Lj4anCsS2h4j+oTYm5ll+UpRybQmVLb9zFavOtt2N9byeb aiKZciysfRoisbUDpk0o9Qk7WCmylwKUOrM0iZzHBcdZfwbG7IDxFqgW+/xIHVll hv99GXR7QJHV0vW/nb5trzvO7sgOC/+5lraF1uvDOgyYhlZ9Y19IN57LxWtZ5p4= =PBWM -----END PGP SIGNATURE----- --1cCnpoiHki66W0Dogsl4SIV2jh6s1D5wX--