CVS commit: pkgsrc/www

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu Jun 29 12:20:06 UTC 2017

Modified Files:
        pkgsrc/www/nginx: Makefile Makefile.common
        pkgsrc/www/nginx-devel: Makefile

Log Message:
Install processed rather than template nginx man page. PKGREVISION++
Fixes joyent/pkgsrc/issues/515


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/nginx/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/nginx-devel/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.71 pkgsrc/www/nginx/Makefile:1.72
--- pkgsrc/www/nginx/Makefile:1.71      Mon Jun  5 14:25:07 2017
+++ pkgsrc/www/nginx/Makefile   Thu Jun 29 12:20:05 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2017/06/05 14:25:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2017/06/29 12:20:05 fhajny Exp $
 
 DISTNAME=              nginx-1.12.0
 MAINTAINER=            joerg%NetBSD.org@localhost
 
-PKGREVISION= 1
+PKGREVISION=   2
 .include "../../www/nginx/Makefile.common"

Index: pkgsrc/www/nginx/Makefile.common
diff -u pkgsrc/www/nginx/Makefile.common:1.9 pkgsrc/www/nginx/Makefile.common:1.10
--- pkgsrc/www/nginx/Makefile.common:1.9        Sun Jan  1 16:38:24 2017
+++ pkgsrc/www/nginx/Makefile.common    Thu Jun 29 12:20:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2017/01/01 16:38:24 rillig Exp $
+# $NetBSD: Makefile.common,v 1.10 2017/06/29 12:20:05 fhajny Exp $
 # used by www/nginx/Makefile
 # used by www/nginx-devel/Makefile
 
@@ -107,7 +107,7 @@ do-install:
 .endfor
        ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
        ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
-       ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 .if !empty(PKG_OPTIONS:Mnaxsi)
        ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
 .endif

Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.24 pkgsrc/www/nginx-devel/Makefile:1.25
--- pkgsrc/www/nginx-devel/Makefile:1.24        Tue May  2 12:31:43 2017
+++ pkgsrc/www/nginx-devel/Makefile     Thu Jun 29 12:20:06 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2017/05/02 12:31:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.25 2017/06/29 12:20:06 fhajny Exp $
 
 DISTNAME=              nginx-1.13.0
 MAINTAINER=            imil%NetBSD.org@localhost
 
+PKGREVISION=   1
 .include "../../www/nginx/Makefile.common"