pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www Added www/nghttp2-tools (to avoid circular depende...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5feb026c0ad3
branches: trunk
changeset: 414574:5feb026c0ad3
user: adam <adam%pkgsrc.org@localhost>
date: Mon Mar 30 13:54:29 2020 +0000
description:
Added www/nghttp2-tools (to avoid circular dependency)
diffstat:
www/Makefile | 3 ++-
www/nghttp2-tools/DESCR | 1 +
www/nghttp2-tools/Makefile | 31 +++++++++++++++++++++++++++++++
www/nghttp2-tools/PLIST | 7 +++++++
www/nghttp2-tools/distinfo | 6 ++++++
www/nghttp2/Makefile | 17 +++++------------
www/nghttp2/PLIST | 8 +-------
www/nghttp2/buildlink3.mk | 4 ++--
www/nghttp2/options.mk | 26 +++-----------------------
9 files changed, 58 insertions(+), 45 deletions(-)
diffs (187 lines):
diff -r c18fc65b89a1 -r 5feb026c0ad3 www/Makefile
--- a/www/Makefile Mon Mar 30 13:38:57 2020 +0000
+++ b/www/Makefile Mon Mar 30 13:54:29 2020 +0000
@@ -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+= netscape
SUBDIR+= netsurf
SUBDIR+= nghttp2
+SUBDIR+= nghttp2-tools
SUBDIR+= nginx
SUBDIR+= nginx-devel
SUBDIR+= nostromo
diff -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2-tools/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nghttp2-tools/DESCR Mon Mar 30 13:54:29 2020 +0000
@@ -0,0 +1,1 @@
+Tools for nghttp2.
diff -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2-tools/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nghttp2-tools/Makefile Mon Mar 30 13:54:29 2020 +0000
@@ -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"
diff -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2-tools/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nghttp2-tools/PLIST Mon Mar 30 13:54:29 2020 +0000
@@ -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
diff -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2-tools/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/nghttp2-tools/distinfo Mon Mar 30 13:54:29 2020 +0000
@@ -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
diff -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2/Makefile
--- a/www/nghttp2/Makefile Mon Mar 30 13:38:57 2020 +0000
+++ b/www/nghttp2/Makefile Mon Mar 30 13:54:29 2020 +0000
@@ -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 $
+
+.include "Makefile.common"
-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}
+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_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 -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2/PLIST
--- a/www/nghttp2/PLIST Mon Mar 30 13:38:57 2020 +0000
+++ b/www/nghttp2/PLIST Mon Mar 30 13:54:29 2020 +0000
@@ -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 -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2/buildlink3.mk
--- a/www/nghttp2/buildlink3.mk Mon Mar 30 13:38:57 2020 +0000
+++ b/www/nghttp2/buildlink3.mk Mon Mar 30 13:54:29 2020 +0000
@@ -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 @@
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 -r c18fc65b89a1 -r 5feb026c0ad3 www/nghttp2/options.mk
--- a/www/nghttp2/options.mk Mon Mar 30 13:38:57 2020 +0000
+++ b/www/nghttp2/options.mk Mon Mar 30 13:54:29 2020 +0000
@@ -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 @@
.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
Home |
Main Index |
Thread Index |
Old Index