Date: Fri, 16 Jun 2006 20:09:43 +0300 From: Vasil Dimov <vd@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roam@FreeBSD.org Subject: ports/99050: [patch] Update port ftp/curl to 7.15.4 Message-ID: <20060616170943.GA21998@qlovarnika.bg.datamax> Resent-Message-ID: <200606161710.k5GHALSI014754@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99050
>Category: ports
>Synopsis: [patch] Update port ftp/curl to 7.15.4
>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: Fri Jun 16 17:10:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Vasil Dimov
>Release: FreeBSD 6.1-STABLE amd64
>Organization:
N/A
>Environment:
>Description:
Update ftp/curl from 7.15.3 to 7.15.4:
* Some more man pages are installed (and .html and .pdf files)
* By default man pages got installed in ${PREFIX}/share/man, thus
add --mandir=${PREFIX}/man to the configure args
* sync the test target with the template one
* adjust files/patch-configure
The MAN3's value if difficult to manage, what about placing one entry
per line?
>How-To-Repeat:
>Fix:
--- curl_7.15.3-7.15.4.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- Makefile 7 May 2006 11:09:17 -0000 1.78
+++ Makefile 16 Jun 2006 17:03:22 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= curl
-PORTVERSION= 7.15.3
+PORTVERSION= 7.15.4
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
${MASTER_SITE_SOURCEFORGE} \
@@ -19,7 +19,8 @@
COMMENT= Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
MAN1= curl.1 curl-config.1
-MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
+MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_escape.3 \
+ curl_easy_getinfo.3 curl_easy_unescape.3 \
curl_easy_init.3 curl_easy_perform.3 curl_easy_reset.3 \
curl_easy_setopt.3 curl_easy_strerror.3 curl_escape.3 \
curl_unescape.3 curl_formadd.3 curl_formfree.3 curl_free.3 \
@@ -28,7 +29,9 @@
curl_multi_add_handle.3 curl_multi_cleanup.3 \
curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3 \
curl_multi_perform.3 curl_multi_remove_handle.3 \
- curl_multi_strerror.3 curl_share_cleanup.3 curl_share_init.3 \
+ curl_multi_setopt.3 curl_multi_socket.3 \
+ curl_multi_strerror.3 curl_multi_timeout.3 \
+ curl_share_cleanup.3 curl_share_init.3 \
curl_share_setopt.3 curl_share_strerror.3 curl_slist_append.3 \
curl_slist_free_all.3 curl_strequal.3 curl_version.3 \
curl_version_info.3 libcurl.3 libcurl-easy.3 libcurl-errors.3 \
@@ -43,6 +46,7 @@
USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --mandir=${PREFIX}/man
.if defined(WITH_GNUTLS)
WITHOUT_SSL= yes
@@ -55,9 +59,9 @@
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS= --with-ssl=${OPENSSLBASE}
+CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
.else
-CONFIGURE_ARGS= --without-ssl
+CONFIGURE_ARGS+= --without-ssl
.endif
.if defined(WITH_GNUTLS)
@@ -101,6 +105,6 @@
# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
# the user's locale when dates are sent to the server.
test: build
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} test
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/distinfo,v
retrieving revision 1.44
diff -u -r1.44 distinfo
--- distinfo 20 Mar 2006 12:49:55 -0000 1.44
+++ distinfo 16 Jun 2006 17:03:22 -0000
@@ -1,3 +1,3 @@
-MD5 (curl-7.15.3.tar.bz2) = d71b2ee8febfde2c7dc30a43638ec0d9
-SHA256 (curl-7.15.3.tar.bz2) = 77771db616dee02f21b94c409ed423a72fa7f2b2d65c27395137b0f920388440
-SIZE (curl-7.15.3.tar.bz2) = 1467043
+MD5 (curl-7.15.4.tar.bz2) = d9345a55c8bc67eafcd37fa1b728e00e
+SHA256 (curl-7.15.4.tar.bz2) = 11521127e175eb633c046a2c6ed11f97e81816d3aec9e8cac560763457a8e623
+SIZE (curl-7.15.4.tar.bz2) = 1519792
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- pkg-plist 20 Mar 2006 12:49:55 -0000 1.19
+++ pkg-plist 16 Jun 2006 17:03:22 -0000
@@ -61,6 +61,7 @@
%%PORTDOCS%%%%DOCSDIR%%/examples/ftpget.c
%%PORTDOCS%%%%DOCSDIR%%/examples/ftpgetresp.c
%%PORTDOCS%%%%DOCSDIR%%/examples/ftpupload.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/ftpuploadresume.c
%%PORTDOCS%%%%DOCSDIR%%/examples/getinfo.c
%%PORTDOCS%%%%DOCSDIR%%/examples/getinmemory.c
%%PORTDOCS%%%%DOCSDIR%%/examples/htmltidy.c
@@ -79,6 +80,7 @@
%%PORTDOCS%%%%DOCSDIR%%/examples/persistant.c
%%PORTDOCS%%%%DOCSDIR%%/examples/post-callback.c
%%PORTDOCS%%%%DOCSDIR%%/examples/postit2.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/sampleconv.c
%%PORTDOCS%%%%DOCSDIR%%/examples/sepheaders.c
%%PORTDOCS%%%%DOCSDIR%%/examples/simple.c
%%PORTDOCS%%%%DOCSDIR%%/examples/simplepost.c
@@ -94,6 +96,9 @@
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_duphandle.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_escape.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_getinfo.pdf
@@ -112,6 +117,9 @@
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_strerror.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_easy_unescape.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_escape.pdf
@@ -163,9 +171,18 @@
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_remove_handle.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_setopt.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_socket.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_strerror.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.3
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.html
+%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_multi_timeout.pdf
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.3
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.html
%%PORTDOCS%%%%DOCSDIR%%/libcurl/curl_share_cleanup.pdf
Index: files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/ftp/curl/files/patch-configure,v
retrieving revision 1.5
diff -u -r1.5 patch-configure
--- files/patch-configure 5 Sep 2005 18:12:41 -0000 1.5
+++ files/patch-configure 16 Jun 2006 17:03:22 -0000
@@ -1,6 +1,6 @@
---- configure.orig Fri Sep 2 20:22:43 2005
-+++ configure Fri Sep 2 20:37:36 2005
-@@ -24917,8 +24917,10 @@
+--- configure.orig Fri Jun 16 17:33:17 2006
++++ configure Fri Jun 16 17:36:02 2006
+@@ -26690,8 +26690,10 @@
PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL
LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
@@ -11,12 +11,12 @@
;;
esac
-@@ -32576,7 +32578,7 @@
+@@ -35638,7 +35640,7 @@
main ()
{
#ifndef basename
- char *p = (char *) basename;
+ char *(*p)(const char *) = basename;
+ return !p;
#endif
- ;
--- curl_7.15.3-7.15.4.diff ends here ---
--
Vasil Dimov
gro.DSBeerF@dv
Testing can show the presence of bugs, but not their absence.
-- Edsger W. Dijkstra
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060616170943.GA21998>