From vd@datamax.bg  Fri Sep  2 18:20:52 2005
Return-Path: <vd@datamax.bg>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 019D516A496;
	Fri,  2 Sep 2005 18:20:52 +0000 (GMT)
	(envelope-from vd@datamax.bg)
Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7177643D45;
	Fri,  2 Sep 2005 18:20:51 +0000 (GMT)
	(envelope-from vd@datamax.bg)
Received: from sinanica.bg.datamax (sinanica.bg.datamax [192.168.10.1])
	by jengal.datamax.bg (Postfix) with QMQP
	id C215D87CF; Fri,  2 Sep 2005 21:20:50 +0300 (EEST)
Received: (nullmailer pid 54616 invoked by uid 1004);
	Fri, 02 Sep 2005 18:20:52 -0000
Message-Id: <20050902182052.GA54594@sinanica.bg.datamax>
Date: Fri, 2 Sep 2005 21:20:52 +0300
From: Vasil Dimov <vd@datamax.bg>
Reply-To: vd@datamax.bg
To: FreeBSD-gnats-submit@freebsd.org
Cc: roam@freebsd.org
Subject: Update port: ftp/curl to 7.14.1
X-Send-Pr-Version: 3.113

>Number:         85660
>Category:       ports
>Synopsis:       Update port: ftp/curl to 7.14.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    roam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 02 18:30:21 GMT 2005
>Closed-Date:    Mon Sep 05 20:17:00 GMT 2005
>Last-Modified:  Mon Sep 05 20:17:00 GMT 2005
>Originator:     Vasil Dimov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:

>Description:

Update curl from 7.14.0 to 7.14.1.

>How-To-Repeat:

>Fix:

--- curl_7.14.0-7.14.1.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/curl/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- Makefile	5 Jun 2005 19:31:45 -0000	1.70
+++ Makefile	2 Sep 2005 18:17:03 -0000
@@ -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} \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/ftp/curl/distinfo,v
retrieving revision 1.40
diff -u -r1.40 distinfo
--- distinfo	5 Jun 2005 19:31:45 -0000	1.40
+++ distinfo	2 Sep 2005 18:17:03 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/curl/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist	5 Jun 2005 19:31:45 -0000	1.15
+++ pkg-plist	2 Sep 2005 18:17:04 -0000
@@ -16,6 +16,7 @@
 %%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 @@
 %%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 @@
 %%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
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/ftp/curl/files/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- files/patch-configure	12 Mar 2005 02:36:52 -0000	1.4
+++ files/patch-configure	2 Sep 2005 18:17:04 -0000
@@ -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
--- curl_7.14.0-7.14.1.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->roam   
Responsible-Changed-By: ahze 
Responsible-Changed-When: Fri Sep 2 20:19:50 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85660 
State-Changed-From-To: open->closed 
State-Changed-By: roam 
State-Changed-When: Mon Sep 5 20:16:06 GMT 2005 
State-Changed-Why:  
Oops, it turns out that I'd come up with an amazingly similar patch 
over the weekend!  Sorry, I committed the update before I saw your 
PR... time for a forced commit, it seems! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85660 
>Unformatted:
