From 267d8dc26c4c3126c0171f94cfee73f6689daa67 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 11 May 2021 15:37:07 +0200 Subject: 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: -- cgit v1.2.3