Update to 6.0.0a:

Changes between 6.0.0 and 6.0.0a:
Not documented.

Changes between GMP version 5.1.* and 6.0.0

  BUGS FIXED
  * The function mpz_invert now considers any number invertible in Z/1Z.

  * The mpn multiply code now handles operands of more than 2^31 limbs
    correctly.  (Note however that the mpz code is limited to 2^32 bits on
    32-bit hosts and 2^37 bits on 64-bit hosts.)

  * Contains all fixes from release 5.1.3.

  SPEEDUPS
  * Plain division of large operands is faster and more monotonous in operand
    size.

  * Major speedup for ARM, in particular ARM Cortex-A15, thanks to improved
    assembly.

  * Major speedup for SPARC T4/T5 and speedup also for T3, thanks to a lot of
    new assembly.

  * Speedup for Intel Sandy Bridge, Ivy Bridge, Haswell, thanks to rewritten
    and vastly expanded assembly support.  Speedup also for the older Core 2
    and Nehalem.

  * Faster mixed arithmetic between mpq_class and double.

  * With g++, optimise more operations when one argument is a simple constant.

  FEATURES
  * Support for new Intel and AMD CPUs.

  * Support for ARM64 alias Aarch64 alias ARMv8.

  * New public functions mpn_sec_mul and mpn_sec_sqr, implementing side-channel
    silent multiplication and squaring.

  * New public functions mpn_sec_div_qr and mpn_sec_div_r, implementing
    side-channel silent division.

  * New public functions mpn_cnd_add_n and mpn_cnd_sub_n.  Side-channel silent
    conditional addition and subtraction.

  * New public function mpn_sec_powm, implementing side-channel silent modexp.

  * New public function mpn_sec_invert, implementing side-channel silent
    modular inversion.

  * Better support for applications which use the mpz_t type, but nevertheless
    need to call some of the lower-level mpn functions.  See the documentation
    for mpz_limbs_read and related functions.

  MISC
    [FreeBSD bashing removed]

3 files changed, 15 insertions, 14 deletions

diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 39ac6486878..77e31544542 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2013/10/02 15:13:46 adam Exp $
+# $NetBSD: Makefile,v 1.73 2014/04/17 13:08:24 wiz Exp $
 
-DISTNAME=	gmp-5.1.3
+DISTNAME=	gmp-6.0.0a
 CATEGORIES=	devel math
-MASTER_SITES=	ftp://ftp.gmplib.org/pub/${DISTNAME}/
+MASTER_SITES=	https://gmplib.org/download/gmp/ \
+		${MASTER_SITE_GNU:=gmp/}
 # Use .tar.bz2 distfile so that no extra dependency on archivers/xz
 # is needed when building lang/gcc* with option gcc-inplace-math.
 EXTRACT_SUFX=	.tar.bz2
@@ -12,8 +13,6 @@ HOMEPAGE=	http://gmplib.org/
 COMMENT=	Library for arbitrary precision arithmetic
 LICENSE=	gnu-lgpl-v3 AND gnu-gpl-v3
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 INFO_FILES=		yes
 USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
@@ -21,6 +20,8 @@ USE_TOOLS+=		gm4 autoconf makeinfo
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-readline
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/a$//}
+
 TEST_TARGET=		check
 
 PLIST_VARS+=		cxx
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index 1e092150337..e110b4ae1ab 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2013/10/02 15:13:46 adam Exp $
+$NetBSD: distinfo,v 1.45 2014/04/17 13:08:24 wiz Exp $
 
-SHA1 (gmp-5.1.3.tar.bz2) = b35928e2927b272711fdfbf71b7cfd5f86a6b165
-RMD160 (gmp-5.1.3.tar.bz2) = 5c1815d794e0d67e351f312dee4f78004b27053e
-Size (gmp-5.1.3.tar.bz2) = 2196480 bytes
-SHA1 (patch-aa) = ce0eefbbffe426aee5025e0d304c34954573609b
+SHA1 (gmp-6.0.0a.tar.bz2) = 360802e3541a3da08ab4b55268c80f799939fddc
+RMD160 (gmp-6.0.0a.tar.bz2) = 2322e21e2042c974dcfaca2da18ae22d43a23ec4
+Size (gmp-6.0.0a.tar.bz2) = 2319400 bytes
+SHA1 (patch-aa) = dec275cbd5886a70f7cf0def1dedf01e7e4a49e9
 SHA1 (patch-ab) = 829812822a72a4926ea4cf6e8ffafdcd13a0f76c
 SHA1 (patch-ac) = 6f7de0a285bec2c2645479d3090dc0276580f3d8
 SHA1 (patch-mpn_arm_invert__limb.asm) = 0d4c4af299b846834bb13277844df364824d3a09
diff --git a/devel/gmp/patches/patch-aa b/devel/gmp/patches/patch-aa
index bca9d821e55..348cd48ba88 100644
--- a/devel/gmp/patches/patch-aa
+++ b/devel/gmp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2013/01/31 20:30:26 adam Exp $
+$NetBSD: patch-aa,v 1.13 2014/04/17 13:08:24 wiz Exp $
 
---- longlong.h.orig	2006-12-08 17:56:28.000000000 -0800
+--- longlong.h.orig	2014-03-25 14:37:55.000000000 +0000
 +++ longlong.h
-@@ -1031,8 +1031,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
+@@ -1039,8 +1039,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype 
     count is only an int. */
  #define count_trailing_zeros(count, x)					\
    do {									\
@@ -12,5 +12,5 @@ $NetBSD: patch-aa,v 1.12 2013/01/31 20:30:26 adam Exp $
 +    __asm__ ("bsfq %1,%q0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));	\
 +    (count) = __cbtmp;							\
    } while (0)
- #endif /* x86_64 */
+ #endif /* __amd64__ */