SF.net SVN: gar:[22248] csw/mgar/pkg/libcurl4/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22248
          http://gar.svn.sourceforge.net/gar/?rev=22248&view=rev
Author:   dmichelsen
Date:     2013-10-18 15:38:47 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
libcurl4/trunk: Update to 7.33.0 and add metalink support

Modified Paths:
--------------
    csw/mgar/pkg/libcurl4/trunk/Makefile
    csw/mgar/pkg/libcurl4/trunk/checksums

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2013-10-18 15:23:35 UTC (rev 22247)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2013-10-18 15:38:47 UTC (rev 22248)
@@ -1,5 +1,5 @@
 NAME = curl
-VERSION = 7.32.0
+VERSION = 7.33.0
 GARTYPE = v2
 
 DESCRIPTION = Command line tool and library for client-side URL transfers
@@ -28,6 +28,7 @@
 BUILD_DEP_PKGS += CSWlibfbopenssl-dev
 BUILD_DEP_PKGS += CSWlibrtmp-dev
 BUILD_DEP_PKGS += CSWlibidn-dev
+BUILD_DEP_PKGS += CSWlibmetalink-dev
 
 PACKAGES += CSWlibcurl4
 CATALOGNAME_CSWlibcurl4 = libcurl4
@@ -81,7 +82,8 @@
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibz1
 #RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4
-#RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWcurl += CSWlibmetalink3
 
 EXTRA_MODULATORS = FEATURES
 MODULATIONS_FEATURES = minimal full
@@ -95,6 +97,7 @@
 EXTRA_CONFIGURE_ARGS_features-full += --with-spnego=$(libdir)
 EXTRA_CONFIGURE_ARGS_features-full += --enable-ldap
 EXTRA_CONFIGURE_ARGS_features-full += --enable-ldaps
+EXTRA_CONFIGURE_ARGS_features-full += --with-libmetalink
 
 # Make sure to link to the new libnet. See for details http://wiki.opencsw.org/project-libnet
 EXTRA_LDFLAGS = -L$(libdir)/libnet-new
@@ -123,10 +126,12 @@
 EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,,"
 EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
 
-MERGE_SCRIPTS_isa-default-features-minimal = copy-all
+# Make sure to pick the "curl" binary from features-full as e.g. metalink support is only in the binary
+# and not libmetalink
+MERGE_SCRIPTS_isa-default-features-minimal = copy-only
 MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only copy-config-only
 MERGE_DIRS_isa-default64-features-minimal = $(libdir)
-MERGE_SCRIPTS_isa-default-features-full = copy-only
+MERGE_SCRIPTS_isa-default-features-full = copy-all
 MERGE_DIRS_isa-default-features-full = $(libdir)
 MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only
 MERGE_DIRS_isa-default64-features-full = $(libdir)

Modified: csw/mgar/pkg/libcurl4/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/checksums	2013-10-18 15:23:35 UTC (rev 22247)
+++ csw/mgar/pkg/libcurl4/trunk/checksums	2013-10-18 15:38:47 UTC (rev 22248)
@@ -1 +1 @@
-db5948f44e7ef3edbf9a7907af9556ac  curl-7.32.0.tar.lzma
+eb463192f37c260163e006d6c4d3f114  curl-7.33.0.tar.lzma

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.