Index: branches/2016Q1/www/nghttp2/Makefile =================================================================== --- branches/2016Q1/www/nghttp2/Makefile (revision 408929) +++ branches/2016Q1/www/nghttp2/Makefile (revision 408930) @@ -1,68 +1,67 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= nghttp2 -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.1 +DISTVERSIONPREFIX= v CATEGORIES= www net -MASTER_SITES= https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \ - LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= HTTP/2.0 C Library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= libev>=4.15:${PORTSDIR}/devel/libev \ libevent2>=2.0.8:${PORTSDIR}/devel/libevent2 \ spdylay>=1.3.0:${PORTSDIR}/www/spdylay LIB_DEPENDS= libev.so:${PORTSDIR}/devel/libev \ libevent_openssl.so:${PORTSDIR}/devel/libevent2 \ libspdylay.so:${PORTSDIR}/www/spdylay -RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= ASIO DOCS HPACK OPTIONS_DEFAULT=HPACK OPTIONS_SUB= yes +USE_GITHUB= yes +GH_ACCOUNT= tatsuhiro-t + CONFIGURE_ARGS= --disable-python-bindings \ --enable-app \ --enable-examples \ --with-spdylay CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ ZLIB_CFLAGS="-I${INCLUDEDIR}" \ ZLIB_LIBS="-L${LIBDIR} -lz" GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +PATHFIX_MAKEFILEIN= Makefile.am USE_CXXSTD= c++11 USE_GNOME= libxml2 USE_LDCONFIG= yes USE_OPENSSL= yes -USES= compiler:c++11-lib gmake libtool localbase pathfix pkgconfig tar:xz +USES= autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig PORTDATA= fetch-ocsp-response PORTDOCS= * ASIO_BUILD_DEPENDS= boost-libs>=1.54.0:${PORTSDIR}/devel/boost-libs ASIO_CONFIGURE_OFF= --with-boost=no ASIO_CONFIGURE_ON= --enable-asio-lib --with-boost-asio --with-boost-system --with-boost-thread ASIO_LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs ASIO_RUN_DEPENDS= boost-libs>=1.54.0:${PORTSDIR}/devel/boost-libs HPACK_CONFIGURE_ENABLE= hpack-tools HPACK_LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson .include .if ${OSVERSION} <= 1000000 CPPFLAGS+= -D_GLIBCXX_USE_C99 .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 CONFIGURE_ARGS+=--with-jemalloc .endif - -post-patch: - @${REINPLACE_CMD} -e '/JEMALLOC_LIBS/ s|-ljemalloc||' ${WRKSRC}/configure .include Index: branches/2016Q1/www/nghttp2/distinfo =================================================================== --- branches/2016Q1/www/nghttp2/distinfo (revision 408929) +++ branches/2016Q1/www/nghttp2/distinfo (revision 408930) @@ -1,2 +1,2 @@ -SHA256 (nghttp2-1.6.0.tar.xz) = cc569501d243c934ea980a1f68fadb8ccc4f133ae8a5b15dcd29f0de76f9bac3 -SIZE (nghttp2-1.6.0.tar.xz) = 1399524 +SHA256 (tatsuhiro-t-nghttp2-v1.7.1_GH0.tar.gz) = 3f939b1507b4b9b94d8c1f873b41945d0c7bcf6a21c313124526201dc6e11c3c +SIZE (tatsuhiro-t-nghttp2-v1.7.1_GH0.tar.gz) = 1561854 Index: branches/2016Q1/www/nghttp2/files/patch-configure.ac =================================================================== --- branches/2016Q1/www/nghttp2/files/patch-configure.ac (nonexistent) +++ branches/2016Q1/www/nghttp2/files/patch-configure.ac (revision 408930) @@ -0,0 +1,35 @@ +From e4b2847d3135a024c740d25f9e11da7ff0bf0fd6 Mon Sep 17 00:00:00 2001 +From: Bernard Spil +Date: Sat, 6 Feb 2016 14:36:27 +0100 +Subject: [PATCH] Don't check for dlopen/libdl on *BSD + +This makes linking fail on -ldl as there is no libdl on in /usr/lib or /usr/local/lib on *BSD +Tested (and part of the proposed nghttp2 1.7.0) on [https://reviews.freebsd.org/D5218|FreeBSD] +--- + configure.ac | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 09a2538..4a4defe 100644 +--- configure.ac.orig ++++ configure.ac +@@ -256,9 +256,16 @@ if test "x${have_zlib}" = "xno"; then + fi + + # dl: openssl requires libdl when it is statically linked. +-LIBS_OLD=$LIBS +-AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], []) +-LIBS=$LIBS_OLD ++case "${host_os}" in ++ *bsd*) ++ # dlopen is in libc on *BSD ++ ;; ++ *) ++ save_LIBS=$LIBS ++ AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], []) ++ LIBS=$save_LIBS ++ ;; ++esac + + # cunit + PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) Property changes on: branches/2016Q1/www/nghttp2/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2016Q1/www/nghttp2/pkg-plist =================================================================== --- branches/2016Q1/www/nghttp2/pkg-plist (revision 408929) +++ branches/2016Q1/www/nghttp2/pkg-plist (revision 408930) @@ -1,25 +1,25 @@ %%HPACK%%bin/deflatehd bin/h2load %%HPACK%%bin/inflatehd bin/nghttp bin/nghttpd bin/nghttpx %%ASIO%%include/nghttp2/asio_http2.h %%ASIO%%include/nghttp2/asio_http2_client.h %%ASIO%%include/nghttp2/asio_http2_server.h include/nghttp2/nghttp2.h include/nghttp2/nghttp2ver.h lib/libnghttp2.a lib/libnghttp2.so lib/libnghttp2.so.14 -lib/libnghttp2.so.14.4.0 +lib/libnghttp2.so.14.4.1 %%ASIO%%lib/libnghttp2_asio.a %%ASIO%%lib/libnghttp2_asio.so %%ASIO%%lib/libnghttp2_asio.so.1 %%ASIO%%lib/libnghttp2_asio.so.1.0.0 libdata/pkgconfig/libnghttp2.pc %%ASIO%%libdata/pkgconfig/libnghttp2_asio.pc man/man1/h2load.1.gz man/man1/nghttp.1.gz man/man1/nghttpd.1.gz man/man1/nghttpx.1.gz Index: branches/2016Q1 =================================================================== --- branches/2016Q1 (revision 408929) +++ branches/2016Q1 (revision 408930) Property changes on: branches/2016Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r408929