Sat Oct 17 09:56:40 2015 UTC ()
Changes 1.3.4:
* Make traditional init script fail if new config file is broken
* nghttpx-logrotate: Don't use killall since we have multiple processes
* nghttpx: Fix improper signal handling


(adam)
diff -r1.1 -r1.2 pkgsrc/www/nghttp2/Makefile
diff -r1.1 -r1.2 pkgsrc/www/nghttp2/distinfo
diff -r1.1 -r1.2 pkgsrc/www/nghttp2/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/www/nghttp2/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nghttp2/Makefile 2015/06/03 11:53:53 1.1
+++ pkgsrc/www/nghttp2/Makefile 2015/10/17 09:56:40 1.2
@@ -1,27 +1,30 @@ @@ -1,27 +1,30 @@
1# $NetBSD: Makefile,v 1.1 2015/06/03 11:53:53 fhajny Exp $ 1# $NetBSD: Makefile,v 1.2 2015/10/17 09:56:40 adam Exp $
2 2
3DISTNAME= nghttp2-1.0.1 3DISTNAME= nghttp2-1.3.4
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=tatsuhiro-t/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=tatsuhiro-t/}
 6EXTRACT_SUFX= .tar.xz
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://nghttp2.org/ 9HOMEPAGE= https://nghttp2.org/
9COMMENT= Implementation of HTTP/2 in C 10COMMENT= Implementation of HTTP/2 in C
10LICENSE= mit 11LICENSE= mit
11 12
12GITHUB_RELEASE= v${PKGVERSION_NOREV} 13GITHUB_RELEASE= v${PKGVERSION_NOREV}
13 14
14GNU_CONFIGURE= yes 15USE_LANGUAGES= c c++
15USE_LANGUAGES= c c++ 16USE_LIBTOOL= yes
16USE_LIBTOOL= yes 17USE_TOOLS+= gmake pkg-config
17USE_TOOLS+= gmake pkg-config 18GNU_CONFIGURE= yes
18 19CONFIGURE_ARGS+= --disable-examples
19.include "options.mk" 20CONFIGURE_ARGS+= --disable-python-bindings
20 
21PKGCONFIG_OVERRIDE+= lib/libnghttp2.pc.in 21PKGCONFIG_OVERRIDE+= lib/libnghttp2.pc.in
22PKGCONFIG_OVERRIDE+= src/libnghttp2_asio.pc.in 22PKGCONFIG_OVERRIDE+= src/libnghttp2_asio.pc.in
23 23
24CONFIGURE_ARGS+= --disable-examples 24REPLACE_PYTHON+= script/fetch-ocsp-response
25CONFIGURE_ARGS+= --disable-python-bindings 25
 26.include "options.mk"
26 27
 28.include "../../lang/python/application.mk"
 29.include "../../textproc/libxml2/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/www/nghttp2/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nghttp2/distinfo 2015/06/03 11:53:53 1.1
+++ pkgsrc/www/nghttp2/distinfo 2015/10/17 09:56:40 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1 2015/06/03 11:53:53 fhajny Exp $ 1$NetBSD: distinfo,v 1.2 2015/10/17 09:56:40 adam Exp $
2 2
3SHA1 (nghttp2-1.0.1.tar.gz) = 6dc5a07e8f5a0351ca388e5d30c0978fe0530fee 3SHA1 (nghttp2-1.3.4.tar.xz) = d7d5ff650ffcced862db7ef0e83c1cc72b420740
4RMD160 (nghttp2-1.0.1.tar.gz) = e6b7fa4d2502506b7cef6967b4e88a490a5e238d 4RMD160 (nghttp2-1.3.4.tar.xz) = e04fc798e99f63c3a325cbe1242e8c75620c4c9b
5Size (nghttp2-1.0.1.tar.gz) = 1350918 bytes 5SHA512 (nghttp2-1.3.4.tar.xz) = 5130ea9e68f85d7c626f585b20c4cd9af22de2c3ecc70f811197f07f00b94d135b645e9437909a60923fa5c24ef0a2d3fd7b7b6334653cdb2a627f5b5a0c80db
6SHA1 (patch-configure) = 7a776cad97a6590d3bbef93ffee6815341719f46 6Size (nghttp2-1.3.4.tar.xz) = 1271920 bytes
cvs diff -r1.1 -r1.2 pkgsrc/www/nghttp2/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nghttp2/Attic/options.mk 2015/06/03 11:53:53 1.1
+++ pkgsrc/www/nghttp2/Attic/options.mk 2015/10/17 09:56:40 1.2
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: options.mk,v 1.1 2015/06/03 11:53:53 fhajny Exp $ 1# $NetBSD: options.mk,v 1.2 2015/10/17 09:56:40 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nghttp2 3PKG_OPTIONS_VAR= PKG_OPTIONS.nghttp2
4PKG_SUPPORTED_OPTIONS= nghttp2-asio nghttp2-tools 4PKG_SUPPORTED_OPTIONS= nghttp2-asio nghttp2-tools
5PKG_SUGGESTED_OPTIONS= # 5PKG_SUGGESTED_OPTIONS= #
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= asio tools 9PLIST_VARS+= asio tools
10 10
11### 11###
12### Build the ASIO C++ library 12### Build the ASIO C++ library
13### 13###
14.if !empty(PKG_OPTIONS:Mnghttp2-asio) 14.if !empty(PKG_OPTIONS:Mnghttp2-asio)
15# Requires emplace() for associative containers, introduced in gcc 4.8.0 15# Requires emplace() for associative containers, introduced in gcc 4.8.0
16GCC_REQD+= 4.8 16GCC_REQD+= 4.8
17CONFIGURE_ARGS+= --enable-asio-lib 17CONFIGURE_ARGS+= --enable-asio-lib
18CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs} 18CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs}
19CONFIGURE_ARGS+= --with-boost-asio --with-boost-system --with-boost-thread 19CONFIGURE_ARGS+= --with-boost-asio
 20CONFIGURE_ARGS+= --with-boost-system
 21CONFIGURE_ARGS+= --with-boost-thread
20PLIST.asio= yes 22PLIST.asio= yes
21.include "../../devel/boost-libs/buildlink3.mk" 23.include "../../devel/boost-libs/buildlink3.mk"
22.include "../../security/openssl/buildlink3.mk" 24.include "../../security/openssl/buildlink3.mk"
23.else 25.else
24CONFIGURE_ARGS+= --with-boost=no 26CONFIGURE_ARGS+= --with-boost=no
25.endif 27.endif
26 28
27### 29###
28### Build apps and tools 30### Build apps and tools
29### 31###
30.if !empty(PKG_OPTIONS:Mnghttp2-tools) 32.if !empty(PKG_OPTIONS:Mnghttp2-tools)
31# Requires emplace() for associative containers, introduced in gcc 4.8.0 33# Requires emplace() for associative containers, introduced in gcc 4.8.0
32GCC_REQD+= 4.8 34GCC_REQD+= 4.8