Update to 4.1.3 release:

 o Upwardly binary compatible with 4.1.2, 4.1.1, 4.1, 4.0.1, 4.0, and 3.x versions.
 o Bug fix to FFT multiplication code.
 o Bug fix to K6 assembly code for gcd.
 o Bug fix to IA-64 assembly code for population count.
 o Portability improvements, most notably functional AMD64 support.
 o Many minor bug fixes.
 o Make portlint happy.

10 files changed, 14 insertions, 72 deletions

diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index e085ce60b8f3..06713f61c160 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libgmp
-PORTVERSION=	4.1.2
-PORTREVISION=	3
+PORTVERSION=	4.1.3
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gmp
@@ -19,13 +18,16 @@ COMMENT=	A free library for arbitrary precision arithmetic
 
 CONFLICTS=	libgmp-2*
 USE_REINPLACE=	yes
+USE_GNOME=	lthack
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx --enable-mpfr
 INSTALLS_SHLIB=	yes
 
+INFO=		gmp mpfr
+
 post-extract:
-	@rm -f ${WRKSRC}/gmp.info*
+	@${RM} -f ${WRKSRC}/gmp.info*
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | \
diff --git a/math/gmp/distinfo b/math/gmp/distinfo
index dc96e69eecef..867ff4b35518 100644
--- a/math/gmp/distinfo
+++ b/math/gmp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gmp-4.1.2.tar.gz) = 01c7fbd6abbb8824a22161f6c6bbdaf0
-SIZE (gmp-4.1.2.tar.gz) = 2159329
+MD5 (gmp-4.1.3.tar.gz) = bdbb9136fa22a0ccf028d0f87aae1dd2
+SIZE (gmp-4.1.3.tar.gz) = 2198898
diff --git a/math/gmp/files/patch-configure b/math/gmp/files/patch-configure
deleted file mode 100644
index 68f608ac1291..000000000000
--- a/math/gmp/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri May 24 19:54:44 2002
-+++ configure	Fri Jul 19 05:02:31 2002
-@@ -16277,6 +16277,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/math/gmp/files/patch-longlong.h b/math/gmp/files/patch-longlong.h
deleted file mode 100644
index 105464b6ae63..000000000000
--- a/math/gmp/files/patch-longlong.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- longlong.h.old	2003-07-29 17:10:52.000000000 +1000
-+++ longlong.h	2003-07-29 17:12:16.000000000 +1000
-@@ -715,8 +715,10 @@
-   } while (0)
- #define count_trailing_zeros(count, x)					\
-   do {									\
-+    UDItype __cbtmp;							\
-     ASSERT ((x) != 0);							\
--    __asm__ ("bsfq %1,%0" : "=r" (count) : "rm" ((UDItype)(x)));	\
-+    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));	\
-+    (count) = __cbtmp;							\
-   } while (0)
- #endif /* x86_64 */
- 
diff --git a/math/gmp/pkg-plist b/math/gmp/pkg-plist
index ddb561708978..8320acf290d7 100644
--- a/math/gmp/pkg-plist
+++ b/math/gmp/pkg-plist
@@ -1,15 +1,8 @@
-@comment $FreeBSD$
 include/gmp.h
 include/gmpxx.h
 include/mpf2mpfr.h
 include/mpfr.h
 include/mpfrxx.h
-@unexec install-info --delete %D/info/gmp.info %D/info/dir
-info/gmp.info
-@exec install-info %D/info/gmp.info %D/info/dir
-@unexec install-info --delete %D/info/mpfr.info %D/info/dir
-info/mpfr.info
-@exec install-info %D/info/mpfr.info %D/info/dir
 lib/libgmp.a
 lib/libgmp.so
 lib/libgmp.so.6
diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile
index e085ce60b8f3..06713f61c160 100644
--- a/math/libgmp4/Makefile
+++ b/math/libgmp4/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libgmp
-PORTVERSION=	4.1.2
-PORTREVISION=	3
+PORTVERSION=	4.1.3
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gmp
@@ -19,13 +18,16 @@ COMMENT=	A free library for arbitrary precision arithmetic
 
 CONFLICTS=	libgmp-2*
 USE_REINPLACE=	yes
+USE_GNOME=	lthack
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx --enable-mpfr
 INSTALLS_SHLIB=	yes
 
+INFO=		gmp mpfr
+
 post-extract:
-	@rm -f ${WRKSRC}/gmp.info*
+	@${RM} -f ${WRKSRC}/gmp.info*
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | \
diff --git a/math/libgmp4/distinfo b/math/libgmp4/distinfo
index dc96e69eecef..867ff4b35518 100644
--- a/math/libgmp4/distinfo
+++ b/math/libgmp4/distinfo
@@ -1,2 +1,2 @@
-MD5 (gmp-4.1.2.tar.gz) = 01c7fbd6abbb8824a22161f6c6bbdaf0
-SIZE (gmp-4.1.2.tar.gz) = 2159329
+MD5 (gmp-4.1.3.tar.gz) = bdbb9136fa22a0ccf028d0f87aae1dd2
+SIZE (gmp-4.1.3.tar.gz) = 2198898
diff --git a/math/libgmp4/files/patch-configure b/math/libgmp4/files/patch-configure
deleted file mode 100644
index 68f608ac1291..000000000000
--- a/math/libgmp4/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Fri May 24 19:54:44 2002
-+++ configure	Fri Jul 19 05:02:31 2002
-@@ -16277,6 +16277,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/math/libgmp4/files/patch-longlong.h b/math/libgmp4/files/patch-longlong.h
deleted file mode 100644
index 105464b6ae63..000000000000
--- a/math/libgmp4/files/patch-longlong.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- longlong.h.old	2003-07-29 17:10:52.000000000 +1000
-+++ longlong.h	2003-07-29 17:12:16.000000000 +1000
-@@ -715,8 +715,10 @@
-   } while (0)
- #define count_trailing_zeros(count, x)					\
-   do {									\
-+    UDItype __cbtmp;							\
-     ASSERT ((x) != 0);							\
--    __asm__ ("bsfq %1,%0" : "=r" (count) : "rm" ((UDItype)(x)));	\
-+    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));	\
-+    (count) = __cbtmp;							\
-   } while (0)
- #endif /* x86_64 */
- 
diff --git a/math/libgmp4/pkg-plist b/math/libgmp4/pkg-plist
index ddb561708978..8320acf290d7 100644
--- a/math/libgmp4/pkg-plist
+++ b/math/libgmp4/pkg-plist
@@ -1,15 +1,8 @@
-@comment $FreeBSD$
 include/gmp.h
 include/gmpxx.h
 include/mpf2mpfr.h
 include/mpfr.h
 include/mpfrxx.h
-@unexec install-info --delete %D/info/gmp.info %D/info/dir
-info/gmp.info
-@exec install-info %D/info/gmp.info %D/info/dir
-@unexec install-info --delete %D/info/mpfr.info %D/info/dir
-info/mpfr.info
-@exec install-info %D/info/mpfr.info %D/info/dir
 lib/libgmp.a
 lib/libgmp.so
 lib/libgmp.so.6