Date: Thu, 10 Apr 2014 15:59:53 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Olli Hauer <ohauer@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r350852 - head/www/apache22 Message-ID: <53470649.9000808@FreeBSD.org> In-Reply-To: <201404102057.s3AKvavX033606@svn.freebsd.org> References: <201404102057.s3AKvavX033606@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <higuchi@jt-sys.co.jp> >=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 <bsd.port.pre.mk> > .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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53470649.9000808>