Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Apr 2016 17:28:01 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
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
Message-ID:  <201604301728.u3UHS1Xu098733@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604301728.u3UHS1Xu098733>