gmp: update to 6.2.1.

Fix some pkglint while here.

Changes between GMP version 6.2.0 and 6.2.1

  BUGS FIXED
  * A possible overflow of type int is avoided for mpz_cmp on huge operands.

  * Overflows are more carefully detected and reported for mpz_pow_ui.

  * A bug in longlong.h for aarch64 sub_ddmmss, not affecting GMP, was healed.

  * mini-gmp: mpz_out_str and mpq_out_str now correctly handle out of
    range bases.

  FEATURES
  * C90 compliance.

  * Initial support for Darwin on arm64, and improved portability.

  * Support for more processors.

  SPEEDUPS
  * None, except indirectly through recognition of new CPUs.

4 files changed, 17 insertions, 15 deletions

diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index b880bf123dd..3e85c1da24a 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2020/01/20 21:25:24 adam Exp $
+# $NetBSD: Makefile,v 1.88 2020/11/16 13:12:41 wiz Exp $
 
-DISTNAME=	gmp-6.2.0
+DISTNAME=	gmp-6.2.1
 CATEGORIES=	devel math
 MASTER_SITES=	https://gmplib.org/download/gmp/
 MASTER_SITES+=	${MASTER_SITE_GNU:=gmp/}
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--enable-cxx
 PLIST.cxx=		yes
 .endif
 
-.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI)
+.if !empty(MACHINE_PLATFORM:MIRIX-5.*) && !empty(ABI)
 ABI=			o32
 .endif
 
diff --git a/devel/gmp/builtin.mk b/devel/gmp/builtin.mk
index 6ec93c39bcd..185abb19853 100644
--- a/devel/gmp/builtin.mk
+++ b/devel/gmp/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2020/09/03 08:58:42 prlw1 Exp $
+# $NetBSD: builtin.mk,v 1.11 2020/11/16 13:12:41 wiz Exp $
 
 BUILTIN_PKG:=	gmp
 
@@ -6,11 +6,11 @@ BUILTIN_FIND_HEADERS_VAR:=	H_GMP
 BUILTIN_FIND_HEADERS.H_GMP=	gmp.h gmp/gmp.h
 
 BUILTIN_VERSION_SCRIPT.gmp=	${AWK} \
-	'/\#define[ \t]*__GNU_MP_VERSION[ \t]/ { major = $$3; } \
-	/\#define[ \t]*__GNU_MP_VERSION_MINOR[ \t]/ { minor = $$3; } \
-	/\#define[ \t]*__GNU_MP_VERSION_PATCHLEVEL[ \t]/ { patch = $$3; } \
-	END { if (major!="" && minor!="" && patch!="") \
-	print major "." minor "." patch; else print ""; }'
+				'/\#define[ \t]*__GNU_MP_VERSION[ \t]/ { major = $$3; } \
+				/\#define[ \t]*__GNU_MP_VERSION_MINOR[ \t]/ { minor = $$3; } \
+				/\#define[ \t]*__GNU_MP_VERSION_PATCHLEVEL[ \t]/ { patch = $$3; } \
+				END { if (major!="" && minor!="" && patch!="") \
+				print major "." minor "." patch; else print ""; }'
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index a134e2ad6d6..bbe05853694 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.55 2020/01/20 21:25:24 adam Exp $
+$NetBSD: distinfo,v 1.56 2020/11/16 13:12:41 wiz Exp $
 
-SHA1 (gmp-6.2.0.tar.bz2) = 5e9341d3807bc7505376f9ed9f5c1c6c57050aa6
-RMD160 (gmp-6.2.0.tar.bz2) = 9e0c387608c7dd3eb339afcd989ef5037d7cacbd
-SHA512 (gmp-6.2.0.tar.bz2) = ff22ed47fff176ed56301ecab0213316150a3abb370fed031635804f829c878296d7c65597b1f687f394479eef04fae6eba771162f7d363dc4c94c7334fc1fc0
-Size (gmp-6.2.0.tar.bz2) = 2453458 bytes
+SHA1 (gmp-6.2.1.tar.bz2) = 2dcf34d4a432dbe6cce1475a835d20fe44f75822
+RMD160 (gmp-6.2.1.tar.bz2) = 2a4204453eb608bec6bb647ff5a0c47ca4d43878
+SHA512 (gmp-6.2.1.tar.bz2) = 8904334a3bcc5c896ececabc75cda9dec642e401fb5397c4992c4fabea5e962c9ce8bd44e8e4233c34e55c8010cc28db0545f5f750cbdbb5f00af538dc763be9
+Size (gmp-6.2.1.tar.bz2) = 2493916 bytes
 SHA1 (patch-acinclude.m4) = 3f76c0aa8d29ec815a93448f9c4bc976ebdf7a2a
diff --git a/devel/gmp/inplace.mk b/devel/gmp/inplace.mk
index e540ac30d0d..7ea26cc3100 100644
--- a/devel/gmp/inplace.mk
+++ b/devel/gmp/inplace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: inplace.mk,v 1.7 2017/10/18 11:15:39 joerg Exp $
+# $NetBSD: inplace.mk,v 1.8 2020/11/16 13:12:41 wiz Exp $
 #
 # Include this file to extract devel/gmp source into the WRKSRC of
 # another package. This is to be used by GCC packages to avoid the
@@ -8,10 +8,12 @@ post-fetch: fetch-inplace-gmp
 
 post-extract: extract-inplace-gmp
 
+.PHONY: fetch-inplace-gmp
 fetch-inplace-gmp:
 	(cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \
 		WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES checksum)
 
+.PHONY: extract-inplace-gmp
 extract-inplace-gmp:
 	(cd ../../devel/gmp && ${MAKE} WRKDIR=${WRKSRC}/.devel.gmp EXTRACT_DIR=${WRKSRC} \
 		WRKSRC='$${EXTRACT_DIR}/$${DISTNAME:C/a$$//}' SKIP_DEPENDS=YES patch)