<!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>[138795] trunk/dports/www/nghttp2</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/138795">138795</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-07-19 08:10:43 -0700 (Sun, 19 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>nghttp2: update to 1.1.2. Patch provided by maintainer. Fixes: #48402.
Refactor configure.env into alphabetical.
Add patch for python destroot issue https://github.com/tatsuhiro-t/nghttp2/issues/303.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwnghttp2Portfile">trunk/dports/www/nghttp2/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/www/nghttp2/files/</li>
<li><a href="#trunkdportswwwnghttp2filespatchpythonMakefileindiff">trunk/dports/www/nghttp2/files/patch-python-Makefile.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwnghttp2Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/nghttp2/Portfile (138794 => 138795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/nghttp2/Portfile 2015-07-19 14:19:05 UTC (rev 138794)
+++ trunk/dports/www/nghttp2/Portfile 2015-07-19 15:10:43 UTC (rev 138795)
</span><span class="lines">@@ -5,7 +5,8 @@
</span><span class="cx"> PortGroup cxx11 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup tatsuhiro-t nghttp2 1.1.1 v
</del><ins>+github.setup tatsuhiro-t nghttp2 1.1.2 v
+set PythonVersion 2.7
</ins><span class="cx"> categories www
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:mschamschula openmaintainer
</span><span class="lines">@@ -19,8 +20,8 @@
</span><span class="cx"> github.tarball_from releases
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 52570dd747832bd151d34fa9c2b9e3ec232e485f \
- sha256 d36ba13066f4e0594c741a6448547f0b492e31043e0149bd39d2503854d6411c
</del><ins>+checksums rmd160 863f176b35b6b1ec7f2d77eea40383650b030606 \
+ sha256 8bd4a1dde16bf82fbacfe26ba48f22f6758c2d38202e7a956e0d070372699237
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -37,16 +38,21 @@
</span><span class="cx"> configure.args --disable-silent-rules \
</span><span class="cx"> --disable-threads
</span><span class="cx">
</span><del>-configure.env PYTHON=${prefix}/bin/python2.7 CYTHON=${prefix}/bin/cython-2.7 \
</del><ins>+configure.env CYTHON=${prefix}/bin/cython-${PythonVersion} \
</ins><span class="cx"> JANSSON_CFLAGS=-I${prefix}/include JANSSON_LIBS="-L${prefix}/lib -ljansson" \
</span><span class="cx"> LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
</span><span class="cx"> LIBEVENT_OPENSSL_LIBS="-L${prefix}/lib -levent -levent_openssl" \
</span><span class="cx"> OPENSSL_CFLAGS=-I${prefix}/include/openssl \
</span><span class="cx"> OPENSSL_LIBS="-L${prefix}/lib -lcrypto -lssl" \
</span><del>- PYTHON_EXTRA_LDFLAGS="-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/2.7/Python"
</del><ins>+ PYTHON=${prefix}/bin/python${PythonVersion} \
+ PYTHON_EXTRA_LDFLAGS="-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
</ins><span class="cx">
</span><ins>+# Patch to deal with https://github.com/tatsuhiro-t/nghttp2/issues/303
+# Remove once this is fixed upstream.
+patchfiles patch-python-Makefile.in.diff
+
</ins><span class="cx"> destroot.env PYTHONPATH=${destroot}${prefix}/lib/python2.7/site-packages/
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><del>- xinstall -d ${destroot}${prefix}/lib/python2.7/site-packages/
</del><ins>+ xinstall -d ${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportswwwnghttp2filespatchpythonMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/nghttp2/files/patch-python-Makefile.in.diff (0 => 138795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/nghttp2/files/patch-python-Makefile.in.diff (rev 0)
+++ trunk/dports/www/nghttp2/files/patch-python-Makefile.in.diff 2015-07-19 15:10:43 UTC (rev 138795)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- python/Makefile.in.orig 2015-07-17 10:28:43.000000000 -0500
++++ python/Makefile.in 2015-07-19 07:37:58.000000000 -0500
+@@ -524,8 +524,7 @@
+ @ENABLE_PYTHON_BINDINGS_TRUE@ $(PYTHON) setup.py build
+
+ @ENABLE_PYTHON_BINDINGS_TRUE@install-exec-local:
+-@ENABLE_PYTHON_BINDINGS_TRUE@ test -d $(pyexecdir) || mkdir -p $(pyexecdir)
+-@ENABLE_PYTHON_BINDINGS_TRUE@ PYTHONUSERBASE=$(DESTDIR)/$(prefix) $(PYTHON) setup.py install --user
++@ENABLE_PYTHON_BINDINGS_TRUE@ $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+
+ @ENABLE_PYTHON_BINDINGS_TRUE@uninstall-local:
+ @ENABLE_PYTHON_BINDINGS_TRUE@ rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
</ins></span></pre>
</div>
</div>
</body>
</html>