Update wget to 1.13.4, note that it fails to build, triping up in util.c

This commit is contained in:
Scott McCreary
2012-03-18 10:08:54 +00:00
parent 89d92102f1
commit c1f7ca4804
2 changed files with 91 additions and 0 deletions

View File

@@ -0,0 +1,71 @@
diff -urN wget-1.13.4/src/http.c wget-1.13.4-haiku/src/http.c
--- wget-1.13.4/src/http.c 2011-09-07 03:58:01.006291456 -0700
+++ wget-1.13.4-haiku/src/http.c 2012-03-17 12:20:29.000000000 -0700
@@ -1046,6 +1046,7 @@
char separator)
{
const char *p = *source;
+ int param_type;
while (c_isspace (*p)) ++p;
if (!*p)
@@ -1101,7 +1102,7 @@
}
*source = p;
- int param_type = modify_param_name(name);
+ param_type = modify_param_name(name);
if (NOT_RFC2231 != param_type)
{
modify_param_value(value, param_type);
diff -urN wget-1.13.4/src/main.c wget-1.13.4-haiku/src/main.c
--- wget-1.13.4/src/main.c 2011-09-06 06:50:11.004456448 -0700
+++ wget-1.13.4-haiku/src/main.c 2012-03-17 12:23:37.000000000 -0700
@@ -913,14 +913,16 @@
int i, ret, longindex;
int nurl;
bool append_to_log = false;
-
- total_downloaded_bytes = 0;
-
- program_name = argv[0];
+ int retconf;
+ bool use_userconfig = false;
struct ptimer *timer = ptimer_new ();
double start_time = ptimer_measure (timer);
+ total_downloaded_bytes = 0;
+
+ program_name = argv[0];
+
i18n_initialize ();
/* Construct the name of the executable, without the directory part. */
@@ -948,8 +950,6 @@
/* This seperate getopt_long is needed to find the user config
and parse it before the other user options. */
longindex = -1;
- int retconf;
- bool use_userconfig = false;
while ((retconf = getopt_long (argc, argv,
short_options, long_options, &longindex)) != -1)
@@ -1432,11 +1432,14 @@
&&
total_downloaded_bytes != 0)
{
+ char *wall_time;
+ char *download_time;
double end_time = ptimer_measure (timer);
ptimer_destroy (timer);
-
- char *wall_time = xstrdup (secs_to_human_time (end_time - start_time));
- char *download_time = xstrdup (secs_to_human_time (total_download_time));
+
+ wall_time = xstrdup (secs_to_human_time (end_time - start_time));
+ download_time = xstrdup (secs_to_human_time (total_download_time));
+
logprintf (LOG_NOTQUIET,
_("FINISHED --%s--\nTotal wall clock time: %s\n"
"Downloaded: %d files, %s in %s (%s)\n"),

View File

@@ -0,0 +1,20 @@
DESCRIPTION="wget"
HOMEPAGE="http://www.gnu.org/software/wget"
SRC_URI="http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.gz"
CHECKSUM_MD5="1df489976a118b9cbe1b03502adbfc27"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
cd wget-1.13.4
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl=openssl
make
}
INSTALL {
cd wget-1.13.4
make install
}
LICENSE="GNU GPL v3"
COPYRIGHT="1996-2011 Free Software Foundation"