Update to 7.10.2, which fixes a signals/threads problem in DNS resolving.

Add PORTDOCS handling.

4 files changed, 182 insertions, 3 deletions

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 70c2e7a4c581..75bd298a06b9 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.9.8
+PORTVERSION=	7.10.2
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		http://download.sourceforge.net/curl/ \
@@ -21,6 +21,7 @@ MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
 		curl_easy_init.3 curl_easy_perform.3 curl_easy_setopt.3 \
 		curl_escape.3 curl_unescape.3 \
 		curl_formadd.3 curl_formparse.3 curl_formfree.3 \
+		curl_free.3 \
 		curl_getdate.3 curl_getenv.3 \
 		curl_global_init.3 curl_global_cleanup.3 \
 		curl_mprintf.3 \
@@ -29,7 +30,7 @@ MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
 		curl_multi_perform.3 curl_multi_remove_handle.3 \
 		curl_slist_append.3 curl_slist_free_all.3 \
 		curl_strequal.3 curl_strnequal.3 \
-		curl_version.3 \
+		curl_version.3 curl_version_info.3 \
 		libcurl.3 libcurl-multi.3 libcurl-errors.3
 
 INSTALLS_SHLIB=	yes
@@ -57,4 +58,10 @@ USE_BZIP2=	yes
 test:	build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
 
+.if !defined(NOPORTDOCS)
+post-install:
+	${MKDIR} ${DOCSDIR}
+	${CP} -r ${WRKSRC}/docs/* ${DOCSDIR}/ 
+.endif
+
 .include <bsd.port.mk>
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 67861a4bf9c4..0be1c749a3a9 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1 +1 @@
-MD5 (curl-7.9.8.tar.bz2) = 9f29e398d36050816fc4759d4837eb65
+MD5 (curl-7.10.2.tar.bz2) = 9f6a911b5ee5432128f67d4d8df09279
diff --git a/ftp/curl/files/patch-lib::url.c b/ftp/curl/files/patch-lib::url.c
new file mode 100644
index 000000000000..af8f7e7cbf36
--- /dev/null
+++ b/ftp/curl/files/patch-lib::url.c
@@ -0,0 +1,13 @@
+--- lib/url.c.old	Wed Nov 27 17:22:24 2002
++++ lib/url.c	Wed Nov 27 17:23:29 2002
+@@ -288,6 +288,10 @@
+   
+   data->set.proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
+ 
++#if defined(__FreeBSD_version)
++  data->set.no_signal = TRUE; /* different handling of signals and threads */
++#endif /* __FreeBSD_version */
++
+   /* create an array with connection data struct pointers */
+   data->state.numconnects = 5; /* hard-coded right now */
+   data->state.connects = (struct connectdata **)
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index e6d0b9822657..fa5c620f3089 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -11,3 +11,162 @@ lib/libcurl.a
 lib/libcurl.la
 lib/libcurl.so
 lib/libcurl.so.%%SHLIB_VER%%
