Update to latest bugfix release 0.5.17.

Change knob IMAP_MODULE to MAIL_MODULE (1).
Keep compatibility for IMAP_MODULE, notice warning if usage.
Cosmetic fixes for package list (2).

(1) Anton Yuzhaninov (citrin at rambler-co dot ru)
(2) portlint -a

6 files changed, 34 insertions, 18 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 44f1b20fd4b9..75208d0a2f8f 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.5.15
+PORTVERSION=	0.5.17
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -52,9 +52,9 @@ NGINX_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-http_ssl_module
 .endif
 
-.if defined(WITH_IMAP_MODULE)
+.if defined(WITH_MAIL_MODULE) || defined(WITH_IMAP_MODULE)
 NGINX_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-imap --with-imap_ssl_module
+CONFIGURE_ARGS+=--with-mail --with-mail_ssl_module
 .endif
 
 .if defined(NGINX_OPENSSL)
@@ -81,6 +81,14 @@ PLIST_SUB+=	WWWDATA=""
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
+pre-fetch:
+.if defined(WITH_IMAP_MODULE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} WITH_IMAP_MODULE knob deprecated.
+	@${ECHO_MSG} Please use WITH_MAIL_MODULE knob instead.
+	@${ECHO_MSG}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index ed68463abf11..b9c9c32f3a0f 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (nginx-0.5.15.tar.gz) = 651feea215c9d934542b4bae1711d921
-SHA256 (nginx-0.5.15.tar.gz) = 38728a5f68fa20a55825703735be5ecac2c87b6fa4882fc3cb623fdd3d44be20
-SIZE (nginx-0.5.15.tar.gz) = 462364
+MD5 (nginx-0.5.17.tar.gz) = 1c4bb0deb22c6566fb66b40724e099ed
+SHA256 (nginx-0.5.17.tar.gz) = 6cc67c38807bb1c39a3778ed4f15594b4541e3f0d5155b5e0c792a01649c0225
+SIZE (nginx-0.5.17.tar.gz) = 463513
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index a2e58adedfb6..7182b1af0a78 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -5,15 +5,15 @@ etc/nginx/koi-win
 etc/nginx/win-utf
 @unexec if cmp -s %D/etc/nginx/mime.types %D/etc/nginx/mime.types-dist; then rm -f %D/etc/nginx/mime.types; fi
 etc/nginx/mime.types-dist
-@exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
+@exec [ -f %D/mime.types ] || cp %D/%f %D/mime.types
 @unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi
 etc/nginx/nginx.conf-dist
-@exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf
+@exec [ -f %D/nginx.conf ] || cp %D/%f %D/nginx.conf
 @dirrmtry etc/nginx
 %%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
 @comment @unexec chmod u+w 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%%@exec [ -d %D/www/nginx/ ] || ln -fs %D %D/www/nginx
 %%WWWDATA%%www/nginx-dist/index.html
 %%WWWDATA%%www/nginx-dist/50x.html
 %%WWWDATA%%@exec chmod a-w www/nginx-dist
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 44f1b20fd4b9..75208d0a2f8f 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nginx
-PORTVERSION=	0.5.15
+PORTVERSION=	0.5.17
 CATEGORIES=	www
 MASTER_SITES=	http://sysoev.ru/nginx/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -52,9 +52,9 @@ NGINX_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-http_ssl_module
 .endif
 
-.if defined(WITH_IMAP_MODULE)
+.if defined(WITH_MAIL_MODULE) || defined(WITH_IMAP_MODULE)
 NGINX_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-imap --with-imap_ssl_module
+CONFIGURE_ARGS+=--with-mail --with-mail_ssl_module
 .endif
 
 .if defined(NGINX_OPENSSL)
@@ -81,6 +81,14 @@ PLIST_SUB+=	WWWDATA=""
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
+pre-fetch:
+.if defined(WITH_IMAP_MODULE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} WITH_IMAP_MODULE knob deprecated.
+	@${ECHO_MSG} Please use WITH_MAIL_MODULE knob instead.
+	@${ECHO_MSG}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index ed68463abf11..b9c9c32f3a0f 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,3 +1,3 @@
-MD5 (nginx-0.5.15.tar.gz) = 651feea215c9d934542b4bae1711d921
-SHA256 (nginx-0.5.15.tar.gz) = 38728a5f68fa20a55825703735be5ecac2c87b6fa4882fc3cb623fdd3d44be20
-SIZE (nginx-0.5.15.tar.gz) = 462364
+MD5 (nginx-0.5.17.tar.gz) = 1c4bb0deb22c6566fb66b40724e099ed
+SHA256 (nginx-0.5.17.tar.gz) = 6cc67c38807bb1c39a3778ed4f15594b4541e3f0d5155b5e0c792a01649c0225
+SIZE (nginx-0.5.17.tar.gz) = 463513
diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist
index a2e58adedfb6..7182b1af0a78 100644
--- a/www/nginx/pkg-plist
+++ b/www/nginx/pkg-plist
@@ -5,15 +5,15 @@ etc/nginx/koi-win
 etc/nginx/win-utf
 @unexec if cmp -s %D/etc/nginx/mime.types %D/etc/nginx/mime.types-dist; then rm -f %D/etc/nginx/mime.types; fi
 etc/nginx/mime.types-dist
-@exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
+@exec [ -f %D/mime.types ] || cp %D/%f %D/mime.types
 @unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi
 etc/nginx/nginx.conf-dist
-@exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf
+@exec [ -f %D/nginx.conf ] || cp %D/%f %D/nginx.conf
 @dirrmtry etc/nginx
 %%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist
 @comment @unexec chmod u+w 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%%@exec [ -d %D/www/nginx/ ] || ln -fs %D %D/www/nginx
 %%WWWDATA%%www/nginx-dist/index.html
 %%WWWDATA%%www/nginx-dist/50x.html
 %%WWWDATA%%@exec chmod a-w www/nginx-dist