sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert another 2 third-party modules to dynamic:

Browse source 
o) rds_csv
o) rds_json

Bump PORTREVISION.
This commit is contained in:
Sergey A. Osokin 2020-04-25 15:55:47 +00:00
parent 939bd3db6e
commit 13f080cf9f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=532959
5 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/nginx-devel/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa

6
www/nginx-devel/Makefile.extmod
View file

@ -261,10 +261,12 @@ POSTGRES_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_postgres-config
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

15
www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config Normal file
View file

@ -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

15
www/nginx-devel/files/extra-patch-rds-json-nginx-module-config Normal file
View file

@ -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

2
www/nginx-devel/pkg-plist
View file

@ -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