cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses/cabal.mk: Set EXTRACT_ONLY based on DISTFILES value, just like bsd.port.mk does.

Browse Source 
This removes the need for specifying EXTRACT_ONLY for Haskell ports that have USE_{GITHUB,GITLAB}.

PR:		244784
This commit is contained in:
Gleb Popov 2020-12-30 18:57:32 +00:00
parent d2630f9e50
commit 08a23e2c83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=559679
8 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mk/Uses/cabal.mk
View File

@ -78,7 +78,6 @@ DIST_SUBDIR?= cabal
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}
. endif
_USES_extract= 701:cabal-post-extract
@ -101,9 +100,6 @@ _REV= ${package:C/[^_]*//:S/_//}
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}
@ -111,6 +107,10 @@ DISTFILES+= ${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal:${p
. 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}
${RM} -rf ${CABAL_HOME}/.cabal

1
devel/elm-format/Makefile
View File

@ -4,7 +4,6 @@ PORTNAME= elm-format
PORTVERSION= 0.8.3
PORTREVISION= 2
CATEGORIES= devel textproc
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= haskell@FreeBSD.org
COMMENT= Elm source code formatter based on the official Elm Style Guide

1
devel/stack/Makefile
View File

@ -5,7 +5,6 @@ PORTNAME= stack
PORTVERSION= 2.5.1
DISTVERSIONPREFIX= v
CATEGORIES= devel haskell
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= haskell@FreeBSD.org
COMMENT= Cross-platform program for developing Haskell programs

2
lang/elm/Makefile
View File

@ -6,8 +6,6 @@ PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= LOCAL/arrowd/:package_list
DISTFILES= elm-compiler-bootstrap-${PORTVERSION}${EXTRACT_SUFX}:package_list
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
elm-compiler-bootstrap-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= haskell@FreeBSD.org
COMMENT= Delightful language for reliable webapps

1
math/hs-penrose/Makefile
View File

@ -6,7 +6,6 @@ DISTVERSION= 0.1-737
DISTVERSIONSUFFIX= -gb336c8d
PORTREVISION= 3
CATEGORIES= math haskell
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= yuri@FreeBSD.org
COMMENT= Create diagrams by typing mathematical notation in plain text

1
net-im/matterhorn/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= matterhorn
PORTVERSION= 50200.10.1
CATEGORIES= net-im
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= haskell@FreeBSD.org
COMMENT= Feature-rich Unix terminal client for the Mattermost chat system

1
sysutils/hs-cputype/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= cputype
PORTVERSION= 0.2.1
CATEGORIES= sysutils haskell
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= arrowd@FreeBSD.org
COMMENT= Find out your CPUTYPE

1
x11/conlecterm/Makefile
View File

@ -4,7 +4,6 @@ PORTNAME= conlecterm
PORTVERSION= 1.4.3.0
DISTVERSIONPREFIX= v
CATEGORIES= x11
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= hsw@bitmark.com
COMMENT= Multi tabbed terminal for rxvt/xterm/emacs