[63928] trunk/dports/net
ryandesign at macports.org
ryandesign at macports.org
Thu Feb 18 00:35:56 PST 2010
Revision: 63928
http://trac.macports.org/changeset/63928
Author: ryandesign at macports.org
Date: 2010-02-18 00:35:52 -0800 (Thu, 18 Feb 2010)
Log Message:
-----------
curl:
* update to 7.20.0
* remove idn variant; international domain name support is now always on; this furthers #23177
* use more explicit configure args to ensure features only get enabled when the corresponding variant is chosen; this fixes #23277 and maybe other similar issues
* generalize how -arch flags are removed from curl-config and libcurl.pc and do so even when not building universal
* ensure gss variant does not use MacPorts gss or kerberos; see #12805 and #21553
* add variant descriptions
curl-ca-bundle:
* update to 7.20.0
* update certdata.txt to 1.58
Modified Paths:
--------------
trunk/dports/net/curl/Portfile
trunk/dports/net/curl-ca-bundle/Portfile
Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile 2010-02-18 06:54:02 UTC (rev 63927)
+++ trunk/dports/net/curl/Portfile 2010-02-18 08:35:52 UTC (rev 63928)
@@ -6,8 +6,7 @@
name curl
# keep the version in sync with the curl-ca-bundle port
-version 7.19.7
-revision 1
+version 7.20.0
categories net www
maintainers ryandesign
license curl
@@ -30,36 +29,49 @@
http://cool.haxx.se/curl/ \
http://www.execve.net/curl/
-checksums md5 79a8fbb2eed5464b97bdf94bee109380 \
- sha1 c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c \
- rmd160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4
+checksums md5 3dda78c4a808d9a779dc3a2ae81b47d8 \
+ sha1 89215fc4c4cd1e42134d6117255c401372e628de \
+ rmd160 9418ab686551af58df84960277868c77836d6817
configure.args --enable-ipv6 \
- --without-libidn \
+ --without-gnutls \
+ --without-gssapi \
--without-libssh2 \
+ --without-spnego \
--without-ssl \
+ --disable-ares \
--disable-ldap \
+ --disable-ldaps \
+ --with-libidn \
--with-zlib=${prefix}
configure.env PKG_CONFIG_PATH=${prefix}
depends_build port:pkgconfig
-depends_lib port:zlib
+depends_lib port:zlib \
+ port:libidn
-archcheck.files lib/libz.dylib
+archcheck.files lib/libz.dylib \
+ lib/libidn.dylib
test.run yes
test.target test-full
post-build {
if {[variant_isset universal]} {
- foreach arch ${universal_archs} {
- reinplace "s|[muniversal_get_arch_flag ${arch}]||" \
- ${worksrcpath}-${arch}/curl-config \
- ${worksrcpath}-${arch}/libcurl.pc
+ set dirs {}
+ foreach arch ${universal_archs_to_use} {
+ lappend dirs ${worksrcpath}-${arch}
}
+ } else {
+ set dirs ${worksrcpath}
}
+ foreach dir ${dirs} {
+ reinplace -E {s|-arch [a-z0-9_]+||g} \
+ ${dir}/curl-config \
+ ${dir}/libcurl.pc
+ }
}
post-destroot {
@@ -96,53 +108,58 @@
default_variants +ssl
}
-variant ssl {
+variant ssl description {Allow secure connections using OpenSSL} {
depends_lib-append port:openssl \
port:curl-ca-bundle
archcheck.files-append lib/libssl.dylib
- configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
configure.args-delete --without-ssl
+ configure.args-append --with-ssl \
+ --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
}
variant ares description {Add support for resolving names asynchronously} {
depends_lib-append port:c-ares
archcheck.files-append lib/libcares.dylib
- configure.args-append --enable-ares=${prefix}
+ configure.args-delete --disable-ares
+ configure.args-append --enable-ares
}
-variant idn description {Add support for internationalized domain names} {
- depends_lib-append port:libidn
- archcheck.files-append lib/libidn.dylib
- configure.args-delete --without-libidn
-}
-
variant spnego description {Enable SPNEGO authentication support} {
# kind of broken?
depends_lib-append port:fbopenssl
archcheck.files-append lib/libfbopenssl.dylib
+ configure.args-delete --without-spnego
configure.args-append --with-spnego=${prefix}
}
-variant gnutls conflicts ssl {
+variant gnutls conflicts ssl description {Allow secure connections using GNU TLS} {
depends_lib-append port:gnutls
archcheck.files-append lib/libgnutls.dylib
+ configure.args-delete --without-gnutls
configure.args-append --with-gnutls
}
-variant gss {
+variant gss description {Support the Generic Security Service API} {
+ # This needs to use the system's Kerberos, not MacPorts' gss or kerberos5.
+ conflicts-append gss kerberos5
+ configure.args-delete --without-gssapi
configure.args-append --with-gssapi
}
-variant openldap {
+variant openldap description {Support performing Lightweight Directory Access Protocol queries with OpenLDAP} {
depends_lib-append port:openldap
archcheck.files-append lib/libldap.dylib
- configure.args-delete --disable-ldap
+ configure.args-delete --disable-ldap \
+ --disable-ldaps
+ configure.args-append --enable-ldap \
+ --enable-ldaps
}
variant sftp_scp description {Add SFTP/SCP support via libssh2} {
depends_lib-append port:libssh2
archcheck.files-append lib/libssh2.dylib
configure.args-delete --without-libssh2
+ configure.args-append --with-libssh2
}
livecheck.type freshmeat
Modified: trunk/dports/net/curl-ca-bundle/Portfile
===================================================================
--- trunk/dports/net/curl-ca-bundle/Portfile 2010-02-18 06:54:02 UTC (rev 63927)
+++ trunk/dports/net/curl-ca-bundle/Portfile 2010-02-18 08:35:52 UTC (rev 63928)
@@ -4,8 +4,7 @@
name curl-ca-bundle
# keep the version in sync with the curl port
-version 7.19.7
-revision 1
+version 7.20.0
set curl_name curl
categories net
maintainers ryandesign
@@ -19,8 +18,8 @@
dist_subdir ${curl_name}
set curl_source ${distname}${extract.suffix}
set certdata_file certdata.txt
-set certdata_version 1.57
-set certdata_date 2009-12-03
+set certdata_version 1.58
+set certdata_date 2010-02-16
set certdata_distfile certdata-${certdata_version}.txt
set certdata_path security/nss/lib/ckfw/builtins/${certdata_file}
build.target ca-bundle
@@ -50,13 +49,13 @@
checksums \
${curl_source} \
- md5 79a8fbb2eed5464b97bdf94bee109380 \
- sha1 c306ebf0f65fb90df3c9c9a12fb04fb77cc29e2c \
- rmd160 b170b24af3a6d3fc3357e90fc7ae5ef34d722fb4 \
+ md5 3dda78c4a808d9a779dc3a2ae81b47d8 \
+ sha1 89215fc4c4cd1e42134d6117255c401372e628de \
+ rmd160 9418ab686551af58df84960277868c77836d6817 \
${certdata_distfile} \
- md5 85e459aa8dcdddda6438216b67c6b7bb \
- sha1 678d65dd3c1d1243d58668377ca945b17f33fba0 \
- rmd160 0a935823e5c5f533f987daaec9a845fcce31f186
+ md5 7d0926c462d973ebd4beee6f004ebcc5 \
+ sha1 a5c98c10313a1e250a38df1fa53fb9978773891e \
+ rmd160 7269b98e326e98b247a9d613dc1c11b06121caae
depends_build \
path:bin/perl:perl5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100218/4bada23c/attachment.html>
More information about the macports-changes
mailing list