From owner-svn-ports-head@freebsd.org Sat Dec 10 18:45:06 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2398FC7131B; Sat, 10 Dec 2016 18:45:06 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CEC6F1672; Sat, 10 Dec 2016 18:45:05 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBAIj59m094518; Sat, 10 Dec 2016 18:45:05 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBAIj4Dv094516; Sat, 10 Dec 2016 18:45:04 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201612101845.uBAIj4Dv094516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Sat, 10 Dec 2016 18:45:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428313 - in head/www: nginx nginx-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Dec 2016 18:45:06 -0000 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