From owner-svn-ports-head@freebsd.org  Mon Jan  4 11:31:38 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B5324D1D46;
 Mon,  4 Jan 2021 11:31:38 +0000 (UTC)
 (envelope-from arrowd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D8YP629Mkz4Z65;
 Mon,  4 Jan 2021 11:31:38 +0000 (UTC)
 (envelope-from arrowd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D3E418F66;
 Mon,  4 Jan 2021 11:31:38 +0000 (UTC)
 (envelope-from arrowd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 104BVceP087332;
 Mon, 4 Jan 2021 11:31:38 GMT (envelope-from arrowd@FreeBSD.org)
Received: (from arrowd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 104BVciP087331;
 Mon, 4 Jan 2021 11:31:38 GMT (envelope-from arrowd@FreeBSD.org)
Message-Id: <202101041131.104BVciP087331@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arrowd set sender to
 arrowd@FreeBSD.org using -f
From: Gleb Popov <arrowd@FreeBSD.org>
Date: Mon, 4 Jan 2021 11:31:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r560282 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: arrowd
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 560282
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2021 11:31:38 -0000

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}