diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2022-07-21 07:24:02 +0000 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2022-07-27 14:55:50 +0000 |
| commit | 22d118e2620c44b6273ea00be51a5fcdfcf1c604 (patch) | |
| tree | 5cb2acb23e31a6e965567c32677ad13c3fd71373 /Mk/Uses | |
| parent | 4ad8bbf22f2b9aaa79caccba7559b058245e12a7 (diff) | |
| download | ports-22d118e2620c44b6273ea00be51a5fcdfcf1c604.tar.gz ports-22d118e2620c44b6273ea00be51a5fcdfcf1c604.zip | |
Uses/cabal.mk: Simplify EXTRACT_ONLY setting.
Adapt ports that were using hacks to set EXTRACT_ONLY.
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/cabal.mk | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index dd7f0d917dbe..2037696ab369 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -109,14 +109,6 @@ _hackage_is_default= no MASTER_SITES= https://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ \ http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ DISTFILES+= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} -EXTRACT_ONLY+= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} -. else -. if defined(USE_GITHUB) && !defined(DISTFILES) && !${USE_GITHUB:Mnodefault} -EXTRACT_ONLY+= ${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX} -. endif -. if defined(USE_GITLAB) && !defined(DISTFILES) && !${USE_GITLAB:Mnodefault} -EXTRACT_ONLY+= ${DISTNAME}${_GITLAB_EXTRACT_SUFX} -. endif . endif _USES_extract= 701:cabal-post-extract @@ -141,16 +133,18 @@ 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 +_CABAL_EXTRACT_ONLY+= ${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${CABAL_EXTRACT_SUFX} . endfor +. if !defined(EXTRACT_ONLY) +EXTRACT_ONLY= ${_DISTFILES:N*\.cabal} +. else +EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} +. endif # Auxiliary targets used during port creation/updating. |