CVS commit: pkgsrc/www

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Mar 30 13:54:30 UTC 2020

Modified Files:
        pkgsrc/www: Makefile
        pkgsrc/www/nghttp2: Makefile PLIST buildlink3.mk options.mk
Added Files:
        pkgsrc/www/nghttp2-tools: DESCR Makefile PLIST distinfo

Log Message:
Added www/nghttp2-tools (to avoid circular dependency)


To generate a diff of this commit:
cvs rdiff -u -r1.1448 -r1.1449 pkgsrc/www/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/nghttp2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/nghttp2/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/nghttp2/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/nghttp2/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/nghttp2-tools/DESCR \
    pkgsrc/www/nghttp2-tools/Makefile pkgsrc/www/nghttp2-tools/PLIST \
    pkgsrc/www/nghttp2-tools/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/Makefile
diff -u pkgsrc/www/Makefile:1.1448 pkgsrc/www/Makefile:1.1449
--- pkgsrc/www/Makefile:1.1448  Sat Mar 21 16:29:42 2020
+++ pkgsrc/www/Makefile Mon Mar 30 13:54:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1448 2020/03/21 16:29:42 taca Exp $
+# $NetBSD: Makefile,v 1.1449 2020/03/30 13:54:29 adam Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -220,6 +220,7 @@ SUBDIR+=    neon
 SUBDIR+=       netscape
 SUBDIR+=       netsurf
 SUBDIR+=       nghttp2
+SUBDIR+=       nghttp2-tools
 SUBDIR+=       nginx
 SUBDIR+=       nginx-devel
 SUBDIR+=       nostromo

Index: pkgsrc/www/nghttp2/Makefile
diff -u pkgsrc/www/nghttp2/Makefile:1.59 pkgsrc/www/nghttp2/Makefile:1.60
--- pkgsrc/www/nghttp2/Makefile:1.59    Sat Jan 18 21:48:30 2020
+++ pkgsrc/www/nghttp2/Makefile Mon Mar 30 13:54:29 2020
@@ -1,16 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2020/01/18 21:48:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.60 2020/03/30 13:54:29 adam Exp $
 
-DISTNAME=      nghttp2-1.40.0
-PKGREVISION=   2
-CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=tatsuhiro-t/}
-EXTRACT_SUFX=  .tar.xz
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+.include "Makefile.common"
+
+PKGREVISION=   3
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://nghttp2.org/
 COMMENT=       Implementation of HTTP/2 in C
-LICENSE=       mit
 
 # Upstream documents that c++14 is required for C++ parts of the code;
 # the base package does not use C++.
@@ -18,8 +12,7 @@ USE_LANGUAGES=                c
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --disable-examples
-CONFIGURE_ARGS+=       --disable-python-bindings
+CONFIGURE_ARGS+=       --enable-lib-only
 PKGCONFIG_OVERRIDE+=   lib/libnghttp2.pc.in
 PKGCONFIG_OVERRIDE+=   src/libnghttp2_asio.pc.in
 

Index: pkgsrc/www/nghttp2/PLIST
diff -u pkgsrc/www/nghttp2/PLIST:1.1 pkgsrc/www/nghttp2/PLIST:1.2
--- pkgsrc/www/nghttp2/PLIST:1.1        Wed Jun  3 11:53:53 2015
+++ pkgsrc/www/nghttp2/PLIST    Mon Mar 30 13:54:29 2020
@@ -1,10 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/03 11:53:53 fhajny Exp $
-${PLIST.tools}bin/deflatehd
-${PLIST.tools}bin/h2load
-${PLIST.tools}bin/inflatehd
-${PLIST.tools}bin/nghttp
-${PLIST.tools}bin/nghttpd
-${PLIST.tools}bin/nghttpx
+@comment $NetBSD: PLIST,v 1.2 2020/03/30 13:54:29 adam Exp $
 ${PLIST.asio}include/nghttp2/asio_http2.h
 ${PLIST.asio}include/nghttp2/asio_http2_client.h
 ${PLIST.asio}include/nghttp2/asio_http2_server.h

Index: pkgsrc/www/nghttp2/buildlink3.mk
diff -u pkgsrc/www/nghttp2/buildlink3.mk:1.13 pkgsrc/www/nghttp2/buildlink3.mk:1.14
--- pkgsrc/www/nghttp2/buildlink3.mk:1.13       Sat Jan 18 21:48:30 2020
+++ pkgsrc/www/nghttp2/buildlink3.mk    Mon Mar 30 13:54:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2020/01/18 21:48:30 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2020/03/30 13:54:29 adam Exp $
 
 BUILDLINK_TREE+=       nghttp2
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.nghttp2?= ../../www/
 pkgbase := nghttp2
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.nghttp2:Mnghttp2-asio)
+.if ${PKG_BUILD_OPTIONS.nghttp2:Mnghttp2-asio}
 .  include "../../devel/boost-libs/buildlink3.mk"
 .  include "../../security/openssl/buildlink3.mk"
 .endif

