Page MenuHomeFreeBSD
Files F144518159

D20140.id56958.diff
No OneTemporary
Actions

D20140.id56958.diff
View Options

Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1341,15 +1341,7 @@
PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
-.if defined(USE_GITHUB) && empty(MASTER_SITES:MGHC) && empty(USE_GITHUB:Mnodefault)
-. if empty(DISTNAME)
-_GITHUB_MUST_SET_DISTNAME= yes
-. else
-DEV_WARNING+= "You are using USE_GITHUB and DISTNAME is set which is wrong. Set GH_ACCOUNT/GH_PROJECT/GH_TAGNAME correctly and remove WRKSRC entirely."
-. endif
-.else
DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL}
-.endif
INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -443,26 +443,22 @@
# and extraction directory. It also replaces + with -.
GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/:S/+/-/g}
. endif
-. if defined(_GITHUB_MUST_SET_DISTNAME)
-# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice
-. if ${GH_TAGNAME} != ${DISTVERSIONFULL}
-DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
-. else
-DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
-. endif
-. 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
# which has happened before.
_GITHUB_REV= 0
-. if ${MASTER_SITES:MGH}
-DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
-. endif
_GITHUB_EXTRACT_SUFX= .tar.gz
# Put the DEFAULT distfile first
_GITHUB_CLONE_DIR?= ${WRKDIR}/git-clone
_PORTS_DIRECTORIES+= ${_GITHUB_CLONE_DIR}
-. if !${USE_GITHUB:Mnodefault} && defined(_GITHUB_MUST_SET_DISTNAME)
+. if !${USE_GITHUB:Mnodefault} && empty(MASTER_SITES:MGHC)
+# GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice
+. if ${GH_TAGNAME} != ${DISTVERSIONFULL}
+DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
+. else
+DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
+. endif
+DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}
git-clone: git-clone-DEFAULT
git-clone-DEFAULT: ${_GITHUB_CLONE_DIR}
@@ -592,15 +588,14 @@
GL_COMMIT:= ${GL_COMMIT_DEFAULT}
GL_SUBDIR:= ${GL_SUBDIR_DEFAULT}
-
_GITLAB_REV= 0
-DISTNAME:= ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV}
_GITLAB_EXTRACT_SUFX= .tar.gz
_GITLAB_CLONE_DIR?= ${WRKDIR}/git-clone
_PORTS_DIRECTORIES+= ${_GITLAB_CLONE_DIR}
. if !${USE_GITLAB:Mnodefault}
+DISTNAME:= ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV}
DISTFILES+= ${DISTNAME}${_GITLAB_EXTRACT_SUFX}
git-clone: git-clone-DEFAULT
git-clone-DEFAULT: ${_GITLAB_CLONE_DIR}

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 10, 2:39 AM (18 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28611263
Default Alt Text
D20140.id56958.diff (2 KB)

Event Timeline