From owner-svn-ports-all@freebsd.org Tue Sep 11 02:13:19 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 876BE10A4E24; Tue, 11 Sep 2018 02:13:19 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3C5F480613; Tue, 11 Sep 2018 02:13:19 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36C1611651; Tue, 11 Sep 2018 02:13:19 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8B2DJOw085500; Tue, 11 Sep 2018 02:13:19 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8B2DIVq085499; Tue, 11 Sep 2018 02:13:18 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201809110213.w8B2DIVq085499@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Tue, 11 Sep 2018 02:13:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479498 - head/www/nginx-devel X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: head/www/nginx-devel X-SVN-Commit-Revision: 479498 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 11 Sep 2018 02:13:19 -0000 Author: osa Date: Tue Sep 11 02:13:18 2018 New Revision: 479498 URL: https://svnweb.freebsd.org/changeset/ports/479498 Log: Merge r479404 from www/nginx. Some modules depend on other being there before. For example, devel_kit needs to be there before a few other, so this fixes, and allow for future fixes of this kind of problem: configuring additional dynamic modules adding module in /wrkdirs/usr/ports/www/nginx-full/work/array-var-nginx-module-0.05 error: ngx_devel_kit is required to build ngx_array_var; please put it before ngx_array_var. PR: 230864 Submitted by: mat exp-runs by: antoine Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Sep 11 01:51:56 2018 (r479497) +++ head/www/nginx-devel/Makefile Tue Sep 11 02:13:18 2018 (r479498) @@ -197,6 +197,12 @@ _addextmod= add-module CONFIGURE_ARGS+= --with-${mod}${_addbasemod} .endfor +# Some modules depend on other being there before, for example, devel_kit needs +# to be there before a few other. +.for mod in ${FIRST_DSO_EXTMODS} +CONFIGURE_ARGS+= --${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR} +.endfor + .for mod in ${DSO_EXTMODS} CONFIGURE_ARGS+= --${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR} .endfor Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Sep 11 01:51:56 2018 (r479497) +++ head/www/nginx-devel/Makefile.extmod Tue Sep 11 02:13:18 2018 (r479498) @@ -45,7 +45,7 @@ DYNAMIC_UPSTREAM_GH_TUPLE= cubicdaiya:ngx_dynamic_upst DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream DEVEL_KIT_GH_TUPLE= simpl:ngx_devel_kit:v0.3.0:devel_kit -DEVEL_KIT_VARS= DSO_EXTMODS+=devel_kit +DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit ENCRYPTSESSION_IMPLIES= DEVEL_KIT ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.08:encryptsession