# svn status
M       bsd.sites.mk
M       bsd.port.mk

Index: bsd.sites.mk
===================================================================
--- bsd.sites.mk	(revision 304350)
+++ bsd.sites.mk	(working copy)
@@ -538,7 +538,6 @@
 MASTER_SITES+=	GH
 GH_PROJECT?=	${PORTNAME}
 GH_TAGNAME?=	${DISTVERSION}
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
 .endif
 .endif
 
Index: bsd.port.mk
===================================================================
--- bsd.port.mk	(revision 304350)
+++ bsd.port.mk	(working copy)
@@ -1523,6 +1523,9 @@
 _POSTMKINCLUDED=	yes
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
+.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
+WRKSRC?=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
+.endif
 .if defined(NO_WRKSUBDIR)
 WRKSRC?=		${WRKDIR}
 .else