diff options
| author | jmmv <jmmv> | 2005-06-12 13:43:36 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-06-12 13:43:36 +0000 |
| commit | 858e1b4fbcd43169bcad2f227070949a451ef7ad (patch) | |
| tree | ae5ee719f074f2da522cc24852b04b07c19bef31 /www/curl | |
| parent | e6055c110c12a3b1ca192bef6275488857e1e0fb (diff) | |
| download | pkgsrc-858e1b4fbcd43169bcad2f227070949a451ef7ad.tar.gz | |
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 (limited to 'www/curl')
| -rw-r--r-- | www/curl/Makefile | 17 | ||||
| -rw-r--r-- | www/curl/distinfo | 3 | ||||
| -rw-r--r-- | www/curl/patches/patch-aa | 18 |
3 files changed, 36 insertions, 2 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index f3a79056fdb..02cc504a32d 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -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_ENV+= F77=${FALSE} 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 --git a/www/curl/distinfo b/www/curl/distinfo index 5c7e8b80d71..75fd2c1d453 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -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 --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa new file mode 100644 index 00000000000..5a6e1f33e51 --- /dev/null +++ b/www/curl/patches/patch-aa @@ -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> |