From 4dce62d655ec0a5205d7b1412ac6371118eea28c Mon Sep 17 00:00:00 2001 From: op Date: Fri, 4 Nov 2022 15:05:10 +0000 Subject: [PATCH] mark archivers/lrzip and comms/lrzsz as conflicting spotted by naddy@, ok sthen@ --- archivers/lrzip/Makefile | 1 + archivers/lrzip/pkg/PLIST | 1 + comms/lrzsz/Makefile | 2 +- comms/lrzsz/pkg/PLIST | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile index 0ccb917fc77..bfb1a115ae1 100644 --- a/archivers/lrzip/Makefile +++ b/archivers/lrzip/Makefile @@ -3,6 +3,7 @@ COMMENT = compression utility for large files GH_ACCOUNT = ckolivas GH_PROJECT = lrzip GH_TAGNAME = v0.651 +REVISION = 0 CATEGORIES = archivers diff --git a/archivers/lrzip/pkg/PLIST b/archivers/lrzip/pkg/PLIST index e87f73c53bc..1002c72c369 100644 --- a/archivers/lrzip/pkg/PLIST +++ b/archivers/lrzip/pkg/PLIST @@ -1,3 +1,4 @@ +@conflict lrzsz-* bin/lrunzip bin/lrz bin/lrzcat diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile index 3a6953bd1b3..82da9b0a805 100644 --- a/comms/lrzsz/Makefile +++ b/comms/lrzsz/Makefile @@ -1,7 +1,7 @@ COMMENT= receive/send files via X/Y/ZMODEM protocol DISTNAME= lrzsz-0.12.20 -REVISION= 2 +REVISION= 3 CATEGORIES= comms HOMEPAGE= https://www.ohse.de/uwe/software/lrzsz.html diff --git a/comms/lrzsz/pkg/PLIST b/comms/lrzsz/pkg/PLIST index 1bb9ed6f28c..7591ea62ea7 100644 --- a/comms/lrzsz/pkg/PLIST +++ b/comms/lrzsz/pkg/PLIST @@ -1,3 +1,4 @@ +@conflict lrzip-* @bin bin/lrb @bin bin/lrx @bin bin/lrz