From 37de4ed629b4479e2101d819d04434f72475109d Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Tue, 20 Sep 2011 06:17:40 +0000 Subject: Upgrade ftp/wget from 1.12 to 1.13.4 --- ftp/wget/Makefile | 4 +--- ftp/wget/distinfo | 4 ++-- ftp/wget/files/patch-doc__wget.texi | 29 ----------------------------- ftp/wget/files/patch-src__ChangeLog | 23 ----------------------- ftp/wget/files/patch-src__gnutls.c | 11 ----------- ftp/wget/files/patch-src__http.c | 33 --------------------------------- ftp/wget/files/patch-src__http.h | 15 --------------- ftp/wget/files/patch-src__init.c | 12 ------------ ftp/wget/files/patch-src__main.c | 21 --------------------- ftp/wget/files/patch-src__options.h | 12 ------------ ftp/wget/files/patch-src__retr.c | 13 ------------- ftp/wget/pkg-descr | 2 +- ftp/wget/pkg-plist | 10 +--------- 13 files changed, 5 insertions(+), 184 deletions(-) delete mode 100644 ftp/wget/files/patch-doc__wget.texi delete mode 100644 ftp/wget/files/patch-src__ChangeLog delete mode 100644 ftp/wget/files/patch-src__gnutls.c delete mode 100644 ftp/wget/files/patch-src__http.c delete mode 100644 ftp/wget/files/patch-src__http.h delete mode 100644 ftp/wget/files/patch-src__init.c delete mode 100644 ftp/wget/files/patch-src__main.c delete mode 100644 ftp/wget/files/patch-src__options.h delete mode 100644 ftp/wget/files/patch-src__retr.c (limited to 'ftp') diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile index 63326f7cc0b3..d60084b24038 100644 --- a/ftp/wget/Makefile +++ b/ftp/wget/Makefile @@ -6,12 +6,10 @@ # PORTNAME= wget -DISTVERSION= 1.12 -PORTREVISION= 4 +DISTVERSION= 1.13.4 CATEGORIES= ftp www ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= wget -EXTRACT_SUFX= .tar.lzma MAINTAINER= vd@FreeBSD.org COMMENT= Retrieve files from the Net via HTTP(S) and FTP diff --git a/ftp/wget/distinfo b/ftp/wget/distinfo index 8dd38973a2e0..271224c5db0a 100644 --- a/ftp/wget/distinfo +++ b/ftp/wget/distinfo @@ -1,2 +1,2 @@ -SHA256 (wget-1.12.tar.lzma) = 7426a8c7092f1df1b6b0990c9c049388128fc0ad403752929f972616bfae2715 -SIZE (wget-1.12.tar.lzma) = 1200752 +SHA256 (wget-1.13.4.tar.xz) = 12a839a5f622e82d4f7b4a75ae09ed4b084658468c9f90796480754f5d96d1d6 +SIZE (wget-1.13.4.tar.xz) = 1453220 diff --git a/ftp/wget/files/patch-doc__wget.texi b/ftp/wget/files/patch-doc__wget.texi deleted file mode 100644 index fc21fe844a9e..000000000000 --- a/ftp/wget/files/patch-doc__wget.texi +++ /dev/null @@ -1,29 +0,0 @@ ---- doc/wget.texi 2010-05-27 10:45:15 +0000 -+++ doc/wget.texi 2010-07-28 19:22:22 +0000 -@@ -1498,6 +1498,13 @@ - @code{Content-Disposition} headers to describe what the name of a - downloaded file should be. - -+@cindex Trust server names -+@item --trust-server-names -+ -+If this is set to on, on a redirect the last component of the -+redirection URL will be used as the local file name. By default it is -+used the last component in the original URL. -+ - @cindex authentication - @item --auth-no-challenge - -@@ -2810,6 +2817,10 @@ - Turn on recognition of the (non-standard) @samp{Content-Disposition} - HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}. - -+@item trust_server_names = on/off -+If set to on, use the last component of a redirection URL for the local -+file name. -+ - @item continue = on/off - If set to on, force continuation of preexistent partially retrieved - files. See @samp{-c} before setting it. - -=== modified file 'src/ChangeLog' diff --git a/ftp/wget/files/patch-src__ChangeLog b/ftp/wget/files/patch-src__ChangeLog deleted file mode 100644 index 728938e5293e..000000000000 --- a/ftp/wget/files/patch-src__ChangeLog +++ /dev/null @@ -1,23 +0,0 @@ ---- src/ChangeLog 2010-07-20 17:42:13 +0000 -+++ src/ChangeLog 2010-07-28 19:22:22 +0000 -@@ -1,3 +1,18 @@ -+2010-07-28 Giuseppe Scrivano -+ -+ * http.h (http_loop): Add new argument `original_url' -+ * http.c (http_loop): Add new argument `original_url'. Use -+ `original_url' to get a filename if `trustservernames' is false. -+ -+ * init.c (commands): Add "trustservernames". -+ -+ * options.h (library): Add variable `trustservernames'. -+ -+ * main.c (option_data): Add trust-server-names. -+ (print_help): Describe --trust-server-names. -+ -+ * retr.c (retrieve_url): Pass new argument to `http_loop'. -+ - 2010-07-20 Alan Jenkins (tiny change) - - * http.c (gethttp): Check content-length was set before trying to - -=== modified file 'src/http.c' diff --git a/ftp/wget/files/patch-src__gnutls.c b/ftp/wget/files/patch-src__gnutls.c deleted file mode 100644 index 4e112e03e88c..000000000000 --- a/ftp/wget/files/patch-src__gnutls.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gnutls.c.orig 2010-02-20 21:56:01.000000000 +0200 -+++ src/gnutls.c 2010-02-20 21:56:15.000000000 +0200 -@@ -181,7 +181,7 @@ - }; - - bool --ssl_connect (int fd) -+ssl_connect_wget (int fd) - { - static const int cert_type_priority[] = { - GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 diff --git a/ftp/wget/files/patch-src__http.c b/ftp/wget/files/patch-src__http.c deleted file mode 100644 index bf9a10281b04..000000000000 --- a/ftp/wget/files/patch-src__http.c +++ /dev/null @@ -1,33 +0,0 @@ ---- src/http.c 2010-07-20 17:42:13 +0000 -+++ src/http.c 2010-07-28 19:22:22 +0000 -@@ -2593,8 +2593,9 @@ - /* The genuine HTTP loop! This is the part where the retrieval is - retried, and retried, and retried, and... */ - uerr_t --http_loop (struct url *u, char **newloc, char **local_file, const char *referer, -- int *dt, struct url *proxy, struct iri *iri) -+http_loop (struct url *u, struct url *original_url, char **newloc, -+ char **local_file, const char *referer, int *dt, struct url *proxy, -+ struct iri *iri) - { - int count; - bool got_head = false; /* used for time-stamping and filename detection */ -@@ -2641,7 +2642,8 @@ - } - else if (!opt.content_disposition) - { -- hstat.local_file = url_file_name (u); -+ hstat.local_file = -+ url_file_name (opt.trustservernames ? u : original_url); - got_name = true; - } - -@@ -2679,7 +2681,7 @@ - - /* Send preliminary HEAD request if -N is given and we have an existing - * destination file. */ -- file_name = url_file_name (u); -+ file_name = url_file_name (opt.trustservernames ? u : original_url); - if (opt.timestamping - && !opt.content_disposition - && file_exists_p (file_name)) diff --git a/ftp/wget/files/patch-src__http.h b/ftp/wget/files/patch-src__http.h deleted file mode 100644 index 785a74877e85..000000000000 --- a/ftp/wget/files/patch-src__http.h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/http.h 2010-05-08 19:56:15 +0000 -+++ src/http.h 2010-07-28 19:22:22 +0000 -@@ -33,8 +33,8 @@ - - struct url; - --uerr_t http_loop (struct url *, char **, char **, const char *, int *, -- struct url *, struct iri *); -+uerr_t http_loop (struct url *, struct url *, char **, char **, const char *, -+ int *, struct url *, struct iri *); - void save_cookies (void); - void http_cleanup (void); - time_t http_atotm (const char *); - -=== modified file 'src/init.c' diff --git a/ftp/wget/files/patch-src__init.c b/ftp/wget/files/patch-src__init.c deleted file mode 100644 index 2b002b0b3aeb..000000000000 --- a/ftp/wget/files/patch-src__init.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/init.c 2010-05-08 19:56:15 +0000 -+++ src/init.c 2010-07-28 19:22:22 +0000 -@@ -252,6 +252,7 @@ - { "timeout", NULL, cmd_spec_timeout }, - { "timestamping", &opt.timestamping, cmd_boolean }, - { "tries", &opt.ntry, cmd_number_inf }, -+ { "trustservernames", &opt.trustservernames, cmd_boolean }, - { "useproxy", &opt.use_proxy, cmd_boolean }, - { "user", &opt.user, cmd_string }, - { "useragent", NULL, cmd_spec_useragent }, - -=== modified file 'src/main.c' diff --git a/ftp/wget/files/patch-src__main.c b/ftp/wget/files/patch-src__main.c deleted file mode 100644 index 3fe5df0670a5..000000000000 --- a/ftp/wget/files/patch-src__main.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/main.c 2010-06-20 10:10:35 +0000 -+++ src/main.c 2010-07-28 19:22:22 +0000 -@@ -266,6 +266,7 @@ - { "timeout", 'T', OPT_VALUE, "timeout", -1 }, - { "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 }, - { "tries", 't', OPT_VALUE, "tries", -1 }, -+ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 }, - { "user", 0, OPT_VALUE, "user", -1 }, - { "user-agent", 'U', OPT_VALUE, "useragent", -1 }, - { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 }, -@@ -680,6 +681,8 @@ - N_("\ - -I, --include-directories=LIST list of allowed directories.\n"), - N_("\ -+ --trust-server-names use the name specified by the redirection url last component.\n"), -+ N_("\ - -X, --exclude-directories=LIST list of excluded directories.\n"), - N_("\ - -np, --no-parent don't ascend to the parent directory.\n"), - -=== modified file 'src/options.h' diff --git a/ftp/wget/files/patch-src__options.h b/ftp/wget/files/patch-src__options.h deleted file mode 100644 index e3d1f37bb687..000000000000 --- a/ftp/wget/files/patch-src__options.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/options.h 2010-05-08 19:56:15 +0000 -+++ src/options.h 2010-07-28 19:22:22 +0000 -@@ -242,6 +242,7 @@ - char *encoding_remote; - char *locale; - -+ bool trustservernames; - #ifdef __VMS - int ftp_stmlf; /* Force Stream_LF format for binary FTP. */ - #endif /* def __VMS */ - -=== modified file 'src/retr.c' diff --git a/ftp/wget/files/patch-src__retr.c b/ftp/wget/files/patch-src__retr.c deleted file mode 100644 index 666b3d29c182..000000000000 --- a/ftp/wget/files/patch-src__retr.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/retr.c 2010-05-08 19:56:15 +0000 -+++ src/retr.c 2010-07-28 19:22:22 +0000 -@@ -731,7 +731,8 @@ - #endif - || (proxy_url && proxy_url->scheme == SCHEME_HTTP)) - { -- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri); -+ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt, -+ proxy_url, iri); - } - else if (u->scheme == SCHEME_FTP) - { - diff --git a/ftp/wget/pkg-descr b/ftp/wget/pkg-descr index 20f3f5800811..31699054852c 100644 --- a/ftp/wget/pkg-descr +++ b/ftp/wget/pkg-descr @@ -19,4 +19,4 @@ entire web or FTP sites easy, including: be re-downloaded when mirroring o GNU wget is distributed under the GNU General Public License. -WWW: http://www.gnu.org/software/wget/wget.html +WWW: http://www.gnu.org/s/wget/ diff --git a/ftp/wget/pkg-plist b/ftp/wget/pkg-plist index 3200e4a4aee6..f98bd2c803b0 100644 --- a/ftp/wget/pkg-plist +++ b/ftp/wget/pkg-plist @@ -1,5 +1,6 @@ bin/wget etc/wgetrc.sample +lib/charset.alias %%NLS%%share/locale/be/LC_MESSAGES/wget.mo %%NLS%%share/locale/bg/LC_MESSAGES/wget.mo %%NLS%%share/locale/ca/LC_MESSAGES/wget.mo @@ -7,10 +8,7 @@ etc/wgetrc.sample %%NLS%%share/locale/da/LC_MESSAGES/wget.mo %%NLS%%share/locale/de/LC_MESSAGES/wget.mo %%NLS%%share/locale/el/LC_MESSAGES/wget.mo -%%NLS%%share/locale/en@boldquot/LC_MESSAGES/wget.mo -%%NLS%%share/locale/en@quot/LC_MESSAGES/wget.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/wget.mo -%%NLS%%share/locale/en_US/LC_MESSAGES/wget.mo %%NLS%%share/locale/eo/LC_MESSAGES/wget.mo %%NLS%%share/locale/es/LC_MESSAGES/wget.mo %%NLS%%share/locale/et/LC_MESSAGES/wget.mo @@ -42,9 +40,3 @@ etc/wgetrc.sample %%NLS%%share/locale/vi/LC_MESSAGES/wget.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/wget.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/wget.mo -%%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en@boldquot -%%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en@quot -%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en_US -- cgit v1.2.3