From owner-svn-ports-all@freebsd.org  Sat Apr 30 17:28:02 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 2AB96B22204;
 Sat, 30 Apr 2016 17:28:02 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 F0B531FFE;
 Sat, 30 Apr 2016 17:28:01 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3UHS1kk098735;
 Sat, 30 Apr 2016 17:28:01 GMT (envelope-from osa@FreeBSD.org)
Received: (from osa@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3UHS1Xu098733;
 Sat, 30 Apr 2016 17:28:01 GMT (envelope-from osa@FreeBSD.org)
Message-Id: <201604301728.u3UHS1Xu098733@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org
 using -f
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Sat, 30 Apr 2016 17:28:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r414350 - 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.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Apr 2016 17:28:02 -0000

Author: osa
Date: Sat Apr 30 17:28:00 2016
New Revision: 414350
URL: https://svnweb.freebsd.org/changeset/ports/414350

Log:
  Fix the nginx.conf-dist installation if DSO undefined.
  Do not bump PORTREVISION because DSO is defined by default.
  
  Pointed out by: mat

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

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Apr 30 16:53:44 2016	(r414349)
+++ head/www/nginx-devel/Makefile	Sat Apr 30 17:28:00 2016	(r414350)
@@ -1286,9 +1286,9 @@ post-install:
 	(cd ${STAGEDIR} && \
 		${FIND} ${MODULESDIR:S|^/||} -type f -name '*.so' \
 			-exec ${ECHO_CMD} "load_module /{};" \; \
-			>>${STAGEDIR}${ETCDIR}/nginx.conf-dist && \
-		${CAT} ${WRKSRC}/conf/nginx.conf \
 			>>${STAGEDIR}${ETCDIR}/nginx.conf-dist)
 .endif
+	${CAT} ${WRKSRC}/conf/nginx.conf \
+		>>${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 .include <bsd.port.mk>

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Apr 30 16:53:44 2016	(r414349)
+++ head/www/nginx/Makefile	Sat Apr 30 17:28:00 2016	(r414350)
@@ -1286,9 +1286,9 @@ post-install:
 	(cd ${STAGEDIR} && \
 		${FIND} ${MODULESDIR:S|^/||} -type f -name '*.so' \
 			-exec ${ECHO_CMD} "load_module /{};" \; \
-			>>${STAGEDIR}${ETCDIR}/nginx.conf-dist && \
-		${CAT} ${WRKSRC}/conf/nginx.conf \
 			>>${STAGEDIR}${ETCDIR}/nginx.conf-dist)
 .endif
+	${CAT} ${WRKSRC}/conf/nginx.conf \
+		>>${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 .include <bsd.port.mk>