From owner-svn-ports-head@freebsd.org Fri Dec 1 23:05:04 2017 Return-Path: Delivered-To: svn-ports-head@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 7C96BDB9F70; Fri, 1 Dec 2017 23:05:04 +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 mx1.freebsd.org (Postfix) with ESMTPS id 3E7B175DF8; Fri, 1 Dec 2017 23:05:04 +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 vB1N53v0008558; Fri, 1 Dec 2017 23:05:03 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1N53V7008557; Fri, 1 Dec 2017 23:05:03 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201712012305.vB1N53V7008557@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Fri, 1 Dec 2017 23:05:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455321 - head/www/nginx/files X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: head/www/nginx/files X-SVN-Commit-Revision: 455321 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2017 23:05:04 -0000 Author: joneum Date: Fri Dec 1 23:05:03 2017 New Revision: 455321 URL: https://svnweb.freebsd.org/changeset/ports/455321 Log: www/nginx: patch garbled from last commit Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13330 Modified: head/www/nginx/files/extra-patch-brotli_config Modified: head/www/nginx/files/extra-patch-brotli_config ============================================================================== --- head/www/nginx/files/extra-patch-brotli_config Fri Dec 1 23:01:05 2017 (r455320) +++ head/www/nginx/files/extra-patch-brotli_config Fri Dec 1 23:05:03 2017 (r455321) @@ -57,64 +57,3 @@ index 9d069f8..5e712d2 100644 ngx_module_order="$ngx_module_name \ ngx_pagespeed \ ngx_http_postpone_filter_module \ - -From ad89164d7405b39fd947c998c80fc64fc866a440 Mon Sep 17 00:00:00 2001 -From: Bernard Spil -Date: Thu, 30 Nov 2017 21:39:32 +0100 -Subject: [PATCH] Allow building with an already installed libbrotli - -Currently the module requires a bundled brotli source. This patch allows building with an external libbrotli (if detected) - -See also the [this bug report in FreeBSD](https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224000) ---- - config | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/config b/config -index 9d069f8..5e712d2 100644 ---- ../ngx_brotli-9891a98/config.orig 2017-11-28 11:00:45.000000000 +0100 -+++ ../ngx_brotli-9891a98/config 2017-11-30 21:05:56.300023000 +0100 -@@ -55,6 +55,14 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated - # HTTP filter module with Brotli library - # - -+ -+ngx_module_type=HTTP_FILTER -+ngx_module_name=ngx_http_brotli_filter_module -+ -+brotli="/usr/local" -+ -+if [ ! -f "$brotli/include/brotli/encode.h" ]; then -+ - brotli="$ngx_addon_dir/deps/brotli" - - if [ ! -f "$brotli/include/brotli/encode.h" ]; then -@@ -71,8 +79,6 @@ END - exit 1 - fi - --ngx_module_type=HTTP_FILTER --ngx_module_name=ngx_http_brotli_filter_module - ngx_module_incs="$brotli/include" - ngx_module_deps="$brotli/common/constants.h \ - $brotli/common/dictionary.h \ -@@ -132,6 +138,18 @@ ngx_module_srcs="$brotli/common/dictionary.c \ - $brotli/enc/utf8_util.c \ - $ngx_addon_dir/src/ngx_http_brotli_filter_module.c" - ngx_module_libs="-lm" -+ -+else # encode.h in /usr/local -+ -+ngx_module_incs="$brotli/include" -+ngx_module_deps="$brotli/include/brotli/encode.h \ -+ $brotli/include/brotli/port.h \ -+ $brotli/include/brotli/types.h" -+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_brotli_filter_module.c" -+ngx_module_libs="-lbrotlienc -lm" -+ -+fi # encode.h in /usr/local -+ - ngx_module_order="$ngx_module_name \ - ngx_pagespeed \ - ngx_http_postpone_filter_module \ -