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

[Sergey A. Osokin]

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>