CVS commit: pkgsrc/www/curl

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

Module Name:    pkgsrc
Committed By:   nikita
Date:           Wed May 31 20:17:52 UTC 2023

Modified Files:
        pkgsrc/www/curl: Makefile
Added Files:
        pkgsrc/www/curl: Makefile.common

Log Message:
curl: create Makefile.common, to be used by curl and libcurl-gnutls


To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 pkgsrc/www/curl/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/curl/Makefile.common

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
diff -u pkgsrc/www/curl/Makefile:1.272 pkgsrc/www/curl/Makefile:1.273
--- pkgsrc/www/curl/Makefile:1.272      Wed May 31 08:52:59 2023
+++ pkgsrc/www/curl/Makefile    Wed May 31 20:17:52 2023
@@ -1,54 +1,10 @@
-# $NetBSD: Makefile,v 1.272 2023/05/31 08:52:59 adam Exp $
+# $NetBSD: Makefile,v 1.273 2023/05/31 20:17:52 nikita Exp $
 
-DISTNAME=      curl-8.1.2
-CATEGORIES=    www
-MASTER_SITES=  https://curl.se/download/
-EXTRACT_SUFX=  .tar.xz
+.include "Makefile.common"
 
-MAINTAINER=    leot%NetBSD.org@localhost
-HOMEPAGE=      https://curl.se/
-COMMENT=       Client that groks URLs
-# not completely, but near enough
-LICENSE=       mit
-
-BUILD_DEFS+=   IPV6_READY
-
-TEST_DEPENDS+= ${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-impacket
-
-USE_TOOLS+=            nroff perl
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
-# 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
 
 .include "options.mk"
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/www/curl/Makefile.common
diff -u /dev/null pkgsrc/www/curl/Makefile.common:1.1
--- /dev/null   Wed May 31 20:17:52 2023
+++ pkgsrc/www/curl/Makefile.common     Wed May 31 20:17:52 2023
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile.common,v 1.1 2023/05/31 20:17:52 nikita Exp $
+
+DISTNAME=      curl-8.1.2
+CATEGORIES=    www
+MASTER_SITES=  https://curl.se/download/
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    leot%NetBSD.org@localhost
+HOMEPAGE=      https://curl.se/
+COMMENT=       Client that groks URLs
+# not completely, but near enough
+LICENSE=       mit
+
+BUILD_DEFS+=   IPV6_READY
+
+TEST_DEPENDS+= ${PYPKGPREFIX}-impacket-[0-9]*:../../net/py-impacket
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-impacket
+
+USE_TOOLS+=            nroff perl
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
+# 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
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/pthread.buildlink3.mk"