diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2014-04-10 20:57:35 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2014-04-10 20:57:35 +0000 |
| commit | 876883a3500d9bf21cc4c0d44261db40149f9d72 (patch) | |
| tree | 0402d58091e2b9273efe0b7e283e9b85efbafaf5 /www | |
| parent | Unbreak post-install in case of !DBUS after r349157. (diff) | |
- 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>
Notes
Notes:
svn path=/head/; revision=350852
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache22/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index db1cf7116a29..55d629f8ca14 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -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 mod_suexec.\ .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 |