diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-03-20 04:45:03 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-03-20 04:45:03 +0800 |
| commit | 20144eb20a8df438da13835cb7ad7551c38c432f (patch) | |
| tree | 355434b3eee3a7ef4a1df43aa26e32dcab7d814b /Mk | |
| parent | a0949c381d50ee6addd1d96efc44bb19ea97b3da (diff) | |
| download | freebsd-ports-gnome-20144eb20a8df438da13835cb7ad7551c38c432f.tar.gz freebsd-ports-gnome-20144eb20a8df438da13835cb7ad7551c38c432f.tar.zst freebsd-ports-gnome-20144eb20a8df438da13835cb7ad7551c38c432f.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
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 3 | ||||
| -rw-r--r-- | Mk/bsd.sites.mk | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0d66ef97e57a..9020890b563d 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1352,7 +1352,8 @@ _SUF2= ,${PORTEPOCH} PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} -DISTNAME?= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} +DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} +DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL} INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} 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 |