CVS commit: pkgsrc/www

["nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Wed May 31 20:19:46 UTC 2023

Modified Files:
        pkgsrc/www/curl: Makefile.common
        pkgsrc/www/libcurl-gnutls: Makefile distinfo

Log Message:
libcurl-gnutls: update to version 8.1.2, use Makefile fragment


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/curl/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/libcurl-gnutls/Makefile \
    pkgsrc/www/libcurl-gnutls/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/curl/Makefile.common
diff -u pkgsrc/www/curl/Makefile.common:1.1 pkgsrc/www/curl/Makefile.common:1.2
--- pkgsrc/www/curl/Makefile.common:1.1 Wed May 31 20:17:52 2023
+++ pkgsrc/www/curl/Makefile.common     Wed May 31 20:19:46 2023
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.1 2023/05/31 20:17:52 nikita Exp $
+# $NetBSD: Makefile.common,v 1.2 2023/05/31 20:19:46 nikita Exp $
+# used by www/libcurl-gnutls/Makefile
 
 DISTNAME=      curl-8.1.2
 CATEGORIES=    www

Index: pkgsrc/www/libcurl-gnutls/Makefile
diff -u pkgsrc/www/libcurl-gnutls/Makefile:1.1 pkgsrc/www/libcurl-gnutls/Makefile:1.2
--- pkgsrc/www/libcurl-gnutls/Makefile:1.1      Wed May 31 18:37:52 2023
+++ pkgsrc/www/libcurl-gnutls/Makefile  Wed May 31 20:19:46 2023
@@ -1,53 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2023/05/31 18:37:52 nikita Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/31 20:19:46 nikita Exp $
 
-DISTNAME=      curl-8.1.1
-PKGNAME=       ${DISTNAME:S/curl/libcurl-gnutls/}
-CATEGORIES=    www
-MASTER_SITES=  https://curl.se/download/
-EXTRACT_SUFX=  .tar.xz
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://curl.se/
-COMMENT=       Client that groks URLs (build against gnuTLS)
-# not completely, but near enough
-LICENSE=       mit
+.include "../../www/curl/Makefile.common"
 
-BUILD_DEFS+=   IPV6_READY
+PKGNAME=       ${DISTNAME:S/curl/libcurl-gnutls/}
 
-TEST_DEPENDS+= ${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket
 TOOL_DEPENDS+= patchelf-[0-9]*:../../devel/patchelf
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-impacket
-
-USE_TOOLS+=            nroff perl
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-gnutls=${BUILDLINK_PREFIX.gnutls}
-# Some systems use bundles instead of directories; this needs configuring
-# because curl doesn't use default validation.
-.if !empty(SSLCERTBUNDLE)
-CONFIGURE_ARGS+=       --with-ca-bundle=${SSLCERTBUNDLE}
-.else
-CONFIGURE_ARGS+=       --with-ca-path=${SSLCERTS}
-.endif
-CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+=       --without-libpsl
-PKGCONFIG_OVERRIDE=    libcurl.pc.in
-TEST_TARGET=           check
-
-SUBST_CLASSES+=                python
-SUBST_STAGE.python=    pre-configure
-SUBST_MESSAGE.python=  Adjust hard-coded python invocations
-SUBST_FILES.python=    tests/data/test1451
-SUBST_SED.python=      -e 's,python,${PYTHONBIN},g'
-
-REPLACE_PERL+=         tests/*.pl tests/*/*.pl
-REPLACE_PYTHON+=       tests/*.py
-
-PYTHON_FOR_BUILD_ONLY= test
 
 INSTALLATION_DIRS+=    lib
 
+.include "options.mk"
+
 do-install:
        cd ${WRKSRC} && \
                ${PREFIX}/bin/patchelf \
@@ -58,11 +22,5 @@ do-install:
                ${LN} -s libcurl-gnutls.so.4.8.0 libcurl-gnutls.so && \
                ${LN} -s libcurl-gnutls.so.4.8.0 libcurl-gnutls.so.4
 
-.include "options.mk"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../security/gnutls/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/libcurl-gnutls/distinfo
diff -u pkgsrc/www/libcurl-gnutls/distinfo:1.1 pkgsrc/www/libcurl-gnutls/distinfo:1.2
--- pkgsrc/www/libcurl-gnutls/distinfo:1.1      Wed May 31 18:37:52 2023
+++ pkgsrc/www/libcurl-gnutls/distinfo  Wed May 31 20:19:46 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2023/05/31 18:37:52 nikita Exp $
+$NetBSD: distinfo,v 1.2 2023/05/31 20:19:46 nikita Exp $
 
-BLAKE2s (curl-8.1.1.tar.xz) = f371264eb96fafea3a254ce2d26c3b1733776a8908141a8ad49be39d62055447
-SHA512 (curl-8.1.1.tar.xz) = d034b1ab9c00e8a0acf7ba6c6344734945d45666b4f38394f5456fcd9b22623146a897270861b7411412ca25c912e1bbf24eb139a6dfc1a8c00d098b3b925399
-Size (curl-8.1.1.tar.xz) = 2613348 bytes
+BLAKE2s (curl-8.1.2.tar.xz) = 106547c2bdf7ec6d5cb8269f20e84d874d02a2fa002fbbaee1064051b530d708
+SHA512 (curl-8.1.2.tar.xz) = 532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4
+Size (curl-8.1.2.tar.xz) = 2612652 bytes
 SHA1 (patch-configure) = ae123a94fa84ef99dfc1dadd596ac86ef0d143fe
 SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df