git: 3934afc3ff36 - main - sysutils/e2fsprogs-core: clean out obsolete conflicts

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Thu, 09 Feb 2023 18:55:29 UTC

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3934afc3ff36557cfb26173bc0e29a69929586ab

commit 3934afc3ff36557cfb26173bc0e29a69929586ab
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2023-02-09 18:54:11 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2023-02-09 18:55:14 +0000

    sysutils/e2fsprogs-core: clean out obsolete conflicts
---
 sysutils/e2fsprogs-core/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sysutils/e2fsprogs-core/Makefile b/sysutils/e2fsprogs-core/Makefile
index b8b2fc9047cb..e70f10fef4c5 100644
--- a/sysutils/e2fsprogs-core/Makefile
+++ b/sysutils/e2fsprogs-core/Makefile
@@ -45,8 +45,6 @@ CFLAGS+=	-Wno-unused-command-line-argument
 MAKE_ARGS+=	pkgconfigdir='${PREFIX}/libdata/pkgconfig'
 MAKE_ENV+=	CHECK_CMD=@true
 
-CONFLICTS_INSTALL=	e2fsprogs-nobootfsck e2fsprogs-roothardlinks
-
 PORTSCOUT=	ignore:1	# cannot handle the version in the directory
 
 .if !defined(MASTERDIR)