Date: Sat, 9 Mar 2024 14:10:20 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 82670b6f51b7 - main - ftp/curl: Clean up Message-ID: <202403091410.429EAKFD003053@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=82670b6f51b7e3a8d7c2162e5581772f2c4346d6 commit 82670b6f51b7e3a8d7c2162e5581772f2c4346d6 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-03-09 13:45:04 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-03-09 14:05:24 +0000 ftp/curl: Clean up - Update LDAPS_DESC - Fix CONFIGURE_ARGS - Clean up patches USES=autoreconf can be removed after next version update. --- ftp/curl/Makefile | 12 +++++++----- ftp/curl/distinfo | 4 +++- ftp/curl/files/patch-Makefile.in | 25 ------------------------- ftp/curl/files/patch-scripts-Makefile.in | 21 --------------------- 4 files changed, 10 insertions(+), 52 deletions(-) diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index f90b24402213..957a4d17f80d 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -5,7 +5,8 @@ MASTER_SITES= https://curl.se/download/ \ https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/ PATCH_SITES= https://github.com/curl/curl/commit/ -PATCHFILES= e75a48d2c32d92b0321fbb09c25885a706077201.patch:-p1 +PATCHFILES= e75a48d2c32d92b0321fbb09c25885a706077201.patch:-p1 \ + 89733e2dd26b51c16b2c9f090881127dbba58ce8.patch:-p1 MAINTAINER= sunpoet@FreeBSD.org COMMENT= Command line tool and library for transferring data with URLs @@ -15,7 +16,7 @@ WWW= https://curl.se/ \ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe libtool localbase pathfix perl5 shebangfix tar:xz +USES= autoreconf cpe libtool localbase pathfix perl5 shebangfix tar:xz USE_PERL5= build CONFIGURE_ARGS= --disable-werror \ @@ -28,10 +29,10 @@ CONFIGURE_ARGS= --disable-werror \ --enable-netrc \ --enable-openssl-auto-load-config \ --enable-progress-meter \ - --with-fish-functions-dir=${LOCALBASE}/share/fish/completions \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ --without-ca-bundle \ - --without-ca-path + --without-ca-path \ + --without-fish-functions-dir CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no GNU_CONFIGURE= yes @@ -63,6 +64,7 @@ HTTP2_DESC= HTTP/2 support (requires HTTP) HTTP2_IMPLIES= HTTP IMAP_DESC= IMAP/IMAPS support LDAPS_IMPLIES= LDAP +LDAPS_DESC= LDAP protocol over SSL support (requires GNUTLS/OPENSSL/WOLFSSL) LIBSSH_DESC= SCP/SFTP support via libssh (requires OPENSSL) LIBSSH_IMPLIES= OPENSSL LIBSSH2_DESC= SCP/SFTP support via libssh2 (requires OPENSSL) @@ -160,7 +162,7 @@ IGNORE= only supports TLS-SRP with either OpenSSL or GnuTLS .endif .if ${PORT_OPTIONS:MLDAPS} && !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} && !${PORT_OPTIONS:MWOLFSSL} -IGNORE= only supports LDAPS with SSL +IGNORE= only supports LDAPS with GNUTLS/OPENSSL/WOLFSSL enabled .endif post-install: diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index ba0eb936f9d8..fd1e6b2918d3 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1707351676 +TIMESTAMP = 1709390388 SHA256 (curl-8.6.0.tar.xz) = 3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15 SIZE (curl-8.6.0.tar.xz) = 2630108 SHA256 (e75a48d2c32d92b0321fbb09c25885a706077201.patch) = ba977cec34b09820edb26e5edb8a4be3a8aaf7df4784295a081cca753a3eaac8 SIZE (e75a48d2c32d92b0321fbb09c25885a706077201.patch) = 750 +SHA256 (89733e2dd26b51c16b2c9f090881127dbba58ce8.patch) = 6e6a0b1832f8c3177dcacf8c758d1b48f2425fdda0e07094cc24626e977945ca +SIZE (89733e2dd26b51c16b2c9f090881127dbba58ce8.patch) = 4511 diff --git a/ftp/curl/files/patch-Makefile.in b/ftp/curl/files/patch-Makefile.in deleted file mode 100644 index 38f2a3dba772..000000000000 --- a/ftp/curl/files/patch-Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.in.orig 2023-03-20 13:54:32 UTC -+++ Makefile.in -@@ -684,7 +684,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) $(V - $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) - - bin_SCRIPTS = curl-config --SUBDIRS = lib src -+SUBDIRS = lib src docs scripts - DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libcurl.pc -@@ -1785,13 +1783,11 @@ cygwinbin: - # We extend the standard install with a custom hook: - install-data-hook: - (cd include && $(MAKE) install) -- (cd docs && $(MAKE) install) - (cd docs/libcurl && $(MAKE) install) - - # We extend the standard uninstall with a custom hook: - uninstall-hook: - (cd include && $(MAKE) uninstall) -- (cd docs && $(MAKE) uninstall) - (cd docs/libcurl && $(MAKE) uninstall) - - ca-bundle: $(srcdir)/scripts/mk-ca-bundle.pl diff --git a/ftp/curl/files/patch-scripts-Makefile.in b/ftp/curl/files/patch-scripts-Makefile.in deleted file mode 100644 index e241d63770d7..000000000000 --- a/ftp/curl/files/patch-scripts-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- scripts/Makefile.in.orig 2023-03-20 11:39:06 UTC -+++ scripts/Makefile.in -@@ -592,7 +592,7 @@ uninstall-am: - .PRECIOUS: Makefile - - --all-local: $(ZSH_COMPLETION_FUNCTION_FILENAME) $(FISH_COMPLETION_FUNCTION_FILENAME) -+all-local: $(ZSH_COMPLETION_FUNCTION_FILENAME) - - $(ZSH_COMPLETION_FUNCTION_FILENAME): completion.pl - @CROSSCOMPILING_TRUE@ @echo "NOTICE: we can't generate zsh completion when cross-compiling!" -@@ -607,9 +607,7 @@ $(FISH_COMPLETION_FUNCTION_FILENAME): completion.pl - install-data-local: - @CROSSCOMPILING_TRUE@ @echo "NOTICE: we can't install zsh completion when cross-compiling!" - @CROSSCOMPILING_FALSE@ $(MKDIR_P) $(DESTDIR)$(ZSH_FUNCTIONS_DIR) --@CROSSCOMPILING_FALSE@ $(MKDIR_P) $(DESTDIR)$(FISH_FUNCTIONS_DIR) - @CROSSCOMPILING_FALSE@ $(INSTALL_DATA) $(ZSH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(ZSH_FUNCTIONS_DIR)/$(ZSH_COMPLETION_FUNCTION_FILENAME) --@CROSSCOMPILING_FALSE@ $(INSTALL_DATA) $(FISH_COMPLETION_FUNCTION_FILENAME) $(DESTDIR)$(FISH_FUNCTIONS_DIR)/$(FISH_COMPLETION_FUNCTION_FILENAME) - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403091410.429EAKFD003053>