Date: Thu, 10 Apr 2014 20:57:36 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350852 - head/www/apache22 Message-ID: <201404102057.s3AKvavX033606@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/ Log: - fix build against security/openssl on FreeBSD-10 in case port is build with tinderbox or poudriere. 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. Thanks to Katsuya Higuchi who noted this issue on the apache@ mailing list. http://lists.freebsd.org/pipermail/freebsd-apache/2014-April/003490.html MFH: 2014Q2 Submitted by: Katsuya Higuchi <higuchi@jt-sys.co.jp> Modified: head/www/apache22/Makefile Modified: head/www/apache22/Makefile ============================================================================== --- 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 @@ PORTNAME= apache22 PORTVERSION= 2.2.27 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -123,11 +123,6 @@ IGNORE= suEXEC UserDir patch requires m .include <bsd.port.pre.mk> .include "${APACHEDIR}/Makefile.modules" -pre-configure:: - @${ECHO_MSG} "" - @${ECHO_MSG} " You can check your modules configuration by using make show-modules" - @${ECHO_MSG} "" - show-options: @${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc @@ -149,10 +144,17 @@ post-patch: @${RM} -rf ${WRKSRC}/srclib @${REINPLACE_CMD} -e 's/srclib//' ${WRKSRC}/Makefile.in +pre-configure:: + @${ECHO_MSG} "" + @${ECHO_MSG} " You can check your modules configuration by using make show-modules" + @${ECHO_MSG} "" + # Fix build on FreeBSD-10+ with OpenSSL from ports .if ${PORT_OPTIONS:MSSL} . if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 . if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" + @${ECHO_MSG} "===> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404102057.s3AKvavX033606>