Sun Sep 23 12:46:15 2012 UTC ()
Add option 'nginx-autodetect-cflags' (not set by default) -- fixes build
problem on Solaris with Sun compiler (nginx ticket 65).


(shattered)
diff -r1.25 -r1.26 pkgsrc/www/nginx/Makefile
diff -r0 -r1.1 pkgsrc/www/nginx/Makefile.cflags
diff -r1.16 -r1.17 pkgsrc/www/nginx/options.mk
cvs diff -r1.25 -r1.26 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2012/08/08 06:44:08 1.25
+++ pkgsrc/www/nginx/Makefile 2012/09/23 12:46:15 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2012/08/08 06:44:08 imil Exp $ 1# $NetBSD: Makefile,v 1.26 2012/09/23 12:46:15 shattered Exp $
2 2
3DISTNAME= nginx-1.2.3 3DISTNAME= nginx-1.2.3
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= http://nginx.org/download/ 5MASTER_SITES= http://nginx.org/download/
6DISTFILES= ${DEFAULT_DISTFILES} 6DISTFILES= ${DEFAULT_DISTFILES}
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://nginx.org/ 9HOMEPAGE= http://nginx.org/
10COMMENT= Lightweight HTTP server and mail proxy server 10COMMENT= Lightweight HTTP server and mail proxy server
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
@@ -91,13 +91,14 @@ do-install: @@ -91,13 +91,14 @@ do-install:
91.for file in ${EGFILES} 91.for file in ${EGFILES}
92 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file} 92 ${INSTALL_DATA} ${WRKSRC}/conf/${file} ${DESTDIR}${EGDIR}/conf/${file}
93.endfor 93.endfor
94 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html 94 ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
95 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html 95 ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
96 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 96 ${INSTALL_MAN} ${WRKSRC}/man/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
97.if !empty(PKG_OPTIONS:Mnaxsi) 97.if !empty(PKG_OPTIONS:Mnaxsi)
98 ${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf 98 ${INSTALL_DATA} ${WRKDIR}/${NAXSI}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
99.endif 99.endif
100 100
101 101
102.include "../../devel/zlib/buildlink3.mk" 102.include "../../devel/zlib/buildlink3.mk"
103.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
 104.include "Makefile.cflags"
File Added: pkgsrc/www/nginx/Attic/Makefile.cflags
# $NetBSD: Makefile.cflags,v 1.1 2012/09/23 12:46:15 shattered Exp $

# This must be included after everything else to truly clear CFLAGS.
# If CFLAGS is non-empty, build with SunPro fails (bug 65).

.if !empty(PKG_OPTIONS:Mnginx-autodetect-cflags)
CFLAGS=
.endif
cvs diff -r1.16 -r1.17 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2012/08/06 14:31:58 1.16
+++ pkgsrc/www/nginx/options.mk 2012/09/23 12:46:15 1.17
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: options.mk,v 1.16 2012/08/06 14:31:58 imil Exp $ 1# $NetBSD: options.mk,v 1.17 2012/09/23 12:46:15 shattered Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \ 4PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \
5 push realip ssl sub uwsgi image-filter upload debug \ 5 push realip ssl sub uwsgi image-filter upload debug \
6 status 6 status nginx-autodetect-cflags
7PKG_SUGGESTED_OPTIONS= inet6 pcre ssl 7PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
8 8
9PLIST_VARS+= naxsi uwsgi 9PLIST_VARS+= naxsi uwsgi
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13# documentation says naxsi must be the first module 13# documentation says naxsi must be the first module
14.if !empty(PKG_OPTIONS:Mnaxsi) 14.if !empty(PKG_OPTIONS:Mnaxsi)
15PLIST.naxsi= yes 15PLIST.naxsi= yes
16CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src 16CONFIGURE_ARGS+= --add-module=../${NAXSI}/naxsi_src
17.endif 17.endif
18 18
19.if !empty(PKG_OPTIONS:Mdebug) 19.if !empty(PKG_OPTIONS:Mdebug)