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

4 files changed, 11 insertions, 44 deletions

diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
index d4ea9a6cda8..bab76587c36 100644
--- a/www/nghttp2/Makefile
+++ b/www/nghttp2/Makefile
@@ -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
-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
 
diff --git a/www/nghttp2/PLIST b/www/nghttp2/PLIST
index 8a7bd4f1139..bda4402f0b0 100644
--- a/www/nghttp2/PLIST
+++ b/www/nghttp2/PLIST
@@ -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
diff --git a/www/nghttp2/buildlink3.mk b/www/nghttp2/buildlink3.mk
index 9d22dec2913..1f2be735f6d 100644
--- a/www/nghttp2/buildlink3.mk
+++ b/www/nghttp2/buildlink3.mk
@@ -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/nghttp2
 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
diff --git a/www/nghttp2/options.mk b/www/nghttp2/options.mk
index e53118bf41c..d94ee3c0c5d 100644
--- a/www/nghttp2/options.mk
+++ b/www/nghttp2/options.mk
@@ -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