Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Oct 2020 15:45:12 +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: r550845 - head/www/nginx-devel
Message-ID:  <202010011545.091FjCUq099155@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Thu Oct  1 15:45:12 2020
New Revision: 550845
URL: https://svnweb.freebsd.org/changeset/ports/550845

Log:
  Re-add the patch from r550699 to fix build with -fno-common for
  the third-party nchan module.
  
  Bump PORTREVISION.
  
  Spotted by:	vanilla

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Thu Oct  1 15:36:27 2020	(r550844)
+++ head/www/nginx-devel/Makefile	Thu Oct  1 15:45:12 2020	(r550845)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.19.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Thu Oct  1 15:36:27 2020	(r550844)
+++ head/www/nginx-devel/Makefile.extmod	Thu Oct  1 15:45:12 2020	(r550845)
@@ -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



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