Merge ssh://www@nem.cielonegro.org/home/www/git.cielonegro.org/htdocs/pkgsrc-ghc

diff --git a/Makefile b/Makefile
index f54ed3748edb8c0701478018545e6c3af9c9acda..a732e84192e3686506f1098420780c49b4993151 100644 (file)
--- 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.3
+VERSION=               6.10.4
 CATEGORIES=            lang
 MASTER_SITES=  http://www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=            kristerw@NetBSD.org
@@ -51,7 +51,7 @@ CONFIGURE_ARGS += --with-gmp-libraries=${PREFIX}/lib
 # because we don't build it in a standard way (./configure && make).
 #
 # To install it, we search for any non-symlink executables in
-# work/ghc-6.4.2 whose name ends with "-inplace". Then copy those
+# work/ghc-6.6.1 whose name ends with "-inplace". Then copy those
 # files into ${BUILDLINK_DIR}/bin with dropping the "-inplace" at
 # their tails.
 pre-configure:

diff --git a/distinfo b/distinfo
index 229f48b1b43cdf66befdc87af2322855f532397d..ae2af555129eda3524fddd803a635506aa0ec36f 100644 (file)
--- 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.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.10.4-src.tar.bz2) = 0566858b409066d98da70de5adb9a7030d0df5dc
+RMD160 (ghc-6.10.4-src.tar.bz2) = 5f83baf2549f1f4bea140c6a80728c2a76f60ab6
+Size (ghc-6.10.4-src.tar.bz2) = 8060565 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