Date: Tue, 24 Mar 2015 16:42:39 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382120 - head/Mk Message-ID: <201503241642.t2OGgdhl066266@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Mar 24 16:42:38 2015 New Revision: 382120 URL: https://svnweb.freebsd.org/changeset/ports/382120 QAT: https://qat.redports.org/buildarchive/r382120/ Log: Github's main archive link silently is converting tags starting with 'v' to not have 'v' in the filename downloaded or the extraction directory. The filename is not an issue since we force to use DISTNAME via the ?dummy trick to fetch(1). Due to this though we must make the same replacement for tags since we are not using their filename (which matches the extraction dir). Incidentally this is working if DISTVERSIONPREFIX=v is used since that value was not used in WRKSRC. With hat: portmgr PR: 198869 Modified: head/Mk/bsd.port.mk head/Mk/bsd.sites.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Mar 24 16:42:26 2015 (r382119) +++ head/Mk/bsd.port.mk Tue Mar 24 16:42:38 2015 (r382120) @@ -1559,7 +1559,7 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} . else . if defined(GH_TAGNAME) -WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_SANITIZED} +WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} . else WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} . endif Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Tue Mar 24 16:42:26 2015 (r382119) +++ head/Mk/bsd.sites.mk Tue Mar 24 16:42:38 2015 (r382120) @@ -568,6 +568,9 @@ DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} . endif . if defined(GH_TAGNAME) GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,} +# Github silently converts tags starting with v to not have v in the filename +# and extraction directory. +GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:S/^v//} . endif .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241642.t2OGgdhl066266>