From owner-freebsd-haskell@freebsd.org Tue Mar 24 16:41:54 2020 Return-Path: Delivered-To: freebsd-haskell@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 C5B3F26195E for ; Tue, 24 Mar 2020 16:41:54 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48mxq61x3cz4f8b for ; Tue, 24 Mar 2020 16:41:54 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9239126193A; Tue, 24 Mar 2020 16:41:45 +0000 (UTC) Delivered-To: haskell@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 8C2C0261938 for ; Tue, 24 Mar 2020 16:41:45 +0000 (UTC) (envelope-from bugzilla-noreply@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) server-signature RSA-PSS (4096 bits) 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 48mxpt6NRMz4dyr for ; Tue, 24 Mar 2020 16:41:42 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E262725EE for ; Tue, 24 Mar 2020 16:30:27 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 02OGUR48000545 for ; Tue, 24 Mar 2020 16:30:27 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 02OGURrS000544 for haskell@FreeBSD.org; Tue, 24 Mar 2020 16:30:27 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: haskell@FreeBSD.org Subject: [Bug 244784] Mk/Uses/cabal.mk: GitHub-based Haskell ports list the main tarball twice in distinfo Date: Tue, 24 Mar 2020 16:30:27 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Ports Framework X-Bugzilla-Version: Latest X-Bugzilla-Keywords: needs-patch, needs-qa X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: arrowd@FreeBSD.org X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: haskell@FreeBSD.org X-Bugzilla-Flags: merge-quarterly? X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-haskell@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FreeBSD-specific Haskell issues and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2020 16:41:55 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D244784 --- Comment #2 from Gleb Popov --- Here is my try, but it obviously handles only GitHub and Gitlab: diff --git Mk/Uses/cabal.mk Mk/Uses/cabal.mk index 85d2a6a38e66..4e2316b01326 100644 --- Mk/Uses/cabal.mk +++ Mk/Uses/cabal.mk @@ -74,10 +74,15 @@ LIB_DEPENDS+=3D libgmp.so:math/gmp \ DIST_SUBDIR?=3D cabal +. if !defined(USE_GITHUB) && !defined(USE_GITLAB) MASTER_SITES?=3D https://hackage.haskell.org/package/${PORTNAME}-${PORTVER= SION}/ \ http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSIO= N}/ DISTFILES?=3D ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} EXTRACT_ONLY?=3D ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} +. endif +. elif defined(USE_GITLAB) +EXTRACT_ONLY?=3D ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL0${EXTRACT_SUF= X} +. endif _USES_extract=3D 701:cabal-post-extract _USES_patch=3D 701:cabal-post-patch --=20 You are receiving this mail because: You are the assignee for the bug.=