From owner-svn-ports-all@freebsd.org Sun Sep 27 18:30:53 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56F49A0AECC for ; Sun, 27 Sep 2015 18:30:53 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from mail-ig0-f169.google.com (mail-ig0-f169.google.com [209.85.213.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28FDF773 for ; Sun, 27 Sep 2015 18:30:52 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: by igcpb10 with SMTP id pb10so41962951igc.1 for ; Sun, 27 Sep 2015 11:30:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=Z5QC7Y+a7C3mv0Dcn0Qxs/nVtAVz84KkzbzT7lFeVjE=; b=L3lUbbR3Yz//VjaSaC0P+haQnCePmWVT/fzHxXu2HAGuImniYpdKbqT1xfiFp/zNuT 8Y+NT6uNZXn0tIqCGtq0gvusn6vZmyQ00opyokd/wg1YCzLZ/UmLbRrqPgdr2f+EQKf2 yZlPGcvEhM2MgA7ZONPq6Y1dihDxIc0MSi2+8nHreIrFMHarp++5sDOoTZ1LdUgZb9Pv 8Lslv+zSmWjCbn5bI6xaiKIBGnRWK4XCIpnQjWku8atnSUHqnamnvNw8/9fPMGlNXrgX VEBehfJ+uFxJFLsvTDqYuIzh5joOn664OsM8eBRWnqOdipZ8aoHLhH5x4ajDcQ4DCp70 KaYw== X-Gm-Message-State: ALoCoQmEMJZwKjhsWwj6q0JktXX8iyDYcSkVt1XpNAAzbchBd2lBJeeb9sJZk9C+Xh4gB+LnG0EC X-Received: by 10.50.50.68 with SMTP id a4mr12831979igo.49.1443378221325; Sun, 27 Sep 2015 11:23:41 -0700 (PDT) MIME-Version: 1.0 Received: by 10.50.77.230 with HTTP; Sun, 27 Sep 2015 11:23:01 -0700 (PDT) X-Originating-IP: [96.255.75.208] In-Reply-To: <201509271044.t8RAid2e026093@repo.freebsd.org> References: <201509271044.t8RAid2e026093@repo.freebsd.org> From: "Philip M. Gollucci" Date: Sun, 27 Sep 2015 14:23:01 -0400 Message-ID: Subject: Re: svn commit: r398034 - head/www/apache22 To: Olli Hauer Cc: "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , "svn-ports-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2015 18:30:53 -0000 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 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 > > 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@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" > -- --------------------------------------------------------------------------------- Curb: Your ride is here 4096R/D21D2752 ECDF B597 B54B 7F92 753E E0EA F699 A450 D21D 2752 Philip M. Gollucci (pgollucci@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.