svn commit: r550720 - in head/www/nginx-devel: . files

[Sergey A. Osokin]

Author: osa
Date: Wed Sep 30 16:12:16 2020
New Revision: 550720
URL: https://svnweb.freebsd.org/changeset/ports/550720

Log:
  Fix build with -fno-common.
  Bump PORTREVISION.
  
  Submitted by:	vanilla

Added:
  head/www/nginx-devel/files/extra-patch-nchan-store-redis-redis_lua_commands.h   (contents, props changed)
Deleted:
  head/www/nginx-devel/files/extra-patch-nchan-store-private.h
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Wed Sep 30 16:07:59 2020	(r550719)
+++ head/www/nginx-devel/Makefile	Wed Sep 30 16:12:16 2020	(r550720)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.19.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Wed Sep 30 16:07:59 2020	(r550719)
+++ head/www/nginx-devel/Makefile.extmod	Wed Sep 30 16:12:16 2020	(r550720)
@@ -138,7 +138,7 @@ HTTP_NOTICE_VARS=		DSO_EXTMODS+=notice
 
 HTTP_PUSH_GH_TUPLE=		slact:nchan:v1.2.7:push
 HTTP_PUSH_VARS=			DSO_EXTMODS+=push
-HTTP_PUSH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nchan-store-private.h
+HTTP_PUSH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nchan-store-redis-redis_lua_commands.h
 
 HTTP_PUSH_STREAM_GH_TUPLE=	wandenberg:nginx-push-stream-module:0.5.4:pushstream
 HTTP_PUSH_STREAM_VARS=		DSO_EXTMODS+=pushstream

Added: head/www/nginx-devel/files/extra-patch-nchan-store-redis-redis_lua_commands.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-nchan-store-redis-redis_lua_commands.h	Wed Sep 30 16:12:16 2020	(r550720)
@@ -0,0 +1,12 @@
+--- ../nchan-1.2.7/src/store/redis/redis_lua_commands.h.orig	2020-09-30 23:51:52.116513000 +0800
++++ ../nchan-1.2.7/src/store/redis/redis_lua_commands.h	2020-09-30 23:52:11.164617000 +0800
+@@ -63,7 +63,7 @@ typedef struct {
+   redis_lua_script_t subscriber_unregister;
+ 
+ } redis_lua_scripts_t;
+-redis_lua_scripts_t redis_lua_scripts;
+-const int redis_lua_scripts_count;
++extern redis_lua_scripts_t redis_lua_scripts;
++extern const int redis_lua_scripts_count;
+ #define REDIS_LUA_SCRIPTS_EACH(script) \
+ for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++)