From: PHO <pho@cielonegro.org>
Date: Sun, 28 Jun 2009 12:44:26 +0000 (+0900)
Subject: upstream update to 6.10.3
X-Git-Tag: GHC-6.12.1~12
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=59f2175138d2f58b8993738ad56778bc85e409f3;p=pkgsrc-ghc.git

upstream update to 6.10.3
---

diff --git a/Makefile b/Makefile
index f178a5c..4bf1b2c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=		ghc-${VERSION}
-VERSION=		6.10.1
+VERSION=		6.10.3
 CATEGORIES=		lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=		kristerw@NetBSD.org
@@ -61,11 +61,13 @@ pre-configure:
 # as long than when the files are not split.  See
 #    http://mail-index.netbsd.org/tech-pkg/2006/07/30/0005.html
 # for a description of the problem.
-# Disable file splitting until pkgsrc has been improved.
+# Disable file splitting until pkgsrc gets improved.
 pre-build:
 	${ECHO} "SplitObjs=NO" > ${WRKSRC}/mk/build.mk
 
+# Some unused scripts don't pass the portability test.
+CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
+
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../wip/editline/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/buildlink3.mk b/buildlink3.mk
index 72881f6..7119437 100644
--- a/buildlink3.mk
+++ b/buildlink3.mk
@@ -5,11 +5,10 @@ BUILDLINK_TREE+=	ghc
 .if !defined(GHC_BUILDLINK3_MK)
 GHC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ghc+=	ghc>=6.10.1
+BUILDLINK_API_DEPENDS.ghc+=	ghc>=6.10.3
 BUILDLINK_PKGSRCDIR.ghc?=	../../wip/ghc
 
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../wip/editline/buildlink3.mk"
 .endif	# GHC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ghc
diff --git a/distinfo b/distinfo
index 4c39557..229f48b 100644
--- a/distinfo
+++ b/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.22 2008/07/07 14:58:00 kristerw Exp $
 
-SHA1 (ghc-6.10.1-src.tar.bz2) = 5b3759d6a1177f0cc8f754673b52bfd31923280f
-RMD160 (ghc-6.10.1-src.tar.bz2) = 4768e7246edd494367232e3af030ffed77990c10
-Size (ghc-6.10.1-src.tar.bz2) = 9590409 bytes
+SHA1 (ghc-6.10.3-src.tar.bz2) = 598bef94c99011a4f6791b8fbb7153ba7dffaf92
+RMD160 (ghc-6.10.3-src.tar.bz2) = 90b01fefd474a64cf6b6b507f224abf6250745d3
+Size (ghc-6.10.3-src.tar.bz2) = 8059285 bytes
 SHA1 (ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz) = 48ff45c34bc1ad8c0a6cbbe1f9c36cabbb720912
 RMD160 (ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz) = 0df10237ebeeb7100e84778fef862baed815650d
 Size (ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz) = 11278184 bytes