[Midnightbsd-cvs] mports [20254] trunk/Mk/bsd.mport.mk: revert the last change and fix wrksrc instead

[laffer1 at midnightbsd.org]

Revision: 20254
          http://svnweb.midnightbsd.org/mports/?rev=20254
Author:   laffer1
Date:     2015-09-19 15:13:42 -0400 (Sat, 19 Sep 2015)
Log Message:
-----------
revert the last change and fix wrksrc instead

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2015-09-19 19:11:45 UTC (rev 20253)
+++ trunk/Mk/bsd.mport.mk	2015-09-19 19:13:42 UTC (rev 20254)
@@ -303,9 +303,9 @@
 # Only add in DISTVERSIONFULL if GH_TAGNAME if set by port. Otherwise
 # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice.
 .  if defined(GH_TAGNAME)
-DISTNAME?=	${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
+DISTNAME?=	${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
 .  else
-DISTNAME?=	${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
+DISTNAME?=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
 .  endif
 .else
 DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}
@@ -506,7 +506,7 @@
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
 .if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
-WRKSRC?=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
+WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_COMMIT}
 .endif
 .if defined(NO_WRKSUBDIR)
 WRKSRC?=		${WRKDIR}