Date: Mon, 31 Aug 2015 05:39:42 +0000 (UTC) From: Gabor Pali <pgj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395649 - head/lang/ghc Message-ID: <201508310539.t7V5dgc0058970@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pgj Date: Mon Aug 31 05:39:41 2015 New Revision: 395649 URL: https://svnweb.freebsd.org/changeset/ports/395649 Log: - Remove the deprecated USE_AUTOTOOLS variable - Improve interaction with USE_GITHUB in bsd.cabal.mk that fixes the build of math/hs-Agda-stdlib Obtained from: FreeBSD Haskell Modified: head/lang/ghc/Makefile head/lang/ghc/bsd.cabal.mk Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Mon Aug 31 04:42:58 2015 (r395648) +++ head/lang/ghc/Makefile Mon Aug 31 05:39:41 2015 (r395649) @@ -29,9 +29,8 @@ CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp -USE_AUTOTOOLS= autoconf autoheader USE_PERL5= build -USES= gmake iconv:translit ncurses perl5 tar:xz +USES= autoreconf gmake iconv:translit ncurses perl5 tar:xz MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 # This is needed on FreeBSD 9.x due to the bootstrap tarball. Modified: head/lang/ghc/bsd.cabal.mk ============================================================================== --- head/lang/ghc/bsd.cabal.mk Mon Aug 31 04:42:58 2015 (r395648) +++ head/lang/ghc/bsd.cabal.mk Mon Aug 31 05:39:41 2015 (r395649) @@ -9,13 +9,16 @@ # Maintained by: haskell@FreeBSD.org # -.if !defined(METAPORT) +.if !defined(METAPORT) && !defined(USE_GITHUB) MASTER_SITES?= http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/:hackage DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:hackage -DIST_SUBDIR?= cabal EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX} -.else +.endif + +.if defined(METAPORT) USES+= metaport +.else +DIST_SUBDIR?= cabal .endif # !METAPORT MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508310539.t7V5dgc0058970>