summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/curl/Makefile36
-rw-r--r--www/curl/PLIST3
-rw-r--r--www/curl/buildlink3.mk8
-rw-r--r--www/curl/distinfo8
-rw-r--r--www/curl/options.mk11
5 files changed, 41 insertions, 25 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile
index e22468cb095..5dee1ab3caf 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2008/01/18 05:09:48 tnn Exp $
+# $NetBSD: Makefile,v 1.79 2008/03/02 14:40:26 bjs Exp $
-DISTNAME= curl-7.17.1
-PKGREVISION= 1
+DISTNAME= curl-7.18.0
CATEGORIES= www
MASTER_SITES= http://curl.haxx.se/download/ \
ftp://ftp.sunet.se/pub/www/utilities/curl/
@@ -32,20 +31,23 @@ USE_TOOLS+= perl
.endif
.include "options.mk"
-
-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
+#
+# XXXbjs CHANGES claims this is fixed. I have left it here commented out
+# in case this is not so.
+#
+#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} ${DESTDIR}${PREFIX}/share/doc/curl
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 0ea50076937..04a79fe9fa9 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/09/15 09:29:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/03/02 14:40:26 bjs Exp $
bin/curl
bin/curl-config
include/curl/curl.h
@@ -17,6 +17,7 @@ man/man3/curl_easy_duphandle.3
man/man3/curl_easy_escape.3
man/man3/curl_easy_getinfo.3
man/man3/curl_easy_init.3
+man/man3/curl_easy_pause.3
man/man3/curl_easy_perform.3
man/man3/curl_easy_reset.3
man/man3/curl_easy_setopt.3
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 3a7e3d3c68f..80ae9f32f09 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2008/01/18 05:09:48 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2008/03/02 14:40:26 bjs Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
CURL_BUILDLINK3_MK:= ${CURL_BUILDLINK3_MK}+
@@ -15,6 +15,12 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curl
BUILDLINK_API_DEPENDS.curl+= curl>=7.12.3
BUILDLINK_ABI_DEPENDS.curl+= curl>=7.17.1nb1
BUILDLINK_PKGSRCDIR.curl?= ../../www/curl
+
+pkgbase:= curl
+. include "../../mk/pkg-build-options.mk"
+. if !empty(PKG_BUILD_OPTIONS.curl:Mlibssh2)
+. include "../../security/libssh2/buildlink3.mk"
+. endif
.endif # CURL_BUILDLINK3_MK
.include "../../devel/libidn/buildlink3.mk"
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 9df6d325618..4b226d80c11 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.53 2007/11/01 08:37:10 wiz Exp $
+$NetBSD: distinfo,v 1.54 2008/03/02 14:40:26 bjs Exp $
-SHA1 (curl-7.17.1.tar.bz2) = ad34b9386e7fd1c8f2a8025e2716a8047b194970
-RMD160 (curl-7.17.1.tar.bz2) = 8ab8dc7a33a5265dfe25eb0725248c3cd6519510
-Size (curl-7.17.1.tar.bz2) = 1721551 bytes
+SHA1 (curl-7.18.0.tar.bz2) = f561a6a1f285c22d1f6a54b4dfa19b6cb9362c2a
+RMD160 (curl-7.18.0.tar.bz2) = f25ec844e7ef6221719439b3214fd3c3a42f5604
+Size (curl-7.18.0.tar.bz2) = 1779421 bytes
diff --git a/www/curl/options.mk b/www/curl/options.mk
index 60bee6d8405..7403135232f 100644
--- a/www/curl/options.mk
+++ b/www/curl/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2006/08/10 14:18:16 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/03/02 14:40:26 bjs Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS= inet6
+PKG_SUPPORTED_OPTIONS= inet6 libssh2
.include "../../mk/bsd.options.mk"
@@ -10,3 +10,10 @@ CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
+
+.if !empty(PKG_OPTIONS:Mlibssh2)
+CONFIGURE_ARGS+= --with-libssh2=${BUILDLINK_PREFIX.libssh2:Q}
+. include "../../security/libssh2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-libssh2
+.endif