Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jul 2021 21:05:16 GMT
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8feccf32b526 - main - sysutils/cfengine-masterfiles318: fix
Message-ID:  <202107052105.165L5GMo077256@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by antoine:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8feccf32b5262a9269ae5248902f13b3a403652b

commit 8feccf32b5262a9269ae5248902f13b3a403652b
Author:     Antoine Brodin <antoine@FreeBSD.org>
AuthorDate: 2021-07-05 21:04:51 +0000
Commit:     Antoine Brodin <antoine@FreeBSD.org>
CommitDate: 2021-07-05 21:04:51 +0000

    sysutils/cfengine-masterfiles318: fix
    
    Fix PKGNAME collision
---
 sysutils/cfengine-masterfiles318/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sysutils/cfengine-masterfiles318/Makefile b/sysutils/cfengine-masterfiles318/Makefile
index a40ac337fa66..c03642560146 100644
--- a/sysutils/cfengine-masterfiles318/Makefile
+++ b/sysutils/cfengine-masterfiles318/Makefile
@@ -15,6 +15,10 @@ LICENSE=	GPLv3
 CPE_VENDOR=	gnu
 
 CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[0-79]-*
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	318
+CONFLICTS+=	cfengine-masterfiles-3.*
+.endif
 
 RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107052105.165L5GMo077256>