Date: Thu, 02 May 2019 14:45:28 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 235762] USE_GITHUB=nodefault breaks default DISTFILES Message-ID: <bug-235762-7788-uCiTJSdqBg@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-235762-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-235762-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D235762 --- Comment #3 from Mathieu Arnold <mat@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+=3D ${LATE_INSTALL_ARGS} .include "${PORTSDIR}/Mk/bsd.licenses.mk" .endif +.if empty(DISTFILES) +_I_MAY_NEED_TO_SET_DISTFILES=3D probably +.endif + # Popular master sites .include "${PORTSDIR}/Mk/bsd.sites.mk" @@ -2427,7 +2431,9 @@ NOFETCHFILES?=3D # Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL # according to grouping rules (:something) -DISTFILES?=3D ${DISTNAME}${EXTRACT_SUFX} +.if defined(_I_MAY_NEED_TO_SET_DISTFILES) +DISTFILES+=3D ${DISTNAME}${EXTRACT_SUFX} +.endif _MASTER_SITES_ALL=3D ${_MASTER_SITES_DEFAULT} _PATCH_SITES_ALL=3D ${_PATCH_SITES_DEFAULT} _G_TEMP=3D 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=3D .tar.gz _GITHUB_CLONE_DIR?=3D ${WRKDIR}/git-clone _PORTS_DIRECTORIES+=3D ${_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} !=3D ${DISTVERSIONFULL} DISTNAME=3D=20=20=20=20=20 ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED} @@ -595,6 +596,7 @@ _GITLAB_EXTRACT_SUFX=3D .tar.gz _GITLAB_CLONE_DIR?=3D ${WRKDIR}/git-clone _PORTS_DIRECTORIES+=3D ${_GITLAB_CLONE_DIR} . if !${USE_GITLAB:Mnodefault} +.undef _I_MAY_NEED_TO_SET_DISTFILES DISTNAME:=3D ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV} DISTFILES+=3D ${DISTNAME}${_GITLAB_EXTRACT_SUFX} git-clone: git-clone-DEFAULT --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-235762-7788-uCiTJSdqBg>