svn commit: r568797 - head/Mk

[Mathieu Arnold]

Author: mat
Date: Fri Mar 19 14:32:10 2021
New Revision: 568797
URL: https://svnweb.freebsd.org/changeset/ports/568797

Log:
  Fix usage of USE_GITHUB, multiple downloads, and WRKSRC_SUBDIR.
  
  PR:		246196
  Submitted by:	Sergei Vyshenski

Modified:
  head/Mk/bsd.port.mk   (contents, props changed)

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Mar 19 14:31:27 2021	(r568796)
+++ head/Mk/bsd.port.mk	Fri Mar 19 14:32:10 2021	(r568797)
@@ -1702,7 +1702,7 @@ CONFIGURE_ENV+=		PATH=${PATH}
 .if defined(WRKSRC)
 DEV_WARNING+=	"You are using USE_GITHUB and WRKSRC is set which is wrong.  Set GH_PROJECT correctly, set WRKSRC_SUBDIR or remove WRKSRC entirely."
 .endif
-WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
+WRKSRC?=		${WRKDIR}/${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}
 .endif
 
 .if !default(IGNORE_MASTER_SITE_GITLAB) && defined(USE_GITLAB) && empty(USE_GITLAB:Mnodefault)