curl: Remove, used to update www/curl

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: curl: Remove, used to update www/curl
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sun, 31 Mar 2019 20:55:27 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Mar 31 22:55:27 2019 +0200
Changeset:	2cb48bab230c40c443c4287cb07536a6a930a355

Modified Files:
	Makefile
Removed Files:
	curl/COMMIT_MSG
	curl/DESCR
	curl/Makefile
	curl/PLIST
	curl/buildlink3.mk
	curl/distinfo
	curl/options.mk
	curl/patches/patch-configure
	curl/patches/patch-curl-config.in

Log Message:
curl: Remove, used to update www/curl

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2cb48bab230c40c443c4287cb07536a6a930a355

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

diffstat:
 Makefile                          |   1 -
 curl/COMMIT_MSG                   | 132 -----------
 curl/DESCR                        |   6 -
 curl/Makefile                     |  38 ----
 curl/PLIST                        | 445 --------------------------------------
 curl/buildlink3.mk                |  38 ----
 curl/distinfo                     |   8 -
 curl/options.mk                   |  62 ------
 curl/patches/patch-configure      | 169 ---------------
 curl/patches/patch-curl-config.in |  18 --
 10 files changed, 917 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index a7da3a45a8..ffbb331a42 100644
--- a/Makefile
+++ b/Makefile
@@ -506,7 +506,6 @@ SUBDIR+=	cubature
 SUBDIR+=	cufflinks
 SUBDIR+=	cufflinks-2.2.1
 SUBDIR+=	cup
-SUBDIR+=	curl
 SUBDIR+=	cutecom
 SUBDIR+=	cvc3
 SUBDIR+=	cvs-syncmail
