From a473097cd9ecbfd932d8af3d57148839382f88a6 Mon Sep 17 00:00:00 2001 From: bdrewery Date: Tue, 28 Apr 2015 18:44:04 +0000 Subject: USE_GITHUB: For the new support, fix DISTNAME to be more consistent. When using GH_TAGNAME the DISTNAME would have GH_PROJECT and GH_ACCOUNT in it. When not using GH_TAGNAME it would not have this. Now both cases will add in the GH_PROJECT and GH_ACCOUNT. Add special care to ensure that the DISTVERSION is not added in twice. If a port does GH_TAGNAME=v${PORTVERSION} it will be added in twice though. For that case DISTVERSIONPREFIX=v should be set and no GH_TAGNAME should be used. empty() is used rather than (!defined || !${}) to support fmake. The purpose of setting DISTNAME at all in these cases is to make it more clear that the distfile is from *GITHUB* and to avoid collisions if a project were to be renamed or moved. Without adding in GH_PROJECT and GH_ACCOUNT then there are real risks that collisions on filenames would happen on renamed or moved projects, which is fairly common. A GITHUB-generated file may not match a custom-rolled or git-archive-rolled distfile. PR: 199069 With hat: portmgr Testing done: All USE_GITHUB ports without GH_COMMIT were checksum/fetch/extract/WRKSRC tested. --- net-mgmt/icinga2/distinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net-mgmt') diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo index a20ff5ce3722..501c2b941b4c 100644 --- a/net-mgmt/icinga2/distinfo +++ b/net-mgmt/icinga2/distinfo @@ -1,2 +1,2 @@ -SHA256 (icinga2-v2.3.4_GH0.tar.gz) = 3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa -SIZE (icinga2-v2.3.4_GH0.tar.gz) = 782506 +SHA256 (icinga-icinga2-v2.3.4_GH0.tar.gz) = 3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa +SIZE (icinga-icinga2-v2.3.4_GH0.tar.gz) = 782506 -- cgit