svn commit: r538078 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Sat Jun 6 09:13:42 UTC 2020
Author: joneum
Date: Sat Jun 6 09:13:40 2020
New Revision: 538078
URL: https://svnweb.freebsd.org/changeset/ports/538078
Log:
Merge r532982 from www/nginx-devel:
Convert another 3 third-party modules to dynamic:
o) http_json_status
o) http_mogilefs
o) http_notice
Sponsored by: Netzkommune GmbH
Added:
head/www/nginx/files/extra-patch-nginx-notice-config (contents, props changed)
head/www/nginx/files/extra-patch-nginx_mogilefs_module-config (contents, props changed)
head/www/nginx/files/extra-patch-ngx_http_json_status_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 Sat Jun 6 06:17:44 2020 (r538077)
+++ head/www/nginx/Makefile Sat Jun 6 09:13:40 2020 (r538078)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 10
+PORTREVISION?= 11
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Sat Jun 6 06:17:44 2020 (r538077)
+++ head/www/nginx/Makefile.extmod Sat Jun 6 09:13:40 2020 (r538078)
@@ -125,21 +125,25 @@ HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/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}
+HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status
+HTTP_JSON_STATUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_json_status_module-config
HTTP_MOGILEFS_MASTER_SITES= http://www.grid.net.ru/nginx/download/:mogilefs
HTTP_MOGILEFS_DISTFILES= nginx_mogilefs_module-1.0.4.tar.gz:mogilefs
-HTTP_MOGILEFS_CONFIGURE_ON= --add-module=${WRKDIR}/nginx_mogilefs_module-1.0.4
-HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c
+HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c \
+ ${PATCHDIR}/extra-patch-nginx_mogilefs_module-config
+HTTP_MOGILEFS_VARS= DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4
+
HTTP_MP4_H264_MASTER_SITES= http://h264.code-shop.com/download/:mp4streaming
HTTP_MP4_H264_DISTFILES= nginx_mod_h264_streaming-2.2.7.tar.gz:mp4streaming
HTTP_MP4_H264_CONFIGURE_ON= --add-module=${WRKDIR}/nginx_mod_h264_streaming-2.2.7
HTTP_MP4_H264_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_streaming_module.c
HTTP_NOTICE_GH_TUPLE= kr:nginx-notice:3c95966:notice
-HTTP_NOTICE_CONFIGURE_ON= --add-module=${WRKSRC_notice}
-HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c
+HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \
+ ${PATCHDIR}/extra-patch-nginx-notice-config
+HTTP_NOTICE_VARS= DSO_EXTMODS+=notice
HTTP_PUSH_GH_TUPLE= slact:nchan:v1.1.14:push
HTTP_PUSH_VARS= DSO_EXTMODS+=push
Added: head/www/nginx/files/extra-patch-nginx-notice-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-nginx-notice-config Sat Jun 6 09:13:40 2020 (r538078)
@@ -0,0 +1,13 @@
+--- ../nginx-notice-3c95966/config.orig 2020-04-25 18:03:28.543102000 -0400
++++ ../nginx-notice-3c95966/config 2020-04-25 18:04:14.387235000 -0400
+@@ -1,3 +1,8 @@
+ ngx_addon_name=ngx_http_notice_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_notice_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_notice_module.c"
++
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++
++ngx_module_srcs="$ngx_addon_dir/ngx_http_notice_module.c"
++
++. auto/module
Added: head/www/nginx/files/extra-patch-nginx_mogilefs_module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-nginx_mogilefs_module-config Sat Jun 6 09:13:40 2020 (r538078)
@@ -0,0 +1,13 @@
+--- ../nginx_mogilefs_module-1.0.4/config.orig 2020-04-25 17:51:45.544308000 -0400
++++ ../nginx_mogilefs_module-1.0.4/config 2020-04-25 17:54:01.862958000 -0400
+@@ -1,3 +1,8 @@
+ ngx_addon_name=ngx_http_mogilefs_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_mogilefs_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_mogilefs_module.c"
++
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++
++ngx_module_srcs="$ngx_addon_dir/ngx_http_mogilefs_module.c"
++
++. auto/module
Added: head/www/nginx/files/extra-patch-ngx_http_json_status_module-config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-ngx_http_json_status_module-config Sat Jun 6 09:13:40 2020 (r538078)
@@ -0,0 +1,12 @@
+--- ../ngx_http_json_status_module-1d2f303/config.orig 2020-04-25 16:16:47.024292000 -0400
++++ ../ngx_http_json_status_module-1d2f303/config 2020-04-25 16:18:39.461340000 -0400
+@@ -1,4 +1,6 @@
+ ngx_addon_name=ngx_http_json_status_module
+-HTTP_MODULES="$HTTP_MODULES ngx_http_json_status_module"
+-NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_json_status_module.c"
+-NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/ngx_http_json_status_module.h"
++ngx_module_name="$ngx_addon_name"
++ngx_module_type=HTTP
++ngx_module_srcs="$ngx_addon_dir/ngx_http_json_status_module.c"
++ngx_module_deps="$ngx_addon_dir/ngx_http_json_status_module.h"
++. auto/module
Modified: head/www/nginx/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist Sat Jun 6 06:17:44 2020 (r538077)
+++ head/www/nginx/pkg-plist Sat Jun 6 09:13:40 2020 (r538078)
@@ -41,6 +41,9 @@
%%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_JSON_STATUS%%libexec/nginx/ngx_http_json_status_module.so
+%%DSO%%%%HTTP_MOGILEFS%%libexec/nginx/ngx_http_mogilefs_module.so
+%%DSO%%%%HTTP_NOTICE%%libexec/nginx/ngx_http_notice_module.so
%%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so
%%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
%%DSO%%%%HTTP_PUSH_STREAM%%libexec/nginx/ngx_http_push_stream_module.so
More information about the svn-ports-all
mailing list