From owner-svn-ports-all@freebsd.org Thu Jun 25 21:06:41 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BC8898C11D; Thu, 25 Jun 2015 21:06:41 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E056E153D; Thu, 25 Jun 2015 21:06:40 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5PL6eG9032727; Thu, 25 Jun 2015 21:06:40 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5PL6dBO032720; Thu, 25 Jun 2015 21:06:39 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201506252106.t5PL6dBO032720@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Thu, 25 Jun 2015 21:06:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390602 - in head/www: nginx nginx-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 21:06:41 -0000 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 -@unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi +@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 -@unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi +@dir %%NGINX_TMPDIR%% man/man8/nginx.8.gz