svn commit: r304538 - in head/www: nginx nginx-devel nginx-devel/files nginx/files

[Sergey A. Osokin]

Author: osa
Date: Wed Sep 19 18:29:13 2012
New Revision: 304538
URL: http://svn.freebsd.org/changeset/ports/304538

Log:
  Fix rc script for nginx with profiles.		(*)
  Configure build with original http_dav if third-party http_dav_ext defined.
  
  Bump PORTREVISIONs.
  
  Found by:	Slava Kokorin <slava.kokorin at gmail.com> (*)

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/files/nginx.in
  head/www/nginx/Makefile
  head/www/nginx/files/nginx.in

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Wed Sep 19 18:20:19 2012	(r304537)
+++ head/www/nginx-devel/Makefile	Wed Sep 19 18:29:13 2012	(r304538)
@@ -7,6 +7,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -336,11 +337,12 @@ DISTFILES+=	agentzh-headers-more-nginx-m
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
 .endif
 
-.if ${PORT_OPTIONS:MHTTP_DAV}
+.if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
 CONFIGURE_ARGS+=--with-http_dav_module
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV_EXT}
+USE_HTTP_DAV=	yes
 LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.2
 GIT_DAV_EXT_VERSION=	0-g0e07a3e

Modified: head/www/nginx-devel/files/nginx.in
==============================================================================
--- head/www/nginx-devel/files/nginx.in	Wed Sep 19 18:20:19 2012	(r304537)
+++ head/www/nginx-devel/files/nginx.in	Wed Sep 19 18:29:13 2012	(r304538)
@@ -47,7 +47,7 @@ load_rc_config $name
 if [ -n "$2" ]; then
 	profile="$2"
 	if [ "x${nginx_profiles}" != "x" ]; then
-		pidfile="${_pidprefix}.${profile}.pid"
+		pidfile="${_pidprefix}/${profile}.pid"
 		eval nginx_configfile="\${nginx_${profile}_configfile:-}"
 		if [ "x${nginx_configfile}" = "x" ]; then
 			echo "You must define a configuration file (nginx_${profile}_configfile)"

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Wed Sep 19 18:20:19 2012	(r304537)
+++ head/www/nginx/Makefile	Wed Sep 19 18:29:13 2012	(r304538)
@@ -7,6 +7,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -334,11 +335,12 @@ DISTFILES+=	agentzh-headers-more-nginx-m
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//}
 .endif
 
-.if ${PORT_OPTIONS:MHTTP_DAV}
+.if ${PORT_OPTIONS:MHTTP_DAV} || defined(USE_HTTP_DAV)
 CONFIGURE_ARGS+=--with-http_dav_module
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_DAV_EXT}
+USE_HTTP_DAV=	yes
 LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
 NGINX_DAV_EXT_VERSION=	0.0.2
 GIT_DAV_EXT_VERSION=	0-g0e07a3e

Modified: head/www/nginx/files/nginx.in
==============================================================================
--- head/www/nginx/files/nginx.in	Wed Sep 19 18:20:19 2012	(r304537)
+++ head/www/nginx/files/nginx.in	Wed Sep 19 18:29:13 2012	(r304538)
@@ -47,7 +47,7 @@ load_rc_config $name
 if [ -n "$2" ]; then
 	profile="$2"
 	if [ "x${nginx_profiles}" != "x" ]; then
-		pidfile="${_pidprefix}.${profile}.pid"
+		pidfile="${_pidprefix}/${profile}.pid"
 		eval nginx_configfile="\${nginx_${profile}_configfile:-}"
 		if [ "x${nginx_configfile}" = "x" ]; then
 			echo "You must define a configuration file (nginx_${profile}_configfile)"