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

[Sergey A. Osokin]

Author: osa
Date: Thu Jun 25 21:06:39 2015
New Revision: 390602
URL: https://svnweb.freebsd.org/changeset/ports/390602

Log:
  Be more accurate with tmpdir removal and remove only empty tmpdir.
  Cause otherwise removal non-empty tmpdir breaks running nginx instance.
  
  Bump PORTREVISION.
  
  PR:		201045
  Tested by:	grembo

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/pkg-plist
  head/www/nginx/Makefile
  head/www/nginx/pkg-plist

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Thu Jun 25 20:23:28 2015	(r390601)
+++ head/www/nginx-devel/Makefile	Thu Jun 25 21:06:39 2015	(r390602)
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -1020,6 +1021,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}

Modified: head/www/nginx-devel/pkg-plist
==============================================================================
--- head/www/nginx-devel/pkg-plist	Thu Jun 25 20:23:28 2015	(r390601)
+++ head/www/nginx-devel/pkg-plist	Thu Jun 25 21:06:39 2015	(r390602)
@@ -24,5 +24,5 @@
 %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist
 %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
 sbin/nginx
- at unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi
+ at dir %%NGINX_TMPDIR%%
 man/man8/nginx.8.gz

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Thu Jun 25 20:23:28 2015	(r390601)
+++ head/www/nginx/Makefile	Thu Jun 25 21:06:39 2015	(r390602)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -986,6 +986,7 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}

Modified: head/www/nginx/pkg-plist
==============================================================================
--- head/www/nginx/pkg-plist	Thu Jun 25 20:23:28 2015	(r390601)
+++ head/www/nginx/pkg-plist	Thu Jun 25 21:06:39 2015	(r390602)
@@ -24,5 +24,5 @@
 %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist
 %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
 sbin/nginx
- at unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi
+ at dir %%NGINX_TMPDIR%%
 man/man8/nginx.8.gz