Mon Oct 12 14:53:17 2015 UTC ()
Fix install on Darwin, perl module extension suffix is ".bundle" not ".so".


(jperkin)
diff -r1.6 -r1.7 pkgsrc/www/nginx/Makefile.common
diff -r1.9 -r1.10 pkgsrc/www/nginx/PLIST
diff -r1.3 -r1.4 pkgsrc/www/nginx-devel/PLIST
cvs diff -r1.6 -r1.7 pkgsrc/www/nginx/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/nginx/Attic/Makefile.common 2015/09/30 13:36:00 1.6
+++ pkgsrc/www/nginx/Attic/Makefile.common 2015/10/12 14:53:17 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.6 2015/09/30 13:36:00 imil Exp $ 1# $NetBSD: Makefile.common,v 1.7 2015/10/12 14:53:17 jperkin Exp $
2# used by www/nginx/Makefile 2# used by www/nginx/Makefile
3# used by www/nginx-devel/Makefile 3# used by www/nginx-devel/Makefile
4 4
5# Used by both www/nginx and www/nginx-devel 5# Used by both www/nginx and www/nginx-devel
6# Do *not* add any version-specific data here, any change 6# Do *not* add any version-specific data here, any change
7# in this file will affect both packages 7# in this file will affect both packages
8 8
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= http://nginx.org/download/ 10MASTER_SITES= http://nginx.org/download/
11DISTFILES= ${DEFAULT_DISTFILES} 11DISTFILES= ${DEFAULT_DISTFILES}
12 12
13HOMEPAGE= http://nginx.org/ 13HOMEPAGE= http://nginx.org/
14COMMENT= Lightweight HTTP server and mail proxy server 14COMMENT= Lightweight HTTP server and mail proxy server
@@ -79,36 +79,43 @@ SUBST_CLASSES+= paths @@ -79,36 +79,43 @@ SUBST_CLASSES+= paths
79SUBST_STAGE.paths= pre-configure 79SUBST_STAGE.paths= pre-configure
80SUBST_FILES.paths= conf/nginx.conf 80SUBST_FILES.paths= conf/nginx.conf
81SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g' 81SUBST_SED.paths= -e 's,%%PKG_SYSCONFDIR%%,${PKG_SYSCONFDIR},g'
82SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g' 82SUBST_SED.paths+= -e 's,%%NGINX_LOGDIR%%,${NGINX_LOGDIR},g'
83SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g' 83SUBST_SED.paths+= -e 's,%%NGINX_PIDDIR%%,${NGINX_PIDDIR},g'
84SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g' 84SUBST_SED.paths+= -e 's,%%NGINX_USER%%,${NGINX_USER},g'
85SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g' 85SUBST_SED.paths+= -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
86 86
87MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR} 87MESSAGE_SUBST+= NGINX_LOGDIR=${NGINX_LOGDIR}
88MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR} 88MESSAGE_SUBST+= NGINX_PIDDIR=${NGINX_PIDDIR}
89MESSAGE_SUBST+= NGINX_USER=${NGINX_USER} 89MESSAGE_SUBST+= NGINX_USER=${NGINX_USER}
90MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} 90MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP}
91 91
 92.if ${OPSYS} == "Darwin"
 93SOEXT= bundle
 94.else
 95SOEXT= so
 96.endif
 97PLIST_SUBST+= SOEXT=${SOEXT}
 98
92do-install: 99do-install:
93 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx 100 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
94.for file in ${EGFILES} 101.for file in ${EGFILES}
95 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 102 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
96.endfor 103.endfor
97 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 104 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
98 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 105 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
99 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 106 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
100.if !empty(PKG_OPTIONS:Mnaxsi) 107.if !empty(PKG_OPTIONS:Mnaxsi)
101 ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf 108 ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
102.endif 109.endif
103.if !empty(PKG_OPTIONS:Mperl) 110.if !empty(PKG_OPTIONS:Mperl)
104 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx 111 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
105 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \ 112 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.${SOEXT} \
106 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx 113 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
107 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \ 114 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
108 ${DESTDIR}${PERL5_INSTALLVENDORARCH} 115 ${DESTDIR}${PERL5_INSTALLVENDORARCH}
109.endif 116.endif
110 117
111 118
112.include "../../devel/zlib/buildlink3.mk" 119.include "../../devel/zlib/buildlink3.mk"
113.include "../../mk/bsd.pkg.mk" 120.include "../../mk/bsd.pkg.mk"
114.include "../../www/nginx/Makefile.cflags" 121.include "../../www/nginx/Makefile.cflags"
cvs diff -r1.9 -r1.10 pkgsrc/www/nginx/PLIST (expand / switch to unified diff)

--- pkgsrc/www/nginx/PLIST 2014/06/20 18:48:37 1.9
+++ pkgsrc/www/nginx/PLIST 2015/10/12 14:53:17 1.10
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.9 2014/06/20 18:48:37 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.10 2015/10/12 14:53:17 jperkin Exp $
2${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.so 2${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
3${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm 3${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
4man/man8/nginx.8 4man/man8/nginx.8
5sbin/nginx 5sbin/nginx
6share/examples/nginx/conf/fastcgi.conf 6share/examples/nginx/conf/fastcgi.conf
7share/examples/nginx/conf/fastcgi_params 7share/examples/nginx/conf/fastcgi_params
8share/examples/nginx/conf/koi-utf 8share/examples/nginx/conf/koi-utf
9share/examples/nginx/conf/koi-win 9share/examples/nginx/conf/koi-win
10share/examples/nginx/conf/mime.types 10share/examples/nginx/conf/mime.types
11share/examples/nginx/conf/nginx.conf 11share/examples/nginx/conf/nginx.conf
12${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params 12${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
13${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules 13${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules
14share/examples/nginx/conf/win-utf 14share/examples/nginx/conf/win-utf
15share/examples/nginx/html/50x.html 15share/examples/nginx/html/50x.html
cvs diff -r1.3 -r1.4 pkgsrc/www/nginx-devel/PLIST (expand / switch to unified diff)

--- pkgsrc/www/nginx-devel/PLIST 2014/07/15 12:55:03 1.3
+++ pkgsrc/www/nginx-devel/PLIST 2015/10/12 14:53:17 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.3 2014/07/15 12:55:03 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.4 2015/10/12 14:53:17 jperkin Exp $
2${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.so 2${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
3${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm 3${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
4man/man8/nginx.8 4man/man8/nginx.8
5sbin/nginx 5sbin/nginx
6share/examples/nginx/conf/fastcgi.conf 6share/examples/nginx/conf/fastcgi.conf
7share/examples/nginx/conf/fastcgi_params 7share/examples/nginx/conf/fastcgi_params
8share/examples/nginx/conf/koi-utf 8share/examples/nginx/conf/koi-utf
9share/examples/nginx/conf/koi-win 9share/examples/nginx/conf/koi-win
10share/examples/nginx/conf/mime.types 10share/examples/nginx/conf/mime.types
11share/examples/nginx/conf/nginx.conf 11share/examples/nginx/conf/nginx.conf
12${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params 12${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
13${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules 13${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules
14share/examples/nginx/conf/win-utf 14share/examples/nginx/conf/win-utf
15share/examples/nginx/html/50x.html 15share/examples/nginx/html/50x.html