ports/81195: Update port: ftp/curl to 7.14.0, add GnuTLS support

[Vasil Dimov]

>Number:         81195
>Category:       ports
>Synopsis:       Update port: ftp/curl to 7.14.0, add GnuTLS support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 10:50:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:

System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #6: Tue May 10 12:46:25 EEST 2005     root at sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP  i386

>Description:

Update ftp/curl from 7.13.1 to 7.14.0, which has several bugfixes
and some new features like GnuTLS instead of OpenSSL.

>How-To-Repeat:

>Fix:

--- curl_update-13-14.diff begins here ---
diff -urN curl.orig/Makefile curl/Makefile
--- curl.orig/Makefile	Mon Mar 14 22:33:30 2005
+++ curl/Makefile	Wed May 18 13:36:17 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	curl
-PORTVERSION=	7.13.1
-PORTREVISION=	1
+PORTVERSION=	7.14.0
 CATEGORIES=	ftp ipv6 www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		${MASTER_SITE_SOURCEFORGE} \
@@ -49,6 +48,11 @@
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+
+.if defined(WITH_GNUTLS)
+WITHOUT_SSL=	yes
+.endif
+
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 .endif
@@ -57,9 +61,20 @@
 
 .if !defined(WITHOUT_SSL)
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
-PLIST_SUB+=	SSL=""
 .else
 CONFIGURE_ARGS=	--without-ssl
+.endif
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-gnutls
+.endif
+
+.if !defined(WITHOUT_SSL) || defined(WITH_GNUTLS)
+PLIST_SUB+=	SSL=""
+.else
 PLIST_SUB+=	SSL="@comment "
 .endif
 
diff -urN curl.orig/distinfo curl/distinfo
--- curl.orig/distinfo	Thu Mar 24 17:03:27 2005
+++ curl/distinfo	Wed May 18 11:44:01 2005
@@ -1,2 +1,2 @@
-MD5 (curl-7.13.1.tar.bz2) = d673f68dbab2553acdbfb5435bd1cd48
-SIZE (curl-7.13.1.tar.bz2) = 1860688
+MD5 (curl-7.14.0.tar.bz2) = 46ce665e47d37fce1a0bad935cce58a9
+SIZE (curl-7.14.0.tar.bz2) = 1920305
diff -urN curl.orig/files/patch-tests::runtests.pl curl/files/patch-tests::runtests.pl
--- curl.orig/files/patch-tests::runtests.pl	Thu Mar 24 17:03:27 2005
+++ curl/files/patch-tests::runtests.pl	Wed May 18 11:51:29 2005
@@ -1,11 +1,11 @@
---- tests/runtests.pl.orig	Sat Mar 12 03:40:30 2005
-+++ tests/runtests.pl	Sat Mar 12 03:40:39 2005
+--- tests/runtests.pl.orig	Wed May 18 11:50:16 2005
++++ tests/runtests.pl	Wed May 18 11:50:32 2005
 @@ -29,7 +29,7 @@
  @INC=(@INC, $ENV{'srcdir'}, ".");
  
  require "getpart.pm"; # array functions
 -require "valgrind.pm"; # valgrind report parser
 +#require "valgrind.pm"; # valgrind report parser
+ require "ftp.pm";
  
  my $srcdir = $ENV{'srcdir'} || '.';
- my $HOSTIP="127.0.0.1";
diff -urN curl.orig/pkg-plist curl/pkg-plist
--- curl.orig/pkg-plist	Thu Mar 24 17:03:27 2005
+++ curl/pkg-plist	Wed May 18 12:31:50 2005
@@ -70,6 +70,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-post.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/multi-single.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/multithread.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/opensslthreadlock.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/persistant.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/post-callback.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/postit2.c
--- curl_update-13-14.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: