Update to version 4.2.2. Support DESTDIR installation. Add option

to build a "fat" binary on (${MACHINE_ARCH} == "i386" && ${OPSYS} != "Darwin").
This isn't enabled by default now, but it might be useful for build builds,
as it uses cpuid at runtime to choose the most appropriate assembler code.
Insofar as I can tell, no BUILDLINK_A[BP]I_DEPENDS bump is necessary.

NOTE: Support for Darwin-*-i386 and Darwin-*-x86_64 has been improved,
see below.  Thus, I recommend that we test building the assembler code
on Darwin at some point.

Changes between GMP version 4.2.1 and 4.2.2:
	* License is now LGPL version 3.
Bugs:
	* Shared library numbers corrected for libcxx.
	* Fixed serious bug in gmpxx.h where a=a+b*c would generate garbage.
	  Note that this only affects C++ programs.
	* Fix crash in mpz_set_d for arguments with large negative exponent.
	* Fix 32-bit ABI bug with Itanium assembly for popcount and hamdist.
	* Fix assembly syntax problem for powerpc-ibm-aix with AIX
	  native assembler.
	* Fix problems with x86 --enable-fat, where the compiler where told to
	  generate code for the build machine, not plain i386 code as it should.
	* Improved recognition of powerpc systems wrt Altivec/VMX capability.
	* Misc minor fixes, mainly workarounds for compiler/assembler bugs.
Speedups:
	* "Core 2" and Pentium 4 processors, running in 64-bit mode will get a
	  slight boost as they are now specifically recognized.
Features:
	* New support for x86_64-solaris
	* New, rudimentary support for x86-apple-darwin and x86_64-apple-darwin.
	  (Please see http://gmplib.org/macos.html for more information.)

2 files changed, 25 insertions, 7 deletions

diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 1d027d0c97a..78811061582 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2007/10/16 23:49:02 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2007/10/30 01:36:59 bjs Exp $
 
-DISTNAME=	gmp-4.2.1
+DISTNAME=	gmp-4.2.2
 CATEGORIES=	devel math
 MASTER_SITES=	${MASTER_SITE_GNU:=gmp/}
 EXTRACT_SUFX=	.tar.bz2
@@ -8,7 +8,9 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://swox.com/gmp/
 COMMENT=	Library for arbitrary precision arithmetic
+LICENSE=	gnu-lgpl-v3
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		c c++ c99
@@ -30,9 +32,25 @@ ABI=			o32
 GCC_REQD+=		3.0
 .endif
 
-.if ${OPSYS} == "Darwin" && ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386"
+.  if ${OPSYS} == "Darwin"
 # don't use x86 assembly (it doesn't build)
 CONFIGURE_ENV+=		MPN_PATH="generic"
+.  else
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gmp
+PKG_SUPPORTED_OPTIONS=	gmp-fat
+#PKG_SUGGESTED_OPTIONS=	gmp-fat		# XXX could be good for bulk builds (?)
+.    include "../../mk/bsd.options.mk"
+###
+### Support for a "fat" binary on i386.  There's CPU autodetection,
+### so we'll be safe and filter out -march/-mcpu, et. al.
+###
+.    if !empty(PKG_OPTIONS:Mgmp-fat)
+CONFIGURE_ARGS+=	--enable-fat
+BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu
+BUILDLINK_TRANSFORM+=	rm:-mmmx rm:-msse rm:-msse2 rm:-msse3 rm:-m3dnow
+.    endif
+.  endif
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index 70f963f3461..b850f0fcbfb 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2006/12/09 03:38:16 jnemeth Exp $
+$NetBSD: distinfo,v 1.19 2007/10/30 01:36:59 bjs Exp $
 
-SHA1 (gmp-4.2.1.tar.bz2) = 00a97f0ec1eb1d9429ab5c64be6889e8a497425e
-RMD160 (gmp-4.2.1.tar.bz2) = 831e02a36ac7b466857f8fafeffad7d51f7656e7
-Size (gmp-4.2.1.tar.bz2) = 1726453 bytes
+SHA1 (gmp-4.2.2.tar.bz2) = 8c5f9798956f9b0162a25a56477a3566a92abc72
+RMD160 (gmp-4.2.2.tar.bz2) = 4021720f78b02244197c0c49522289e7fe81aad9
+Size (gmp-4.2.2.tar.bz2) = 1747068 bytes
 SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6