From 610c9c2937f002f884e6ef5aede13adad1683110 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 24 Nov 2009 19:23:34 +0000 Subject: [PATCH] Updated curl bep file and patch to build with cmake. --- net-misc/curl/curl-7.19.7.bep | 4 +-- net-misc/curl/patches/curl-7.19.7.patch | 40 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 net-misc/curl/patches/curl-7.19.7.patch diff --git a/net-misc/curl/curl-7.19.7.bep b/net-misc/curl/curl-7.19.7.bep index 434a268be..c2712df56 100644 --- a/net-misc/curl/curl-7.19.7.bep +++ b/net-misc/curl/curl-7.19.7.bep @@ -2,11 +2,11 @@ DESCRIPTION="curl and libcurl" HOMEPAGE="curl.haxx.se" SRC_URI="http://curl.haxx.se/download/curl-7.19.7.tar.gz" REVISION="1" -STATUS_HAIKU="broken" +STATUS_HAIKU="stable" DEPEND="" BUILD { cd curl-7.19.7 - cmake -DCMAKE_INSTALL_PREFIX=/boot/common . + cmake -DCMAKE_INSTALL_PREFIX=/boot/common -DCURL_DISABLE_LDAP=ON . make } diff --git a/net-misc/curl/patches/curl-7.19.7.patch b/net-misc/curl/patches/curl-7.19.7.patch new file mode 100644 index 000000000..acdfa8f56 --- /dev/null +++ b/net-misc/curl/patches/curl-7.19.7.patch @@ -0,0 +1,40 @@ +diff -ur curl-7.19.7/CMakeLists.txt curl-7.19.7-haiku/CMakeLists.txt +--- curl-7.19.7/CMakeLists.txt 2009-07-22 14:09:53.000000000 -0600 ++++ curl-7.19.7-haiku/CMakeLists.txt 2009-11-24 11:55:56.000000000 -0700 +@@ -227,6 +227,9 @@ + check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) + endif(BEOS) + ++# Haiku needs libnetwork for recv and friends ++check_library_exists_concat("network" recv HAVE_LIBNETWORK) ++ + if(NOT NOT_NEED_LIBNSL) + check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) + endif(NOT NOT_NEED_LIBNSL) +@@ -783,7 +786,11 @@ + + if(HAVE_SOCKLEN_T) + set(CURL_TYPEOF_CURL_SOCKLEN_T "socklen_t") ++ if(HAVE_SYS_SOCKET_H) ++ set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h") ++ endif(HAVE_SYS_SOCKET_H) + check_type_size("socklen_t" CURL_SIZEOF_CURL_SOCKLEN_T) ++ set(CMAKE_EXTRA_INCLUDE_FILES) + else() + set(CURL_TYPEOF_CURL_SOCKLEN_T int) + set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) +diff -ur curl-7.19.7/include/curl/curlbuild.h.cmake curl-7.19.7-haiku/include/curl/curlbuild.h.cmake +--- curl-7.19.7/include/curl/curlbuild.h.cmake 2009-07-22 14:09:53.000000000 -0600 ++++ curl-7.19.7-haiku/include/curl/curlbuild.h.cmake 2009-11-24 12:02:30.000000000 -0700 +@@ -144,6 +144,11 @@ + # include + #endif + ++/* on Haiku socklen_t is in here */ ++#ifdef __HAIKU__ ++# include ++#endif ++ + /* Data type definition of curl_socklen_t. */ + typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; +