@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.53 2008/10/09 10:56:16 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2008/11/21 11:27:31 bjs Exp $
 
 DISTNAME=	gmp-4.2.4
+PKGREVISION=	1
 CATEGORIES=	devel math
 MASTER_SITES=	${MASTER_SITE_GNU:=gmp/}
 EXTRACT_SUFX=	.tar.bz2
 
-#PATCHFILES=
-#PATCH_SITES+=		http://www.gmplib.org/patches/
-#PATCH_DIST_STRIP=	-p0
+PATCHFILES=		mpf_set_str.c.4.diff
+PATCHFILES+=		mpf_eq.diff
+PATCH_SITES+=		http://www.gmplib.org/patches/
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gmplib.org/
@@ -21,7 +23,7 @@
 INFO_FILES=		yes
 USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gm4 autoconf
+USE_TOOLS+=		gm4 autoconf makeinfo
 
 CONFIGURE_ARGS+=	--enable-cxx --without-readline
 
@@ -43,13 +45,21 @@
 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 (?)
+PKG_SUPPORTED_OPTIONS=	gmp-fat mmx simd
+PKG_SUGGESTED_OPTIONS=	gmp-fat
 .    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.
 ###
+### XXX	Currently, the 'mmx' and 'simd' options imply the same thing,
+###	as cpu detection is done at runtime.  Is there a more elegant
+###	way to handle this?
+###
+.    if empty(PKG_OPTIONS:Mgmp-fat) &&	\
+        (!empty(PKG_OPTIONS:Mmmx) || !empty(PKG_OPTIONS:Msimd))
+PKG_OPTIONS+=	gmp-fat
+.    endif
 .    if !empty(PKG_OPTIONS:Mgmp-fat)
 CONFIGURE_ARGS+=	--enable-fat
 BUILDLINK_TRANSFORM+=	rm-optarg:-march rm-optarg:-mcpu

@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.25 2008/11/20 16:44:45 adam Exp $
+$NetBSD: distinfo,v 1.26 2008/11/21 11:27:31 bjs Exp $
 
 SHA1 (gmp-4.2.4.tar.bz2) = bb721f94fbeeb8c609104540b408da6707c370ec
 RMD160 (gmp-4.2.4.tar.bz2) = 15c6c40c377088a3bcf9d432bcc27c777991cb12
 Size (gmp-4.2.4.tar.bz2) = 1710660 bytes
+SHA1 (mpf_eq.diff) = 5fe6dd4dba6574baf3db8f3d2a16fbd73dc295e1
+RMD160 (mpf_eq.diff) = 52036e74d5d118db1fd0ad844ba871249fdbaefc
+Size (mpf_eq.diff) = 9252 bytes
+SHA1 (mpf_set_str.c.4.diff) = b14fc8b7644183e021406f05b5e168589d9acd1d
+RMD160 (mpf_set_str.c.4.diff) = 03015e15518bdd5887d09f8b3fb12f9c8d2b4beb
+Size (mpf_set_str.c.4.diff) = 860 bytes
 SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6
 SHA1 (patch-ab) = e768eca25c117871041d12a618e38d9d252f25e5
-SHA1 (patch-ac) = 9c7e6817632596bfd6c86a30e3b2d7f78fccd5ff
+SHA1 (patch-ac) = 3120f7d207d65942910f8776786c0dbf6ee4d1b2