<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[125927] trunk/dports/www/nginx/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/125927">125927</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-09-29 12:54:09 -0700 (Mon, 29 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>nginx: update to 1.7.5 mainline
Apparently nginx "mainline" is no longer "unstable" or "development" as it
previously was. As such, it probably makes sense to track that version. I also
received a few requests suggesting that.
Furthermore:
- Install the sample configuration files in $prefix/share/nginx/examples and
copy them to $prefix/etc/nginx on activation if they don't exist yet. Closes
#44463.
- Update the upload progress module to 0.9.1
- Update the HTTP Redis module to 0.3.7
- Update the RTMP module to 1.1.5. This one is currently broken with 1.7.5,
a future release will apparently fix that, upstream is aware of the issue.
- Update the HTTP push module to 0.73
- Update the Lua module to 0.9.12. This one is also broken with 1.7.5.
- Fix livecheck to point to mainline instead</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwnginxPortfile">trunk/dports/www/nginx/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwnginxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/nginx/Portfile (125926 => 125927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/nginx/Portfile 2014-09-29 18:58:31 UTC (rev 125926)
+++ trunk/dports/www/nginx/Portfile 2014-09-29 19:54:09 UTC (rev 125927)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name nginx
</span><del>-version 1.6.2
</del><ins>+version 1.7.5
</ins><span class="cx"> categories www mail
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> http://www.grid.net.ru/nginx/download/:upload_module \
</span><span class="cx"> googlecode:mod-zip:zip_module \
</span><span class="cx"> http://people.freebsd.org/~osa/:redis_module \
</span><del>- https://github.com/downloads/masterzen/nginx-upload-progress-module:uploadprogress_module \
</del><ins>+ https://github.com/masterzen/nginx-upload-progress-module/archive/:uploadprogress_module \
</ins><span class="cx"> https://github.com/arut/nginx-dav-ext-module/archive/:davext_module \
</span><span class="cx"> https://github.com/arut/nginx-rtmp-module/archive/:rtmp_module \
</span><span class="cx"> https://github.com/slact/nginx_http_push_module/archive/:http_push_module \
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> distfiles ${name}-${version}${extract.suffix}:nginx
</span><span class="cx"> checksums ${name}-${version}${extract.suffix} \
</span><del>- rmd160 58704be748781db2bcd67e5bad842f5ff8c55326 \
- sha256 b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18
</del><ins>+ rmd160 4bd7b1c8a39eb366548a31073249b5bb4baac498 \
+ sha256 d670006fbeca226d1dd18ad749d9fe6f8b18642f94de3377e0ac69a660e3ca9b
</ins><span class="cx">
</span><span class="cx"> depends_lib port:pcre \
</span><span class="cx"> port:zlib
</span><span class="lines">@@ -43,15 +43,17 @@
</span><span class="cx"> patchfiles patch-auto__install.diff \
</span><span class="cx"> patch-conf__nginx.conf.diff
</span><span class="cx">
</span><ins>+set nginx_share ${prefix}/share/${name}
+set nginx_examples ${nginx_share}/examples
</ins><span class="cx"> set nginx_confdir ${prefix}/etc/${name}
</span><span class="cx"> set nginx_logdir ${prefix}/var/log/${name}
</span><span class="cx"> set nginx_rundir ${prefix}/var/run/${name}
</span><span class="cx"> set nginx_pidfile ${nginx_rundir}/${name}.pid
</span><span class="cx"> set nginx_all_confs {fastcgi.conf fastcgi_params mime.types nginx.conf scgi_params uwsgi_params}
</span><ins>+set auto_activate_confs {nginx.conf mime.types fastcgi_params}
</ins><span class="cx">
</span><span class="cx"> # portfile-scoped vars for variant routines to re-def and use in port-stages (post-extract, pre-patch, etc)
</span><span class="cx"> set nginx_upload_mod_dirname ""
</span><del>-set nginx_upload_progress_mod_dirname ""
</del><span class="cx">
</span><span class="cx"> # for aforementioned re-defs of portfile-scoped vars in variant routines
</span><span class="cx"> proc nginx_set_portfile_var {var_name new_value} {
</span><span class="lines">@@ -82,25 +84,38 @@
</span><span class="cx"> ${destroot}${nginx_rundir}
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><ins>+ xinstall -d -m 755 ${destroot}${nginx_share}
+ xinstall -d -m 755 ${destroot}${nginx_examples}
+
</ins><span class="cx"> foreach conf ${nginx_all_confs} {
</span><span class="cx"> set conf_path "${destroot}${nginx_confdir}/${conf}"
</span><span class="cx"> if {[file exists ${conf_path}]} {
</span><span class="cx"> file delete ${conf_path}
</span><span class="cx"> }
</span><ins>+ if {[file exists ${conf_path}.default]} {
+ move ${conf_path}.default ${destroot}${nginx_examples}
+ }
</ins><span class="cx"> }
</span><del>- file mkdir ${destroot}${prefix}/share/nginx
- file rename ${destroot}${prefix}/html ${destroot}${prefix}/share/nginx
</del><ins>+
+ file rename ${destroot}${prefix}/html ${destroot}${nginx_share}
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+post-activate {
+ foreach conf ${auto_activate_confs} {
+ if {![file exists ${nginx_confdir}/${conf}]} {
+ xinstall -m 644 ${nginx_examples}/${conf} ${nginx_confdir}/${conf}
+ }
+ }
+}
+
</ins><span class="cx"> startupitem.create yes
</span><span class="cx"> startupitem.pidfile auto ${nginx_pidfile}
</span><span class="cx"> startupitem.executable ${prefix}/sbin/nginx
</span><span class="cx">
</span><del>-notes \
- "A sample nginx configuration file has been installed in
- ${nginx_confdir}/nginx.conf.default.\nCopy the configuration to
- ${nginx_confdir}/nginx.conf\nand adjust it to your needs before starting\
- nginx."
</del><ins>+notes "\
+ A set of sample configuration files has been installed in ${nginx_examples}.\n\n\
+ Additionally, the files [join ${auto_activate_confs} ", "] have been copied to ${nginx_confdir} if they didn't exist yet.\n\
+ Adjust these files to your needs before starting nginx."
</ins><span class="cx">
</span><span class="cx"> variant addition description {Append text to pages} {
</span><span class="cx"> configure.args-append --with-http_addition_module
</span><span class="lines">@@ -238,19 +253,13 @@
</span><span class="cx">
</span><span class="cx"> variant upload_progress description {Enable Brice Figureau's upload progress module (https://github.com/masterzen/nginx-upload-progress-module)} {
</span><span class="cx"> set uploadprg_filename nginx_uploadprogress_module
</span><del>- set uploadprg_version 0.9.0
- set uploadprg_distname ${uploadprg_filename}-${uploadprg_version}
</del><ins>+ set uploadprg_version 0.9.1
+ set uploadprg_distname v${uploadprg_version}
</ins><span class="cx"> distfiles-append ${uploadprg_distname}.tar.gz:uploadprogress_module
</span><span class="cx"> checksums-append ${uploadprg_distname}.tar.gz \
</span><del>- rmd160 10ff91748a06afd81abb9fdb203f164ea369463a \
- sha256 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
- configure.args-append --add-module=${workpath}/${uploadprg_distname}
-
- nginx_set_portfile_var nginx_upload_progress_mod_dirname "${uploadprg_distname}"
- post-extract {
- move [glob -directory ${workpath} masterzen-nginx-upload-progress-module*] \
- "${workpath}/${nginx_upload_progress_mod_dirname}"
- }
</del><ins>+ rmd160 4810c8588d7fba9dc0130ec67ffe7e3ef27a2dd5 \
+ sha256 99ec072cca35cd7791e77c40a8ded41a7a8c1111e057be26e55fba2fdf105f43
+ configure.args-append --add-module=${workpath}/nginx-upload-progress-module-${uploadprg_version}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant xslt description {Post-process pages with XSLT} {
</span><span class="lines">@@ -272,35 +281,36 @@
</span><span class="cx">
</span><span class="cx"> variant redis description {Enable Ngx HTTP Redis module} {
</span><span class="cx"> set redis_filename ngx_http_redis
</span><del>- set redis_version 0.3.6
</del><ins>+ set redis_version 0.3.7
</ins><span class="cx"> set redis_distname ${redis_filename}-${redis_version}
</span><span class="cx"> distfiles-append ${redis_distname}.tar.gz:redis_module
</span><span class="cx"> checksums-append ${redis_distname}.tar.gz \
</span><del>- rmd160 0d1de19ce1ae8b9b7fcd9693908403e613f5391d \
- sha256 9e5d8c0f1317a6910710c94d27f9aca4968c48ee1de271e5034525a1e9b6c70e
</del><ins>+ rmd160 c63731371c547f67f4dd8a222ce0fad6ea67632f \
+ sha256 9dfc14db81f431fdf3d69f3661a37daf110aef5f9479aa7c88cf362bb5d62604
</ins><span class="cx"> configure.args-append --add-module=${workpath}/${redis_distname}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant rtmp description {Enable Ngx RTMP module (https://github.com/arut/nginx-rtmp-module)} {
</span><span class="cx"> set rtmp_filename nginx-rtmp-module
</span><del>- set rtmp_version 1.1.4
</del><ins>+ # currently broken with 1.7.5
+ set rtmp_version 1.1.5
</ins><span class="cx"> set rtmp_distname ${rtmp_filename}-${rtmp_version}
</span><span class="cx"> distfiles-append v${rtmp_version}.tar.gz:rtmp_module
</span><span class="cx"> checksums-append v${rtmp_version}.tar.gz \
</span><del>- rmd160 c6338c64bab5c1c4aa10f908439fb1a5caa86ffc \
- sha256 076efef9698076fa23622e093cfb3959e4d14fcd6e9dcdf0b8e6d9154c720dc9
</del><ins>+ rmd160 7ef95c413c86ffc84764cdc85c8c1a47182f866e \
+ sha256 990467fed853b8eecd9b1b10050e2406071d705896be452539be8eced24adf4a
</ins><span class="cx"> configure.args-append --add-module=${workpath}/${rtmp_distname}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant http_push description {Enable Ngx HTTP Push module (https://github.com/slact/nginx_http_push_module)} {
</span><del>- set http_push_filename nginx_http_push_module
- set http_push_version 0.712
- set http_push_distname ${http_push_filename}-${http_push_version}
- distfiles-append v${http_push_version}.tar.gz:http_push_module
- checksums-append v${http_push_version}.tar.gz \
- rmd160 e51c174a0454e5bfb9234252dab73e71338ebdb9 \
- sha256 03eed6c4faf10d4c6226032c5f2632123c8333d9f95364a2a948a31677495719
- configure.args-append --add-module=${workpath}/${http_push_distname}
</del><ins>+ set http_push_filename nginx_http_push_module
+ set http_push_version 0.73
+ set http_push_distname ${http_push_filename}-${http_push_version}
+ distfiles-append v${http_push_version}.tar.gz:http_push_module
+ checksums-append v${http_push_version}.tar.gz \
+ rmd160 4614b35edb7d1fe9e367d769f4c7e39589d3fae2 \
+ sha256 a2a5b53a847493abef89c27360460997bea2b01d1394a7a612f1e13e4cfbb98a
+ configure.args-append --add-module=${workpath}/${http_push_distname}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant devel_kit description {Enable ngx_devel_kit module (https://github.com/simpl/ngx_devel_kit)} {
</span><span class="lines">@@ -318,12 +328,13 @@
</span><span class="cx"> variant lua requires devel_kit description {Enable Lua module (https://github.com/openresty/lua-nginx-module)} {
</span><span class="cx"> depends_lib-append port:luajit
</span><span class="cx"> set ngx_lua_filename lua-nginx-module
</span><del>- set ngx_lua_version 0.9.8
</del><ins>+ # currently broken with 1.7.5
+ set ngx_lua_version 0.9.12
</ins><span class="cx"> set ngx_lua_distname ${ngx_lua_filename}-${ngx_lua_version}
</span><span class="cx"> distfiles-append v${ngx_lua_version}.tar.gz:lua_module
</span><span class="cx"> checksums-append v${ngx_lua_version}.tar.gz \
</span><del>- rmd160 b2941977549bb345322e1ec00fca8916e56ea1e7 \
- sha256 b138ce7e2615f40e68c20dd248e26d88757a6206ca74f0fcdf10d6b06fe01514
</del><ins>+ rmd160 5cbd0137e13efc9667069cd10856013a8c0155c9 \
+ sha256 e85c1924ca4670d5708b58efcd6e77793c43f243317a9850a112964067f63150
</ins><span class="cx">
</span><span class="cx"> configure.cflags -I${prefix}/include/luajit-2.0/ ${configure.cflags}
</span><span class="cx"> configure.env LUAJIT_INC=${prefix}/include/luajit-2.0/
</span><span class="lines">@@ -333,4 +344,4 @@
</span><span class="cx">
</span><span class="cx"> livecheck.type regexm
</span><span class="cx"> livecheck.url ${homepage}
</span><del>-livecheck.regex {nginx-(\d+\.\d+\.\d+)</a>\s+stable}
</del><ins>+livecheck.regex {nginx-(\d+\.\d+\.\d+)</a>\s+mainline}
</ins></span></pre>
</div>
</div>
</body>
</html>