mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
144 lines
3.5 KiB
Plaintext
144 lines
3.5 KiB
Plaintext
From 16a5b177ebc8fdf7c9ba666292fd08179c111f7e Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 May 2014 15:38:37 +0000
|
|
Subject: apply wget-1.14.patch
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 01ea237..c31da2c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -231,6 +231,7 @@ AC_HEADER_STDBOOL
|
|
AC_CHECK_HEADERS(unistd.h sys/time.h)
|
|
AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
|
|
AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
|
|
+AC_CHECK_HEADERS(arpa/inet.h)
|
|
|
|
AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
|
|
|
|
diff --git a/m4/wget.m4 b/m4/wget.m4
|
|
index 777e973..5a8b75d 100644
|
|
--- a/m4/wget.m4
|
|
+++ b/m4/wget.m4
|
|
@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [
|
|
|
|
dnl Check whether we need to link with -lnsl and -lsocket, as is the
|
|
dnl case on e.g. Solaris.
|
|
+dnl Haiku needs libnetwork
|
|
|
|
AC_DEFUN([WGET_NSL_SOCKET], [
|
|
dnl On Solaris, -lnsl is needed to use gethostbyname. But checking
|
|
@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [
|
|
AC_CHECK_LIB(nsl, $wget_check_in_nsl)
|
|
fi
|
|
AC_CHECK_LIB(socket, socket)
|
|
+ AC_CHECK_LIB(network, gethostbyname)
|
|
+ AC_CHECK_LIB(network, socket)
|
|
])
|
|
|
|
|
|
diff --git a/src/config.h.in b/src/config.h.in
|
|
index 3953a4d..26c33a8 100644
|
|
--- a/src/config.h.in
|
|
+++ b/src/config.h.in
|
|
@@ -741,6 +741,9 @@
|
|
/* Define to 1 if you have the <langinfo.h> header file. */
|
|
#undef HAVE_LANGINFO_H
|
|
|
|
+/* Define to 1 if you have the `bind' library (-lbind). */
|
|
+#undef HAVE_LIBBIND
|
|
+
|
|
/* Define to 1 if you have the `dl' library (-ldl). */
|
|
#undef HAVE_LIBDL
|
|
|
|
@@ -753,6 +756,9 @@
|
|
/* Define to 1 if you have the <libintl.h> header file. */
|
|
#undef HAVE_LIBINTL_H
|
|
|
|
+/* Define to 1 if you have the `network' library (-lnetwork). */
|
|
+#undef HAVE_LIBNETWORK
|
|
+
|
|
/* Define to 1 if you have the `nsl' library (-lnsl). */
|
|
#undef HAVE_LIBNSL
|
|
|
|
diff --git a/src/connect.c b/src/connect.c
|
|
index c9dd6fb..0afc248 100644
|
|
--- a/src/connect.c
|
|
+++ b/src/connect.c
|
|
@@ -46,7 +46,7 @@ as that of the covered work. */
|
|
# include <netdb.h>
|
|
# endif /* def __VMS [else] */
|
|
# include <netinet/in.h>
|
|
-# ifndef __BEOS__
|
|
+# ifdef HAVE_ARPA_INET_H
|
|
# include <arpa/inet.h>
|
|
# endif
|
|
#endif /* not WINDOWS */
|
|
diff --git a/src/host.h b/src/host.h
|
|
index 84f3d13..e664e7f 100644
|
|
--- a/src/host.h
|
|
+++ b/src/host.h
|
|
@@ -42,9 +42,9 @@ as that of the covered work. */
|
|
# endif /* def __VMS [else] */
|
|
# include <sys/socket.h>
|
|
# include <netinet/in.h>
|
|
-#ifndef __BEOS__
|
|
-# include <arpa/inet.h>
|
|
-#endif
|
|
+# ifdef HAVE_ARPA_INET_H
|
|
+# include <arpa/inet.h>
|
|
+# endif
|
|
#endif
|
|
|
|
struct url;
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 578731992b9028da3ffee8b498d0c294ded0bb00 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 May 2014 15:47:24 +0000
|
|
Subject: apply and augment wget-1.14-build-fixes.patch
|
|
|
|
|
|
diff --git a/src/utils.c b/src/utils.c
|
|
index 3cc7d97..9f173f3 100644
|
|
--- a/src/utils.c
|
|
+++ b/src/utils.c
|
|
@@ -65,7 +65,9 @@ as that of the covered work. */
|
|
|
|
/* For TIOCGWINSZ and friends: */
|
|
#ifndef WINDOWS
|
|
+#ifndef __HAIKU__
|
|
# include <sys/ioctl.h>
|
|
+#endif
|
|
# include <termios.h>
|
|
#endif
|
|
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 375ccd60aa09df33db4ae51fbe7ab297e43478ae Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 3 Mar 2015 17:18:24 +0000
|
|
Subject: gettext version issue
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c31da2c..6a30b9d 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -177,7 +177,7 @@ dnl
|
|
dnl Gettext
|
|
dnl
|
|
AM_GNU_GETTEXT([external],[need-ngettext])
|
|
-AM_GNU_GETTEXT_VERSION([0.17])
|
|
+AM_GNU_GETTEXT_VERSION([0.18])
|
|
|
|
AC_PROG_RANLIB
|
|
|
|
--
|
|
1.8.3.4
|
|
|