diff --git a/curl/COMMIT_MSG b/curl/COMMIT_MSG
deleted file mode 100644
index 287d99e41b..0000000000
--- a/curl/COMMIT_MSG
+++ /dev/null
@@ -1,132 +0,0 @@
-curl: Update to 7.64.1
-
-pkgsrc changes:
- - No longer install MANUAL, it is no longer available
- - Take MAINTAINERSHIP
-
-Changes:
-7.64.1
-======
-This release includes the following changes:
-
- o alt-svc: experiemental support added [74]
- o configure: add --with-amissl [84]
-
-This release includes the following bugfixes:
-
- o AppVeyor: add MinGW-w64 and classic Mingw builds [55]
- o AppVeyor: switch VS 2015 builds to VS 2017 image [49]
- o CURLU: fix NULL dereference when used over proxy [73]
- o Curl_easy: remove req.maxfd - never used! [58]
- o Curl_now: figure out windows version in win32_init: [11]
- o Curl_resolv: fix a gcc -Werror=maybe-uninitialized warning [20]
- o DoH: inherit some SSL options from user's easy handle [80]
- o Secure Transport: no more "darwinssl" [56]
- o Secure Transport: tvOS 11 is required for ALPN support [94]
- o cirrus: Added FreeBSD builds using Cirrus CI
- o cleanup: make local functions static [5]
- o cli tool: do not use mime.h private structures [27]
- o cmdline-opts/proxytunnel.d: the option tunnnels all protocols [83]
- o configure: add additional libraries to check for LDAP support [45]
- o configure: remove the unused fdopen macro [40]
- o configure: show features as well in the final summary [15]
- o conncache: use conn->data to know if a transfer owns it [95]
- o connection: never reuse CONNECT_ONLY connections [35]
- o connection_check: restore original conn->data after the check [14]
- o connection_check: set ->data to the transfer doing the check [3]
- o cookie: Add support for cookie prefixes [29]
- o cookies: dotless names can set cookies again [81]
- o cookies: fix NULL dereference if flushing cookies with no CookieInfo set [47]
- o curl.1: --user and --proxy-user are hidden from ps output [86]
- o curl.1: mark the argument to --cookie as <data|filename> [87]
- o curl.h: use __has_declspec_attribute for shared builds [52]
- o curl: display --version features sorted alphabetically [51]
- o curl: fix FreeBSD compiler warning in the --xattr code [2]
- o curl: remove MANUAL from -M output [38]
- o curl_easy_duphandle.3: clarify that a duped handle has no shares [64]
- o curl_multi_remove_handle.3: use at any time, just not from within callbacks
- o curl_url.3: this API is not experimental anymore
- o dns: release sharelock as soon as possible [1]
- o docs: update max-redirs.d phrasing [59]
- o easy: fix win32 init to work without CURL_GLOBAL_WIN32 [30]
- o examples/10-at-a-time.c: improve readability and simplify
- o examples/cacertinmem.c: use multiple certificates for loading CA-chain [54]
- o examples/crawler: Fix the Accept-Encoding setting
- o examples/ephiperfifo.c: various fixes [63]
- o examples/externalsocket: add missing close socket calls [78]
- o examples/http2-download: cleaned up
- o examples/http2-serverpush: add some sensible error checks [31]
- o examples/http2-upload: cleaned up
- o examples/httpcustomheader: Value stored to 'res' is never read
- o examples/postinmemory: Potential leak of memory pointed to by 'chunk.memory'
- o examples/sftpuploadresume: Value stored to 'result' is never read
- o examples: only include <curl/curl.h> [70]
- o examples: remove recursive calls to curl_multi_socket_action [42]
- o examples: remove superfluous null-pointer checks
- o file: fix "Checking if unsigned variable 'readcount' is less than zero." [90]
- o fnmatch: disable if FTP is disabled [25]
- o gnutls: remove call to deprecated gnutls_compression_get_name [66]
- o gopher: remove check for path == NULL [69]
- o gssapi: fix deprecated header warnings [16]
- o hostip: make create_hostcache_id avoid alloc + free [4]
- o http2: multi_connchanged() moved from multi.c, only used for h2 [21]
- o http2: verify :athority in push promise requests [37]
- o http: make adding a blank header thread-safe [33]
- o http: send payload when (proxy) authentication is done [89]
- o http: set state.infilesize when sending multipart formposts [57]
- o makefile: make checksrc and hugefile commands "silent" [85]
- o mbedtls: make it build even if MBEDTLS_VERSION_C isn't set [24]
- o mbedtls: release sessionid resources on error [28]
- o memdebug: log pointer before freeing its data [91]
- o memdebug: make debug-specific functions use curl_dbg_ prefix [82]
- o mime: put the boundary buffer into the curl_mime struct [18]
- o multi: call multi_done on connect timeouts, fixes CURLINFO_TOTAL_TIME [43]
- o multi: remove verbose "Expire in" ... messages [23]
- o multi: removed unused code for request retries [79]
- o multi: support verbose conncache closure handle [72]
- o negotiate: fix for HTTP POST with Negotiate [88]
- o openssl: add support for TLS ASYNC state [46]
- o openssl: if cert type is ENG and no key specified, key is ENG too [93]
- o pretransfer: don't strlen() POSTFIELDS set for GET requests [22]
- o rand: Fix a mismatch between comments in source and header [32]
- o runtests: detect "schannel" as an alias for "winssl" [50]
- o schannel: be quiet - remove verbose output [19]
- o schannel: close TLS before removing conn from cache [10]
- o schannel: support CALG_ECDH_EPHEM algorithm [44]
- o scripts/completion.pl: also generate fish completion file [67]
- o singlesocket: fix the 'sincebefore' placement [36]
- o source: fix two 'nread' may be used uninitialized warnings [68]
- o ssh: fix Condition '!status' is always true [60]
- o ssh: loop the state machine if not done and not blocking [71]
- o strerror: make the strerror function use local buffers [48]
- o system_win32: move win32_init here from easy.c [65]
- o test578: make it read data from the correct test
- o tests: Fixed XML validation errors in some test files
- o tests: add stderr comparison to the test suite [26]
- o tests: fix multiple may be used uninitialized warnings
- o threaded-resolver: shutdown the resolver thread without error message [61]
- o tool_cb_wrt: fix writing to Windows null device NUL [96]
- o tool_getpass: termios.h is present on AmigaOS 3, but no tcgetattr/tcsetattr [84]
- o tool_operate: build on AmigaOS [84]
- o tool_operate: fix typecheck warning [9]
- o transfer.c: do not compute length of undefined hex buffer
- o travis: add build using gnutls [75]
- o travis: add scan-build [13]
- o travis: bump the used wolfSSL version to 4.0.0 [92]
- o travis: enable valgrind for the iconv tests [12]
- o travis: use updated compiler versions: clang 7 and gcc 8 [77]
- o unit1307: require FTP support [17]
- o unit1651: survive curl_easy_init() fails
- o url/idnconvert: remove scan for <= 32 ascii values [6]
- o url: change conn shutdown order to ensure SOCKETFUNCTION callbacks [39]
- o urlapi: reduce variable scope, remove unreachable 'break' [7]
- o urldata: convert bools to bitfields and move to end [53]
- o urldata: simplify bytecounters [62]
- o urlglob: Argument with 'nonnull' attribute passed null
- o version.c: silent scan-build even when librtmp is not enabled
- o vtls: rename some of the SSL functions [84]
- o wolfssl: stop custom-adding curves [41]
- o x509asn1: "Dereference of null pointer"
- o x509asn1: cleanup and unify code layout [34]
- o zsh.pl: escape ':' character [8]
- o zsh.pl: update regex to better match curl -h output [8]
diff --git a/curl/DESCR b/curl/DESCR
deleted file mode 100644
index d2ea8434ce..0000000000
--- a/curl/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Curl is a command line tool for transferring files with URL syntax, supporting
-FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports
-HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
-proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
-kerberos...), file transfer resume, proxy tunneling and a busload of other
-useful tricks.
diff --git a/curl/Makefile b/curl/Makefile
deleted file mode 100644
index 4cd41e0afa..0000000000
--- a/curl/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.207 2019/02/06 08:02:48 adam Exp $
-
-DISTNAME=	curl-7.64.1
-CATEGORIES=	www
-MASTER_SITES=	https://curl.haxx.se/download/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	leot%NetBSD.org@localhost
-HOMEPAGE=	https://curl.haxx.se/
-COMMENT=	Client that groks URLs
-# not completely, but near enough
-LICENSE=	mit
-
-BUILD_DEFS+=	IPV6_READY
-
-USE_TOOLS+=		nroff perl
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=	--with-ca-path=${SSLCERTS}
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-PKGCONFIG_OVERRIDE=	libcurl.pc.in
-TEST_TARGET=		check
-
-INSTALLATION_DIRS=	share/doc/curl
-
-.include "options.mk"
-
-post-install:
-.for f in TheArtOfHttpScripting FAQ
-	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DESTDIR}${PREFIX}/share/doc/curl/
-.endfor
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/curl/PLIST b/curl/PLIST
deleted file mode 100644
index 105775cf8a..0000000000
--- a/curl/PLIST
+++ /dev/null
@@ -1,445 +0,0 @@
-@comment $NetBSD: PLIST,v 1.73 2019/02/06 08:02:48 adam Exp $
-bin/curl
-bin/curl-config
-include/curl/curl.h
-include/curl/curlver.h
-include/curl/easy.h
-include/curl/mprintf.h
-include/curl/multi.h
-include/curl/stdcheaders.h
-include/curl/system.h
-include/curl/typecheck-gcc.h
-include/curl/urlapi.h
-lib/libcurl.la
-lib/pkgconfig/libcurl.pc
-man/man1/curl-config.1
-man/man1/curl.1
-man/man3/CURLINFO_ACTIVESOCKET.3
-man/man3/CURLINFO_APPCONNECT_TIME.3
-man/man3/CURLINFO_APPCONNECT_TIME_T.3
-man/man3/CURLINFO_CERTINFO.3
-man/man3/CURLINFO_CONDITION_UNMET.3
-man/man3/CURLINFO_CONNECT_TIME.3
-man/man3/CURLINFO_CONNECT_TIME_T.3
-man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
-man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
-man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
-man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
-man/man3/CURLINFO_CONTENT_TYPE.3
-man/man3/CURLINFO_COOKIELIST.3
-man/man3/CURLINFO_EFFECTIVE_URL.3
-man/man3/CURLINFO_FILETIME.3
-man/man3/CURLINFO_FILETIME_T.3
-man/man3/CURLINFO_FTP_ENTRY_PATH.3
-man/man3/CURLINFO_HEADER_SIZE.3
-man/man3/CURLINFO_HTTPAUTH_AVAIL.3
-man/man3/CURLINFO_HTTP_CONNECTCODE.3
-man/man3/CURLINFO_HTTP_VERSION.3
-man/man3/CURLINFO_LASTSOCKET.3
-man/man3/CURLINFO_LOCAL_IP.3
-man/man3/CURLINFO_LOCAL_PORT.3
-man/man3/CURLINFO_NAMELOOKUP_TIME.3
-man/man3/CURLINFO_NAMELOOKUP_TIME_T.3
-man/man3/CURLINFO_NUM_CONNECTS.3
-man/man3/CURLINFO_OS_ERRNO.3
-man/man3/CURLINFO_PRETRANSFER_TIME.3
-man/man3/CURLINFO_PRETRANSFER_TIME_T.3
-man/man3/CURLINFO_PRIMARY_IP.3
-man/man3/CURLINFO_PRIMARY_PORT.3
-man/man3/CURLINFO_PRIVATE.3
-man/man3/CURLINFO_PROTOCOL.3
-man/man3/CURLINFO_PROXYAUTH_AVAIL.3
-man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3
-man/man3/CURLINFO_REDIRECT_COUNT.3
-man/man3/CURLINFO_REDIRECT_TIME.3
-man/man3/CURLINFO_REDIRECT_TIME_T.3
-man/man3/CURLINFO_REDIRECT_URL.3
-man/man3/CURLINFO_REQUEST_SIZE.3
-man/man3/CURLINFO_RESPONSE_CODE.3
-man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3
-man/man3/CURLINFO_RTSP_CSEQ_RECV.3
-man/man3/CURLINFO_RTSP_SERVER_CSEQ.3
-man/man3/CURLINFO_RTSP_SESSION_ID.3
-man/man3/CURLINFO_SCHEME.3
-man/man3/CURLINFO_SIZE_DOWNLOAD.3
-man/man3/CURLINFO_SIZE_DOWNLOAD_T.3
-man/man3/CURLINFO_SIZE_UPLOAD.3
-man/man3/CURLINFO_SIZE_UPLOAD_T.3
-man/man3/CURLINFO_SPEED_DOWNLOAD.3
-man/man3/CURLINFO_SPEED_DOWNLOAD_T.3
-man/man3/CURLINFO_SPEED_UPLOAD.3
-man/man3/CURLINFO_SPEED_UPLOAD_T.3
-man/man3/CURLINFO_SSL_ENGINES.3
-man/man3/CURLINFO_SSL_VERIFYRESULT.3
-man/man3/CURLINFO_STARTTRANSFER_TIME.3
-man/man3/CURLINFO_STARTTRANSFER_TIME_T.3
-man/man3/CURLINFO_TLS_SESSION.3
-man/man3/CURLINFO_TLS_SSL_PTR.3
-man/man3/CURLINFO_TOTAL_TIME.3
-man/man3/CURLINFO_TOTAL_TIME_T.3
-man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
-man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
-man/man3/CURLMOPT_MAXCONNECTS.3
-man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3
-man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3
-man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3
-man/man3/CURLMOPT_PIPELINING.3
-man/man3/CURLMOPT_PIPELINING_SERVER_BL.3
-man/man3/CURLMOPT_PIPELINING_SITE_BL.3
-man/man3/CURLMOPT_PUSHDATA.3
-man/man3/CURLMOPT_PUSHFUNCTION.3
-man/man3/CURLMOPT_SOCKETDATA.3
-man/man3/CURLMOPT_SOCKETFUNCTION.3
-man/man3/CURLMOPT_TIMERDATA.3
-man/man3/CURLMOPT_TIMERFUNCTION.3
-man/man3/CURLOPT_ABSTRACT_UNIX_SOCKET.3
-man/man3/CURLOPT_ACCEPTTIMEOUT_MS.3
-man/man3/CURLOPT_ACCEPT_ENCODING.3
-man/man3/CURLOPT_ADDRESS_SCOPE.3
-man/man3/CURLOPT_ALTSVC.3
-man/man3/CURLOPT_ALTSVC_CTRL.3
-man/man3/CURLOPT_APPEND.3
-man/man3/CURLOPT_AUTOREFERER.3
-man/man3/CURLOPT_BUFFERSIZE.3
-man/man3/CURLOPT_CAINFO.3
-man/man3/CURLOPT_CAPATH.3
-man/man3/CURLOPT_CERTINFO.3
-man/man3/CURLOPT_CHUNK_BGN_FUNCTION.3
-man/man3/CURLOPT_CHUNK_DATA.3
-man/man3/CURLOPT_CHUNK_END_FUNCTION.3
-man/man3/CURLOPT_CLOSESOCKETDATA.3
-man/man3/CURLOPT_CLOSESOCKETFUNCTION.3
-man/man3/CURLOPT_CONNECTTIMEOUT.3
-man/man3/CURLOPT_CONNECTTIMEOUT_MS.3
-man/man3/CURLOPT_CONNECT_ONLY.3
-man/man3/CURLOPT_CONNECT_TO.3
-man/man3/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3
-man/man3/CURLOPT_CONV_FROM_UTF8_FUNCTION.3
-man/man3/CURLOPT_CONV_TO_NETWORK_FUNCTION.3
-man/man3/CURLOPT_COOKIE.3
-man/man3/CURLOPT_COOKIEFILE.3
-man/man3/CURLOPT_COOKIEJAR.3
-man/man3/CURLOPT_COOKIELIST.3
-man/man3/CURLOPT_COOKIESESSION.3
-man/man3/CURLOPT_COPYPOSTFIELDS.3
-man/man3/CURLOPT_CRLF.3
-man/man3/CURLOPT_CRLFILE.3
-man/man3/CURLOPT_CURLU.3
-man/man3/CURLOPT_CUSTOMREQUEST.3
-man/man3/CURLOPT_DEBUGDATA.3
-man/man3/CURLOPT_DEBUGFUNCTION.3
-man/man3/CURLOPT_DEFAULT_PROTOCOL.3
-man/man3/CURLOPT_DIRLISTONLY.3
-man/man3/CURLOPT_DISALLOW_USERNAME_IN_URL.3
-man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
-man/man3/CURLOPT_DNS_INTERFACE.3
-man/man3/CURLOPT_DNS_LOCAL_IP4.3
-man/man3/CURLOPT_DNS_LOCAL_IP6.3
-man/man3/CURLOPT_DNS_SERVERS.3
-man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3
-man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3
-man/man3/CURLOPT_DOH_URL.3
-man/man3/CURLOPT_EGDSOCKET.3
-man/man3/CURLOPT_ERRORBUFFER.3
-man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3
-man/man3/CURLOPT_FAILONERROR.3
-man/man3/CURLOPT_FILETIME.3
-man/man3/CURLOPT_FNMATCH_DATA.3
-man/man3/CURLOPT_FNMATCH_FUNCTION.3
-man/man3/CURLOPT_FOLLOWLOCATION.3
-man/man3/CURLOPT_FORBID_REUSE.3
-man/man3/CURLOPT_FRESH_CONNECT.3
-man/man3/CURLOPT_FTPPORT.3
-man/man3/CURLOPT_FTPSSLAUTH.3
-man/man3/CURLOPT_FTP_ACCOUNT.3
-man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3
-man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3
-man/man3/CURLOPT_FTP_FILEMETHOD.3
-man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3
-man/man3/CURLOPT_FTP_SKIP_PASV_IP.3
-man/man3/CURLOPT_FTP_SSL_CCC.3
-man/man3/CURLOPT_FTP_USE_EPRT.3
-man/man3/CURLOPT_FTP_USE_EPSV.3
-man/man3/CURLOPT_FTP_USE_PRET.3
-man/man3/CURLOPT_GSSAPI_DELEGATION.3
-man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
-man/man3/CURLOPT_HAPROXYPROTOCOL.3
-man/man3/CURLOPT_HEADER.3
-man/man3/CURLOPT_HEADERDATA.3
-man/man3/CURLOPT_HEADERFUNCTION.3
-man/man3/CURLOPT_HEADEROPT.3
-man/man3/CURLOPT_HTTP09_ALLOWED.3
-man/man3/CURLOPT_HTTP200ALIASES.3
-man/man3/CURLOPT_HTTPAUTH.3
-man/man3/CURLOPT_HTTPGET.3
-man/man3/CURLOPT_HTTPHEADER.3
-man/man3/CURLOPT_HTTPPOST.3
-man/man3/CURLOPT_HTTPPROXYTUNNEL.3
-man/man3/CURLOPT_HTTP_CONTENT_DECODING.3
-man/man3/CURLOPT_HTTP_TRANSFER_DECODING.3
-man/man3/CURLOPT_HTTP_VERSION.3
-man/man3/CURLOPT_IGNORE_CONTENT_LENGTH.3
-man/man3/CURLOPT_INFILESIZE.3
-man/man3/CURLOPT_INFILESIZE_LARGE.3
-man/man3/CURLOPT_INTERFACE.3
-man/man3/CURLOPT_INTERLEAVEDATA.3
-man/man3/CURLOPT_INTERLEAVEFUNCTION.3
-man/man3/CURLOPT_IOCTLDATA.3
-man/man3/CURLOPT_IOCTLFUNCTION.3
-man/man3/CURLOPT_IPRESOLVE.3
-man/man3/CURLOPT_ISSUERCERT.3
-man/man3/CURLOPT_KEEP_SENDING_ON_ERROR.3
-man/man3/CURLOPT_KEYPASSWD.3
-man/man3/CURLOPT_KRBLEVEL.3
-man/man3/CURLOPT_LOCALPORT.3
-man/man3/CURLOPT_LOCALPORTRANGE.3
-man/man3/CURLOPT_LOGIN_OPTIONS.3
-man/man3/CURLOPT_LOW_SPEED_LIMIT.3
-man/man3/CURLOPT_LOW_SPEED_TIME.3
-man/man3/CURLOPT_MAIL_AUTH.3
-man/man3/CURLOPT_MAIL_FROM.3
-man/man3/CURLOPT_MAIL_RCPT.3
-man/man3/CURLOPT_MAXCONNECTS.3
-man/man3/CURLOPT_MAXFILESIZE.3
-man/man3/CURLOPT_MAXFILESIZE_LARGE.3
-man/man3/CURLOPT_MAXREDIRS.3
-man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
-man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
-man/man3/CURLOPT_MIMEPOST.3
-man/man3/CURLOPT_NETRC.3
-man/man3/CURLOPT_NETRC_FILE.3
-man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
-man/man3/CURLOPT_NEW_FILE_PERMS.3
-man/man3/CURLOPT_NOBODY.3
-man/man3/CURLOPT_NOPROGRESS.3
-man/man3/CURLOPT_NOPROXY.3
-man/man3/CURLOPT_NOSIGNAL.3
-man/man3/CURLOPT_OPENSOCKETDATA.3
-man/man3/CURLOPT_OPENSOCKETFUNCTION.3
-man/man3/CURLOPT_PASSWORD.3
-man/man3/CURLOPT_PATH_AS_IS.3
-man/man3/CURLOPT_PINNEDPUBLICKEY.3
-man/man3/CURLOPT_PIPEWAIT.3
-man/man3/CURLOPT_PORT.3
-man/man3/CURLOPT_POST.3
-man/man3/CURLOPT_POSTFIELDS.3
-man/man3/CURLOPT_POSTFIELDSIZE.3
-man/man3/CURLOPT_POSTFIELDSIZE_LARGE.3
-man/man3/CURLOPT_POSTQUOTE.3
-man/man3/CURLOPT_POSTREDIR.3
-man/man3/CURLOPT_PREQUOTE.3
-man/man3/CURLOPT_PRE_PROXY.3
-man/man3/CURLOPT_PRIVATE.3
-man/man3/CURLOPT_PROGRESSDATA.3
-man/man3/CURLOPT_PROGRESSFUNCTION.3
-man/man3/CURLOPT_PROTOCOLS.3
-man/man3/CURLOPT_PROXY.3
-man/man3/CURLOPT_PROXYAUTH.3
-man/man3/CURLOPT_PROXYHEADER.3
-man/man3/CURLOPT_PROXYPASSWORD.3
-man/man3/CURLOPT_PROXYPORT.3
-man/man3/CURLOPT_PROXYTYPE.3
-man/man3/CURLOPT_PROXYUSERNAME.3
-man/man3/CURLOPT_PROXYUSERPWD.3
-man/man3/CURLOPT_PROXY_CAINFO.3
-man/man3/CURLOPT_PROXY_CAPATH.3
-man/man3/CURLOPT_PROXY_CRLFILE.3
-man/man3/CURLOPT_PROXY_KEYPASSWD.3
-man/man3/CURLOPT_PROXY_PINNEDPUBLICKEY.3
-man/man3/CURLOPT_PROXY_SERVICE_NAME.3
-man/man3/CURLOPT_PROXY_SSLCERT.3
-man/man3/CURLOPT_PROXY_SSLCERTTYPE.3
-man/man3/CURLOPT_PROXY_SSLKEY.3
-man/man3/CURLOPT_PROXY_SSLKEYTYPE.3
-man/man3/CURLOPT_PROXY_SSLVERSION.3
-man/man3/CURLOPT_PROXY_SSL_CIPHER_LIST.3
-man/man3/CURLOPT_PROXY_SSL_OPTIONS.3
-man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3
-man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3
-man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3
-man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3
-man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3
-man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3
-man/man3/CURLOPT_PROXY_TRANSFER_MODE.3
-man/man3/CURLOPT_PUT.3
-man/man3/CURLOPT_QUOTE.3
-man/man3/CURLOPT_RANDOM_FILE.3
-man/man3/CURLOPT_RANGE.3
-man/man3/CURLOPT_READDATA.3
-man/man3/CURLOPT_READFUNCTION.3
-man/man3/CURLOPT_REDIR_PROTOCOLS.3
-man/man3/CURLOPT_REFERER.3
-man/man3/CURLOPT_REQUEST_TARGET.3
-man/man3/CURLOPT_RESOLVE.3
-man/man3/CURLOPT_RESOLVER_START_DATA.3
-man/man3/CURLOPT_RESOLVER_START_FUNCTION.3
-man/man3/CURLOPT_RESUME_FROM.3
-man/man3/CURLOPT_RESUME_FROM_LARGE.3
-man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3
-man/man3/CURLOPT_RTSP_REQUEST.3
-man/man3/CURLOPT_RTSP_SERVER_CSEQ.3
-man/man3/CURLOPT_RTSP_SESSION_ID.3
-man/man3/CURLOPT_RTSP_STREAM_URI.3
-man/man3/CURLOPT_RTSP_TRANSPORT.3
-man/man3/CURLOPT_SASL_IR.3
-man/man3/CURLOPT_SEEKDATA.3
-man/man3/CURLOPT_SEEKFUNCTION.3
-man/man3/CURLOPT_SERVICE_NAME.3
-man/man3/CURLOPT_SHARE.3
-man/man3/CURLOPT_SOCKOPTDATA.3
-man/man3/CURLOPT_SOCKOPTFUNCTION.3
-man/man3/CURLOPT_SOCKS5_AUTH.3
-man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
-man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
-man/man3/CURLOPT_SSH_AUTH_TYPES.3
-man/man3/CURLOPT_SSH_COMPRESSION.3
-man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
-man/man3/CURLOPT_SSH_KEYDATA.3
-man/man3/CURLOPT_SSH_KEYFUNCTION.3
-man/man3/CURLOPT_SSH_KNOWNHOSTS.3
-man/man3/CURLOPT_SSH_PRIVATE_KEYFILE.3
-man/man3/CURLOPT_SSH_PUBLIC_KEYFILE.3
-man/man3/CURLOPT_SSLCERT.3
-man/man3/CURLOPT_SSLCERTTYPE.3
-man/man3/CURLOPT_SSLENGINE.3
-man/man3/CURLOPT_SSLENGINE_DEFAULT.3
-man/man3/CURLOPT_SSLKEY.3
-man/man3/CURLOPT_SSLKEYTYPE.3
-man/man3/CURLOPT_SSLVERSION.3
-man/man3/CURLOPT_SSL_CIPHER_LIST.3
-man/man3/CURLOPT_SSL_CTX_DATA.3
-man/man3/CURLOPT_SSL_CTX_FUNCTION.3
-man/man3/CURLOPT_SSL_ENABLE_ALPN.3
-man/man3/CURLOPT_SSL_ENABLE_NPN.3
-man/man3/CURLOPT_SSL_FALSESTART.3
-man/man3/CURLOPT_SSL_OPTIONS.3
-man/man3/CURLOPT_SSL_SESSIONID_CACHE.3
-man/man3/CURLOPT_SSL_VERIFYHOST.3
-man/man3/CURLOPT_SSL_VERIFYPEER.3
-man/man3/CURLOPT_SSL_VERIFYSTATUS.3
-man/man3/CURLOPT_STDERR.3
-man/man3/CURLOPT_STREAM_DEPENDS.3
-man/man3/CURLOPT_STREAM_DEPENDS_E.3
-man/man3/CURLOPT_STREAM_WEIGHT.3
-man/man3/CURLOPT_SUPPRESS_CONNECT_HEADERS.3
-man/man3/CURLOPT_TCP_FASTOPEN.3
-man/man3/CURLOPT_TCP_KEEPALIVE.3
-man/man3/CURLOPT_TCP_KEEPIDLE.3
-man/man3/CURLOPT_TCP_KEEPINTVL.3
-man/man3/CURLOPT_TCP_NODELAY.3
-man/man3/CURLOPT_TELNETOPTIONS.3
-man/man3/CURLOPT_TFTP_BLKSIZE.3
-man/man3/CURLOPT_TFTP_NO_OPTIONS.3
-man/man3/CURLOPT_TIMECONDITION.3
-man/man3/CURLOPT_TIMEOUT.3
-man/man3/CURLOPT_TIMEOUT_MS.3
-man/man3/CURLOPT_TIMEVALUE.3
-man/man3/CURLOPT_TIMEVALUE_LARGE.3
-man/man3/CURLOPT_TLS13_CIPHERS.3
-man/man3/CURLOPT_TLSAUTH_PASSWORD.3
-man/man3/CURLOPT_TLSAUTH_TYPE.3
-man/man3/CURLOPT_TLSAUTH_USERNAME.3
-man/man3/CURLOPT_TRAILERDATA.3
-man/man3/CURLOPT_TRAILERFUNCTION.3
-man/man3/CURLOPT_TRANSFERTEXT.3
-man/man3/CURLOPT_TRANSFER_ENCODING.3
-man/man3/CURLOPT_UNIX_SOCKET_PATH.3
-man/man3/CURLOPT_UNRESTRICTED_AUTH.3
-man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3
-man/man3/CURLOPT_UPLOAD.3
-man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3
-man/man3/CURLOPT_URL.3
-man/man3/CURLOPT_USERAGENT.3
-man/man3/CURLOPT_USERNAME.3
-man/man3/CURLOPT_USERPWD.3
-man/man3/CURLOPT_USE_SSL.3
-man/man3/CURLOPT_VERBOSE.3
-man/man3/CURLOPT_WILDCARDMATCH.3
-man/man3/CURLOPT_WRITEDATA.3
-man/man3/CURLOPT_WRITEFUNCTION.3
-man/man3/CURLOPT_XFERINFODATA.3
-man/man3/CURLOPT_XFERINFOFUNCTION.3
-man/man3/CURLOPT_XOAUTH2_BEARER.3
-man/man3/curl_easy_cleanup.3
-man/man3/curl_easy_duphandle.3
-man/man3/curl_easy_escape.3
-man/man3/curl_easy_getinfo.3
-man/man3/curl_easy_init.3
-man/man3/curl_easy_pause.3
-man/man3/curl_easy_perform.3
-man/man3/curl_easy_recv.3
-man/man3/curl_easy_reset.3
-man/man3/curl_easy_send.3
-man/man3/curl_easy_setopt.3
-man/man3/curl_easy_strerror.3
-man/man3/curl_easy_unescape.3
-man/man3/curl_easy_upkeep.3
-man/man3/curl_escape.3
-man/man3/curl_formadd.3
-man/man3/curl_formfree.3
-man/man3/curl_formget.3
-man/man3/curl_free.3
-man/man3/curl_getdate.3
-man/man3/curl_getenv.3
-man/man3/curl_global_cleanup.3
-man/man3/curl_global_init.3
-man/man3/curl_global_init_mem.3
-man/man3/curl_global_sslset.3
-man/man3/curl_mime_addpart.3
-man/man3/curl_mime_data.3
-man/man3/curl_mime_data_cb.3
-man/man3/curl_mime_encoder.3
-man/man3/curl_mime_filedata.3
-man/man3/curl_mime_filename.3
-man/man3/curl_mime_free.3
-man/man3/curl_mime_headers.3
-man/man3/curl_mime_init.3
-man/man3/curl_mime_name.3
-man/man3/curl_mime_subparts.3
-man/man3/curl_mime_type.3
-man/man3/curl_mprintf.3
-man/man3/curl_multi_add_handle.3
-man/man3/curl_multi_assign.3
-man/man3/curl_multi_cleanup.3
-man/man3/curl_multi_fdset.3
-man/man3/curl_multi_info_read.3
-man/man3/curl_multi_init.3
-man/man3/curl_multi_perform.3
-man/man3/curl_multi_remove_handle.3
-man/man3/curl_multi_setopt.3
-man/man3/curl_multi_socket.3
-man/man3/curl_multi_socket_action.3
-man/man3/curl_multi_socket_all.3
-man/man3/curl_multi_strerror.3
-man/man3/curl_multi_timeout.3
-man/man3/curl_multi_wait.3
-man/man3/curl_share_cleanup.3
-man/man3/curl_share_init.3
-man/man3/curl_share_setopt.3
-man/man3/curl_share_strerror.3
-man/man3/curl_slist_append.3
-man/man3/curl_slist_free_all.3
-man/man3/curl_strequal.3
-man/man3/curl_strnequal.3
-man/man3/curl_unescape.3
-man/man3/curl_url.3
-man/man3/curl_url_cleanup.3
-man/man3/curl_url_dup.3
-man/man3/curl_url_get.3
-man/man3/curl_url_set.3
-man/man3/curl_version.3
-man/man3/curl_version_info.3
-man/man3/libcurl-easy.3
-man/man3/libcurl-env.3
-man/man3/libcurl-errors.3
-man/man3/libcurl-multi.3
-man/man3/libcurl-security.3
-man/man3/libcurl-share.3
-man/man3/libcurl-symbols.3
-man/man3/libcurl-thread.3
-man/man3/libcurl-tutorial.3
-man/man3/libcurl-url.3
-man/man3/libcurl.3
-share/aclocal/libcurl.m4
-share/doc/curl/FAQ
-share/doc/curl/TheArtOfHttpScripting
diff --git a/curl/buildlink3.mk b/curl/buildlink3.mk
deleted file mode 100644
index c1d4fc2934..0000000000
--- a/curl/buildlink3.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.41 2018/12/13 19:51:38 adam Exp $
-
-BUILDLINK_TREE+=	curl
-
-.if !defined(CURL_BUILDLINK3_MK)
-CURL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
-BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.63.0nb1
-BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
-
-pkgbase:= curl
-.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2)
-.  include "../../security/libssh2/buildlink3.mk"
-.endif
-.if !empty(PKG_BUILD_OPTIONS.curl:Mgssapi)
-.  include "../../mk/krb5.buildlink3.mk"
-.endif
-.if !empty(PKG_BUILD_OPTIONS.curl:Mldap)
-.  include "../../databases/openldap-client/buildlink3.mk"
-.endif
-.if !empty(PKG_BUILD_OPTIONS.curl:Mrtmp)
-.  include "../../net/rtmpdump/buildlink3.mk"
-.endif
-.if !empty(PKG_BUILD_OPTIONS.curl:Midn)
-.  include "../../devel/libidn2/buildlink3.mk"
-.endif
-.if !empty(PKG_BUILD_OPTIONS.curl:Mhttp2)
-.  include "../../www/nghttp2/buildlink3.mk"
-.endif
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.endif # CURL_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-curl
diff --git a/curl/distinfo b/curl/distinfo
deleted file mode 100644
index 55489874be..0000000000
--- a/curl/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.150 2019/02/06 08:02:48 adam Exp $
-
-SHA1 (curl-7.64.1.tar.xz) = a7242098aebf31107bd4765f3d54456953dba141
-RMD160 (curl-7.64.1.tar.xz) = e53f8e3279d351de1fba7de1fea3126cdd59bf50
-SHA512 (curl-7.64.1.tar.xz) = 1629ba154691bf9d936e0bce69ec8fb54991a40d34bc16ffdfb117f91e3faa93164154fc9ae9043e963955862e69515018673b7239f2fd625684a59cdd1db81c
-Size (curl-7.64.1.tar.xz) = 2385360 bytes
-SHA1 (patch-configure) = a1674c54b3a8803f84c6b5a7ddd5e79df2b20896
-SHA1 (patch-curl-config.in) = 363359665985cc14f36ddf47fc3480f1200e3533
diff --git a/curl/options.mk b/curl/options.mk
deleted file mode 100644
index d4ea55fd1a..0000000000
--- a/curl/options.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: options.mk,v 1.16 2017/08/17 13:55:39 schmonz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS=	inet6 libssh2 gssapi ldap rtmp idn http2
-PKG_SUGGESTED_OPTIONS=	inet6 idn
-PKG_OPTIONS_LEGACY_OPTS=libidn:idn
-
-# Kerberos is built in - no additional dependency
-PKG_SUGGESTED_OPTIONS.NetBSD+=	gssapi
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mlibssh2)
-CONFIGURE_ARGS+=	--with-libssh2=${BUILDLINK_PREFIX.libssh2}
-.  include "../../security/libssh2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-libssh2
-.endif
-
-.if !empty(PKG_OPTIONS:Mgssapi)
-.include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gssapi=${KRB5BASE}
-CONFIGURE_ARGS+=	--with-gssapi-includes=${KRB5BASE}/include/gssapi
-.else
-CONFIGURE_ARGS+=	--without-gssapi
-.endif
-
-.if !empty(PKG_OPTIONS:Mldap)
-.include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-ldap
-CONFIGURE_ARGS+=	--enable-ldaps
-.else
-CONFIGURE_ARGS+=	--disable-ldap
-.endif
-
-.if !empty(PKG_OPTIONS:Mrtmp)
-.include "../../net/rtmpdump/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-librtmp
-.else
-CONFIGURE_ARGS+=	--without-librtmp
-.endif
-
-.if !empty(PKG_OPTIONS:Midn)
-.include "../../devel/libidn2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libidn2
-.else
-CONFIGURE_ARGS+=	--without-libidn2
-.endif
-
-.if !empty(PKG_OPTIONS:Mhttp2)
-USE_TOOLS+=		pkg-config
-CONFIGURE_ARGS+=	--with-nghttp2=${BUILDLINK_PREFIX.nghttp2}
-.include "../../www/nghttp2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-nghttp2
-.endif
diff --git a/curl/patches/patch-configure b/curl/patches/patch-configure
deleted file mode 100644
index bbd144a0f1..0000000000
--- a/curl/patches/patch-configure
+++ /dev/null
@@ -1,169 +0,0 @@
-$NetBSD: patch-configure,v 1.4 2018/11/28 01:31:45 sevan Exp $
-
-- Builtin krb5-config in platforms such as solaris do not support
-  the gssapi option, and need an explicit -lgss
-- On Darwin, do not append custom CFLAGS.
-- Do not strip debug flags.
-- Support Minix.
-- Avoid unportable `==' test(1) operator, applied upstream via:
-   <https://github.com/curl/curl/pull/3709>
-
---- configure.orig	2019-03-25 21:03:50.000000000 +0000
-+++ configure
-@@ -3746,6 +3746,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar
-         ;;
-     esac
-   done
-+  xc_bad_var_cflags=no
-   if test $xc_bad_var_cflags = yes; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
- $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;}
-@@ -7881,7 +7882,7 @@ else
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-+  bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*)
-     # This has been around since 386BSD, at least.  Likely further.
-     if test -x /sbin/sysctl; then
-       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -8347,12 +8348,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd* | netbsdelf*-gnu)
--  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
--  fi
-+netbsd* | netbsdelf*-gnu | minix*)
-+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-   ;;
- 
- newos6*)
-@@ -12559,14 +12556,13 @@ _LT_EOF
-       fi
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
--      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
--      fi
-+    netbsd* | netbsdelf*-gnu | minix*)
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      output_verbose_link_cmd=func_echo_all
-       ;;
- 
-     solaris*)
-@@ -13249,15 +13245,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       esac
-       ;;
- 
--    netbsd* | netbsdelf*-gnu)
--      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      hardcode_libdir_flag_spec='-R$libdir'
-+    netbsd* | netbsdelf*-gnu | minix*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-+      output_verbose_link_cmd=func_echo_all
-       ;;
- 
-     newsos6)
-@@ -14363,6 +14357,18 @@ fi
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+minix*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Minix ld.elf_so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
- netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-@@ -16931,7 +16937,7 @@ squeeze() {
- 
- 
-       #
--  if test "$compiler_id" != "unknown"; then
-+  if false; then
-     #
-     if test "$compiler_id" = "GNU_C" ||
-       test "$compiler_id" = "CLANG"; then
-@@ -17259,13 +17265,6 @@ $as_echo_n "checking if compiler accepts
-       tmp_options="$flags_dbg_off"
-     fi
-     #
--    if test "$flags_prefer_cppflags" = "yes"; then
--      CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
--      CFLAGS="$tmp_CFLAGS"
--    else
--      CPPFLAGS="$tmp_CPPFLAGS"
--      CFLAGS="$tmp_CFLAGS $tmp_options"
--    fi
-     squeeze CPPFLAGS
-     squeeze CFLAGS
- 
-@@ -18933,7 +18932,7 @@ $as_echo "no" >&6; }
-   tst_cflags="no"
-   case $host_os in
-     darwin*)
--      tst_cflags="yes"
-+      tst_cflags="no"
-       ;;
-   esac
- 
-@@ -21934,7 +21933,11 @@ $as_echo "yes" >&6; }
-      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
-         GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
-      elif test -f "$KRB5CONFIG"; then
--        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
-+        if `$KRB5CONFIG --cflags gssapi` 2>&1 | grep "Unknown option" >/dev/null; then
-+           GSSAPI_INCS=`$KRB5CONFIG --cflags`
-+        else
-+           GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
-+        fi
-      elif test "$GSSAPI_ROOT" != "yes"; then
-         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
-      fi
-@@ -22107,7 +22110,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd
-         LIBS="-lgss $LIBS"
-         ;;
-      *)
--        LIBS="-lgssapi $LIBS"
-+        LIBS="-lgssapi -lkrb5 $LIBS"
-         ;;
-      esac
-   fi
-@@ -22252,7 +22255,7 @@ fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Amiga native SSL/TLS (AmiSSL)" >&5
- $as_echo_n "checking whether to enable Amiga native SSL/TLS (AmiSSL)... " >&6; }
--if test "$HAVE_PROTO_BSDSOCKET_H" == "1"; then
-+if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then
-   if test -z "$ssl_backends" -o "x$OPT_AMISSL" != xno; then
-     ssl_msg=
-     if test "x$OPT_AMISSL" != "xno"; then
diff --git a/curl/patches/patch-curl-config.in b/curl/patches/patch-curl-config.in
deleted file mode 100644
index c7afda509c..0000000000
--- a/curl/patches/patch-curl-config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-curl-config.in,v 1.8 2018/01/24 07:57:19 wiz Exp $
-
-- make "curl-config --libs" return proper ldflags for shared libraries
-
---- curl-config.in.orig	2018-01-22 08:55:10.000000000 +0000
-+++ curl-config.in
-@@ -149,9 +149,9 @@ while test $# -gt 0; do
-            CURLLIBDIR=""
-         fi
-         if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
--          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
-+          echo @LDFLAGS@ ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
-         else
--          echo ${CURLLIBDIR}-lcurl
-+          echo @LDFLAGS@ ${CURLLIBDIR}-lcurl
-         fi
-         ;;
-     --ssl-backends)
Prev by Date: gallery-dl: Remove, used to update net/gallery-dl
Next by Date: arduino-builder: started porting
Previous by Thread: gallery-dl: Remove, used to update net/gallery-dl
Next by Thread: arduino-builder: started porting
Indexes:
Home | Main Index | Thread Index | Old Index