Date: Sun, 7 Jun 2015 20:40:03 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388745 - in head/ftp/curl: . files Message-ID: <201506072040.t57Ke3YY086421@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Jun 7 20:40:03 2015 New Revision: 388745 URL: https://svnweb.freebsd.org/changeset/ports/388745 Log: - Remove trailing space - Regenerate patch files with makepatch: Modified: head/ftp/curl/Makefile head/ftp/curl/files/patch-configure head/ftp/curl/files/patch-lib-hostcheck.h head/ftp/curl/files/patch-lib-url.c head/ftp/curl/files/patch-src-tool_operate.c Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Sun Jun 7 20:39:57 2015 (r388744) +++ head/ftp/curl/Makefile Sun Jun 7 20:40:03 2015 (r388745) @@ -136,8 +136,8 @@ THREADED_RESOLVER_CONFIGURE_OFF=--disabl THREADED_RESOLVER_CONFIGURE_ON= --enable-threaded-resolver TLS_SRP_CONFIGURE_OFF= --disable-tls-srp TLS_SRP_CONFIGURE_ON= --enable-tls-srp -WOLFSSL_CONFIGURE_OFF= --without-cyassl -WOLFSSL_CONFIGURE_ON= --with-cyassl=${LOCALBASE} +WOLFSSL_CONFIGURE_OFF= --without-cyassl +WOLFSSL_CONFIGURE_ON= --with-cyassl=${LOCALBASE} WOLFSSL_LIB_DEPENDS= libwolfssl.so:${PORTSDIR}/security/wolfssl .include <bsd.port.options.mk> Modified: head/ftp/curl/files/patch-configure ============================================================================== --- head/ftp/curl/files/patch-configure Sun Jun 7 20:39:57 2015 (r388744) +++ head/ftp/curl/files/patch-configure Sun Jun 7 20:40:03 2015 (r388745) @@ -6,9 +6,9 @@ Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-19 ---- configure.orig 2013-10-13 04:24:48.000000000 +0800 -+++ configure 2013-10-16 01:59:07.369433723 +0800 -@@ -3550,9 +3550,10 @@ +--- configure.orig 2013-10-12 20:24:48 UTC ++++ configure +@@ -3611,9 +3611,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; @@ -22,7 +22,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -3622,9 +3623,10 @@ +@@ -3683,9 +3684,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in @@ -36,7 +36,7 @@ Last-Update: 2010-12-19 -U*) xc_bad_var_cflags=yes ;; -@@ -16892,6 +16894,8 @@ +@@ -16960,6 +16962,8 @@ $as_echo "$as_me: WARNING: compiler opti tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" @@ -45,7 +45,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -16922,6 +16926,7 @@ +@@ -16990,6 +16994,7 @@ $as_echo "$as_me: WARNING: compiler opti done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -53,7 +53,7 @@ Last-Update: 2010-12-19 # if test "$want_debug" = "yes"; then -@@ -17139,6 +17144,8 @@ +@@ -17207,6 +17212,8 @@ $as_echo "$honor_optimize_option" >&6; } # if test "$honor_optimize_option" = "yes"; then @@ -62,7 +62,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -17169,6 +17176,7 @@ +@@ -17237,6 +17244,7 @@ $as_echo "$honor_optimize_option" >&6; } done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -70,7 +70,7 @@ Last-Update: 2010-12-19 if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -21336,7 +21344,8 @@ +@@ -21417,7 +21425,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg PKGTEST="no" PREFIX_OPENSSL=$OPT_SSL @@ -80,7 +80,7 @@ Last-Update: 2010-12-19 { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5 $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;} if test -f "$OPENSSL_PCDIR/openssl.pc"; then -@@ -24685,29 +24694,30 @@ +@@ -25050,29 +25059,30 @@ $as_echo "found" >&6; } ;; off) LIB_RTMP="-lrtmp" @@ -120,7 +120,7 @@ Last-Update: 2010-12-19 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -39180,9 +39190,10 @@ +@@ -39613,9 +39623,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; @@ -134,7 +134,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -39252,9 +39263,10 @@ +@@ -39685,9 +39696,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in Modified: head/ftp/curl/files/patch-lib-hostcheck.h ============================================================================== --- head/ftp/curl/files/patch-lib-hostcheck.h Sun Jun 7 20:39:57 2015 (r388744) +++ head/ftp/curl/files/patch-lib-hostcheck.h Sun Jun 7 20:40:03 2015 (r388745) @@ -1,5 +1,5 @@ ---- lib/hostcheck.h.orig 2013-09-09 06:11:15.000000000 +0800 -+++ lib/hostcheck.h 2014-03-28 00:39:25.052513814 +0800 +--- lib/hostcheck.h.orig 2013-09-08 22:11:15 UTC ++++ lib/hostcheck.h @@ -23,6 +23,7 @@ ***************************************************************************/ Modified: head/ftp/curl/files/patch-lib-url.c ============================================================================== --- head/ftp/curl/files/patch-lib-url.c Sun Jun 7 20:39:57 2015 (r388744) +++ head/ftp/curl/files/patch-lib-url.c Sun Jun 7 20:40:03 2015 (r388745) @@ -5,7 +5,7 @@ Last-Update: 2010-12-18 --- lib/url.c.orig 2015-04-22 05:55:54 UTC +++ lib/url.c -@@ -658,6 +658,10 @@ CURLcode Curl_open(struct SessionHandle +@@ -659,6 +659,10 @@ CURLcode Curl_open(struct SessionHandle data->progress.flags |= PGRS_HIDE; data->state.current_speed = -1; /* init to negative == impossible */ Modified: head/ftp/curl/files/patch-src-tool_operate.c ============================================================================== --- head/ftp/curl/files/patch-src-tool_operate.c Sun Jun 7 20:39:57 2015 (r388744) +++ head/ftp/curl/files/patch-src-tool_operate.c Sun Jun 7 20:40:03 2015 (r388745) @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2013-08-01 04:53:34.000000000 +0800 -+++ src/tool_operate.c 2013-08-17 18:25:00.139780776 +0800 -@@ -709,20 +709,7 @@ +--- src/tool_operate.c.orig 2013-07-31 20:53:34 UTC ++++ src/tool_operate.c +@@ -589,20 +589,7 @@ static CURLcode operate_do(struct Global DEBUGASSERT(!outs.filename); } @@ -22,7 +22,7 @@ #ifdef __VMS /* open file for output, forcing VMS output format into stream mode which is needed for stat() call above to always work. */ -@@ -730,7 +717,8 @@ +@@ -610,7 +597,8 @@ static CURLcode operate_do(struct Global "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0"); #else /* open file for output: */ @@ -31,8 +31,8 @@ + FILE *file = fopen(outfile, "ab"); #endif if(!file) { - helpf(config->errors, "Can't open '%s'!\n", outfile); -@@ -739,6 +727,19 @@ + helpf(global->errors, "Can't open '%s'!\n", outfile); +@@ -619,6 +607,19 @@ static CURLcode operate_do(struct Global } outs.fopened = TRUE; outs.stream = file;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506072040.t57Ke3YY086421>