Hi,
I found that /usr/local/bin/gsutil is present in two packages which
don't have conflict makrker in their PLIST.
Part of output when google-cloud-sdk is installed and pkg_add gsutil is
executed:
Collision in gsutil-3.1: the following files already exist
/usr/local/bin/gsutil (google-cloud-sdk-279.0.0 and gsutil-3.1)
Couldn't install gsutil-3.1
After the patch pkg_add output looks as follows:
# env TRUSTED_PKG_PATH=... pkg_add -ni gsutil
quirks-3.230 signed on 2020-02-09T15:05:31Z
gsutil-3.1p0:p5-HTML-Form-6.03: ok
Can't install gsutil-3.1p0 because of conflicts (google-cloud-sdk-279.0.0p0)
--- gsutil-3.1p0 -------------------
Can't install gsutil-3.1p0: conflicts
Couldn't install gsutil-3.1p0
Index: telephony/gsutil/Makefile
===================================================================
RCS file: /cvs/ports/telephony/gsutil/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- telephony/gsutil/Makefile 12 Jul 2019 20:49:55 -0000 1.5
+++ telephony/gsutil/Makefile 10 Feb 2020 16:18:22 -0000
@@ -3,6 +3,7 @@
COMMENT = dump/restore Grandstream device configurations
DISTNAME = gsutil-3.1
+REVISION = 0
CATEGORIES = telephony
Index: telephony/gsutil/pkg/PLIST
===================================================================
RCS file: /cvs/ports/telephony/gsutil/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- telephony/gsutil/pkg/PLIST 20 Mar 2008 18:59:15 -0000 1.1.1.1
+++ telephony/gsutil/pkg/PLIST 10 Feb 2020 16:18:22 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/03/20 18:59:15 ian Exp $
+@conflict google-cloud-sdk-*
bin/gsutil
share/doc/gsutil/
share/doc/gsutil/README
Index: sysutils/google-cloud-sdk/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/google-cloud-sdk/Makefile,v
retrieving revision 1.152
diff -u -p -u -r1.152 Makefile
--- sysutils/google-cloud-sdk/Makefile 8 Feb 2020 12:07:25 -0000 1.152
+++ sysutils/google-cloud-sdk/Makefile 10 Feb 2020 16:18:30 -0000
@@ -6,6 +6,7 @@ V= 279.0.0
DISTNAME= google-cloud-sdk-${V}-linux-x86
PKGNAME= google-cloud-sdk-${V}
WRKDIST= ${WRKDIR}/google-cloud-sdk
+REVISION = 0
CATEGORIES= sysutils
Index: sysutils/google-cloud-sdk/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/google-cloud-sdk/pkg/PLIST,v
retrieving revision 1.139
diff -u -p -u -r1.139 PLIST
--- sysutils/google-cloud-sdk/pkg/PLIST 8 Feb 2020 12:07:25 -0000 1.139
+++ sysutils/google-cloud-sdk/pkg/PLIST 10 Feb 2020 16:18:31 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.139 2020/02/08 12:07:25 ajacoutot Exp $
+@conflict gsutil-*
bin/bq
bin/gcloud
bin/git-credential-gcloud.sh
--
Regards,
Mikolaj
