Date: Fri, 24 Apr 2020 13:18:42 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532758 - in head/www/nginx-devel: . files Message-ID: <202004241318.03ODIgh4069931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Fri Apr 24 13:18:42 2020 New Revision: 532758 URL: https://svnweb.freebsd.org/changeset/ports/532758 Log: Convert another 5 third-party modules to dynamic: o) drizzle o) http_dav_ext o) http_footer_filter o) http_ip2location o) http_ip2proxy Bump PORTREVISION. Added: head/www/nginx-devel/files/extra-patch-nginx-http-footer-filter-config (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config head/www/nginx-devel/pkg-plist Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Fri Apr 24 12:19:05 2020 (r532757) +++ head/www/nginx-devel/Makefile Fri Apr 24 13:18:42 2020 (r532758) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Fri Apr 24 12:19:05 2020 (r532757) +++ head/www/nginx-devel/Makefile.extmod Fri Apr 24 13:18:42 2020 (r532758) @@ -37,8 +37,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:e93542e: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_UPSTREAM_GH_TUPLE= cubicdaiya:ngx_dynamic_upstream:v0.1.6:dynamic_upstream DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream @@ -92,7 +92,7 @@ HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam HTTP_DAV_EXT_IMPLIES= HTTP_DAV HTTP_DAV_EXT_USE= GNOME=libxml2,libxslt 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 @@ -101,7 +101,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 @@ -110,11 +111,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-devel/files/extra-patch-nginx-http-footer-filter-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nginx-http-footer-filter-config Fri Apr 24 13:18:42 2020 (r532758) @@ -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 Modified: head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config ============================================================================== --- head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config Fri Apr 24 12:19:05 2020 (r532757) +++ head/www/nginx-devel/files/extra-patch-openresty-drizzle-nginx-module-config Fri Apr 24 13:18:42 2020 (r532758) @@ -1,6 +1,6 @@ ---- ../drizzle-nginx-module-e93542e/config.orig 2011-12-30 10:26:53.000000000 +0400 -+++ ../drizzle-nginx-module-e93542e/config 2011-12-30 10:28:20.000000000 +0400 -@@ -22,12 +22,12 @@ +--- ../drizzle-nginx-module-e93542e/config.orig 2020-01-22 18:04:58.000000000 -0500 ++++ ../drizzle-nginx-module-e93542e/config 2020-04-24 06:23:01.264872000 -0400 +@@ -34,12 +34,12 @@ if [ $ngx_found = no ]; then # FreeBSD, OpenBSD @@ -17,3 +17,26 @@ fi . auto/feature fi +@@ -80,8 +80,19 @@ + 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-devel/pkg-plist ============================================================================== --- head/www/nginx-devel/pkg-plist Fri Apr 24 12:19:05 2020 (r532757) +++ head/www/nginx-devel/pkg-plist Fri Apr 24 13:18:42 2020 (r532758) @@ -20,6 +20,7 @@ %%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so %%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so +%%DSO%%%%DRIZZLE%%libexec/nginx/ngx_http_drizzle_module.so %%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so %%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_module.so %%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so @@ -31,9 +32,13 @@ %%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_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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004241318.03ODIgh4069931>