Date: Wed, 10 Oct 2012 18:20:22 +0000 (UTC) From: Beat Gaetzi <beat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305677 - head/Mk Message-ID: <201210101820.q9AIKM98077265@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Wed Oct 10 18:20:21 2012 New Revision: 305677 URL: http://svn.freebsd.org/changeset/ports/305677 Log: - Only add GH to MASTER_SITES if not already there [1] - Allow WRKSRC to be overridden when using USE_GITHUB [2] PR: ports/171644 [1], ports/171688 [2] Submitted by: bdrewery Reviewed by: gahr Tested by: Exp-run on pointyhat Modified: head/Mk/bsd.port.mk head/Mk/bsd.sites.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Oct 10 17:44:07 2012 (r305676) +++ head/Mk/bsd.port.mk Wed Oct 10 18:20:21 2012 (r305677) @@ -1534,6 +1534,9 @@ check-makefile:: _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 Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Wed Oct 10 17:44:07 2012 (r305676) +++ head/Mk/bsd.sites.mk Wed Oct 10 18:20:21 2012 (r305677) @@ -546,10 +546,11 @@ MASTER_SITE_GET_E+= \ # .if defined(USE_GITHUB) MASTER_SITE_GITHUB+= https://nodeload.github.com/%SUBDIR% +.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH} MASTER_SITES+= GH +.endif GH_PROJECT?= ${PORTNAME} GH_TAGNAME?= ${DISTVERSION} -WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210101820.q9AIKM98077265>