Date: Mon, 4 May 2015 17:42:29 +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: r385420 - head/Mk Message-ID: <201505041742.t44HgTbt041693@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Mon May 4 17:42:29 2015 New Revision: 385420 URL: https://svnweb.freebsd.org/changeset/ports/385420 Log: USE_GITHUB: Fix WRKSRC to contain the full DISTVERSION prefix/suffx when GH_TAGNAME not set. The GH_TAGNAME-based GH_TAGNAME_EXTRACT is now always used for the new style USE_GITHUB WRKSRC default. This was not spotted before since all but 1 github ports were using 'v' as a prefix, where github already stripped it. So the default GH_PROJECT-DISTVERSION was fine. The other case was x11-fonts/sourcesanspro-ttf where GH_TAGNAME was defined to have the full DISTVERSION prefix/suffx. Tested against all current USE_GITHUB !GH_COMMIT ports. PR: 199913 With hat: portmgr Reported by: jbeich Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon May 4 17:26:30 2015 (r385419) +++ head/Mk/bsd.port.mk Mon May 4 17:42:29 2015 (r385420) @@ -1558,11 +1558,7 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work . if defined(GH_COMMIT) WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} . else -. if defined(GH_TAGNAME) WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} -. else -WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} -. endif . endif .endif .if defined(NO_WRKSUBDIR)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041742.t44HgTbt041693>