Index: pkgsrc/www/nghttp2/options.mk
diff -u pkgsrc/www/nghttp2/options.mk:1.7 pkgsrc/www/nghttp2/options.mk:1.8
--- pkgsrc/www/nghttp2/options.mk:1.7   Wed Nov 20 16:38:22 2019
+++ pkgsrc/www/nghttp2/options.mk       Mon Mar 30 13:54:29 2020
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.7 2019/11/20 16:38:22 adam Exp $
+# $NetBSD: options.mk,v 1.8 2020/03/30 13:54:29 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nghttp2
-PKG_SUPPORTED_OPTIONS= nghttp2-asio nghttp2-tools
+PKG_SUPPORTED_OPTIONS= nghttp2-asio
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   asio tools
+PLIST_VARS+=   asio
 
 ###
 ### Build the ASIO C++ library
@@ -25,23 +25,3 @@ PLIST.asio=          yes
 .else
 CONFIGURE_ARGS+=       --with-boost=no
 .endif
-
-###
-### Build apps and tools
-###
-.if !empty(PKG_OPTIONS:Mnghttp2-tools)
-# Upstream documents C++14 and gcc>=6 or clang>=6
-USE_LANGUAGES+=                c++14
-GCC_REQD+=             6
-CONFIGURE_ARGS+=       --enable-app
-CONFIGURE_ARGS+=       --enable-hpack-tools
-PLIST.tools=           yes
-.include "../../devel/libev/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../net/libcares/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/jansson/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-app
-CONFIGURE_ARGS+=       --disable-hpack-tools
-.endif

Added files:

Index: pkgsrc/www/nghttp2-tools/DESCR
diff -u /dev/null pkgsrc/www/nghttp2-tools/DESCR:1.1
--- /dev/null   Mon Mar 30 13:54:30 2020
+++ pkgsrc/www/nghttp2-tools/DESCR      Mon Mar 30 13:54:29 2020
@@ -0,0 +1 @@
+Tools for nghttp2.
Index: pkgsrc/www/nghttp2-tools/Makefile
diff -u /dev/null pkgsrc/www/nghttp2-tools/Makefile:1.1
--- /dev/null   Mon Mar 30 13:54:30 2020
+++ pkgsrc/www/nghttp2-tools/Makefile   Mon Mar 30 13:54:29 2020
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2020/03/30 13:54:29 adam Exp $
+
+.include "../../www/nghttp2/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/-/-tools-/}
+
+COMMENT=       Tools for nghttp2
+
+# Upstream documents that c++14 is required for C++ parts of the code;
+# the base package does not use C++.
+USE_LANGUAGES=         c c++14
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake pkg-config
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-examples
+CONFIGURE_ARGS+=       --disable-python-bindings
+CONFIGURE_ARGS+=       --enable-app
+CONFIGURE_ARGS+=       --enable-hpack-tools
+
+GCC_REQD+=             6
+
+INSTALL_DIRS+=         src
+
+.include "../../devel/libev/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libcares/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/nghttp2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/nghttp2-tools/PLIST
diff -u /dev/null pkgsrc/www/nghttp2-tools/PLIST:1.1
--- /dev/null   Mon Mar 30 13:54:30 2020
+++ pkgsrc/www/nghttp2-tools/PLIST      Mon Mar 30 13:54:29 2020
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2020/03/30 13:54:29 adam Exp $
+bin/deflatehd
+bin/h2load
+bin/inflatehd
+bin/nghttp
+bin/nghttpd
+bin/nghttpx
Index: pkgsrc/www/nghttp2-tools/distinfo
diff -u /dev/null pkgsrc/www/nghttp2-tools/distinfo:1.1
--- /dev/null   Mon Mar 30 13:54:30 2020
+++ pkgsrc/www/nghttp2-tools/distinfo   Mon Mar 30 13:54:29 2020
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2020/03/30 13:54:29 adam Exp $
+
+SHA1 (nghttp2-1.40.0.tar.xz) = 7df231b961b84bd5d0c8ce81062de8aad83fcf5e
+RMD160 (nghttp2-1.40.0.tar.xz) = 91b637294817800880bdce5d15b0876189f2d53a
+SHA512 (nghttp2-1.40.0.tar.xz) = 3f9b989c4bd9571b11bb9d59fe2dfd5596ba3962babfc836587d5047e780400a6cf46e43c602caa25ca83c03b84a1629953140d45223099b193df54a719745ce
+Size (nghttp2-1.40.0.tar.xz) = 1637004 bytes