diff options
| -rw-r--r-- | www/curl/Makefile | 5 | ||||
| -rw-r--r-- | www/curl/distinfo | 12 | ||||
| -rw-r--r-- | www/curl/patches/patch-aa | 39 | ||||
| -rw-r--r-- | www/curl/patches/patch-curl-config.in | 4 |
4 files changed, 16 insertions, 44 deletions
diff --git a/www/curl/Makefile b/www/curl/Makefile index 92ff2a29bb4..c108c63d02f 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.135 2014/02/12 23:18:44 tron Exp $ +# $NetBSD: Makefile,v 1.136 2014/03/30 12:57:54 spz Exp $ -DISTNAME= curl-7.35.0 -PKGREVISION= 1 +DISTNAME= curl-7.36.0 CATEGORIES= www MASTER_SITES= http://curl.haxx.se/download/ \ ftp://ftp.sunet.se/pub/www/utilities/curl/ diff --git a/www/curl/distinfo b/www/curl/distinfo index 88441c6d30f..ce1c6d55a0b 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.92 2014/02/01 11:07:14 adam Exp $ +$NetBSD: distinfo,v 1.93 2014/03/30 12:57:54 spz Exp $ -SHA1 (curl-7.35.0.tar.bz2) = 14d1bca35f611112da0db098b0469efb4a60c8a9 -RMD160 (curl-7.35.0.tar.bz2) = 12844fdfa59538b4daa7d68a57e9d7d680473bf3 -Size (curl-7.35.0.tar.bz2) = 2781470 bytes -SHA1 (patch-aa) = 4d634a15504a4b5e046161feb8c83b357becf2f2 -SHA1 (patch-curl-config.in) = 0dd49de806865c19fbf766ad208f8f2495824442 +SHA1 (curl-7.36.0.tar.bz2) = c39b120585a8a8d64ef14459d6d5f22831d4a7c4 +RMD160 (curl-7.36.0.tar.bz2) = 864f0fe3a15f016cf79bf47172a2ae6a54e0cce4 +Size (curl-7.36.0.tar.bz2) = 2809266 bytes +SHA1 (patch-aa) = 41bbc1e6c17c8ff1bf826d7d8ccdaec9ad9e97ed +SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index 4016a8621c5..fbc989d7106 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.25 2014/02/01 11:07:14 adam Exp $ +$NetBSD: patch-aa,v 1.26 2014/03/30 12:57:54 spz Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss ---- configure.orig 2014-01-29 06:54:45.000000000 +0000 +--- configure.orig 2014-03-25 10:29:28.000000000 +0000 +++ configure @@ -3641,6 +3641,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; @@ -13,7 +13,7 @@ the gssapi option, and need an explicit -lgss if test $xc_bad_var_cflags = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} -@@ -16619,7 +16620,7 @@ squeeze() { +@@ -16620,7 +16621,7 @@ squeeze() { # @@ -22,7 +22,7 @@ the gssapi option, and need an explicit -lgss # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -21078,7 +21079,12 @@ $as_echo "yes" >&6; } +@@ -21079,7 +21080,12 @@ $as_echo "yes" >&6; } if test -z "$GSSAPI_INCS"; then if test -f "$GSSAPI_ROOT/bin/krb5-config"; then @@ -36,7 +36,7 @@ the gssapi option, and need an explicit -lgss elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -21226,13 +21232,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21227,13 +21233,18 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd ;; *) if test -f "$GSSAPI_ROOT/bin/krb5-config"; then @@ -58,7 +58,7 @@ the gssapi option, and need an explicit -lgss fi ;; esac -@@ -21243,7 +21254,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21244,7 +21255,7 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd LIBS="-lgss $LIBS" ;; *) @@ -67,30 +67,3 @@ the gssapi option, and need an explicit -lgss ;; esac fi -@@ -24834,19 +24845,19 @@ $as_echo "$as_me: WARNING: You need an l - $as_echo "yes" >&6; } - if test "x$OPENSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="OPENSSL_" -- elif test "x$GNUTLS_ENABLED" == "x1"; then -+ elif test "x$GNUTLS_ENABLED" = "x1"; then - versioned_symbols_flavour="GNUTLS_" -- elif test "x$NSS_ENABLED" == "x1"; then -+ elif test "x$NSS_ENABLED" = "x1"; then - versioned_symbols_flavour="NSS_" -- elif test "x$POLARSSL_ENABLED" == "x1"; then -+ elif test "x$POLARSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="POLARSSL_" -- elif test "x$CYASSL_ENABLED" == "x1"; then -+ elif test "x$CYASSL_ENABLED" = "x1"; then - versioned_symbols_flavour="CYASSL_" -- elif test "x$AXTLS_ENABLED" == "x1"; then -+ elif test "x$AXTLS_ENABLED" = "x1"; then - versioned_symbols_flavour="AXTLS_" -- elif test "x$WINSSL_ENABLED" == "x1"; then -+ elif test "x$WINSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="WINSSL_" -- elif test "x$DARWINSSL_ENABLED" == "x1"; then -+ elif test "x$DARWINSSL_ENABLED" = "x1"; then - versioned_symbols_flavour="DARWINSSL_" - else - versioned_symbols_flavour="" diff --git a/www/curl/patches/patch-curl-config.in b/www/curl/patches/patch-curl-config.in index e7712e879a7..ccf58619a08 100644 --- a/www/curl/patches/patch-curl-config.in +++ b/www/curl/patches/patch-curl-config.in @@ -1,8 +1,8 @@ -$NetBSD: patch-curl-config.in,v 1.3 2013/06/29 19:24:57 spz Exp $ +$NetBSD: patch-curl-config.in,v 1.4 2014/03/30 12:57:54 spz Exp $ - make "curl-config --libs" return proper ldflags for shared libraries ---- curl-config.in.orig 2013-06-21 22:29:04.000000000 +0000 +--- curl-config.in.orig 2014-01-05 22:07:54.000000000 +0000 +++ curl-config.in @@ -148,9 +148,9 @@ while test $# -gt 0; do CURLLIBDIR="" |