aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2020-10-01 15:45:12 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2020-10-01 15:45:12 +0000
commit0ce4d05deae620b332fd0af8cf7eab851fea57c6 (patch)
tree3ce5ae929fe5a0010026ca8d55c1ce8c0cddf6e2
parent9c89dada6678d390bbd486a7c77dac6bde95786a (diff)
downloadports-0ce4d05deae620b332fd0af8cf7eab851fea57c6.tar.gz
ports-0ce4d05deae620b332fd0af8cf7eab851fea57c6.zip
Re-add the patch from r550699 to fix build with -fno-common for
the third-party nchan module. Bump PORTREVISION. Spotted by: vanilla
Notes
Notes: svn path=/head/; revision=550845
-rw-r--r--www/nginx-devel/Makefile2
-rw-r--r--www/nginx-devel/Makefile.extmod3
2 files changed, 3 insertions, 2 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 26e17d132064..5bd36d184a02 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= nginx
PORTVERSION= 1.19.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index ea70ccb1ed31..1b96faed63d8 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -138,7 +138,8 @@ 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-redis-redis_lua_commands.h
+HTTP_PUSH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nchan-store-private.h \
+ ${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