Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1572,7 +1572,7 @@
 .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
Index: head/sysutils/u-boot-rpi3/Makefile
===================================================================
--- head/sysutils/u-boot-rpi3/Makefile
+++ head/sysutils/u-boot-rpi3/Makefile
@@ -25,7 +25,6 @@
 
 NO_ARCH=	yes
 
-WRKSRC=		${WRKDIR}/u-boot-${DISTVERSION}
 USES=		gmake tar:bzip2
 SSP_UNSAFE=	yes # cross-LD does not support -fstack-protector