[pkgsrc/trunk]: pkgsrc/www/curl Make the include/curl/multi.h self-contained ...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/490011e093c6
branches:  trunk
changeset: 495522:490011e093c6
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Jun 12 13:43:36 2005 +0000

description:
Make the include/curl/multi.h self-contained to fix the build of packages
using it (such as the new drivel-2.0.0).  Bump PKGREVISION to 1.

The problem is that this header file requires the fd_set definitions, but
it only pulls in <sys/select.h> on AIX and NETWARE systems.  Instead, change
the inclusion to only happen if configure script detected it during build
time.

diffstat:

 www/curl/Makefile         |  17 ++++++++++++++++-
 www/curl/distinfo         |   3 ++-
 www/curl/patches/patch-aa |  18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r b81c8eec8051 -r 490011e093c6 www/curl/Makefile
--- a/www/curl/Makefile Sun Jun 12 13:03:38 2005 +0000
+++ b/www/curl/Makefile Sun Jun 12 13:43:36 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2005/05/17 13:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.55 2005/06/12 13:43:36 jmmv Exp $
 
 DISTNAME=      curl-7.14.0
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://curl.haxx.se/download/ \
                ftp://ftp.sunet.se/pub/www/utilities/curl/ \
@@ -32,6 +33,20 @@
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
+post-configure:
+       @if ${GREP} '#define HAVE_SYS_SELECT_H 1' ${WRKSRC}/src/config.h \
+               >/dev/null; \
+       then \
+           line='#include <sys/select.h>'; \
+       else \
+           line='/* sys/select.h not included because it does not exist */'; \
+       fi; \
+       ${SED} -e "s|__INCLUDE_SYS_SELECT_H__|$${line}|" \
+              <${WRKSRC}/include/curl/multi.h \
+              >${WRKSRC}/include/curl/multi.h.new; \
+       ${MV} ${WRKSRC}/include/curl/multi.h.new \
+             ${WRKSRC}/include/curl/multi.h
+
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl
        for _f in MANUAL TheArtOfHttpScripting FAQ              \
diff -r b81c8eec8051 -r 490011e093c6 www/curl/distinfo
--- a/www/curl/distinfo Sun Jun 12 13:03:38 2005 +0000
+++ b/www/curl/distinfo Sun Jun 12 13:43:36 2005 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.36 2005/05/17 13:25:32 adam Exp $
+$NetBSD: distinfo,v 1.37 2005/06/12 13:43:36 jmmv Exp $
 
 SHA1 (curl-7.14.0.tar.bz2) = d39dd3b3603dcfa3f9b8b62ecf54d308bb124ac3
 RMD160 (curl-7.14.0.tar.bz2) = 3d78f8febffacd8e38803db92274e86d0249680c
 Size (curl-7.14.0.tar.bz2) = 1920305 bytes
+SHA1 (patch-aa) = 83b1b2ec0d9531ef85c42d5ba1b5319415168d3e
diff -r b81c8eec8051 -r 490011e093c6 www/curl/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/curl/patches/patch-aa Sun Jun 12 13:43:36 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.10 2005/06/12 13:43:36 jmmv Exp $
+
+--- include/curl/multi.h.orig  2005-04-18 13:45:13.000000000 +0200
++++ include/curl/multi.h
+@@ -52,12 +52,7 @@
+ #endif
+ #else
+ 
+-/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish
+-   libc5-based Linux systems. Only include it on system that are known to
+-   require it! */
+-#if defined(_AIX) || defined(NETWARE)
+-#include <sys/select.h>
+-#endif
++__INCLUDE_SYS_SELECT_H__
+ 
+ #ifndef _WIN32_WCE
+ #include <sys/socket.h>