From owner-svn-ports-all@freebsd.org Sat Nov 26 21:32:51 2016 Return-Path: Delivered-To: svn-ports-all@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 83CBDC57162; Sat, 26 Nov 2016 21:32:51 +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 35CD51F80; Sat, 26 Nov 2016 21:32:51 +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 uAQLWoD9015359; Sat, 26 Nov 2016 21:32:50 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAQLWobU015357; Sat, 26 Nov 2016 21:32:50 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201611262132.uAQLWobU015357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Sat, 26 Nov 2016 21:32:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427183 - 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Nov 2016 21:32:51 -0000 Author: osa Date: Sat Nov 26 21:32:50 2016 New Revision: 427183 URL: https://svnweb.freebsd.org/changeset/ports/427183 Log: Fix the functionality issue of the third-party modsecurity module. Found by: Rami Jebara (in private mail) Modified: head/www/nginx-devel/Makefile head/www/nginx/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sat Nov 26 19:26:42 2016 (r427182) +++ head/www/nginx-devel/Makefile Sat Nov 26 21:32:50 2016 (r427183) @@ -870,6 +870,7 @@ LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libyajl.so:devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 +USES+= pkgconfig shebangfix MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity @@ -1282,7 +1283,9 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module \ + --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} \ + --with-curl=${LOCALBASE} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT} Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Nov 26 19:26:42 2016 (r427182) +++ head/www/nginx/Makefile Sat Nov 26 21:32:50 2016 (r427183) @@ -862,6 +862,7 @@ LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libyajl.so:devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 +USES+= pkgconfig shebangfix MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity @@ -1272,7 +1273,9 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module \ + --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} \ + --with-curl=${LOCALBASE} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT}