From owner-svn-ports-head@FreeBSD.ORG Tue May 5 16:16:32 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9D4B534; Tue, 5 May 2015 16:16:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 7E0F1174F; Tue, 5 May 2015 16:16:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t45GGWEC067852; Tue, 5 May 2015 16:16:32 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t45GGWxQ067849; Tue, 5 May 2015 16:16:32 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201505051616.t45GGWxQ067849@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 5 May 2015 16:16:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385478 - 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.20 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: Tue, 05 May 2015 16:16:32 -0000 Author: bdrewery Date: Tue May 5 16:16:31 2015 New Revision: 385478 URL: https://svnweb.freebsd.org/changeset/ports/385478 Log: Fix selection of HTTP_XSLT and MODSECURITY so that the proper LIB_DEPENDS on libxslt is added. Modified: head/www/nginx-devel/Makefile head/www/nginx/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue May 5 16:14:04 2015 (r385477) +++ head/www/nginx-devel/Makefile Tue May 5 16:16:31 2015 (r385478) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -512,7 +513,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MHTTP_XSLT} -USE_GNOME= libxml2 libxslt +USE_GNOME+= libxml2 libxslt CONFIGURE_ARGS+=--with-http_xslt_module .endif @@ -596,7 +597,7 @@ LIB_DEPENDS+= libpcre.so:${PORTSDIR}/dev libcurl.so:${PORTSDIR}/ftp/curl \ libyajl.so:${PORTSDIR}/devel/yajl USE_APACHE= 22+ -USE_GNOME= libxml2 +USE_GNOME+= libxml2 MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Tue May 5 16:14:04 2015 (r385477) +++ head/www/nginx/Makefile Tue May 5 16:16:31 2015 (r385478) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.8.0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -508,7 +509,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .endif .if ${PORT_OPTIONS:MHTTP_XSLT} -USE_GNOME= libxml2 libxslt +USE_GNOME+= libxml2 libxslt CONFIGURE_ARGS+=--with-http_xslt_module .endif @@ -592,7 +593,7 @@ LIB_DEPENDS+= libpcre.so:${PORTSDIR}/dev libcurl.so:${PORTSDIR}/ftp/curl \ libyajl.so:${PORTSDIR}/devel/yajl USE_APACHE= 22+ -USE_GNOME= libxml2 +USE_GNOME+= libxml2 MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity