Date: Fri, 7 Jun 2013 13:25:23 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320199 - in head: . Mk Message-ID: <201306071325.r57DPNiW013400@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306071325.r57DPNiW013400>