Update to 0.1.5.

Add WITHOUT_WWW knob.

6 files changed, 40 insertions, 22 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index aa2925fdfc6e..e9cca3e269d1 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.1.4
+PORTVERSION=	0.1.5
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 
@@ -40,6 +40,12 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 .endif
 
+.if defined(WITHOUT_WWW)
+PLIST_SUB+=     WWWDATA="@comment "
+.else
+PLIST_SUB+=     WWWDATA=""
+.endif
+
 PLIST_FILES+=	etc/nginx/koi-win \
 		etc/rc.d/nginx.sh \
 		sbin/nginx
@@ -59,7 +65,7 @@ do-build:
 	@cd ${WRKSRC} && ${MAKE}
 
 do-install:
-	${MKDIR} ${PREFIX}/etc/nginx ${PREFIX}/www/nginx-dist
+	${MKDIR} ${PREFIX}/etc/nginx
 	${INSTALL_SCRIPT} ${WRKSRC}/nginx.sh ${PREFIX}/etc/rc.d
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/conf/koi-win ${PREFIX}/etc/nginx
@@ -68,8 +74,11 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/etc/nginx
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/etc/nginx/${i}-dist
 .endfor
+.if !defined(WITHOUT_WWW)
+	${MKDIR} ${PREFIX}/www/nginx-dist
 	${INSTALL_DATA} ${WRKSRC}/html/index.html ${PREFIX}/www/nginx-dist
 	${ECHO_CMD} "" >>${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
 	${LN} -sf ${PREFIX}/www/nginx-dist ${PREFIX}/www/nginx
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 8b66931a3860..b5a5793f54fc 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (nginx-0.1.4.tar.gz) = 953e5b9b70c9f33565208b2dab657c80
-SIZE (nginx-0.1.4.tar.gz) = 233953
+MD5 (nginx-0.1.5.tar.gz) = 91ac6b54b50a745ea04623ec1b7153cb
+SIZE (nginx-0.1.5.tar.gz) = 237067
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 4e4b4e625352..543e40b9de3d 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -6,11 +6,11 @@ etc/nginx/mime.types-dist
 etc/nginx/nginx.conf-dist
 @exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf
 @unexec rmdir $D/etc/nginx 2>/dev/null || true
-@exec mkdir -p -m 755 www/nginx-dist
+%%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
 @comment @unexec chmod u+w www/nginx-dist
-www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-@exec [ -d %D/www/nginx/ ] || ln -fs %B %D/www/nginx
-www/nginx-dist/index.html
-@exec chmod a-w www/nginx-dist
-@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
-@dirrm www/nginx-dist
+%%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
+%%WWWDATA%%@exec [ -d %D/www/nginx/ ] || ln -fs %B %D/www/nginx
+%%WWWDATA%%www/nginx-dist/index.html
+%%WWWDATA%%@exec chmod a-w www/nginx-dist
+%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
+%%WWWDATA%%@dirrm www/nginx-dist
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index aa2925fdfc6e..e9cca3e269d1 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.1.4
+PORTVERSION=	0.1.5
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 
@@ -40,6 +40,12 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 .endif
 
+.if defined(WITHOUT_WWW)
+PLIST_SUB+=     WWWDATA="@comment "
+.else
+PLIST_SUB+=     WWWDATA=""
+.endif
+
 PLIST_FILES+=	etc/nginx/koi-win \
 		etc/rc.d/nginx.sh \
 		sbin/nginx
@@ -59,7 +65,7 @@ do-build:
 	@cd ${WRKSRC} && ${MAKE}
 
 do-install:
-	${MKDIR} ${PREFIX}/etc/nginx ${PREFIX}/www/nginx-dist
+	${MKDIR} ${PREFIX}/etc/nginx
 	${INSTALL_SCRIPT} ${WRKSRC}/nginx.sh ${PREFIX}/etc/rc.d
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/conf/koi-win ${PREFIX}/etc/nginx
@@ -68,8 +74,11 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/etc/nginx
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${PREFIX}/etc/nginx/${i}-dist
 .endfor
+.if !defined(WITHOUT_WWW)
+	${MKDIR} ${PREFIX}/www/nginx-dist
 	${INSTALL_DATA} ${WRKSRC}/html/index.html ${PREFIX}/www/nginx-dist
 	${ECHO_CMD} "" >>${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
 	${LN} -sf ${PREFIX}/www/nginx-dist ${PREFIX}/www/nginx
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 8b66931a3860..b5a5793f54fc 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,2 +1,2 @@
-MD5 (nginx-0.1.4.tar.gz) = 953e5b9b70c9f33565208b2dab657c80
-SIZE (nginx-0.1.4.tar.gz) = 233953
+MD5 (nginx-0.1.5.tar.gz) = 91ac6b54b50a745ea04623ec1b7153cb
+SIZE (nginx-0.1.5.tar.gz) = 237067
diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index 4e4b4e625352..543e40b9de3d 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -6,11 +6,11 @@ etc/nginx/mime.types-dist
 etc/nginx/nginx.conf-dist
 @exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf
 @unexec rmdir $D/etc/nginx 2>/dev/null || true
-@exec mkdir -p -m 755 www/nginx-dist
+%%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
 @comment @unexec chmod u+w www/nginx-dist
-www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
-@exec [ -d %D/www/nginx/ ] || ln -fs %B %D/www/nginx
-www/nginx-dist/index.html
-@exec chmod a-w www/nginx-dist
-@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
-@dirrm www/nginx-dist
+%%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
+%%WWWDATA%%@exec [ -d %D/www/nginx/ ] || ln -fs %B %D/www/nginx
+%%WWWDATA%%www/nginx-dist/index.html
+%%WWWDATA%%@exec chmod a-w www/nginx-dist
+%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
+%%WWWDATA%%@dirrm www/nginx-dist