From owner-svn-ports-all@FreeBSD.ORG Tue Mar 24 16:42:39 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA4C6CC4; Tue, 24 Mar 2015 16:42:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4F65211; Tue, 24 Mar 2015 16:42:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2OGgdcg066271; Tue, 24 Mar 2015 16:42:39 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2OGgdhl066266; Tue, 24 Mar 2015 16:42:39 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201503241642.t2OGgdhl066266@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 24 Mar 2015 16:42:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382120 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2015 16:42:39 -0000 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