Update this to build with either gmp 2.0.2 or gmp 3.0.x.

(Theoretically... the package seems to be broken.)

4 files changed, 63 insertions, 11 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 1d3f7d792c9..7af579dfa8a 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/01/09 01:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/30 16:29:17 danw Exp $
 # FreeBSD Id: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp
 
 DISTNAME=	ghc-4.04
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.haskell.org/ghc/
 
 DEPENDS+=	readline-4.0:../../devel/readline
-DEPENDS+=	gmp-2.0.2:../../devel/gmp
+DEPENDS+=	gmp>=2.0.2:../../devel/gmp
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
diff --git a/lang/ghc/files/patch-sum b/lang/ghc/files/patch-sum
index 2fd89d5a7ac..aacfc72d7b7 100644
--- a/lang/ghc/files/patch-sum
+++ b/lang/ghc/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.3 1999/12/27 18:20:12 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/30 16:29:17 danw Exp $
 
 MD5 (patch-aa) = 80e1756668020337e3c339deef0f2043
 MD5 (patch-ab) = e000c0fe3512c327f09df5ceea61289a
 MD5 (patch-ac) = 9ca5ddf9a9a12a5ab48570da1428bfaf
-MD5 (patch-ad) = 5a32fb21a7612abdf5241d7690342138
-MD5 (patch-ae) = e179b2dc235286da48eaa60ffee041d5
+MD5 (patch-ad) = 0fa214f218c88cf24d1342fe6c7a7d94
+MD5 (patch-ae) = e8a82ef967e1e83d7666870c1206ce85
 MD5 (patch-af) = e38bc9bbbba7ebecf5f2a1eff0fc8443
diff --git a/lang/ghc/patches/patch-ad b/lang/ghc/patches/patch-ad
index 38590887e4b..04f872eacba 100644
--- a/lang/ghc/patches/patch-ad
+++ b/lang/ghc/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/12/15 06:05:15 proff Exp $
+$NetBSD: patch-ad,v 1.2 2000/06/30 16:29:17 danw Exp $
 
---- /p/lang/ghc/old/fptools/configure	Wed Sep 15 09:13:41 1999
-+++ configure	Wed Dec 15 16:37:27 1999
+--- configure.orig	Tue Sep 14 19:13:41 1999
++++ configure	Fri Jun 30 08:05:39 2000
 @@ -786,7 +786,16 @@
          HostPlatform_CPP='i386_unknown_netbsd'
          HostArch_CPP='i386'
@@ -20,3 +20,43 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/12/15 06:05:15 proff Exp $
          ;;
  i[3456]86-*-solaris2*)
  	HostPlatform=i386-unknown-solaris2 # hack again
+@@ -3926,24 +3935,24 @@
+   HaveLibGmp=YES; LibGmp=gmp
+ else
+   echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for mpz_fdiv_qr in -lgmp2""... $ac_c" 1>&6
+-echo "configure:3931: checking for mpz_fdiv_qr in -lgmp2" >&5
+-ac_lib_var=`echo gmp2'_'mpz_fdiv_qr | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for __gmpz_fdiv_qr in -lgmp""... $ac_c" 1>&6
++echo "configure:3931: checking for __gmpz_fdiv_qr in -lgmp" >&5
++ac_lib_var=`echo gmp'_'__gmpz_fdiv_qr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lgmp2  $LIBS"
++LIBS="-lgmp  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3939 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char mpz_fdiv_qr();
++char __gmpz_fdiv_qr();
+ 
+ int main() {
+-mpz_fdiv_qr()
++__gmpz_fdiv_qr()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+@@ -3961,7 +3970,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  HaveLibGmp=YES; LibGmp=gmp2
++  HaveLibGmp=YES; LibGmp=gmp
+ else
+   echo "$ac_t""no" 1>&6
+ HaveLibGmp=No; LibGmp=not-installed
diff --git a/lang/ghc/patches/patch-ae b/lang/ghc/patches/patch-ae
index 47b6589481b..cde42cae38e 100644
--- a/lang/ghc/patches/patch-ae
+++ b/lang/ghc/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/12/15 06:05:15 proff Exp $
+$NetBSD: patch-ae,v 1.2 2000/06/30 16:29:17 danw Exp $
 
---- /p/lang/ghc/old/fptools/configure.in	Wed Sep 15 09:03:35 1999
-+++ configure.in	Wed Dec 15 16:37:23 1999
+--- configure.in.orig	Tue Sep 14 19:03:35 1999
++++ configure.in	Fri Jun 30 08:04:25 2000
 @@ -138,7 +138,16 @@
          HostPlatform_CPP='i386_unknown_netbsd'
          HostArch_CPP='i386'
@@ -20,3 +20,15 @@ $NetBSD: patch-ae,v 1.1.1.1 1999/12/15 06:05:15 proff Exp $
          ;;
  i[[3456]]86-*-solaris2*)
  	HostPlatform=i386-unknown-solaris2 # hack again
+@@ -602,9 +611,9 @@
+ dnl ** check for specific library functions that we are interested in
+ AC_CHECK_FUNCS(access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat symlink sysconf timelocal times vadvise vfork)
+ 
+-dnl ** check whether this machine has gmp2 installed
++dnl ** check whether this machine has gmp installed
+ AC_CHECK_LIB(gmp,  mpz_fdiv_qr, HaveLibGmp=YES; LibGmp=gmp,
+-  AC_CHECK_LIB(gmp2, mpz_fdiv_qr,  HaveLibGmp=YES; LibGmp=gmp2,
++  AC_CHECK_LIB(gmp, __gmpz_fdiv_qr,  HaveLibGmp=YES; LibGmp=gmp,
+     HaveLibGmp=No; LibGmp=not-installed))
+ AC_SUBST(HaveLibGmp)
+ AC_SUBST(LibGmp)