CVS commit: pkgsrc/www

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jun  9 00:53:17 UTC 2023

Modified Files:
        pkgsrc/www/nghttp2: Makefile PLIST distinfo
        pkgsrc/www/nghttp2-tools: Makefile PLIST
Added Files:
        pkgsrc/www/nghttp2/patches: patch-Makefile.in

Log Message:
nghttp2: Move fetch-ocsp-response script to nghttp2-tools.

Used only by the tools, not by the library.

This drops the Python dependency on the library, which is needed by
curl -- should help mitigate the ouroboros of curling pythons here.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/nghttp2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/nghttp2/PLIST
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/nghttp2/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/nghttp2-tools/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/nghttp2-tools/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/www/nghttp2/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/www/nghttp2/Makefile
diff -u pkgsrc/www/nghttp2/Makefile:1.81 pkgsrc/www/nghttp2/Makefile:1.82
--- pkgsrc/www/nghttp2/Makefile:1.81    Wed May 10 12:34:17 2023
+++ pkgsrc/www/nghttp2/Makefile Fri Jun  9 00:53:17 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2023/05/10 12:34:17 adam Exp $
+# $NetBSD: Makefile,v 1.82 2023/06/09 00:53:17 riastradh Exp $
 
+PKGREVISION=   1
 .include "Makefile.common"
 
 COMMENT=       Implementation of HTTP/2 in C
@@ -14,10 +15,5 @@ CONFIGURE_ARGS+=     --enable-lib-only
 PKGCONFIG_OVERRIDE+=   lib/libnghttp2.pc.in
 PKGCONFIG_OVERRIDE+=   src/libnghttp2_asio.pc.in
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
-REPLACE_PYTHON+=       script/fetch-ocsp-response
-
-.include "../../lang/python/application.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/nghttp2/PLIST
diff -u pkgsrc/www/nghttp2/PLIST:1.3 pkgsrc/www/nghttp2/PLIST:1.4
--- pkgsrc/www/nghttp2/PLIST:1.3        Thu Mar 30 12:11:22 2023
+++ pkgsrc/www/nghttp2/PLIST    Fri Jun  9 00:53:17 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/03/30 12:11:22 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/06/09 00:53:17 riastradh Exp $
 include/nghttp2/nghttp2.h
 include/nghttp2/nghttp2ver.h
 lib/libnghttp2.la
@@ -8,4 +8,3 @@ man/man1/nghttp.1
 man/man1/nghttpd.1
 man/man1/nghttpx.1
 share/doc/nghttp2/README.rst
-share/nghttp2/fetch-ocsp-response

Index: pkgsrc/www/nghttp2/distinfo
diff -u pkgsrc/www/nghttp2/distinfo:1.59 pkgsrc/www/nghttp2/distinfo:1.60
--- pkgsrc/www/nghttp2/distinfo:1.59    Wed May 10 12:34:17 2023
+++ pkgsrc/www/nghttp2/distinfo Fri Jun  9 00:53:17 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.59 2023/05/10 12:34:17 adam Exp $
+$NetBSD: distinfo,v 1.60 2023/06/09 00:53:17 riastradh Exp $
 
 BLAKE2s (nghttp2-1.53.0.tar.xz) = 7b0325739c9a30542a6889e1b61b46856bd1149fd6619fa367a7873399f1ae91
 SHA512 (nghttp2-1.53.0.tar.xz) = ae3c7b12fc019fa139e94c16f69070734d9c600c1ebefad46758cd7f9a93d39f1d72fa2a9bce10e757141749436858316752157d9957e6aaa455764e2f667a4e
 Size (nghttp2-1.53.0.tar.xz) = 1543180 bytes
+SHA1 (patch-Makefile.in) = a8b55c4e477ea285a9ba005a20e244b762968f3e

Index: pkgsrc/www/nghttp2-tools/Makefile
diff -u pkgsrc/www/nghttp2-tools/Makefile:1.19 pkgsrc/www/nghttp2-tools/Makefile:1.20
--- pkgsrc/www/nghttp2-tools/Makefile:1.19      Wed May 10 12:34:17 2023
+++ pkgsrc/www/nghttp2-tools/Makefile   Fri Jun  9 00:53:17 2023
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2023/05/10 12:34:17 adam Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/09 00:53:17 riastradh Exp $
 
+PKGREVISION=   1
 .include "../../www/nghttp2/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-tools-/}
 
 COMMENT=       Tools for nghttp2
 
+CONFLICTS+=    nghttp2<1.53.0nb1 # share/nghttp2/fetch-ocsp-response
+
 # 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
@@ -19,10 +22,15 @@ CONFIGURE_ARGS+=    --enable-hpack-tools
 
 GCC_REQD+=             6
 
-INSTALL_DIRS+=         src
+INSTALL_DIRS+=         src script
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+REPLACE_PYTHON+=       script/fetch-ocsp-response
 
 .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../net/libcares/buildlink3.mk"
 .include "../../net/ngtcp2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/www/nghttp2-tools/PLIST
diff -u pkgsrc/www/nghttp2-tools/PLIST:1.1 pkgsrc/www/nghttp2-tools/PLIST:1.2
--- pkgsrc/www/nghttp2-tools/PLIST:1.1  Mon Mar 30 13:54:29 2020
+++ pkgsrc/www/nghttp2-tools/PLIST      Fri Jun  9 00:53:17 2023
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2020/03/30 13:54:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/06/09 00:53:17 riastradh Exp $
 bin/deflatehd
 bin/h2load
 bin/inflatehd
 bin/nghttp
 bin/nghttpd
 bin/nghttpx
+share/nghttp2/fetch-ocsp-response

Added files:

Index: pkgsrc/www/nghttp2/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/www/nghttp2/patches/patch-Makefile.in:1.1
--- /dev/null   Fri Jun  9 00:53:17 2023
+++ pkgsrc/www/nghttp2/patches/patch-Makefile.in        Fri Jun  9 00:53:17 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.1 2023/06/09 00:53:17 riastradh Exp $
+
+Don't descend into script/ for the Python script -- we'll install
+that separately in nghttp2-tools.
+
+--- Makefile.in.orig   2023-05-10 08:29:50.000000000 +0000
++++ Makefile.in
+@@ -449,7 +449,7 @@ top_srcdir = @top_srcdir@
+ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ SUBDIRS = lib third-party src bpf examples tests integration-tests \
+-      doc contrib script
++      doc contrib #script
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ dist_doc_DATA = README.rst