[Bug 235762] USE_GITHUB=nodefault breaks default DISTFILES

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235762

--- Comment #3 from Mathieu Arnold <mat at FreeBSD.org> ---
A simple, but very ugly, fix would be this:

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 2f3abff5130d..f3441049c130 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2198,6 +2198,10 @@ INSTALL_TARGET+= ${LATE_INSTALL_ARGS}
 .include "${PORTSDIR}/Mk/bsd.licenses.mk"
 .endif

+.if empty(DISTFILES)
+_I_MAY_NEED_TO_SET_DISTFILES=  probably
+.endif
+
 # Popular master sites
 .include "${PORTSDIR}/Mk/bsd.sites.mk"

@@ -2427,7 +2431,9 @@ NOFETCHFILES?=

 # Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL
 # according to grouping rules (:something)
-DISTFILES?=            ${DISTNAME}${EXTRACT_SUFX}
+.if defined(_I_MAY_NEED_TO_SET_DISTFILES)
+DISTFILES+=            ${DISTNAME}${EXTRACT_SUFX}
+.endif
 _MASTER_SITES_ALL=     ${_MASTER_SITES_DEFAULT}
 _PATCH_SITES_ALL=      ${_PATCH_SITES_DEFAULT}
 _G_TEMP=       DEFAULT
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index f54e82b36dcf..426dd975734c 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -452,6 +452,7 @@ _GITHUB_EXTRACT_SUFX=       .tar.gz
 _GITHUB_CLONE_DIR?=    ${WRKDIR}/git-clone
 _PORTS_DIRECTORIES+=   ${_GITHUB_CLONE_DIR}
 .  if !${USE_GITHUB:Mnodefault} && empty(MASTER_SITES:MGHC)
+.undef _I_MAY_NEED_TO_SET_DISTFILES
 # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in
twice
 .    if ${GH_TAGNAME} != ${DISTVERSIONFULL}
 DISTNAME=     
${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
@@ -595,6 +596,7 @@ _GITLAB_EXTRACT_SUFX=       .tar.gz
 _GITLAB_CLONE_DIR?=    ${WRKDIR}/git-clone
 _PORTS_DIRECTORIES+=   ${_GITLAB_CLONE_DIR}
 .  if !${USE_GITLAB:Mnodefault}
+.undef _I_MAY_NEED_TO_SET_DISTFILES
 DISTNAME:=     ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV}
 DISTFILES+=    ${DISTNAME}${_GITLAB_EXTRACT_SUFX}
 git-clone: git-clone-DEFAULT

-- 
You are receiving this mail because:
You are on the CC list for the bug.