From owner-dev-commits-ports-all@freebsd.org Tue May 11 13:40:05 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 A7D7C638931; Tue, 11 May 2021 13:40:05 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FffDj4NNNz3tw5; Tue, 11 May 2021 13:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8966419041; Tue, 11 May 2021 13:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14BDe560032153; Tue, 11 May 2021 13:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BDe5n4032150; Tue, 11 May 2021 13:40:05 GMT (envelope-from git) Date: Tue, 11 May 2021 13:40:05 GMT Message-Id: <202105111340.14BDe5n4032150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 267d8dc26c4c - main - framework: Fixup USE_GITHUB when version has multiple + signs. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 267d8dc26c4c3126c0171f94cfee73f6689daa67 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 13:40:05 -0000 The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=267d8dc26c4c3126c0171f94cfee73f6689daa67 commit 267d8dc26c4c3126c0171f94cfee73f6689daa67 Author: Mathieu Arnold AuthorDate: 2021-05-11 13:37:07 +0000 Commit: Mathieu Arnold CommitDate: 2021-05-11 13:38:55 +0000 framework: Fixup USE_GITHUB when version has multiple + signs. --- Mk/bsd.sites.mk | 2 +- math/mpfrc++/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index c205a378865a..ba3124b51421 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -434,7 +434,7 @@ GH_SUBDIR:= ${GH_SUBDIR_DEFAULT} GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,g} # GitHub silently converts tags starting with v to not have v in the filename # and extraction directory. It also replaces + with -. -GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g} +GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g:C/--*/-/g} . endif # This new scheme rerolls distfiles. Also ensure they are renamed to avoid # conflicts. Use _GITHUB_REV in case github changes their zipping or structure diff --git a/math/mpfrc++/Makefile b/math/mpfrc++/Makefile index 822c92a7ad4a..690f98830ed1 100644 --- a/math/mpfrc++/Makefile +++ b/math/mpfrc++/Makefile @@ -16,8 +16,6 @@ GH_PROJECT= mpreal NO_BUILD= yes NO_ARCH= yes -WRKSRC= ${WRKDIR}/${GH_PROJECT}-mpfrc-${DISTVERSION} - PLIST_FILES= include/mpreal.h do-install: