[93704] trunk/dports/net

[ryandesign at macports.org]

Revision: 93704
          https://trac.macports.org/changeset/93704
Author:   ryandesign at macports.org
Date:     2012-05-28 14:01:38 -0700 (Mon, 28 May 2012)
Log Message:
-----------
curl: update to 7.26.0
curl-ca-bundle: update to certdata 1.83, now under the MPL 2 license

Modified Paths:
--------------
    trunk/dports/net/curl/Portfile
    trunk/dports/net/curl-ca-bundle/Portfile
    trunk/dports/net/curl-ca-bundle/files/patch-no-autodownload.diff

Modified: trunk/dports/net/curl/Portfile
===================================================================
--- trunk/dports/net/curl/Portfile	2012-05-28 20:41:30 UTC (rev 93703)
+++ trunk/dports/net/curl/Portfile	2012-05-28 21:01:38 UTC (rev 93704)
@@ -7,8 +7,7 @@
 
 name                        curl
 # keep the version in sync with the curl-ca-bundle port
-version                     7.25.0
-revision                    1
+version                     7.26.0
 categories                  net www
 maintainers                 ryandesign
 license                     curl
@@ -29,8 +28,8 @@
                             ftp://ftp.sunet.se/pub/www/utilities/curl/ \
                             http://www.execve.net/curl/
 
-checksums                   rmd160  e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 \
-                            sha256  cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491
+checksums                   rmd160  90d66cd2f77bf825ba01056f4f384ff74e7b04eb \
+                            sha256  fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a
 
 patchfiles                  patch-curl.h.diff
 

Modified: trunk/dports/net/curl-ca-bundle/Portfile
===================================================================
--- trunk/dports/net/curl-ca-bundle/Portfile	2012-05-28 20:41:30 UTC (rev 93703)
+++ trunk/dports/net/curl-ca-bundle/Portfile	2012-05-28 21:01:38 UTC (rev 93704)
@@ -5,10 +5,10 @@
 
 name                    curl-ca-bundle
 # keep the version in sync with the curl port
-version                 7.25.0
+version                 7.26.0
 set curl_name           curl
 categories              net
-license                 {MPL-1.1 LGPL-2.1+ GPL-2+}
+license                 MPL-2.0
 maintainers             ryandesign
 homepage                http://curl.haxx.se/
 platforms               darwin freebsd
@@ -21,8 +21,8 @@
 dist_subdir             ${curl_name}
 set curl_source         ${distname}${extract.suffix}
 set certdata_file       certdata.txt
-set certdata_version    1.82
-set certdata_date       2012-02-18
+set certdata_version    1.83
+set certdata_date       2012-04-25
 set certdata_distfile   certdata-${certdata_version}.txt
 set certdata_path       security/nss/lib/ckfw/builtins/${certdata_file}
 build.target            ca-bundle
@@ -50,7 +50,7 @@
 # on me noticing new versions within that time and updating the port, and
 # on upstream not updating the file again within that time.
 set days_since_update [expr {[expr {[clock seconds] - [clock format [clock scan ${certdata_date}] -format %s]}] / 86400}]
-if {${days_since_update} > 4} {
+if {${days_since_update} > 35} {
     master_sites-append http://distfiles.macports.org/curl/:certdata
 } else {
     master_sites-append http://mxr.mozilla.org/mozilla/source/${certdata_path}?raw=1&dummy=:certdata
@@ -61,11 +61,11 @@
     ${certdata_distfile}:certdata
 
 checksums                   ${curl_source} \
-                            rmd160  e35b46a17fc2fc2a23fd12ed9488cc753bd941c5 \
-                            sha256  cfb29139dfeb2449bf8a89963c3aed7d87f034013f05564cc0330b435c90b491 \
+                            rmd160  90d66cd2f77bf825ba01056f4f384ff74e7b04eb \
+                            sha256  fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a \
                             ${certdata_distfile} \
-                            rmd160  b3bc4bdb6ac212165dfb7616de33015c368a92c9 \
-                            sha256  9467dceae5024931062b0caa0e71275cb20e806168d1b690c7fef054aa2844ec
+                            rmd160  96cdf9edf178ec522c9d599d9fce7e218b90d280 \
+                            sha256  f61e0dd6e44daa82bc5f4eed6ea81f7624ab4caea2f2e0d1fc5cfec88e0f6963
 
 depends_build \
     path:bin/perl:perl5

Modified: trunk/dports/net/curl-ca-bundle/files/patch-no-autodownload.diff
===================================================================
--- trunk/dports/net/curl-ca-bundle/files/patch-no-autodownload.diff	2012-05-28 20:41:30 UTC (rev 93703)
+++ trunk/dports/net/curl-ca-bundle/files/patch-no-autodownload.diff	2012-05-28 21:01:38 UTC (rev 93704)
@@ -9,13 +9,13 @@
  
  ca-firefox: lib/firefox-db2pem.sh
  	@echo "generate a fresh ca-bundle.crt"
---- lib/mk-ca-bundle.pl.orig	2011-02-02 15:21:45.000000000 -0600
-+++ lib/mk-ca-bundle.pl	2011-03-31 00:02:48.000000000 -0500
+--- lib/mk-ca-bundle.pl.orig	2012-04-23 13:52:44.000000000 -0500
++++ lib/mk-ca-bundle.pl	2012-05-28 15:50:42.000000000 -0500
 @@ -32,7 +32,6 @@
  #
  use Getopt::Std;
  use MIME::Base64;
--use LWP::UserAgent 6;
+-use LWP::UserAgent;
  use strict;
  use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v);
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120528/4e24209d/attachment.html>