X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=b44037cd2f93a5b42ecbbd586aafcac3961df9f2;hb=6c2af7a9e78b9a7fa23710be97688432d32c33c2;hp=abe6b8572c18b14e2375b44a4b62a0b3a2413e8d;hpb=72c1e5fcc2575e0634e3e3a1395cc40eb0151688;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index abe6b85..b44037c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
 # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=		ghc-${VERSION}
-VERSION=		6.12.2
+VERSION=		6.12.3
 CATEGORIES=		lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
+MASTER_SITES=	http://darcs.haskell.org/download/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 \
-				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 \
-				${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
-#				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+DISTFILES=		${DISTNAME}-src.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
+
 
-SITES.${DISTNAME}-src.tar.bz2						= http://www.haskell.org/ghc/dist/${VERSION}/
 SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2	= http://static.cielonegro.org/archive/
@@ -31,8 +31,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
 
 # We must provide the real pass to gcc to the ./configure script,
-# because GHC has a runtime dependency on it. Aren't there any better
-# way than this?
+# because GHC has a runtime dependency on it. Aren't there any ways
+# better than this?
 .include "../../mk/compiler.mk"
 .if empty(CCPATH)
 WARNINGS+= "This package depends on pkgsrc's undocumented variable\
@@ -80,6 +80,8 @@ PLATFORM           = i386-unknown-freebsd
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
 PLATFORM           = powerpc-apple-darwin
+WARNINGS+= "You won't be able to use GHCi library for GHC itself\
+because of Mach-O limitation."
 
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE)
@@ -99,7 +101,7 @@ pre-configure:
 		cd bootstrap/${DISTNAME} && \
 		${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \
 		${ECHO} "====> Configuring for bootstrap compiler" && \
-		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \
+		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot --with-ghc="" ${CONFIGURE_ARGS} && \
 		${ECHO} "====> Extracting bootstrap HC archive" && \
 		(cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
 		${SH} mkfiles && \
@@ -153,24 +155,6 @@ do-configure:
 	${RUN} ${ECHO} "GhcRtsCcOpts = -O0 -g" >> ${WRKSRC}/mk/build.mk
 .endif
 
-pre-build:
-# We have to sacrifice the GHCi library for GHC itself to work around
-# for powerpc ld bug.  See
-# http://hackage.haskell.org/trac/ghc/ticket/3260
-.if ${MACHINE_ARCH} == "powerpc"
-	${RUN} ${MKDIR} ${WRKSRC}/compiler/stage1/build
-	${RUN} ${TOUCH} -t `expr \`date '+%Y'\` + 1`12310000 \
-					${WRKSRC}/compiler/stage1/build/HS${DISTNAME}.o
-	${RUN} ${MKDIR} ${WRKSRC}/compiler/stage2/build
-	${RUN} ${TOUCH} -t `expr \`date '+%Y'\` + 1`12310000 \
-					${WRKSRC}/compiler/stage2/build/HS${DISTNAME}.o
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-WARNINGS+= "You won't be able to use GHCi library for GHC itself\
-because of powerpc ld bug."
-.endif
-
 # Some unused scripts don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 
@@ -179,11 +163,14 @@ CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 CHECK_SHLIBS_SUPPORTED= 	no
 
+# I guess pdcurses works well but not tested.
+USE_NCURSES=	yes
+.include "../../devel/ncurses/buildlink3.mk"
+
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILDLINK_DEPMETHOD.libxslt = build
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk" # I guess pdcurses works well but not tested.
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"