diff options
author | Stefan Eßer <se@FreeBSD.org> | 2022-01-11 09:41:13 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2022-01-11 09:41:13 +0000 |
commit | 9bdd8f141ce741acaf6280649243fffe3e8a0262 (patch) | |
tree | d63123a9a6c8b31201522e3f6b04ae72aba23d05 | |
parent | 9a61a97a87137ff512692f96aa93d5a3b1cfa8df (diff) | |
download | ports-9bdd8f141ce741acaf6280649243fffe3e8a0262.tar.gz ports-9bdd8f141ce741acaf6280649243fffe3e8a0262.zip |
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
-rw-r--r-- | archivers/deco/Makefile | 2 | ||||
-rw-r--r-- | misc/deco/Makefile | 2 |
2 files changed, 0 insertions, 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> |