From owner-svn-ports-head@freebsd.org  Wed Mar 29 13:11:28 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2465ED23520;
 Wed, 29 Mar 2017 13:11:28 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E5086ED;
 Wed, 29 Mar 2017 13:11:27 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2TDBQVS079744;
 Wed, 29 Mar 2017 13:11:26 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2TDBQaJ079742;
 Wed, 29 Mar 2017 13:11:26 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201703291311.v2TDBQaJ079742@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 29 Mar 2017 13:11:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r437197 - in head: Mk sysutils/u-boot-rpi3
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Mar 2017 13:11:28 -0000

Author: mat
Date: Wed Mar 29 13:11:26 2017
New Revision: 437197
URL: https://svnweb.freebsd.org/changeset/ports/437197

Log:
  Do not overwrite WRKSRC when USE_GITHUB=nodefault.
  
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D10091

Modified:
  head/Mk/bsd.port.mk   (contents, props changed)
  head/sysutils/u-boot-rpi3/Makefile   (contents, props changed)

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Mar 29 13:11:22 2017	(r437196)
+++ head/Mk/bsd.port.mk	Wed Mar 29 13:11:26 2017	(r437197)
@@ -1572,7 +1572,7 @@ CONFIGURE_ENV+=	PKG_CONFIG_SYSROOT_DIR="
 .endif
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
-.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
+.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
 WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
 .endif
 # If the distname is not extracting into a specific subdirectory, have the

Modified: head/sysutils/u-boot-rpi3/Makefile
==============================================================================
--- head/sysutils/u-boot-rpi3/Makefile	Wed Mar 29 13:11:22 2017	(r437196)
+++ head/sysutils/u-boot-rpi3/Makefile	Wed Mar 29 13:11:26 2017	(r437197)
@@ -25,7 +25,6 @@ GH_TAGNAME=	${GIT_TAG}:pscimon
 
 NO_ARCH=	yes
 
-WRKSRC=		${WRKDIR}/u-boot-${DISTVERSION}
 USES=		gmake tar:bzip2
 SSP_UNSAFE=	yes # cross-LD does not support -fstack-protector