From owner-svn-ports-all@freebsd.org Sat Jan 27 12:57:24 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 8146BEBEE1E; Sat, 27 Jan 2018 12:57:24 +0000 (UTC) (envelope-from joneum@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 306018789C; Sat, 27 Jan 2018 12:57:24 +0000 (UTC) (envelope-from joneum@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 29FE62A08; Sat, 27 Jan 2018 12:57:24 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0RCvOta078737; Sat, 27 Jan 2018 12:57:24 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0RCvN2I078734; Sat, 27 Jan 2018 12:57:23 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201801271257.w0RCvN2I078734@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Sat, 27 Jan 2018 12:57:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460121 - in head/www/nginx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/www/nginx: . files X-SVN-Commit-Revision: 460121 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.25 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: Sat, 27 Jan 2018 12:57:24 -0000 Author: joneum Date: Sat Jan 27 12:57:23 2018 New Revision: 460121 URL: https://svnweb.freebsd.org/changeset/ports/460121 Log: www/nginx: Fix building of uploadprogress module PR: 225473 Reported by: Matthias Fechner Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D14069 Added: head/www/nginx/files/extra-patch-masterzen-nginx-upload-progress-module (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Jan 27 12:54:08 2018 (r460120) +++ head/www/nginx/Makefile Sat Jan 27 12:57:23 2018 (r460121) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.12.2 -PORTREVISION?= 6 +PORTREVISION?= 7 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -729,10 +729,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_upload} .endif .if ${PORT_OPTIONS:MHTTP_UPLOAD_PROGRESS} -NGINX_UPLOADPROGRESS_VERSION= 0.9.2 +NGINX_UPLOADPROGRESS_VERSION= afb2d31 GH_ACCOUNT+= masterzen:uploadprogress GH_PROJECT+= nginx-upload-progress-module:uploadprogress -GH_TAGNAME+= v${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress +GH_TAGNAME+= ${NGINX_UPLOADPROGRESS_VERSION}:uploadprogress CONFIGURE_ARGS+=--add-module=${WRKSRC_uploadprogress} .endif Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sat Jan 27 12:54:08 2018 (r460120) +++ head/www/nginx/distinfo Sat Jan 27 12:57:23 2018 (r460121) @@ -1,4 +1,4 @@ -TIMESTAMP = 1516812661 +TIMESTAMP = 1517046240 SHA256 (nginx-1.12.2.tar.gz) = 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 SIZE (nginx-1.12.2.tar.gz) = 981687 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -67,8 +67,8 @@ SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.ta SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378 SHA256 (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = c6d4e38ad0712c898cc53721f492f8f73acf2753cc0a0769fa34d4d6ba4e8efd SIZE (Austinb-nginx-upload-module-72ec037_GH0.tar.gz) = 28303 -SHA256 (masterzen-nginx-upload-progress-module-v0.9.2_GH0.tar.gz) = b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497 -SIZE (masterzen-nginx-upload-progress-module-v0.9.2_GH0.tar.gz) = 17268 +SHA256 (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 6318851cc3a624aaad3b1f4cd9f51f79c86575c53dfe0c28bbdcf9470b6a33e6 +SIZE (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 17269 SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e19feeb07a37976347987892a8e8680a961f793ff0d3ef96c07f4 SIZE (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 130039 SHA256 (cryptofuture-nginx-upstream-fair-b5be36f_GH0.tar.gz) = e765afcaab6cd1601e914039a8d00ab18eb6fe01180c58e0e4e098bc5b4d8233 Added: head/www/nginx/files/extra-patch-masterzen-nginx-upload-progress-module ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-masterzen-nginx-upload-progress-module Sat Jan 27 12:57:23 2018 (r460121) @@ -0,0 +1,9 @@ +--- work/nginx-upload-progress-module-0.9.2/config.orig 2018-01-27 09:47:26.335521000 +0100 ++++ work/nginx-upload-progress-module-0.9.2/config 2018-01-27 09:47:53.763756000 +0100 +@@ -1,5 +1,5 @@ + ngx_addon_name=ngx_http_uploadprogress_module +-if test -n "$ngx_module_link"; then ++if [ $ngx_module_link = DYNAMIC ] ; then + ngx_module_type=FILTER + ngx_module_name=ngx_http_uploadprogress_module + ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"