From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 16 17:10:15 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C2A9D1065673 for ; Sun, 16 Sep 2012 17:10:15 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 939A58FC1E for ; Sun, 16 Sep 2012 17:10:15 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8GHAFgw050971 for ; Sun, 16 Sep 2012 17:10:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8GHAFcI050958; Sun, 16 Sep 2012 17:10:15 GMT (envelope-from gnats) Resent-Date: Sun, 16 Sep 2012 17:10:15 GMT Resent-Message-Id: <201209161710.q8GHAFcI050958@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bryan Drewery Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E98B91065679 for ; Sun, 16 Sep 2012 17:07:53 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B404F8FC15 for ; Sun, 16 Sep 2012 17:07:53 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8GH7rpS009237 for ; Sun, 16 Sep 2012 17:07:53 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8GH7reO009222 for FreeBSD-gnats-submit@freebsd.org; Sun, 16 Sep 2012 17:07:53 GMT (envelope-from bdrewery) Received: (qmail 31662 invoked from network); 16 Sep 2012 12:07:49 -0500 Received: from unknown (HELO test8.xzibition.com) (10.10.0.34) by sweb.xzibition.com with SMTP; 16 Sep 2012 12:07:49 -0500 Received: by test8.xzibition.com (sSMTP sendmail emulation); Sun, 16 Sep 2012 12:07:48 -0500 Message-Id: <201209161707.q8GH7reO009222@freefall.freebsd.org> Date: Sun, 16 Sep 2012 12:07:48 -0500 From: Bryan Drewery To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: swills@FreeBSD.org, gahr@FreeBSD.org, portmgr@FreeBSD.org Subject: ports/171688: [bsd.port.mk / bsd.sites.mk] Allow WRKSRC to be overridden when using USE_GITHUB X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Bryan Drewery List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Sep 2012 17:10:16 -0000 >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: