svn commit: r559679 - in head: Mk/Uses devel/elm-format devel/stack lang/elm math/hs-penrose net-im/matterhorn sysutils/hs-cputype x11/conlecterm
Gleb Popov
arrowd at FreeBSD.org
Wed Dec 30 18:57:34 UTC 2020
Author: arrowd
Date: Wed Dec 30 18:57:32 2020
New Revision: 559679
URL: https://svnweb.freebsd.org/changeset/ports/559679
Log:
Uses/cabal.mk: Set EXTRACT_ONLY based on DISTFILES value, just like bsd.port.mk does.
This removes the need for specifying EXTRACT_ONLY for Haskell ports that have USE_{GITHUB,GITLAB}.
PR: 244784
Modified:
head/Mk/Uses/cabal.mk
head/devel/elm-format/Makefile
head/devel/stack/Makefile
head/lang/elm/Makefile
head/math/hs-penrose/Makefile
head/net-im/matterhorn/Makefile
head/sysutils/hs-cputype/Makefile
head/x11/conlecterm/Makefile
Modified: head/Mk/Uses/cabal.mk
==============================================================================
--- head/Mk/Uses/cabal.mk Wed Dec 30 18:08:28 2020 (r559678)
+++ head/Mk/Uses/cabal.mk Wed Dec 30 18:57:32 2020 (r559679)
@@ -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,15 +100,16 @@ _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}
. 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}
Modified: head/devel/elm-format/Makefile
==============================================================================
--- head/devel/elm-format/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/devel/elm-format/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -4,7 +4,6 @@ PORTNAME= elm-format
PORTVERSION= 0.8.3
PORTREVISION= 2
CATEGORIES= devel textproc
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= haskell at FreeBSD.org
COMMENT= Elm source code formatter based on the official Elm Style Guide
Modified: head/devel/stack/Makefile
==============================================================================
--- head/devel/stack/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/devel/stack/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -5,7 +5,6 @@ PORTNAME= stack
PORTVERSION= 2.5.1
DISTVERSIONPREFIX= v
CATEGORIES= devel haskell
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= haskell at FreeBSD.org
COMMENT= Cross-platform program for developing Haskell programs
Modified: head/lang/elm/Makefile
==============================================================================
--- head/lang/elm/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/lang/elm/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -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 at FreeBSD.org
COMMENT= Delightful language for reliable webapps
Modified: head/math/hs-penrose/Makefile
==============================================================================
--- head/math/hs-penrose/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/math/hs-penrose/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -6,7 +6,6 @@ DISTVERSION= 0.1-737
DISTVERSIONSUFFIX= -gb336c8d
PORTREVISION= 3
CATEGORIES= math haskell
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= yuri at FreeBSD.org
COMMENT= Create diagrams by typing mathematical notation in plain text
Modified: head/net-im/matterhorn/Makefile
==============================================================================
--- head/net-im/matterhorn/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/net-im/matterhorn/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -3,7 +3,6 @@
PORTNAME= matterhorn
PORTVERSION= 50200.10.1
CATEGORIES= net-im
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= haskell at FreeBSD.org
COMMENT= Feature-rich Unix terminal client for the Mattermost chat system
Modified: head/sysutils/hs-cputype/Makefile
==============================================================================
--- head/sysutils/hs-cputype/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/sysutils/hs-cputype/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -3,7 +3,6 @@
PORTNAME= cputype
PORTVERSION= 0.2.1
CATEGORIES= sysutils haskell
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= arrowd at FreeBSD.org
COMMENT= Find out your CPUTYPE
Modified: head/x11/conlecterm/Makefile
==============================================================================
--- head/x11/conlecterm/Makefile Wed Dec 30 18:08:28 2020 (r559678)
+++ head/x11/conlecterm/Makefile Wed Dec 30 18:57:32 2020 (r559679)
@@ -4,7 +4,6 @@ PORTNAME= conlecterm
PORTVERSION= 1.4.3.0
DISTVERSIONPREFIX= v
CATEGORIES= x11
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= hsw at bitmark.com
COMMENT= Multi tabbed terminal for rxvt/xterm/emacs
More information about the svn-ports-all
mailing list