svn commit: r428313 - in head/www: nginx nginx-devel

[Sergey A. Osokin]

Author: osa
Date: Sat Dec 10 18:45:04 2016
New Revision: 428313
URL: https://svnweb.freebsd.org/changeset/ports/428313

Log:
  Fix the build issues when:
  o) the drizzle module can't find the libdrizzle headers;
  o) the geoip2 can't find the libmaxminddb.
  
  Do not bump PORTREVISION, those third-party modules are disabled by default.

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

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Dec 10 18:44:36 2016	(r428312)
+++ head/www/nginx-devel/Makefile	Sat Dec 10 18:45:04 2016	(r428313)
@@ -540,6 +540,7 @@ NGINX_HTTP_GEOIP2_VERSION=	2.0
 GH_ACCOUNT+=	leev:geoip2
 GH_PROJECT+=	ngx_http_geoip2_module:geoip2
 GH_TAGNAME+=	${NGINX_HTTP_GEOIP2_VERSION}:geoip2
+CFLAGS+=	"-I${LOCALBASE}/include"
 .if !empty(PORT_OPTIONS:MDSO)
 CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2}
 .else
@@ -788,6 +789,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/m
 
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=	libdrizzle.so:databases/libdrizzle
+CONFIGURE_ENV+=	"LIBDRIZZLE_INC=${LOCALBASE}/include"
+CONFIGURE_ENV+=	"LIBDRIZZLE_LIB=${LOCALBASE}/lib"
 NGINX_DRIZZLE_VERSION=	0.1.9
 GH_ACCOUNT+=	openresty:drizzle
 GH_PROJECT+=	drizzle-nginx-module:drizzle

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Dec 10 18:44:36 2016	(r428312)
+++ head/www/nginx/Makefile	Sat Dec 10 18:45:04 2016	(r428313)
@@ -535,6 +535,7 @@ NGINX_HTTP_GEOIP2_VERSION=	2.0
 GH_ACCOUNT+=	leev:geoip2
 GH_PROJECT+=	ngx_http_geoip2_module:geoip2
 GH_TAGNAME+=	${NGINX_HTTP_GEOIP2_VERSION}:geoip2
+CFLAGS+=	"-I${LOCALBASE}/include"
 .if !empty(PORT_OPTIONS:MDSO)
 CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_geoip2}
 .else
@@ -780,6 +781,8 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/m
 
 .if ${PORT_OPTIONS:MDRIZZLE}
 LIB_DEPENDS+=	libdrizzle.so:databases/libdrizzle
+CONFIGURE_ENV+=	"LIBDRIZZLE_INC=${LOCALBASE}/include"
+CONFIGURE_ENV+=	"LIBDRIZZLE_LIB=${LOCALBASE}/lib"
 NGINX_DRIZZLE_VERSION=	0.1.9
 GH_ACCOUNT+=	openresty:drizzle
 GH_PROJECT+=	drizzle-nginx-module:drizzle