Date: Mon, 4 Jan 2021 11:31:38 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560282 - head/Mk/Uses Message-ID: <202101041131.104BVciP087331@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Mon Jan 4 11:31:37 2021 New Revision: 560282 URL: https://svnweb.freebsd.org/changeset/ports/560282 Log: Uses/cabal.mk: More correct fix for EXTRACT_ONLY problem from r559679. Modified: head/Mk/Uses/cabal.mk Modified: head/Mk/Uses/cabal.mk ============================================================================== --- head/Mk/Uses/cabal.mk Mon Jan 4 10:59:09 2021 (r560281) +++ head/Mk/Uses/cabal.mk Mon Jan 4 11:31:37 2021 (r560282) @@ -80,6 +80,8 @@ MASTER_SITES?= https://hackage.haskell.org/package/${P DISTFILES?= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} . endif +EXTRACT_ONLY?= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} + _USES_extract= 701:cabal-post-extract _USES_patch= 701:cabal-post-patch _USES_stage= 751:cabal-post-install-script @@ -101,15 +103,16 @@ MASTER_SITES+= https://hackage.haskell.org/package/:${ http://hackage.haskell.org/package/:${package:C/[\.-]//g} DISTFILES+= ${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX}:${package:C/[\.-]//g} +. if !defined(CABAL_BOOTSTRAP) +EXTRACT_ONLY+= ${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX} +. endif + . if ${package:C/[^_]*//:S/_//} != "" DISTFILES+= ${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal:${package:C/[\.-]//g} . endif . endfor -. if !defined(CABAL_BOOTSTRAP) -EXTRACT_ONLY= ${DISTFILES:C/:.*//:N*\.cabal} -. endif # Fetches and unpacks package source from Hackage using only PORTNAME and PORTVERSION. cabal-extract: ${WRKDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101041131.104BVciP087331>