svn commit: r398034 - head/www/apache22

[Philip M. Gollucci]

I don't know about this.  You basically added a if exists file trigger
option.



On Sun, Sep 27, 2015 at 6:44 AM, Olli Hauer <ohauer at freebsd.org> wrote:

> Author: ohauer
> Date: Sun Sep 27 10:44:39 2015
> New Revision: 398034
> URL: https://svnweb.freebsd.org/changeset/ports/398034
>
> Log:
>   - fix poudriere build on FreeBSD >= 10.x with OpenSSL from ports
>
>   I haven't found the exact culprit but it seems build in poudriere
> behaves different.
>
>   Fix build in poudriere by inspecting MAKE_ENV, else WITH_OPENSSL_PORT is
> not honored.
>
>   Noted by: Philip Jocks <pj @ netzkommune.de>
>
> Modified:
>   head/www/apache22/Makefile
>
> Modified: head/www/apache22/Makefile
>
> ==============================================================================
> --- head/www/apache22/Makefile  Sun Sep 27 10:32:29 2015        (r398033)
> +++ head/www/apache22/Makefile  Sun Sep 27 10:44:39 2015        (r398034)
> @@ -164,14 +164,13 @@ pre-configure::
>         @${ECHO_MSG}    "  You can check your modules configuration by
> using make show-modules"
>         @${ECHO_MSG}    ""
>
> +pre-configure-SSL-on::
>  # Fix build with OpenSSL from ports
> -.if ${PORT_OPTIONS:MSSL}
> -. if ${OPSYS} == FreeBSD
> -.  if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != ""
> +.if ${OPSYS} == FreeBSD
> +. if (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "") ||
> ${MAKE_ENV:M*${LOCALBASE}/openssl*}
>         @${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
>  .endif
>
> _______________________________________________
> svn-ports-all at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
>



-- 
---------------------------------------------------------------------------------
Curb: Your ride is here
4096R/D21D2752
<http://pgp.mit.edu/pks/lookup?op=get&search=0xF699A450D21D2752> ECDF B597
B54B 7F92 753E  E0EA F699 A450 D21D 2752
Philip M. Gollucci (pgollucci at p6m7g8.com) c: 703.336.9354
Member,                           Apache Software Foundation
Committer,                        FreeBSD Foundation
Consultant,                       P6M7G8 Inc.
Sr. Director IT Operations,       Curb

What doesn't kill us can only make us stronger;
Except it almost kills you.