X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=3c84795fe323ee2a7ffb0f46c77072641ef67f7c;hb=8fd9625d781bdadbe322ce5f2bef150601114481;hp=54cad06f359bb72de2c5f18395f54925f5457c27;hpb=8f74aa5ba1400cc8f2dac567fef45b1916929b3b;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index 54cad06..3c84795 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,8 @@ COMMENT=		Compiler for the functional language Haskell
 LICENSE=		modified-bsd
 
 DISTFILES=		${DISTNAME}-src.tar.bz2 \
-				${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
-#				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 \
 				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 \
+				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 \
 				${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
 
 SITES.${DISTNAME}-src.tar.bz2						= http://www.haskell.org/ghc/dist/${VERSION}/
@@ -100,7 +99,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 && \
@@ -180,11 +179,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"