git: a28f05fb2d27 - main - sysutils/nut*: Register conflicts
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 May 2022 18:11:25 UTC
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a28f05fb2d27823de942563b5a31888d545e08e5 commit a28f05fb2d27823de942563b5a31888d545e08e5 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-05-04 04:47:27 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-05-09 17:49:28 +0000 sysutils/nut*: Register conflicts sysutils/nut and sysutils/nut-devel conflict with each other. --- sysutils/nut-devel/Makefile | 2 ++ sysutils/nut/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index b6bd0978997d..9bafcd1fd295 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -16,6 +16,8 @@ LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS= nut-[0-9]* + USE_GITHUB= yes GH_ACCOUNT= networkupstools GH_TAGNAME= 9cb8de681 diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 4ba9a55ed23d..4bec09e14685 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -13,6 +13,8 @@ LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS= nut-devel-* + GNU_CONFIGURE= yes USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build USE_LDCONFIG= yes