aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-03-08 21:09:12 +0800
committerMathieu Arnold <mat@FreeBSD.org>2016-03-08 21:09:12 +0800
commit018eeadae5746ac3cb925a0429a405eb994f9a95 (patch)
treea55fb9a6cfb3e354f6733d28e492f22ea7fb929d /Mk
parent8da64f95e7a35c7ac6c41cd2d1b37eaea9bd63ae (diff)
downloadfreebsd-ports-gnome-018eeadae5746ac3cb925a0429a405eb994f9a95.tar.gz
freebsd-ports-gnome-018eeadae5746ac3cb925a0429a405eb994f9a95.tar.zst
freebsd-ports-gnome-018eeadae5746ac3cb925a0429a405eb994f9a95.zip
Always set the DEFAULT github DISTFILE with .tar.gz for EXTRACT_SUFX.
Fix distinfo for the offending ports. lang/yorick's tag was moved, and the added patch was no longer needed. PR: 207644 Submitted by: mat Exp-run by by: antoine Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D4268
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.sites.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 9648dbdb17cf..3ee142fd0881 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -634,12 +634,12 @@ _GITHUB_REV= 0
DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
. endif
_GITHUB_EXTRACT_SUFX= .tar.gz
-# If there are non default groups
-. if !empty(_GITHUB_GROUPS:NDEFAULT)
# Put the DEFAULT distfile first
-. if !${USE_GITHUB:Mnodefault}
+. if !${USE_GITHUB:Mnodefault} && defined(_GITHUB_MUST_SET_DISTNAME)
DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}
-. endif
+. endif
+# If there are non default groups
+. if !empty(_GITHUB_GROUPS:NDEFAULT)
# Then for each of the remaining groups, add DISTFILES and MASTER_SITES
# entries with the correct group and create {WRKSRC,DISTNAME,DISTFILES}_group
# helper variables.