Update to version 4.08.2.

PR:		24934
Submitted by:	Simon Marlow <simonmar@microsoft.com>

12 files changed, 18 insertions, 321 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 7f125b8bf238..e9e9a335dee6 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,14 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	4.08.1
+PORTVERSION=	4.08.2
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/4.08.1/
+MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX} \
 		ghc-${PORTVERSION}-x86-hc${EXTRACT_SUFX}
 
 MAINTAINER=	simonmar@microsoft.com
 
+USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -21,8 +22,6 @@ CONFIGURE_ARGS= --enable-hc-boot --libdir=${PREFIX}/lib/ghc
 # specifying CONFIGURE_TARGET doesn't work for some reason.
 CONFIGURE_TARGET=
 
-WRKSRC=		${WRKDIR}/fptools
-
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
 TMPDIR = ${WRKSRC}/tmp
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 3ebbea2b26d4..edb7b65a18cb 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-4.08.1-src.tar.gz) = f2c4a579c186102239411efea17c963c
-MD5 (ghc-4.08.1-x86-hc.tar.gz) = b1d18eeb3f5fdb02a85ef24b40d1bf0d
+MD5 (ghc-4.08.2-src.tar.bz2) = c5199db1c12cc633970dfe920f50244d
+MD5 (ghc-4.08.2-x86-hc.tar.bz2) = d25dd1062b09af699f8361fb35394587
diff --git a/lang/ghc/files/patch-ab b/lang/ghc/files/patch-ab
deleted file mode 100644
index 20f3a9be98ae..000000000000
--- a/lang/ghc/files/patch-ab
+++ /dev/null
@@ -1,100 +0,0 @@
-*** mk/config.mk.in~       Thu Jun  1 12:02:31 2000
---- mk/config.mk.in        Sat Sep  2 16:35:34 2000
-***************
-*** 365,371 ****
-  # this in build.mk or set your environment variable "TMPDIR" to point
-  # to somewhere with more space.  (TMPDIR=. is a good choice).
-  
-! TMPDIR			= /tmp
-  
-  # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-  
---- 365,371 ----
-  # this in build.mk or set your environment variable "TMPDIR" to point
-  # to somewhere with more space.  (TMPDIR=. is a good choice).
-
-! GHC_TMPDIR            = /tmp
-
-  # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-
-*** ghc/driver/Makefile~   Thu Apr 27 12:04:37 2000
---- ghc/driver/Makefile    Sat Sep  2 16:35:43 2000
-***************
-*** 65,71 ****
-  ifeq "$(BIN_DIST)" "1"
-  SCRIPT_PREFIX_FILES=prefix.txt
-  else
-! SCRIPT_SUBST_VARS += libdir includedir libexecdir datadir bindir TMPDIR TOP_PWD
-  endif
-
-  all :: $(DYN_LOADABLE_BITS)
---- 65,71 ----
-  ifeq "$(BIN_DIST)" "1"
-  SCRIPT_PREFIX_FILES=prefix.txt
-  else
-! SCRIPT_SUBST_VARS += libdir includedir libexecdir datadir bindir GHC_TMPDIR TOP_PWD
-  endif
-
-  all :: $(DYN_LOADABLE_BITS)
-*** ghc/driver/ghc.lprl~	Wed Aug  9 14:55:39 2000
---- ghc/driver/ghc.lprl		Sat Sep  2 16:56:16 2000
-***************
-*** 108,114 ****
-  
-  bindir libdir libexecdir datadir
-  
-! CURRENT_DIR TMPDIR
-  
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
-  
---- 108,114 ----
-  
-  bindir libdir libexecdir datadir
-  
-! CURRENT_DIR GHC_TMPDIR
-  
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
-  
-***************
-*** 157,177 ****
-  @INC = ( ( $INSTALLING ) ? $InstLibDirGhc
-  			   : "$TopPwd/${CURRENT_DIR}" );
-  
-! $ENV{'TMPDIR'} = $TMPDIR if $TargetPlatform =~ /^.*(cygwin32|mingw32)$/;
-! if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
-!     # Try to find a $Tmp_prefix which isn't being used...
-!     $tmp = $$;
-!     do {
-!       $Tmp_prefix = ($ENV{'TMPDIR'} . "/ghc$tmp");
-!       $tmp++;
-!     } while ( -e "$Tmp_prefix.hc" ||
-! 	      -e "$Tmp_Prefix.s"  || 
-! 	      -e "$Tmp_Prefix.hi" );
-! } else {
-!     print STDERR "TMPDIR has not been set to anything useful!\n" if (${TMPDIR} eq '');
-!     $Tmp_prefix ="${TMPDIR}/ghc$$"; # TMPDIR set via Makefile when booting..
-!     $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
-  }
-  
-  # Some shells run into real trouble when command line and environment
-  # gets big (e.g., cmd lines of >4K to /bin/sh causes havoc on our 
---- 157,177 ----
-  @INC = ( ( $INSTALLING ) ? $InstLibDirGhc
-  			   : "$TopPwd/${CURRENT_DIR}" );
-  
-! $ENV{'TMPDIR'} = ${GHC_TMPDIR} if $TargetPlatform =~ /^.*(cygwin32|mingw32)$/;
-! if ( ! $ENV{'TMPDIR'} ) {
-!     print STDERR "TMPDIR has not been set to anything useful!\n" if (${GHC_TMPDIR} eq '');
-!     $ENV{'TMPDIR'} = ${GHC_TMPDIR}; # set the env var as well
-  }
-+ # Try to find a $Tmp_prefix which isn't being used...
-+ $tmp = $$;
-+ do {
-+     $Tmp_prefix = ($ENV{'TMPDIR'} . "/ghc$tmp");
-+     $tmp++;
-+ } while ( -e "$Tmp_prefix.hc" ||
-+         -e "$Tmp_Prefix.s"  ||
-+         -e "$Tmp_Prefix.hi" );
-  
-  # Some shells run into real trouble when command line and environment
-  # gets big (e.g., cmd lines of >4K to /bin/sh causes havoc on our 
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index c56fe8a24786..9d673f62243c 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -1,5 +1,5 @@
 bin/ghc
