Upgrade to 6.2.1.

Approved by:	maintainer

6 files changed, 16 insertions, 50 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index b777b5c5a271..462cd1859d27 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	6.2
-PORTREVISION=	1
+PORTVERSION=	6.2.1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index c19cd0a0ddf0..0357e7809c21 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,3 +1,6 @@
-MD5 (ghc-6.2-src.tar.bz2) = cc495e263f4384e1d6b38e851bf6eca0
-MD5 (ghc-6.2-i386-unknown-freebsd-boot.tar.bz2) = 4b6665095ce2e43ec08a815c81712bd7
-MD5 (ghc-6.2-i386-unknown-freebsd5-boot.tar.bz2) = 61a369a1f9e8f9461b4545a7140546a3
+MD5 (ghc-6.2.1-src.tar.bz2) = fa9f90fd6b8852679c5fc16509e94d7a
+SIZE (ghc-6.2.1-src.tar.bz2) = 5367409
+MD5 (ghc-6.2.1-i386-unknown-freebsd-boot.tar.bz2) = 8414f11ac59c2b8b4bd19c363a5f6f41
+SIZE (ghc-6.2.1-i386-unknown-freebsd-boot.tar.bz2) = 5647007
+MD5 (ghc-6.2.1-i386-unknown-freebsd5-boot.tar.bz2) = dc3538e580c08a0b3619a18e1f146a71
+SIZE (ghc-6.2.1-i386-unknown-freebsd5-boot.tar.bz2) = 5690738
diff --git a/lang/ghc/files/patch-ghc::rts::Linker.c b/lang/ghc/files/patch-ghc::rts::Linker.c
deleted file mode 100644
index 221101d0b7ef..000000000000
--- a/lang/ghc/files/patch-ghc::rts::Linker.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ghc/rts/Linker.c.orig	Tue Dec 16 17:58:26 2003
-+++ ghc/rts/Linker.c	Tue Jan 13 16:47:50 2004
-@@ -10,6 +10,12 @@
- #if 0
- #include "PosixSource.h"
- #endif
-+
-+//  Linux needs _GNU_SOURCE to get RTLD_DEFAULT from <dlfcn.h>.
-+#ifdef __linux__
-+#define _GNU_SOURCE
-+#endif
-+
- #include "Rts.h"
- #include "RtsFlags.h"
- #include "HsFFI.h"
-@@ -694,7 +700,11 @@
- #   endif
- 
- #   if defined(OBJFORMAT_ELF) || defined(OBJFORMAT_MACHO)
-+#   if defined(RTLD_DEFAULT)
-+    dl_prog_handle = RTLD_DEFAULT;
-+#   else
-     dl_prog_handle = dlopen(NULL, RTLD_LAZY);
-+#   endif // RTLD_DEFAULT
- #   endif
- }
- 
diff --git a/lang/ghc/files/patch-ghc::rts::package.conf.in b/lang/ghc/files/patch-ghc::rts::package.conf.in
index a1876bd9b395..479d7f2fc168 100644
--- a/lang/ghc/files/patch-ghc::rts::package.conf.in
+++ b/lang/ghc/files/patch-ghc::rts::package.conf.in
@@ -1,10 +1,10 @@
---- ghc/rts/package.conf.in.orig	Tue Dec 16 17:58:38 2003
-+++ ghc/rts/package.conf.in	Thu Jan 15 00:00:31 2004
-@@ -140,6 +140,7 @@
+--- ghc/rts/package.conf.in.orig	Mon Mar  1 16:26:29 2004
++++ ghc/rts/package.conf.in	Mon Mar 22 22:07:53 2004
+@@ -131,6 +131,7 @@
           , "-u", "GHCziWeak_runFinalizzerBatch_closure"
           , "-u", "__stginit_Prelude"
  #endif
 +         , "-L%%LOCALBASE%%/lib"
- #if defined(THREADED_RTS) && defined(freebsd_TARGET_OS)
- 	 , "-pthread"
- #endif
+          ]
+ #ifdef HAVE_FRAMEWORK_HASKELLSUPPORT
+         , extra_frameworks  = [ "HaskellSupport" ]
diff --git a/lang/ghc/files/patch-libraries::base::GHC::Unicode.hsc b/lang/ghc/files/patch-libraries::base::GHC::Unicode.hsc
deleted file mode 100644
index 0941605a36e6..000000000000
--- a/lang/ghc/files/patch-libraries::base::GHC::Unicode.hsc
+++ /dev/null
@@ -1,11 +0,0 @@
---- libraries/base/GHC/Unicode.hsc.orig	Mon Oct 20 12:12:20 2003
-+++ libraries/base/GHC/Unicode.hsc	Mon Jan 12 23:32:22 2004
-@@ -112,7 +112,7 @@
- -- -----------------------------------------------------------------------------
- -- Win32 implementation
- 
--#if (defined(HAVE_WCTYPE_H) && HAVE_ISWSPACE) || mingw32_TARGET_OS
-+#if (defined(HAVE_WCTYPE_H) && HAVE_ISWSPACE && defined(HTYPE_WINT_T)) || mingw32_TARGET_OS
- 
- -- Use the wide-char classification functions if available.  Glibc
- -- seems to implement these properly, even for chars > 0xffff, as long
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index 739c76c89785..5871104ece8a 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -826,7 +826,6 @@ lib/ghc-%%GHC_VERSION%%/include/Updates.h
 lib/ghc-%%GHC_VERSION%%/include/config.h
 lib/ghc-%%GHC_VERSION%%/include/consUtils.h
 lib/ghc-%%GHC_VERSION%%/include/dirUtils.h
-lib/ghc-%%GHC_VERSION%%/include/ghc_errno.h
 lib/ghc-%%GHC_VERSION%%/include/gmp.h
 lib/ghc-%%GHC_VERSION%%/include/ieee-flpt.h
 lib/ghc-%%GHC_VERSION%%/include/lockFile.h
@@ -862,6 +861,9 @@ lib/ghc-%%GHC_VERSION%%/libHSreadline.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSreadline_p.a
 lib/ghc-%%GHC_VERSION%%/libHSrts.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHSrts_p.a
+lib/ghc-%%GHC_VERSION%%/libHSrts_debug.a
+lib/ghc-%%GHC_VERSION%%/libHSrts_thr.a
+lib/ghc-%%GHC_VERSION%%/libHSrts_thr_p.a
 lib/ghc-%%GHC_VERSION%%/libHStext.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/libHStext_p.a
 lib/ghc-%%GHC_VERSION%%/libHSunix.a