X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=a732e84192e3686506f1098420780c49b4993151;hb=4438f821ea049c5784b1afb1caffe5b76cdcb643;hp=f178a5c164156cef875629079ed2e102d847f1ca;hpb=2f210ad08cf0e8cd1092e891991b807cb21d3b29;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index f178a5c..a732e84 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=		ghc-${VERSION}
-VERSION=		6.10.1
+VERSION=		6.10.4
 CATEGORIES=		lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://www.haskell.org/ghc/
 COMMENT=		Compiler for the functional language Haskell
+LICENSE=		modified-bsd
 
 DISTFILES=		${DISTNAME}-src.tar.bz2 \
 				ghc-6.6.1-src.tar.bz2 \
@@ -17,6 +18,8 @@ SITES.ghc-6.6.1-src.tar.bz2						= http://www.haskell.org/ghc/dist/6.6.1/
 SITES.ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz	= http://static.cielonegro.org/archive/
 SITES.ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz	= http://static.cielonegro.org/archive/
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 # Unregisterised HC packages are architecture dependent. We have to
@@ -37,12 +40,18 @@ EXTRACT_ONLY += ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz
 EXTRACT_ONLY += ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz
 .endif
 
+# We need to tell the ./configure that libgmp is in a non-standard path. Without
+# that, the resulting GHC tries to link programs by executing ld(1) without
+# passing it -L${PREFIX}/lib.
+CONFIGURE_ARGS += --with-gmp-includes=${PREFIX}/include
+CONFIGURE_ARGS += --with-gmp-libraries=${PREFIX}/lib
+
 # Build an unregisterised bootstrap compiler and install it directly
 # into the .buildlink directory. But we can't use "make install"
 # 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:
@@ -61,11 +70,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"