Add vendor's patch, remove needless patch.

Pointed by:	ru
Obtained from:	http://hg.nginx.org/nginx/raw-rev/35487ea55cb6
This commit is contained in:
Sergey A. Osokin 2016-02-26 23:19:45 +00:00
parent 3b82a701b3
commit 2a68c75e02
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=409639
2 changed files with 15 additions and 5 deletions

View file

@ -1094,11 +1094,6 @@ pre-configure:
( cd ${WRKSRC_small_light} && ./setup )
.endif
post-configure:
.if ${PORT_OPTIONS:MNJS}
( cd ${WRKSRC_njs} && ./${CONFIGURE_SCRIPT} && ${MAKE} )
.endif
do-build:
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}

View file

@ -0,0 +1,15 @@
--- auto/make Thu Feb 25 16:28:42 2016 +0300
+++ auto/make Thu Feb 25 15:22:05 2016 +0300
@@ -437,9 +437,9 @@
# the addons config.make
-if test -n "$NGX_ADDONS"; then
+if test -n "$NGX_ADDONS$DYNAMIC_ADDONS"; then
- for ngx_addon_dir in $NGX_ADDONS
+ for ngx_addon_dir in $NGX_ADDONS $DYNAMIC_ADDONS
do
if test -f $ngx_addon_dir/config.make; then
. $ngx_addon_dir/config.make