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

[Bryan Drewery]

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