diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-05-04 17:42:29 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-05-04 17:42:29 +0000 |
| commit | 007bf7a3d4b1305b498dce38abbc6578d91585d8 (patch) | |
| tree | 18916b945592c38462a04324e39af3fb758d3e02 | |
| parent | - Update to 1 May version of OpenBSD's rdate (diff) | |
USE_GITHUB: Fix WRKSRC to contain the full DISTVERSION prefix/suffx when GH_TAGNAME not set.
The GH_TAGNAME-based GH_TAGNAME_EXTRACT is now always used for the new style
USE_GITHUB WRKSRC default.
This was not spotted before since all but 1 github ports were using 'v' as a
prefix, where github already stripped it. So the default GH_PROJECT-DISTVERSION
was fine. The other case was x11-fonts/sourcesanspro-ttf where
GH_TAGNAME was defined to have the full DISTVERSION prefix/suffx.
Tested against all current USE_GITHUB !GH_COMMIT ports.
PR: 199913
With hat: portmgr
Reported by: jbeich
Notes
Notes:
svn path=/head/; revision=385420
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c3a05fc695df..a7ccb4bce23c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1558,11 +1558,7 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work . if defined(GH_COMMIT) WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT} . else -. if defined(GH_TAGNAME) WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} -. else -WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION} -. endif . endif .endif .if defined(NO_WRKSUBDIR) |