summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2009-12-18 11:09:14 +0000
committerPeter Pentchev <roam@FreeBSD.org>2009-12-18 11:09:14 +0000
commit4333c0727c00950c9a44e9bc663bf0db384a852d (patch)
tree5ac60ea21c6c0268c06cfc6f4a1ac19cad6e139a /ftp
parent- Portlint, tweak plist (diff)
Fix the build of dependent ports by including <sys/select.h> on
earlier FreeBSD versions. I've modified the PR patch slightly to make it a bit more portable so it was suitable for forwarding upstream :) Bump PORTREVISION. PR: 141459 Submitted by: garga
Notes
Notes: svn path=/head/; revision=246139
Diffstat (limited to 'ftp')
-rw-r--r--ftp/curl/Makefile1
-rw-r--r--ftp/curl/files/patch-include__curl__curl.h30
2 files changed, 31 insertions, 0 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index f6ef67a98ae4..9afa4d8d1915 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= curl
PORTVERSION= 7.19.7
+PORTREVISION= 1
CATEGORIES= ftp ipv6 www
MASTER_SITES= http://curl.haxx.se/download/ \
ftp://ftp.sunet.se/pub/www/utilities/curl/ \
diff --git a/ftp/curl/files/patch-include__curl__curl.h b/ftp/curl/files/patch-include__curl__curl.h
new file mode 100644
index 000000000000..71cb68b62107
--- /dev/null
+++ b/ftp/curl/files/patch-include__curl__curl.h
@@ -0,0 +1,30 @@
+Description: Include <sys/select.h> for fd_set on earlier versions of FreeBSD
+Bug-FreeBSD: http://www.freebsd.org/cgi/query-pr.cgi?pr=141459
+Forwarded: http://sourceforge.net/tracker/?func=detail&aid=2916915&group_id=976&atid=100976
+Author: Renato Botelho <garga@FreeBSD.org>,
+ Peter Pentchev <roam@ringlet.net>
+Last-Update: 2009-12-18
+
+--- a/include/curl/curl.h
++++ b/include/curl/curl.h
+@@ -55,6 +55,11 @@
+ #include <stdio.h>
+ #include <limits.h>
+
++#if defined(__FreeBSD__)
++/* Needed to check FreeBSD version */
++#include <osreldate.h>
++#endif
++
+ /* The include stuff here below is mainly for time_t! */
+ #include <sys/types.h>
+ #include <time.h>
+@@ -74,7 +79,7 @@
+ require it! */
+ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
+ defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
+- defined(ANDROID)
++ defined(ANDROID) || (defined(__FreeBSD__) && __FreeBSD_version < 800000)
+ #include <sys/select.h>
+ #endif
+