-bin/ghc-4.08.1
+bin/ghc-4.08.2
 bin/ghcprof
 bin/hp2ps
 bin/stat2resid
diff --git a/lang/ghc5/Makefile b/lang/ghc5/Makefile
index 7f125b8bf238..e9e9a335dee6 100644
--- a/lang/ghc5/Makefile
+++ b/lang/ghc5/Makefile
@@ -5,14 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	4.08.1
+PORTVERSION=	4.08.2
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/4.08.1/
+MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX} \
 		ghc-${PORTVERSION}-x86-hc${EXTRACT_SUFX}
 
 MAINTAINER=	simonmar@microsoft.com
 
+USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -21,8 +22,6 @@ CONFIGURE_ARGS= --enable-hc-boot --libdir=${PREFIX}/lib/ghc
 # specifying CONFIGURE_TARGET doesn't work for some reason.
 CONFIGURE_TARGET=
 
-WRKSRC=		${WRKDIR}/fptools
-
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
 TMPDIR = ${WRKSRC}/tmp
diff --git a/lang/ghc5/distinfo b/lang/ghc5/distinfo
index 3ebbea2b26d4..edb7b65a18cb 100644
--- a/lang/ghc5/distinfo
+++ b/lang/ghc5/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-4.08.1-src.tar.gz) = f2c4a579c186102239411efea17c963c
-MD5 (ghc-4.08.1-x86-hc.tar.gz) = b1d18eeb3f5fdb02a85ef24b40d1bf0d
+MD5 (ghc-4.08.2-src.tar.bz2) = c5199db1c12cc633970dfe920f50244d
+MD5 (ghc-4.08.2-x86-hc.tar.bz2) = d25dd1062b09af699f8361fb35394587
diff --git a/lang/ghc5/files/patch-ab b/lang/ghc5/files/patch-ab
deleted file mode 100644
index 20f3a9be98ae..000000000000
--- a/lang/ghc5/files/patch-ab
+++ /dev/null
@@ -1,100 +0,0 @@
-*** mk/config.mk.in~       Thu Jun  1 12:02:31 2000
---- mk/config.mk.in        Sat Sep  2 16:35:34 2000
-***************
-*** 365,371 ****
-  # this in build.mk or set your environment variable "TMPDIR" to point
-  # to somewhere with more space.  (TMPDIR=. is a good choice).
-  
-! TMPDIR			= /tmp
-  
-  # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-  
---- 365,371 ----
-  # this in build.mk or set your environment variable "TMPDIR" to point
-  # to somewhere with more space.  (TMPDIR=. is a good choice).
-
-! GHC_TMPDIR            = /tmp
-
-  # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-
-*** ghc/driver/Makefile~   Thu Apr 27 12:04:37 2000
---- ghc/driver/Makefile    Sat Sep  2 16:35:43 2000
-***************
-*** 65,71 ****
-  ifeq "$(BIN_DIST)" "1"
-  SCRIPT_PREFIX_FILES=prefix.txt
-  else
-! SCRIPT_SUBST_VARS += libdir includedir libexecdir datadir bindir TMPDIR TOP_PWD
-  endif
-
-  all :: $(DYN_LOADABLE_BITS)
---- 65,71 ----
-  ifeq "$(BIN_DIST)" "1"
-  SCRIPT_PREFIX_FILES=prefix.txt
-  else
-! SCRIPT_SUBST_VARS += libdir includedir libexecdir datadir bindir GHC_TMPDIR TOP_PWD
-  endif
-
-  all :: $(DYN_LOADABLE_BITS)
-*** ghc/driver/ghc.lprl~	Wed Aug  9 14:55:39 2000
---- ghc/driver/ghc.lprl		Sat Sep  2 16:56:16 2000
-***************
-*** 108,114 ****
-  
-  bindir libdir libexecdir datadir
-  
-! CURRENT_DIR TMPDIR
-  
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
-  
---- 108,114 ----
-  
-  bindir libdir libexecdir datadir
-  
-! CURRENT_DIR GHC_TMPDIR
-  
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
-  
-***************
-*** 157,177 ****
-  @INC = ( ( $INSTALLING ) ? $InstLibDirGhc
-  			   : "$TopPwd/${CURRENT_DIR}" );
-  
-! $ENV{'TMPDIR'} = $TMPDIR if $TargetPlatform =~ /^.*(cygwin32|mingw32)$/;
-! if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
-!     # Try to find a $Tmp_prefix which isn't being used...
-!     $tmp = $$;
-!     do {
-!       $Tmp_prefix = ($ENV{'TMPDIR'} . "/ghc$tmp");
-!       $tmp++;
-!     } while ( -e "$Tmp_prefix.hc" ||
-! 	      -e "$Tmp_Prefix.s"  || 
-! 	      -e "$Tmp_Prefix.hi" );
-! } else {
-!     print STDERR "TMPDIR has not been set to anything useful!\n" if (${TMPDIR} eq '');
-!     $Tmp_prefix ="${TMPDIR}/ghc$$"; # TMPDIR set via Makefile when booting..
-!     $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
-  }
-  
-  # Some shells run into real trouble when command line and environment
-  # gets big (e.g., cmd lines of >4K to /bin/sh causes havoc on our 
---- 157,177 ----
-  @INC = ( ( $INSTALLING ) ? $InstLibDirGhc
-  			   : "$TopPwd/${CURRENT_DIR}" );
-  
-! $ENV{'TMPDIR'} = ${GHC_TMPDIR} if $TargetPlatform =~ /^.*(cygwin32|mingw32)$/;
-! if ( ! $ENV{'TMPDIR'} ) {
-!     print STDERR "TMPDIR has not been set to anything useful!\n" if (${GHC_TMPDIR} eq '');
-!     $ENV{'TMPDIR'} = ${GHC_TMPDIR}; # set the env var as well
-  }
-+ # Try to find a $Tmp_prefix which isn't being used...
-+ $tmp = $$;
-+ do {
-+     $Tmp_prefix = ($ENV{'TMPDIR'} . "/ghc$tmp");
-+     $tmp++;
-+ } while ( -e "$Tmp_prefix.hc" ||
-+         -e "$Tmp_Prefix.s"  ||
-+         -e "$Tmp_Prefix.hi" );
-  
-  # Some shells run into real trouble when command line and environment
-  # gets big (e.g., cmd lines of >4K to /bin/sh causes havoc on our 
diff --git a/lang/ghc5/pkg-plist b/lang/ghc5/pkg-plist
index c56fe8a24786..9d673f62243c 100644
--- a/lang/ghc5/pkg-plist
+++ b/lang/ghc5/pkg-plist
@@ -1,5 +1,5 @@
 bin/ghc
