svn commit: r437197 - in head: Mk sysutils/u-boot-rpi3

[Mathieu Arnold]

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