diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-19 20:45:03 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-19 20:45:03 +0000 |
commit | 965611a69295c03a21755fe17c00bb162b718876 (patch) | |
tree | 355434b3eee3a7ef4a1df43aa26e32dcab7d814b /Mk/bsd.sites.mk | |
parent | db55af0feaf06de83e7b82145dfd453c5cfa4762 (diff) | |
download | ports-965611a69295c03a21755fe17c00bb162b718876.tar.gz ports-965611a69295c03a21755fe17c00bb162b718876.zip |
Fix renamed distfiles missed in r381688. Also fix the GHR ports updated in
r381648 which were expecting DISTVERSIONPREFIX/SUFFIX to be used in the
tag fetched from github by defaulting GH_TAGNAME to the same value
as DISTVERSION would get by only when GH_COMMIT is not set (when using the
new scheme).
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=381689
Diffstat (limited to 'Mk/bsd.sites.mk')
-rw-r--r-- | Mk/bsd.sites.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index ec7c7c312f64..fa7f4bdb7b39 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -559,7 +559,13 @@ DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} . endif GH_ACCOUNT?= ${PORTNAME} GH_PROJECT?= ${PORTNAME} +. if defined(DH_COMMIT) +# Use the old style for safety for now. GH_TAGNAME?= ${DISTVERSION} +. else +# Use full PREFIX/SUFFIX and converted DISTVERSION +GH_TAGNAME?= ${DISTVERSIONFULL} +. endif .endif .endif |