-bin/ghc-4.08.1
+bin/ghc-4.08.2
 bin/ghcprof
 bin/hp2ps
 bin/stat2resid
diff --git a/lang/ghc6/Makefile b/lang/ghc6/Makefile
index 7f125b8bf238..e9e9a335dee6 100644
--- a/lang/ghc6/Makefile
+++ b/lang/ghc6/Makefile
@@ -5,14 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	4.08.1
+PORTVERSION=	4.08.2
 CATEGORIES=	lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/4.08.1/
+MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX} \
 		ghc-${PORTVERSION}-x86-hc${EXTRACT_SUFX}
 
 MAINTAINER=	simonmar@microsoft.com
 
+USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -21,8 +22,6 @@ CONFIGURE_ARGS= --enable-hc-boot --libdir=${PREFIX}/lib/ghc
 # specifying CONFIGURE_TARGET doesn't work for some reason.
 CONFIGURE_TARGET=
 
-WRKSRC=		${WRKDIR}/fptools
-
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
 TMPDIR = ${WRKSRC}/tmp
diff --git a/lang/ghc6/distinfo b/lang/ghc6/distinfo
index 3ebbea2b26d4..edb7b65a18cb 100644
--- a/lang/ghc6/distinfo
+++ b/lang/ghc6/distinfo
@@ -1,2 +1,2 @@
-MD5 (ghc-4.08.1-src.tar.gz) = f2c4a579c186102239411efea17c963c
-MD5 (ghc-4.08.1-x86-hc.tar.gz) = b1d18eeb3f5fdb02a85ef24b40d1bf0d
+MD5 (ghc-4.08.2-src.tar.bz2) = c5199db1c12cc633970dfe920f50244d
+MD5 (ghc-4.08.2-x86-hc.tar.bz2) = d25dd1062b09af699f8361fb35394587
diff --git a/lang/ghc6/files/patch-ab b/lang/ghc6/files/patch-ab
deleted file mode 100644
index 20f3a9be98ae..000000000000
--- a/lang/ghc6/files/patch-ab
+++ /dev/null
@@ -1,100 +0,0 @@
-*** mk/config.mk.in~       Thu Jun  1 12:02:31 2000
---- mk/config.mk.in        Sat Sep  2 16:35:34 2000
-***************
-*** 365,371 ****
-  # this in build.mk or set your environment variable "TMPDIR" to point
-  # to somewhere with more space.  (TMPDIR=. is a good choice).
-  
-! TMPDIR			= /tmp
-  
-  # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-  
---- 365,371 ----
-  # this in build.mk or set your environment variable "TMPDIR" to point
-  # to somewhere with more space.  (TMPDIR=. is a good choice).
-
-! GHC_TMPDIR            = /tmp
-
-  # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
-
-*** ghc/driver/Makefile~   Thu Apr 27 12:04:37 2000
---- ghc/driver/Makefile    Sat Sep  2 16:35:43 2000
-***************
-*** 65,71 ****
-  ifeq "$(BIN_DIST)" "1"
-  SCRIPT_PREFIX_FILES=prefix.txt
-  else
-! SCRIPT_SUBST_VARS += libdir includedir libexecdir datadir bindir TMPDIR TOP_PWD
-  endif
-
-  all :: $(DYN_LOADABLE_BITS)
---- 65,71 ----
-  ifeq "$(BIN_DIST)" "1"
-  SCRIPT_PREFIX_FILES=prefix.txt
-  else
-! SCRIPT_SUBST_VARS += libdir includedir libexecdir datadir bindir GHC_TMPDIR TOP_PWD
-  endif
-
-  all :: $(DYN_LOADABLE_BITS)
-*** ghc/driver/ghc.lprl~	Wed Aug  9 14:55:39 2000
---- ghc/driver/ghc.lprl		Sat Sep  2 16:56:16 2000
-***************
-*** 108,114 ****
-  
-  bindir libdir libexecdir datadir
-  
-! CURRENT_DIR TMPDIR
-  
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
-  
---- 108,114 ----
-  
-  bindir libdir libexecdir datadir
-  
-! CURRENT_DIR GHC_TMPDIR
-  
-  GHC_LIB_DIR GHC_RUNTIME_DIR GHC_INCLUDE_DIR
-  
-***************
-*** 157,177 ****
-  @INC = ( ( $INSTALLING ) ? $InstLibDirGhc
-  			   : "$TopPwd/${CURRENT_DIR}" );
-  
-! $ENV{'TMPDIR'} = $TMPDIR if $TargetPlatform =~ /^.*(cygwin32|mingw32)$/;
-! if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
-!     # Try to find a $Tmp_prefix which isn't being used...
-!     $tmp = $$;
-!     do {
-!       $Tmp_prefix = ($ENV{'TMPDIR'} . "/ghc$tmp");
-!       $tmp++;
-!     } while ( -e "$Tmp_prefix.hc" ||
-! 	      -e "$Tmp_Prefix.s"  || 
-! 	      -e "$Tmp_Prefix.hi" );
-! } else {
-!     print STDERR "TMPDIR has not been set to anything useful!\n" if (${TMPDIR} eq '');
-!     $Tmp_prefix ="${TMPDIR}/ghc$$"; # TMPDIR set via Makefile when booting..
-!     $ENV{'TMPDIR'} = ${TMPDIR}; # set the env var as well
-  }
-  
-  # Some shells run into real trouble when command line and environment
-  # gets big (e.g., cmd lines of >4K to /bin/sh causes havoc on our 
---- 157,177 ----
-  @INC = ( ( $INSTALLING ) ? $InstLibDirGhc
-  			   : "$TopPwd/${CURRENT_DIR}" );
-  
-! $ENV{'TMPDIR'} = ${GHC_TMPDIR} if $TargetPlatform =~ /^.*(cygwin32|mingw32)$/;
-! if ( ! $ENV{'TMPDIR'} ) {
-!     print STDERR "TMPDIR has not been set to anything useful!\n" if (${GHC_TMPDIR} eq '');
-!     $ENV{'TMPDIR'} = ${GHC_TMPDIR}; # set the env var as well
-  }
-+ # Try to find a $Tmp_prefix which isn't being used...
-+ $tmp = $$;
-+ do {
-+     $Tmp_prefix = ($ENV{'TMPDIR'} . "/ghc$tmp");
-+     $tmp++;
-+ } while ( -e "$Tmp_prefix.hc" ||
-+         -e "$Tmp_Prefix.s"  ||
-+         -e "$Tmp_Prefix.hi" );
-  
-  # Some shells run into real trouble when command line and environment
-  # gets big (e.g., cmd lines of >4K to /bin/sh causes havoc on our 
diff --git a/lang/ghc6/pkg-plist b/lang/ghc6/pkg-plist
index c56fe8a24786..9d673f62243c 100644
--- a/lang/ghc6/pkg-plist
+++ b/lang/ghc6/pkg-plist
@@ -1,5 +1,5 @@
 bin/ghc
-bin/ghc-4.08.1
+bin/ghc-4.08.2
 bin/ghcprof
 bin/hp2ps
 bin/stat2resid