Update port to version 5.02.2 and remove dependency on devel/happy from the

configuration script.

PR:		34349
Submitted by:	Simon Marlow <simon@smarlow.com>

9 files changed, 66 insertions, 9 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index f2dfdcdfa479..da1dac950e75 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	5.02.1
+PORTVERSION=	5.02.2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/
 
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 1a120654e282..0504bbb43af5 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-5.02.1-src-1.tar.bz2) = 836a694411a2ec702eadb01df8d26936
-MD5 (ghc-5.02.1-i386-unknown-freebsd-boot.tar.bz2) = 7e04f91990d67560281b852a7dece0c5
+MD5 (ghc-5.02.2-src-1.tar.bz2) = 97295bf16d4df59f46e6040cc26bb6f4
+MD5 (ghc-5.02.2-i386-unknown-freebsd-boot.tar.bz2) = f63aacdb00cdf1684e61878f20e94056
diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure
new file mode 100644
index 000000000000..35b9e011265e
--- /dev/null
+++ b/lang/ghc/files/patch-configure
@@ -0,0 +1,19 @@
+*** configure~	Fri Nov  2 12:49:24 2001
+--- configure	Thu Jan 24 21:51:56 2002
+***************
+*** 2593,2599 ****
+        test ${h1} -lt ${h2}
+      )
+  then 
+!   { echo "configure: error: Happy version 1.9 or later is required to compile GHC." 1>&2; exit 1; }
+  
+  fi
+  fi
+--- 2593,2599 ----
+        test ${h1} -lt ${h2}
+      )
+  then 
+! #  { echo "configure: error: Happy version 1.9 or later is required to compile GHC." 1>&2; exit 1; }
+  
+  fi
+  fi
diff --git a/lang/ghc5/Makefile b/lang/ghc5/Makefile
index f2dfdcdfa479..da1dac950e75 100644
--- a/lang/ghc5/Makefile
+++ b/lang/ghc5/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	5.02.1
+PORTVERSION=	5.02.2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/
 
diff --git a/lang/ghc5/distinfo b/lang/ghc5/distinfo
index 1a120654e282..0504bbb43af5 100644
--- a/lang/ghc5/distinfo
+++ b/lang/ghc5/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-5.02.1-src-1.tar.bz2) = 836a694411a2ec702eadb01df8d26936
-MD5 (ghc-5.02.1-i386-unknown-freebsd-boot.tar.bz2) = 7e04f91990d67560281b852a7dece0c5
+MD5 (ghc-5.02.2-src-1.tar.bz2) = 97295bf16d4df59f46e6040cc26bb6f4
+MD5 (ghc-5.02.2-i386-unknown-freebsd-boot.tar.bz2) = f63aacdb00cdf1684e61878f20e94056
diff --git a/lang/ghc5/files/patch-configure b/lang/ghc5/files/patch-configure
new file mode 100644
index 000000000000..35b9e011265e
--- /dev/null
+++ b/lang/ghc5/files/patch-configure
@@ -0,0 +1,19 @@
+*** configure~	Fri Nov  2 12:49:24 2001
+--- configure	Thu Jan 24 21:51:56 2002
+***************
+*** 2593,2599 ****
+        test ${h1} -lt ${h2}
+      )
+  then 
+!   { echo "configure: error: Happy version 1.9 or later is required to compile GHC." 1>&2; exit 1; }
+  
+  fi
+  fi
+--- 2593,2599 ----
+        test ${h1} -lt ${h2}
+      )
+  then 
+! #  { echo "configure: error: Happy version 1.9 or later is required to compile GHC." 1>&2; exit 1; }
+  
+  fi
+  fi
diff --git a/lang/ghc6/Makefile b/lang/ghc6/Makefile
index f2dfdcdfa479..da1dac950e75 100644
--- a/lang/ghc6/Makefile
+++ b/lang/ghc6/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	5.02.1
+PORTVERSION=	5.02.2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/
 
diff --git a/lang/ghc6/distinfo b/lang/ghc6/distinfo
index 1a120654e282..0504bbb43af5 100644
--- a/lang/ghc6/distinfo
+++ b/lang/ghc6/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-5.02.1-src-1.tar.bz2) = 836a694411a2ec702eadb01df8d26936
-MD5 (ghc-5.02.1-i386-unknown-freebsd-boot.tar.bz2) = 7e04f91990d67560281b852a7dece0c5
+MD5 (ghc-5.02.2-src-1.tar.bz2) = 97295bf16d4df59f46e6040cc26bb6f4
+MD5 (ghc-5.02.2-i386-unknown-freebsd-boot.tar.bz2) = f63aacdb00cdf1684e61878f20e94056
diff --git a/lang/ghc6/files/patch-configure b/lang/ghc6/files/patch-configure
new file mode 100644
index 000000000000..35b9e011265e
--- /dev/null
+++ b/lang/ghc6/files/patch-configure
@@ -0,0 +1,19 @@
+*** configure~	Fri Nov  2 12:49:24 2001
+--- configure	Thu Jan 24 21:51:56 2002
+***************
+*** 2593,2599 ****
+        test ${h1} -lt ${h2}
+      )
+  then 
+!   { echo "configure: error: Happy version 1.9 or later is required to compile GHC." 1>&2; exit 1; }
+  
+  fi
+  fi
+--- 2593,2599 ----
+        test ${h1} -lt ${h2}
+      )
+  then 
+! #  { echo "configure: error: Happy version 1.9 or later is required to compile GHC." 1>&2; exit 1; }
+  
+  fi
+  fi