ports/171688: [bsd.port.mk / bsd.sites.mk] Allow WRKSRC to be overridden when using USE_GITHUB

[Bryan Drewery]

>Number:         171688
>Category:       ports
>Synopsis:       [bsd.port.mk / bsd.sites.mk] Allow WRKSRC to be overridden when using USE_GITHUB
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 16 17:10:15 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Bryan Drewery
>Release:        FreeBSD 8.3-RELEASE i386
>Organization:
>Environment:

	
>Description:
	When using USE_GITHUB, it is not possible to override WRKSRC. This is needed for ports such as www/phalcon and cad/openvsp.
>How-To-Repeat:
	Apply http://people.freebsd.org/~bdrewery/patch-cad-openvsp-use-github.txt to cad/openvsp and try to build. It will override WRKSRC and lose the /src subdir.

>Fix:

	Fix is to move the WRKSRC for github up to bsd.port.mk before the default WRKSRC is set, and use the same logic that bsd.sites.mk uses for USE_GITHUB.

	Mirrored at http://people.freebsd.org/~bdrewery/patch-use-github-wrksrc.txt

--- patch-use-github-wrksrc.txt begins here ---
# 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
--- patch-use-github-wrksrc.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: