Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2020 15:55:48 +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: r532959 - in head/www/nginx-devel: . files
Message-ID:  <202004251555.03PFtmdJ081959@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Sat Apr 25 15:55:47 2020
New Revision: 532959
URL: https://svnweb.freebsd.org/changeset/ports/532959

Log:
  Convert another 2 third-party modules to dynamic:
  
  o) rds_csv
  o) rds_json
  
  Bump PORTREVISION.

Added:
  head/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config   (contents, props changed)
  head/www/nginx-devel/files/extra-patch-rds-json-nginx-module-config   (contents, props changed)
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod
  head/www/nginx-devel/pkg-plist

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Apr 25 15:55:08 2020	(r532958)
+++ head/www/nginx-devel/Makefile	Sat Apr 25 15:55:47 2020	(r532959)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Sat Apr 25 15:55:08 2020	(r532958)
+++ head/www/nginx-devel/Makefile.extmod	Sat Apr 25 15:55:47 2020	(r532959)
@@ -261,10 +261,12 @@ POSTGRES_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_po
 POSTGRES_VARS=		DSO_EXTMODS+=postgres
 
 RDS_CSV_GH_TUPLE=	openresty:rds-csv-nginx-module:v0.09:rdscsv
-RDS_CSV_CONFIGURE_ON=	--add-module=${WRKSRC_rdscsv}
+RDS_CSV_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-rds-csv-nginx-module-config
+RDS_CSV_VARS=		DSO_EXTMODS+=rdscsv
 
 RDS_JSON_GH_TUPLE=	openresty:rds-json-nginx-module:v0.15:rdsjson
-RDS_JSON_CONFIGURE_ON=	--add-module=${WRKSRC_rdsjson}
+RDS_JSON_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-rds-json-nginx-module-config
+RDS_JSON_VARS=		DSO_EXTMODS+=rdsjson
 
 REDIS2_GH_TUPLE=	openresty:redis2-nginx-module:v0.15:redis2
 REDIS2_VARS=		DSO_EXTMODS+=redis2

Added: head/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config	Sat Apr 25 15:55:47 2020	(r532959)
@@ -0,0 +1,15 @@
+--- ../rds-csv-nginx-module-0.09/config.orig	2020-04-25 11:37:21.896900000 -0400
++++ ../rds-csv-nginx-module-0.09/config	2020-04-25 11:39:06.371176000 -0400
+@@ -1,5 +1,9 @@
+ ngx_addon_name=ngx_http_rds_csv_filter_module
+-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_csv_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.c $ngx_addon_dir/src/ngx_http_rds_csv_processor.c $ngx_addon_dir/src/ngx_http_rds_csv_util.c $ngx_addon_dir/src/ngx_http_rds_csv_output.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.h $ngx_addon_dir/src/ngx_http_rds_csv_processor.h $ngx_addon_dir/src/ngx_http_rds_csv_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h"
+ 
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP_FILTER
++
++ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_csv_filter_module.c $ngx_addon_dir/src/ngx_http_rds_csv_processor.c $ngx_addon_dir/src/ngx_http_rds_csv_util.c $ngx_addon_dir/src/ngx_http_rds_csv_output.c"
++ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_filter_module.h $ngx_addon_dir/src/ngx_http_rds_csv_processor.h $ngx_addon_dir/src/ngx_http_rds_csv_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_csv_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h"
++
++. auto/module

Added: head/www/nginx-devel/files/extra-patch-rds-json-nginx-module-config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-rds-json-nginx-module-config	Sat Apr 25 15:55:47 2020	(r532959)
@@ -0,0 +1,15 @@
+--- ../rds-json-nginx-module-0.15/config.orig	2020-04-25 11:39:29.003855000 -0400
++++ ../rds-json-nginx-module-0.15/config	2020-04-25 11:40:18.345148000 -0400
+@@ -1,5 +1,9 @@
+ ngx_addon_name=ngx_http_rds_json_filter_module
+-HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_json_filter_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h"
+ 
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP_FILTER
++
++ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c"
++ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h"
++
++. auto/module

Modified: head/www/nginx-devel/pkg-plist
==============================================================================
--- head/www/nginx-devel/pkg-plist	Sat Apr 25 15:55:08 2020	(r532958)
+++ head/www/nginx-devel/pkg-plist	Sat Apr 25 15:55:47 2020	(r532959)
@@ -64,6 +64,8 @@
 %%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
 %%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
 %%DSO%%%%POSTGRES%%libexec/nginx/ngx_postgres_module.so
+%%DSO%%%%RDS_CSV%%libexec/nginx/ngx_http_rds_csv_filter_module.so
+%%DSO%%%%RDS_JSON%%libexec/nginx/ngx_http_rds_json_filter_module.so
 %%DSO%%%%REDIS2%%libexec/nginx/ngx_http_redis2_module.so
 %%DSO%%%%RTMP%%libexec/nginx/ngx_rtmp_module.so
 %%DSO%%%%SET_MISC%%libexec/nginx/ngx_http_set_misc_module.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004251555.03PFtmdJ081959>