diff options
| author | roam <roam@FreeBSD.org> | 2006-07-14 15:11:59 +0800 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2006-07-14 15:11:59 +0800 |
| commit | 42ed3325a42a23ef80b7f9dd532dc3ae7426b68f (patch) | |
| tree | 07ec150c911c13e3d4102689b8d46beb31eed072 /ftp | |
| parent | 57f95f50527ade6faa8a191b4d190779787435d3 (diff) | |
| download | freebsd-ports-gnome-42ed3325a42a23ef80b7f9dd532dc3ae7426b68f.tar.gz freebsd-ports-gnome-42ed3325a42a23ef80b7f9dd532dc3ae7426b68f.tar.zst freebsd-ports-gnome-42ed3325a42a23ef80b7f9dd532dc3ae7426b68f.zip | |
Add an explicit knob for c-ares support now that we have Daniel's version
of the ares library in the ports tree. The knob defaults to "off" since
it conflicts with curl's IPv6 support - which is now also configurable via
its own knob.
PORTREVISION not bumped since there is no change in the default package
build - if enough people consider asynchronous DNS resolving to be good,
it could become the default, but for the present it is not.
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/curl/Makefile | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index df554ef58fe1..20e9729ee3ca 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -49,8 +49,10 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --mandir=${PREFIX}/man -OPTIONS= CURL_DEBUG "Enable curl diagnostic output" off \ +OPTIONS= CARES "Asynchronous DNS resolution via c-ares" off \ + CURL_DEBUG "Enable curl diagnostic output" off \ GNUTLS "Use GNU TLS if WITHOUT_SSL is specified" off \ + IPV6 "IPv6 support" on \ KERBEROS4 "Kerberos 4 authentication" off \ LIBIDN "Internationalized Domain Names via libidn" off \ NTLM "NTLM authentication" off @@ -69,12 +71,23 @@ IGNORE= may only use GNU TLS if WITHOUT_SSL is defined IGNORE= only supports NTLM with OpenSSL .endif +.if defined(WITH_CARES) && defined(WITH_IPV6) +IGNORE= does not support both c-ares and IPv6 - disable one of them +.endif + .if !defined(WITHOUT_SSL) CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .else CONFIGURE_ARGS+= --without-ssl .endif +.if defined(WITH_CARES) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcares.a:${PORTSDIR}/dns/c-ares +CONFIGURE_ARGS+= --enable-ares=${LOCALBASE} +.else +CONFIGURE_ARGS+= --disable-ares +.endif + .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE} @@ -88,6 +101,12 @@ PLIST_SUB+= SSL="" PLIST_SUB+= SSL="@comment " .endif +.if defined(WITH_IPV6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif + .if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4) CONFIGURE_ARGS += --with-krb4=/usr .else |