From owner-svn-ports-head@FreeBSD.ORG  Fri Jun  7 13:25:24 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id F2AABAA8;
 Fri,  7 Jun 2013 13:25:23 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E546E1EEB;
 Fri,  7 Jun 2013 13:25:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r57DPNaT013402;
 Fri, 7 Jun 2013 13:25:23 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r57DPNiW013400;
 Fri, 7 Jun 2013 13:25:23 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201306071325.r57DPNiW013400@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 7 Jun 2013 13:25:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320199 - in head: . Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jun 2013 13:25:24 -0000

Author: bdrewery
Date: Fri Jun  7 13:25:22 2013
New Revision: 320199
URL: http://svnweb.freebsd.org/changeset/ports/320199

Log:
  Add WRKSRC_SUBDIR to simplify overriding WRKSRC:
  	WRKSRC=		${WRKDIR}/${DISTNAME}/src
    This becomes:
  	WRKSRC_SUBDIR=	src
  
  Reviewed by:	bapt
  With hat:	portmgr

Modified:
  head/CHANGES
  head/Mk/bsd.port.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Fri Jun  7 13:21:00 2013	(r320198)
+++ head/CHANGES	Fri Jun  7 13:25:22 2013	(r320199)
@@ -11,6 +11,18 @@ in the release notes and/or placed into 
 All ports committers are allowed to commit to this file.
 
 20130606:
+AUTHOR: bdrewery@FreeBSD.org
+
+  * WRKSRC_SUBDIR has been added to simplify overriding WRKSRC
+    to use a subdirectory:
+
+  WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
+  Becomes:
+
+  WRKSRC_SUBDIR=	src
+
+20130606:
 AUTHOR: bapt@FreeBSD.org
 
   The OPTIONS macro is no longer recognized, please use the new options

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Jun  7 13:21:00 2013	(r320198)
+++ head/Mk/bsd.port.mk	Fri Jun  7 13:25:22 2013	(r320199)
@@ -568,6 +568,9 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  unpacks to.
 #				  Default: ${WRKDIR}/${DISTNAME} unless NO_WRKSUBDIR is set,
 #				  in which case simply ${WRKDIR}
+# WRKSRC_SUBDIR	- A subdirectory of ${WRKSRC} where the distribution actually
+#				  build in.
+#				  Default: not set
 # NO_WRKSUBDIR	- Assume port unpacks directly into ${WRKDIR}.
 # PATCHDIR		- A directory containing any additional patches you made
 #				  to port this software to FreeBSD.
@@ -1543,6 +1546,9 @@ WRKSRC?=		${WRKDIR}
 .else
 WRKSRC?=		${WRKDIR}/${DISTNAME}
 .endif
+.if defined(WRKSRC_SUBDIR)
+WRKSRC:=		${WRKSRC}/${WRKSRC_SUBDIR}
+.endif
 
 PATCH_WRKSRC?=	${WRKSRC}
 CONFIGURE_WRKSRC?=	${WRKSRC}