Date: Tue, 11 Jan 2022 09:41:58 GMT From: =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9bdd8f141ce7 - main - archivers/deco, misc/deco: remove CONFLICTS entry Message-ID: <202201110941.20B9fwiI017079@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bdd8f141ce741acaf6280649243fffe3e8a0262 commit 9bdd8f141ce741acaf6280649243fffe3e8a0262 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2022-01-11 09:41:13 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2022-01-11 09:41:13 +0000 archivers/deco, misc/deco: remove CONFLICTS entry Files installed by the archivers/deco port have been renamed by makc@ to no longer conflict with those from the misc/deco port. Reported by: makc --- archivers/deco/Makefile | 2 -- misc/deco/Makefile | 2 -- 2 files changed, 4 deletions(-) diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile index 3d50665310a6..392d995029eb 100644 --- a/archivers/deco/Makefile +++ b/archivers/deco/Makefile @@ -28,8 +28,6 @@ RUN_DEPENDS= arc:archivers/arc \ zoo:archivers/zoo \ flac:audio/flac -CONFLICTS= deco-misc # bin/deco - DARCHIVE_VER= 1.7 DARCHIVE= deco-archive-${DARCHIVE_VER} diff --git a/misc/deco/Makefile b/misc/deco/Makefile index e1d455c10353..d4b11db6be9b 100644 --- a/misc/deco/Makefile +++ b/misc/deco/Makefile @@ -15,6 +15,4 @@ USES= ncurses tar:tgz GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share -CONFIGURE_INSTALL= deco # bin/deco - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201110941.20B9fwiI017079>