From owner-svn-ports-all@freebsd.org Mon Sep 10 13:11:13 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 73D87108F3A2; Mon, 10 Sep 2018 13:11:13 +0000 (UTC) (envelope-from mat@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 294D07FE38; Mon, 10 Sep 2018 13:11:13 +0000 (UTC) (envelope-from mat@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 242A4BDA; Mon, 10 Sep 2018 13:11:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8ADBDA0043575; Mon, 10 Sep 2018 13:11:13 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8ADBCuk043574; Mon, 10 Sep 2018 13:11:12 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201809101311.w8ADBCuk043574@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 10 Sep 2018 13:11:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479404 - head/www/nginx X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/www/nginx X-SVN-Commit-Revision: 479404 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: Mon, 10 Sep 2018 13:11:13 -0000 Author: mat Date: Mon Sep 10 13:11:12 2018 New Revision: 479404 URL: https://svnweb.freebsd.org/changeset/ports/479404 Log: 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/Makefile (contents, props changed) head/www/nginx/Makefile.extmod (contents, props changed) Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Mon Sep 10 12:55:59 2018 (r479403) +++ head/www/nginx/Makefile Mon Sep 10 13:11:12 2018 (r479404) @@ -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/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Mon Sep 10 12:55:59 2018 (r479403) +++ head/www/nginx/Makefile.extmod Mon Sep 10 13:11:12 2018 (r479404) @@ -45,7 +45,7 @@ DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream DYNAMIC_UPSTREAM_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_inet_slab.c 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.07:encryptsession