Index: head/www/nginx/files/extra-patch-brotli_config
===================================================================
--- head/www/nginx/files/extra-patch-brotli_config
+++ head/www/nginx/files/extra-patch-brotli_config
@@ -57,64 +57,3 @@
  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 <Sp1l@users.noreply.github.com>
-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 \
-