Date: Fri, 29 May 2015 21:43:28 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387895 - head/Mk Message-ID: <201505292143.t4TLhSIM016252@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri May 29 21:43:27 2015 New Revision: 387895 URL: https://svnweb.freebsd.org/changeset/ports/387895 Log: Revert that bit from r387852, it was not needed, and breaks at least devel/poudriere-devel PR: 200528 Poked by: bdrewery Pointy hat to: mat Sponsored by: Absolight Modified: head/Mk/bsd.sites.mk Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Fri May 29 21:39:29 2015 (r387894) +++ head/Mk/bsd.sites.mk Fri May 29 21:43:27 2015 (r387895) @@ -603,7 +603,6 @@ GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,- # and extraction directory. GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/} . endif -_GITHUB_REV= 0 . if defined(_GITHUB_MUST_SET_DISTNAME) # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice . if ${GH_TAGNAME} != ${DISTVERSIONFULL} @@ -611,13 +610,14 @@ DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${ . 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 -. endif .endif _GITHUB_EXTRACT_SUFX= .tar.gz # If there are non default groups
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505292143.t4TLhSIM016252>