Fri May 30 08:14:07 2014 UTC ()
Add support for the embedded Perl interpreter.


(fhajny)
diff -r1.2 -r1.3 pkgsrc/www/nginx/Makefile.common
diff -r1.7 -r1.8 pkgsrc/www/nginx/PLIST
diff -r1.29 -r1.30 pkgsrc/www/nginx/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/www/nginx/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/nginx/Attic/Makefile.common 2013/05/25 18:18:58 1.2
+++ pkgsrc/www/nginx/Attic/Makefile.common 2014/05/30 08:14:07 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.2 2013/05/25 18:18:58 shattered Exp $ 1# $NetBSD: Makefile.common,v 1.3 2014/05/30 08:14:07 fhajny 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
@@ -90,18 +90,27 @@ MESSAGE_SUBST+= NGINX_USER=${NGINX_USER @@ -90,18 +90,27 @@ MESSAGE_SUBST+= NGINX_USER=${NGINX_USER
90MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP} 90MESSAGE_SUBST+= NGINX_GROUP=${NGINX_GROUP}
91 91
92do-install: 92do-install:
93 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx 93 ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
94.for file in ${EGFILES} 94.for file in ${EGFILES}
95 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 95 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
96.endfor 96.endfor
97 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 97 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
98 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 98 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
99 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 99 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
100.if !empty(PKG_OPTIONS:Mnaxsi) 100.if !empty(PKG_OPTIONS:Mnaxsi)
101 ${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf 101 ${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
102.endif 102.endif
 103.if !empty(PKG_OPTIONS:Mperl)
 104 ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
 105 ${INSTALL_LIB} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 106 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
 107 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs \
 108 ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx
 109 ${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 110 ${DESTDIR}${PERL5_INSTALLVENDORARCH}
 111.endif
103 112
104 113
105.include "../../devel/zlib/buildlink3.mk" 114.include "../../devel/zlib/buildlink3.mk"
106.include "../../mk/bsd.pkg.mk" 115.include "../../mk/bsd.pkg.mk"
107.include "../../www/nginx/Makefile.cflags" 116.include "../../www/nginx/Makefile.cflags"
cvs diff -r1.7 -r1.8 pkgsrc/www/nginx/PLIST (expand / switch to unified diff)

--- pkgsrc/www/nginx/PLIST 2014/03/11 14:05:18 1.7
+++ pkgsrc/www/nginx/PLIST 2014/05/30 08:14:07 1.8
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:18 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.8 2014/05/30 08:14:07 fhajny Exp $
 2${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.bs
 3${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.so
 4${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
2man/man8/nginx.8 5man/man8/nginx.8
3sbin/nginx 6sbin/nginx
4share/examples/nginx/conf/fastcgi.conf 7share/examples/nginx/conf/fastcgi.conf
5share/examples/nginx/conf/fastcgi_params 8share/examples/nginx/conf/fastcgi_params
6share/examples/nginx/conf/koi-utf 9share/examples/nginx/conf/koi-utf
7share/examples/nginx/conf/koi-win 10share/examples/nginx/conf/koi-win
8share/examples/nginx/conf/mime.types 11share/examples/nginx/conf/mime.types
9share/examples/nginx/conf/nginx.conf 12share/examples/nginx/conf/nginx.conf
10${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params 13${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
11${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules 14${PLIST.naxsi}share/examples/nginx/conf/naxsi_core.rules
12share/examples/nginx/conf/win-utf 15share/examples/nginx/conf/win-utf
13share/examples/nginx/html/50x.html 16share/examples/nginx/html/50x.html
14share/examples/nginx/html/index.html 17share/examples/nginx/html/index.html
cvs diff -r1.29 -r1.30 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2014/03/26 13:31:22 1.29
+++ pkgsrc/www/nginx/options.mk 2014/05/30 08:14:07 1.30
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: options.mk,v 1.29 2014/03/26 13:31:22 imil Exp $ 1# $NetBSD: options.mk,v 1.30 2014/05/30 08:14:07 fhajny Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \ 4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
5 pcre push realip ssl sub uwsgi image-filter upload \ 5 pcre push realip ssl sub uwsgi image-filter upload \
6 debug status nginx-autodetect-cflags spdy echo \ 6 debug status nginx-autodetect-cflags spdy echo \
7 set-misc headers-more array-var encrypted-session \ 7 set-misc headers-more array-var encrypted-session \
8 form-input 8 form-input perl
9PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 9PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
10 10
11PLIST_VARS+= naxsi uwsgi 11PLIST_VARS+= naxsi perl uwsgi
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15# documentation says naxsi must be the first module 15# documentation says naxsi must be the first module
16.if !empty(PKG_OPTIONS:Mnaxsi) 16.if !empty(PKG_OPTIONS:Mnaxsi)
17PLIST.naxsi= yes 17PLIST.naxsi= yes
18CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src 18CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src
19.endif 19.endif
20 20
21.if !empty(PKG_OPTIONS:Mdebug) 21.if !empty(PKG_OPTIONS:Mdebug)
22CONFIGURE_ARGS+= --with-debug 22CONFIGURE_ARGS+= --with-debug
23.endif 23.endif
24 24
@@ -194,13 +194,22 @@ DISTFILES+= ${NGX_UPLOAD_DISTFILE} @@ -194,13 +194,22 @@ DISTFILES+= ${NGX_UPLOAD_DISTFILE}
194NGX_UPLOAD= nginx_upload_module-2.2.0 194NGX_UPLOAD= nginx_upload_module-2.2.0
195NGX_UPLOAD_DISTFILE= ${NGX_UPLOAD}.tar.gz 195NGX_UPLOAD_DISTFILE= ${NGX_UPLOAD}.tar.gz
196SITES.${NGX_UPLOAD_DISTFILE}= http://www.grid.net.ru/nginx/download/ 196SITES.${NGX_UPLOAD_DISTFILE}= http://www.grid.net.ru/nginx/download/
197.endif 197.endif
198 198
199.if !empty(PKG_OPTIONS:Mimage-filter) 199.if !empty(PKG_OPTIONS:Mimage-filter)
200.include "../../graphics/gd/buildlink3.mk" 200.include "../../graphics/gd/buildlink3.mk"
201CONFIGURE_ARGS+= --with-http_image_filter_module 201CONFIGURE_ARGS+= --with-http_image_filter_module
202.endif 202.endif
203 203
204.if !empty(PKG_OPTIONS:Mstatus) 204.if !empty(PKG_OPTIONS:Mstatus)
205CONFIGURE_ARGS+= --with-http_stub_status_module 205CONFIGURE_ARGS+= --with-http_stub_status_module
206.endif 206.endif
 207
 208.if !empty(PKG_OPTIONS:Mperl)
 209CONFIGURE_ARGS+= --with-http_perl_module
 210CONFIGURE_ARGS+= --with-perl=${PERL5:Q}
 211INSTALLATION_DIRS+= ${PERL5_INSTALLVENDORARCH}/auto/nginx
 212PLIST.perl= yes
 213.include "../../lang/perl5/dirs.mk"
 214.include "../../lang/perl5/buildlink3.mk"
 215.endif