From owner-svn-ports-head@FreeBSD.ORG Tue Jan 22 10:52:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 21EF4534; Tue, 22 Jan 2013 10:52:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0F4AB8EA; Tue, 22 Jan 2013 10:52:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0MAqbjC020545; Tue, 22 Jan 2013 10:52:37 GMT (envelope-from pgj@svn.freebsd.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0MAqbwD020542; Tue, 22 Jan 2013 10:52:37 GMT (envelope-from pgj@svn.freebsd.org) Message-Id: <201301221052.r0MAqbwD020542@svn.freebsd.org> From: Gabor Pali Date: Tue, 22 Jan 2013 10:52:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310825 - head/lang/ghc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 10:52:38 -0000 Author: pgj Date: Tue Jan 22 10:52:37 2013 New Revision: 310825 URL: http://svnweb.freebsd.org/changeset/ports/310825 Log: - Fix configure flags for the bootstrap compiler, so now it works for clang-only base systems too [1] - Allow to use GCC 4.6 and later (requested by: gerald) - Add USE_NCURSES, so now it can pick up ports ncurses when installed - Fix COMMENT to comply with the Porter's Handbook PR: ports/161356 [1] Submitted by: David Marker (reworked by: ashish) [1] Obtained from: FreeBSD Haskell Modified: head/lang/ghc/Makefile head/lang/ghc/bsd.cabal.mk Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Tue Jan 22 10:51:18 2013 (r310824) +++ head/lang/ghc/Makefile Tue Jan 22 10:52:37 2013 (r310825) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= pgj/:boot DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source MAINTAINER= haskell@FreeBSD.org -COMMENT= A Compiler for the functional language Haskell +COMMENT= Compiler for the functional language Haskell ONLY_FOR_ARCHS= i386 amd64 @@ -30,7 +30,8 @@ USE_PERL5_BUILD= yes USE_GMAKE= yes USE_ICONV= yes USE_BINUTILS= yes -USE_GCC= 4.6 +USE_GCC= 4.6+ +USE_NCURSES= yes LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE @@ -121,7 +122,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} -CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} CC=${CC} +CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} --with-gcc=${CC} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT @@ -201,13 +202,13 @@ post-extract: .else @${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}" .endif - @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I/usr/include -L/usr/lib -I${LOCALBASE}/include -L${LOCALBASE}/lib" + @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${LOCALBASE}/include" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib" - @${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=/usr/include --configure-option=--with-curses-libraries=/usr/lib" + @${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}" # @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot" # @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_TAR = ghc-\$$(ProjectVersion)-amd64-ash0-freebsd8-boot.tar" Modified: head/lang/ghc/bsd.cabal.mk ============================================================================== --- head/lang/ghc/bsd.cabal.mk Tue Jan 22 10:51:18 2013 (r310824) +++ head/lang/ghc/bsd.cabal.mk Tue Jan 22 10:52:37 2013 (r310825) @@ -81,7 +81,7 @@ BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PO .endif USE_BINUTILS= yes -USE_GCC= 4.6 +USE_GCC= 4.6+ .if ${PORT_OPTIONS:MDYNAMIC} LIB_DEPENDS+= ffi.5:${PORTSDIR}/devel/libffi