[csw-devel] SF.net SVN: gar:[15992] csw/mgar/pkg/nettle/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15992
          http://gar.svn.sourceforge.net/gar/?rev=15992&view=rev
Author:   dmichelsen
Date:     2011-10-25 21:28:39 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
nettle/trunk: Update to 2.4

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

Removed Paths:
-------------
    csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch

Modified: csw/mgar/pkg/nettle/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nettle/trunk/Makefile	2011-10-25 18:30:19 UTC (rev 15991)
+++ csw/mgar/pkg/nettle/trunk/Makefile	2011-10-25 21:28:39 UTC (rev 15992)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = nettle
-VERSION = 2.1
+VERSION = 2.4
 GARTYPE = v2
 CATEGORIES = utils
 
@@ -15,14 +15,15 @@
 
 MASTER_SITES = http://www.lysator.liu.se/~nisse/archive/
 DISTFILES  = $(DISTNAME).tar.gz
-PATCHFILES += 0001-Add-dynamic-linkage-information-for-Solaris.patch
 
 VENDOR_URL = http://www.lysator.liu.se/~nisse/nettle/
 
+LICENSE = COPYING.LIB
+
 PACKAGES += CSWlibhogweed2
 PKGFILES_CSWlibhogweed2 += $(call pkgfiles_lib,libhogweed.so.2)
 SPKG_DESC_CSWlibhogweed2 += A low-level cryptographic library, libhogweed.so.2
-RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibgmp
+RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibgmp10
 RUNTIME_DEP_PKGS_CSWlibhogweed2 += CSWlibnettle4
 
 PACKAGES += CSWlibnettle4
@@ -40,7 +41,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibhogweed2
 RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibnettle4
-RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp
+RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp10
 
 BUILD64 = 1
 

Modified: csw/mgar/pkg/nettle/trunk/checksums
===================================================================
--- csw/mgar/pkg/nettle/trunk/checksums	2011-10-25 18:30:19 UTC (rev 15991)
+++ csw/mgar/pkg/nettle/trunk/checksums	2011-10-25 21:28:39 UTC (rev 15992)
@@ -1 +1 @@
-2bfaf16234a5d8deb96cd23f53a682bb  nettle-2.1.tar.gz
+450be8c4886d46c09f49f568ad6fa013  nettle-2.4.tar.gz

Deleted: csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch	2011-10-25 18:30:19 UTC (rev 15991)
+++ csw/mgar/pkg/nettle/trunk/files/0001-Add-dynamic-linkage-information-for-Solaris.patch	2011-10-25 21:28:39 UTC (rev 15992)
@@ -1,61 +0,0 @@
-From 834e429f07e890d943a517501f1d566ad2dbccd7 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 5 May 2011 11:25:05 +0200
-Subject: [PATCH] Add dynamic linkage information for Solaris
-
----
- configure    |   13 +++++++++++++
- configure.ac |   13 +++++++++++++
- 2 files changed, 26 insertions(+), 0 deletions(-)
-
-diff --git a/configure b/configure
-index f7d6767..0f0cbca 100755
---- a/configure
-+++ b/configure
-@@ -4198,6 +4198,19 @@ case "$host_os" in
-     LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)'
-     LIBHOGWEED_LIBS=''
-     ;;
-+  solaris*)
-+    LIBNETTLE_FORLINK=libnettle.so
-+    LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
-+    LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
-+    LIBNETTLE_LINK='$(CC) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)'
-+    LIBNETTLE_LIBS=''
-+
-+    LIBHOGWEED_FORLINK=libhogweed.so
-+    LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
-+    LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
-+    LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)'
-+    LIBHOGWEED_LIBS='-lnettle -lgmp'
-+    ;;
-   *)
-     LIBNETTLE_FORLINK=libnettle.so
-     LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
-diff --git a/configure.ac b/configure.ac
-index 0251ffa..439cee8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -259,6 +259,19 @@ case "$host_os" in
-     LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)'
-     LIBHOGWEED_LIBS=''
-     ;;
-+  solaris*)
-+    LIBNETTLE_FORLINK=libnettle.so
-+    LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
-+    LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
-+    LIBNETTLE_LINK='$(CC) $(LDFLAGS) -G -h $(LIBNETTLE_SONAME)'
-+    LIBNETTLE_LIBS=''
-+
-+    LIBHOGWEED_FORLINK=libhogweed.so
-+    LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
-+    LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
-+    LIBHOGWEED_LINK='$(CC) $(LDFLAGS) -L. -G -h $(LIBHOGWEED_SONAME)'
-+    LIBHOGWEED_LIBS='-lnettle -lgmp'
-+    ;;
-   *)
-     LIBNETTLE_FORLINK=libnettle.so
-     LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
--- 
-1.7.3.2
-

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