svn commit: r537930 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Thu Jun 4 18:58:01 UTC 2020
Author: joneum
Date: Thu Jun 4 18:57:59 2020
New Revision: 537930
URL: https://svnweb.freebsd.org/changeset/ports/537930
Log:
Merge r532758 from www/nginx-devel:
Convert another 5 third-party modules to dynamic:
o) drizzle
o) http_dav_ext
o) http_footer_filter
o) http_ip2location
o) http_ip2proxy
Sponsored by: Netzkommune GmbH
Added:
head/www/nginx/files/extra-patch-nginx-http-footer-filter-config (contents, props changed)
head/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config (contents, props changed)
Modified:
head/www/nginx/Makefile
head/www/nginx/Makefile.extmod
head/www/nginx/pkg-plist
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Thu Jun 4 18:56:20 2020 (r537929)
+++ head/www/nginx/Makefile Thu Jun 4 18:57:59 2020 (r537930)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 5
+PORTREVISION?= 6
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Thu Jun 4 18:56:20 2020 (r537929)
+++ head/www/nginx/Makefile.extmod Thu Jun 4 18:57:59 2020 (r537930)
@@ -35,7 +35,8 @@ DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzl
DRIZZLE_CONFIGURE_ENV= LIBDRIZZLE_INC=${LOCALBASE}/include \
LIBDRIZZLE_LIB=${LOCALBASE}/lib
DRIZZLE_GH_TUPLE= openresty:drizzle-nginx-module:v0.1.11:drizzle
-DRIZZLE_CONFIGURE_ON= --add-module=${WRKSRC_drizzle}
+DRIZZLE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config
+DRIZZLE_VARS= DSO_EXTMODS+=drizzle
DYNAMIC_TLS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-dynamic_tls_records
@@ -98,7 +99,7 @@ HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam
HTTP_DAV_EXT_IMPLIES= HTTP_DAV
HTTP_DAV_EXT_LIB_DEPENDS= libexpat.so:textproc/expat2
HTTP_DAV_EXT_GH_TUPLE= arut:nginx-dav-ext-module:v3.0.0:dav_ext
-HTTP_DAV_EXT_CONFIGURE_ON= --add-module=${WRKSRC_dav_ext}
+HTTP_DAV_EXT_VARS= DSO_EXTMODS+=dav_ext
HTTP_EVAL_GH_TUPLE= openresty:nginx-eval-module:582bd25:eval
HTTP_EVAL_VARS= DSO_EXTMODS+=eval
@@ -107,7 +108,8 @@ HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:v0.4
HTTP_FANCYINDEX_VARS= DSO_EXTMODS+=fancyindex
HTTP_FOOTER_GH_TUPLE= alibaba:nginx-http-footer-filter:1.2.2:footer
-HTTP_FOOTER_CONFIGURE_ON= --add-module=${WRKSRC_footer}
+HTTP_FOOTER_VARS= DSO_EXTMODS+=footer
+HTTP_FOOTER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-http-footer-filter-config
HTTP_GEOIP2_GH_TUPLE= leev:ngx_http_geoip2_module:3.2:geoip2
HTTP_GEOIP2_CFLAGS= -I${LOCALBASE}/include
@@ -116,11 +118,11 @@ HTTP_GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxmin
HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:7aa49ce:ip2location
HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location
-HTTP_IP2LOCATION_CONFIGURE_ON= --add-module=${WRKSRC_ip2location}
+HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location
HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:f9815e3:ip2proxy
HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy
-HTTP_IP2PROXY_CONFIGURE_ON= --add-module=${WRKSRC_ip2proxy}
+HTTP_IP2PROXY_VARS= DSO_EXTMODS+=ip2proxy
HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status
HTTP_JSON_STATUS_CONFIGURE_ON= --add-module=${WRKSRC_json_status}
Added: head/www/nginx/files/extra-patch-nginx-http-footer-filter-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-nginx-http-footer-filter-config Thu Jun 4 18:57:59 2020 (r537930)
@@ -0,0 +1,12 @@
+--- ../nginx-http-footer-filter-1.2.2/config.orig 2020-04-24 08:37:44.671689000 -0400
++++ ../nginx-http-footer-filter-1.2.2/config 2020-04-24 08:44:41.868601000 -0400
+@@ -1,3 +1,7 @@
+ ngx_addon_name=ngx_http_footer_filter_module
+-HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES ngx_http_footer_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_footer_filter_module.c"
++ngx_module_type=HTTP_FILTER
++ngx_module_name="$ngx_addon_name"
++
++ngx_module_srcs="$ngx_addon_dir/ngx_http_footer_filter_module.c"
++
++. auto/module
Added: head/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-openresty-drizzle-nginx-module-config Thu Jun 4 18:57:59 2020 (r537930)
@@ -0,0 +1,42 @@
+--- ../drizzle-nginx-module-0.1.11/config.orig 2020-06-04 19:19:26.245657000 +0200
++++ ../drizzle-nginx-module-0.1.11/config 2020-06-04 19:29:28.502730000 +0200
+@@ -34,12 +34,12 @@ else
+
+ if [ $ngx_found = no ]; then
+ # FreeBSD, OpenBSD
+- ngx_feature="libdrizzle library in /usr/local/"
+- ngx_feature_path="/usr/local/include/libdrizzle-1.0"
++ ngx_feature="libdrizzle library in %%PREFIX%%"
++ ngx_feature_path="%%PREFIX%%/include/libdrizzle"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle"
+ else
+- ngx_feature_libs="-L/usr/local/lib -ldrizzle"
++ ngx_feature_libs="-L%%PREFIX/lib -ldrizzle"
+ fi
+ . auto/feature
+ fi
+@@ -80,8 +80,19 @@ END
+ fi
+
+ ngx_addon_name=ngx_http_drizzle_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_drizzle_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_drizzle_module.c $ngx_addon_dir/src/ngx_http_drizzle_handler.c $ngx_addon_dir/src/ngx_http_drizzle_processor.c $ngx_addon_dir/src/ngx_http_drizzle_upstream.c $ngx_addon_dir/src/ngx_http_drizzle_util.c $ngx_addon_dir/src/ngx_http_drizzle_output.c $ngx_addon_dir/src/ngx_http_drizzle_keepalive.c $ngx_addon_dir/src/ngx_http_drizzle_quoting.c $ngx_addon_dir/src/ngx_http_drizzle_checker.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_drizzle_module.h $ngx_addon_dir/src/ngx_http_drizzle_handler.h $ngx_addon_dir/src/ngx_http_drizzle_processor.h $ngx_addon_dir/src/ngx_http_drizzle_upstream.h $ngx_addon_dir/src/ngx_http_drizzle_util.h $ngx_addon_dir/src/ngx_http_drizzle_output.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_drizzle_keepalive.h $ngx_addon_dir/src/ngx_http_drizzle_quoting.h $ngx_addon_dir/src/ngx_http_drizzle_checker.h"
++if test -n "$ngx_module_link"; then
++ ngx_module_type=HTTP
++ ngx_module_name=$ngx_addon_name
++ ngx_module_srcs="$ngx_addon_dir/src/ngx_http_drizzle_module.c $ngx_addon_dir/src/ngx_http_drizzle_handler.c $ngx_addon_dir/src/ngx_http_drizzle_processor.c $ngx_addon_dir/src/ngx_http_drizzle_upstream.c $ngx_addon_dir/src/ngx_http_drizzle_util.c $ngx_addon_dir/src/ngx_http_drizzle_output.c $ngx_addon_dir/src/ngx_http_drizzle_keepalive.c $ngx_addon_dir/src/ngx_http_drizzle_quoting.c $ngx_addon_dir/src/ngx_http_drizzle_checker.c"
++ ngx_module_incs="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_drizzle_module.h $ngx_addon_dir/src/ngx_http_drizzle_handler.h $ngx_addon_dir/src/ngx_http_drizzle_processor.h $ngx_addon_dir/src/ngx_http_drizzle_upstream.h $ngx_addon_dir/src/ngx_http_drizzle_util.h $ngx_addon_dir/src/ngx_http_drizzle_output.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_drizzle_keepalive.h $ngx_addon_dir/src/ngx_http_drizzle_quoting.h $ngx_addon_dir/src/ngx_http_drizzle_checker.h"
++ ngx_module_deps=
++ ngx_module_libs="-L%%PREFIX%%/lib -ldrizzle"
++
++ . auto/module
++else
++ HTTP_MODULES="$HTTP_MODULES ngx_http_drizzle_module"
++ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_drizzle_module.c $ngx_addon_dir/src/ngx_http_drizzle_handler.c $ngx_addon_dir/src/ngx_http_drizzle_processor.c $ngx_addon_dir/src/ngx_http_drizzle_upstream.c $ngx_addon_dir/src/ngx_http_drizzle_util.c $ngx_addon_dir/src/ngx_http_drizzle_output.c $ngx_addon_dir/src/ngx_http_drizzle_keepalive.c $ngx_addon_dir/src/ngx_http_drizzle_quoting.c $ngx_addon_dir/src/ngx_http_drizzle_checker.c"
++ NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/ngx_http_drizzle_module.h $ngx_addon_dir/src/ngx_http_drizzle_handler.h $ngx_addon_dir/src/ngx_http_drizzle_processor.h $ngx_addon_dir/src/ngx_http_drizzle_upstream.h $ngx_addon_dir/src/ngx_http_drizzle_util.h $ngx_addon_dir/src/ngx_http_drizzle_output.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_drizzle_keepalive.h $ngx_addon_dir/src/ngx_http_drizzle_quoting.h $ngx_addon_dir/src/ngx_http_drizzle_checker.h"
++fi
+
+ have=NGX_DRIZZLE_MODULE . auto/have
Modified: head/www/nginx/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist Thu Jun 4 18:56:20 2020 (r537929)
+++ head/www/nginx/pkg-plist Thu Jun 4 18:57:59 2020 (r537930)
@@ -20,6 +20,7 @@
%%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_module.so
%%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so
%%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
+%%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so
%%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so
%%DSO%%%%FASTDFS%%libexec/nginx/ngx_http_fastdfs_module.so
%%DSO%%%%FORMINPUT%%libexec/nginx/ngx_http_form_input_module.so
@@ -30,11 +31,15 @@
%%DSO%%%%HTTP_AUTH_KRB5%%libexec/nginx/ngx_http_auth_spnego_module.so
%%DSO%%%%HTTP_AUTH_LDAP%%libexec/nginx/ngx_http_auth_ldap_module.so
%%DSO%%%%HTTP_AUTH_PAM%%libexec/nginx/ngx_http_auth_pam_module.so
+%%DSO%%%%HTTP_DAV_EXT%%libexec/nginx/ngx_http_dav_ext_module.so
%%DSO%%%%HTTP_EVAL%%libexec/nginx/ngx_http_eval_module.so
%%DSO%%%%HTTP_FANCYINDEX%%libexec/nginx/ngx_http_fancyindex_module.so
+%%DSO%%%%HTTP_FOOTER%%libexec/nginx/ngx_http_footer_filter_module.so
%%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/nginx/ngx_http_geoip2_module.so
%%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
%%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so
+%%DSO%%%%HTTP_IP2LOCATION%%libexec/nginx/ngx_http_ip2location_module.so
+%%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so
%%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so
%%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
%%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so
More information about the svn-ports-head
mailing list