[138795] trunk/dports/www/nghttp2

[ionic at macports.org]

Revision: 138795
          https://trac.macports.org/changeset/138795
Author:   ionic at macports.org
Date:     2015-07-19 08:10:43 -0700 (Sun, 19 Jul 2015)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/www/nghttp2/Portfile

Added Paths:
-----------
    trunk/dports/www/nghttp2/files/
    trunk/dports/www/nghttp2/files/patch-python-Makefile.in.diff

Modified: trunk/dports/www/nghttp2/Portfile
===================================================================
--- 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)
@@ -5,7 +5,8 @@
 PortGroup           cxx11 1.0
 PortGroup           github 1.0
 
-github.setup        tatsuhiro-t nghttp2 1.1.1 v
+github.setup        tatsuhiro-t nghttp2 1.1.2 v
+set PythonVersion   2.7
 categories          www
 platforms           darwin
 maintainers         gmail.com:mschamschula openmaintainer
@@ -19,8 +20,8 @@
 github.tarball_from releases
 use_xz              yes
 
-checksums           rmd160 52570dd747832bd151d34fa9c2b9e3ec232e485f \
-                    sha256 d36ba13066f4e0594c741a6448547f0b492e31043e0149bd39d2503854d6411c
+checksums           rmd160 863f176b35b6b1ec7f2d77eea40383650b030606 \
+                    sha256 8bd4a1dde16bf82fbacfe26ba48f22f6758c2d38202e7a956e0d070372699237
 
 depends_build       port:pkgconfig
 
@@ -37,16 +38,21 @@
 configure.args      --disable-silent-rules \
                     --disable-threads
 
-configure.env       PYTHON=${prefix}/bin/python2.7 CYTHON=${prefix}/bin/cython-2.7 \
+configure.env       CYTHON=${prefix}/bin/cython-${PythonVersion} \
                     JANSSON_CFLAGS=-I${prefix}/include JANSSON_LIBS="-L${prefix}/lib -ljansson" \
                     LIBEVENT_OPENSSL_CFLAGS=-I${prefix}/include/event2 \
                     LIBEVENT_OPENSSL_LIBS="-L${prefix}/lib -levent -levent_openssl" \
                     OPENSSL_CFLAGS=-I${prefix}/include/openssl \
                     OPENSSL_LIBS="-L${prefix}/lib -lcrypto -lssl" \
-                    PYTHON_EXTRA_LDFLAGS="-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/2.7/Python"
+                    PYTHON=${prefix}/bin/python${PythonVersion} \
+                    PYTHON_EXTRA_LDFLAGS="-u _PyMac_Error ${frameworks_dir}/Python.framework/Versions/${PythonVersion}/Python"
 
+#   Patch to deal with https://github.com/tatsuhiro-t/nghttp2/issues/303
+#   Remove once this is fixed upstream.
+patchfiles          patch-python-Makefile.in.diff
+
 destroot.env        PYTHONPATH=${destroot}${prefix}/lib/python2.7/site-packages/
 
 pre-destroot {
-    xinstall -d ${destroot}${prefix}/lib/python2.7/site-packages/
+    xinstall -d ${destroot}${prefix}/lib/python${PythonVersion}/site-packages/
 }

Added: trunk/dports/www/nghttp2/files/patch-python-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+--- 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 at install-exec-local:
+- at ENABLE_PYTHON_BINDINGS_TRUE@	test -d $(pyexecdir) || mkdir -p $(pyexecdir)
+- at ENABLE_PYTHON_BINDINGS_TRUE@	PYTHONUSERBASE=$(DESTDIR)/$(prefix) $(PYTHON) setup.py install --user
++ at ENABLE_PYTHON_BINDINGS_TRUE@	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+ 
+ @ENABLE_PYTHON_BINDINGS_TRUE at uninstall-local:
+ @ENABLE_PYTHON_BINDINGS_TRUE@	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150719/0110c48b/attachment-0001.html>