+share/curl/curl-ca-bundle.crt
+@dirrm share/curl
+%%PORTDOCS%%share/doc/curl/BINDINGS
+%%PORTDOCS%%share/doc/curl/BUGS
+%%PORTDOCS%%share/doc/curl/CONTRIBUTE
+%%PORTDOCS%%share/doc/curl/FAQ
+%%PORTDOCS%%share/doc/curl/FEATURES
+%%PORTDOCS%%share/doc/curl/HISTORY
+%%PORTDOCS%%share/doc/curl/INSTALL
+%%PORTDOCS%%share/doc/curl/INTERNALS
+%%PORTDOCS%%share/doc/curl/KNOWN_BUGS
+%%PORTDOCS%%share/doc/curl/MANUAL
+%%PORTDOCS%%share/doc/curl/Makefile
+%%PORTDOCS%%share/doc/curl/Makefile.am
+%%PORTDOCS%%share/doc/curl/Makefile.in
+%%PORTDOCS%%share/doc/curl/README.win32
+%%PORTDOCS%%share/doc/curl/RESOURCES
+%%PORTDOCS%%share/doc/curl/THANKS
+%%PORTDOCS%%share/doc/curl/TODO
+%%PORTDOCS%%share/doc/curl/TheArtOfHttpScripting
+%%PORTDOCS%%share/doc/curl/VERSIONS
+%%PORTDOCS%%share/doc/curl/curl-config.1
+%%PORTDOCS%%share/doc/curl/curl-config.html
+%%PORTDOCS%%share/doc/curl/curl-config.pdf
+%%PORTDOCS%%share/doc/curl/curl.1
+%%PORTDOCS%%share/doc/curl/curl.html
+%%PORTDOCS%%share/doc/curl/curl.pdf
+%%PORTDOCS%%share/doc/curl/examples/Makefile
+%%PORTDOCS%%share/doc/curl/examples/Makefile.am
+%%PORTDOCS%%share/doc/curl/examples/Makefile.example
+%%PORTDOCS%%share/doc/curl/examples/Makefile.in
+%%PORTDOCS%%share/doc/curl/examples/README
+%%PORTDOCS%%share/doc/curl/examples/curlgtk.c
+%%PORTDOCS%%share/doc/curl/examples/fopen.c
+%%PORTDOCS%%share/doc/curl/examples/ftpget.c
+%%PORTDOCS%%share/doc/curl/examples/ftpgetresp.c
+%%PORTDOCS%%share/doc/curl/examples/ftpupload.c
+%%PORTDOCS%%share/doc/curl/examples/getinmemory.c
+%%PORTDOCS%%share/doc/curl/examples/http-post.c
+%%PORTDOCS%%share/doc/curl/examples/httpput.c
+%%PORTDOCS%%share/doc/curl/examples/multi-app.c
+%%PORTDOCS%%share/doc/curl/examples/multi-double.c
+%%PORTDOCS%%share/doc/curl/examples/multi-post.c
+%%PORTDOCS%%share/doc/curl/examples/multi-single.c
+%%PORTDOCS%%share/doc/curl/examples/multithread.c
+%%PORTDOCS%%share/doc/curl/examples/persistant.c
+%%PORTDOCS%%share/doc/curl/examples/post-callback.c
+%%PORTDOCS%%share/doc/curl/examples/postit2.c
+%%PORTDOCS%%share/doc/curl/examples/sepheaders.c
+%%PORTDOCS%%share/doc/curl/examples/simple.c
+%%PORTDOCS%%share/doc/curl/examples/simplepost.c
+%%PORTDOCS%%share/doc/curl/examples/simplessl.c
+%%PORTDOCS%%share/doc/curl/libcurl-the-guide
+%%PORTDOCS%%share/doc/curl/libcurl/Makefile
+%%PORTDOCS%%share/doc/curl/libcurl/Makefile.am
+%%PORTDOCS%%share/doc/curl/libcurl/Makefile.in
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_cleanup.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_cleanup.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_cleanup.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_duphandle.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_duphandle.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_duphandle.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_getinfo.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_getinfo.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_getinfo.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_init.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_init.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_init.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_perform.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_perform.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_perform.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_setopt.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_setopt.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_easy_setopt.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_escape.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_escape.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_escape.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formadd.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formadd.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formadd.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formfree.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formfree.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formfree.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formparse.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formparse.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_formparse.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_free.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_free.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_free.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_getdate.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_getdate.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_getdate.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_getenv.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_getenv.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_getenv.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_global_cleanup.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_global_cleanup.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_global_cleanup.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_global_init.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_global_init.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_global_init.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_mprintf.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_mprintf.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_mprintf.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_add_handle.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_add_handle.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_add_handle.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_cleanup.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_cleanup.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_cleanup.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_fdset.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_fdset.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_fdset.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_info_read.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_info_read.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_info_read.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_init.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_init.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_init.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_perform.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_perform.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_perform.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_remove_handle.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_remove_handle.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_multi_remove_handle.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_slist_append.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_slist_append.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_slist_append.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_slist_free_all.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_slist_free_all.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_slist_free_all.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_strequal.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_strequal.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_strequal.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_strnequal.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_strnequal.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_strnequal.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_unescape.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_unescape.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_unescape.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_version.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_version.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_version.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/curl_version_info.3
+%%PORTDOCS%%share/doc/curl/libcurl/curl_version_info.html
+%%PORTDOCS%%share/doc/curl/libcurl/curl_version_info.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/index.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-errors.3
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-errors.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-errors.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-multi.3
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-multi.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl-multi.pdf
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl.3
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl.html
+%%PORTDOCS%%share/doc/curl/libcurl/libcurl.pdf
+%%PORTDOCS%%@dirrm share/doc/curl/libcurl
+%%PORTDOCS%%@dirrm share/doc/curl/examples
+%%PORTDOCS%%@dirrm share/doc/curl