diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2021-01-04 11:31:37 +0000 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2021-01-04 11:31:37 +0000 |
| commit | 41d66222fbe9eb9b8e0d6186a4b28ce8fc2e4439 (patch) | |
| tree | 04a550c1e2ce4b2fe8b055552e96dc5878b69c1d /Mk/Uses | |
| parent | 713c3be30011a83fcf2c64497d9064a39d59be74 (diff) | |
| download | ports-41d66222fbe9eb9b8e0d6186a4b28ce8fc2e4439.tar.gz ports-41d66222fbe9eb9b8e0d6186a4b28ce8fc2e4439.zip | |
Uses/cabal.mk: More correct fix for EXTRACT_ONLY problem from r559679.
Notes
Notes:
svn path=/head/; revision=560282
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/cabal.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 9b9b8e272a17..0a5d699b7d6a 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -80,6 +80,8 @@ MASTER_SITES?= https://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ \ 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/:${package:C/[\.-]//g} \ 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} |