From 77d9fbd8373ce35d77204616c91bd47a3ec6a5c1 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Mon, 5 Sep 2005 18:12:41 +0000
Subject: Update to 7.14.1.

---
 ftp/curl/Makefile              |  2 +-
 ftp/curl/distinfo              |  4 ++--
 ftp/curl/files/patch-configure | 18 +++++++++---------
 ftp/curl/pkg-plist             |  4 ++++
 4 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'ftp')

diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index b42d0cf48638..6ffaf672e1d7 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.14.0
+PORTVERSION=	7.14.1
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo
index 93bf4be8f139..9094a701cb4c 100644
--- a/ftp/curl/distinfo
+++ b/ftp/curl/distinfo
@@ -1,2 +1,2 @@
-MD5 (curl-7.14.0.tar.bz2) = 46ce665e47d37fce1a0bad935cce58a9
-SIZE (curl-7.14.0.tar.bz2) = 1920305
+MD5 (curl-7.14.1.tar.bz2) = 8b8723f3c0e7acfb30c5215e6cffde32
+SIZE (curl-7.14.1.tar.bz2) = 1399247
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure
index 1aff9ed58908..3c42e9761ca3 100644
--- a/ftp/curl/files/patch-configure
+++ b/ftp/curl/files/patch-configure
@@ -1,17 +1,17 @@
---- configure.orig	Mon Dec 20 11:39:59 2004
-+++ configure	Thu Feb 17 19:07:53 2005
-@@ -24438,8 +24438,10 @@
-   *)
+--- configure.orig	Fri Sep  2 20:22:43 2005
++++ configure	Fri Sep  2 20:37:36 2005
+@@ -24917,8 +24917,10 @@
          PKGTEST="no"
-     EXTRA_SSL=$OPT_SSL
-+    if ! [ "$EXTRA_SSL" = "/usr" ]; then
-     LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib$libsuff"
-     CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
+     PREFIX_OPENSSL=$OPT_SSL
+     LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
++    if ! [ "$PREFIX_OPENSSL" = "/usr" ]; then
+     LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
+     CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
 +    fi
      ;;
    esac
  
-@@ -31950,7 +31952,7 @@
+@@ -32576,7 +32578,7 @@
  main ()
  {
  #ifndef basename
diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist
index 00c17bc33162..e4099fe24c37 100644
--- a/ftp/curl/pkg-plist
+++ b/ftp/curl/pkg-plist
@@ -16,6 +16,7 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/BINDINGS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTE
+%%PORTDOCS%%%%DOCSDIR%%/DISTRO-DILEMMA
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/FEATURES
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
@@ -47,6 +48,8 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.in
 %%PORTDOCS%%%%DOCSDIR%%/examples/README
 %%PORTDOCS%%%%DOCSDIR%%/examples/anyauthput.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/cacertinmem.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/cookie_interface.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/curlgtk.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/curlx.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/debug.c
@@ -190,6 +193,7 @@ lib/libcurl.so.%%SHLIB_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_version_info.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/getinfo-times
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/index.html
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.3
 %%PORTDOCS%%%%DOCSDIR%%/libcurl/libcurl-easy.html
-- 
cgit v1.2.3