From 4cba0d4501d9a33729ad7d7f5550987d349c6206 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 11 Feb 2020 20:48:30 +0000
Subject: [PATCH] register @conflicts; from Mikolaj Kucharski

---
 sysutils/google-cloud-sdk/Makefile  | 3 ++-
 sysutils/google-cloud-sdk/pkg/PLIST | 3 ++-
 telephony/gsutil/Makefile           | 3 ++-
 telephony/gsutil/pkg/PLIST          | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sysutils/google-cloud-sdk/Makefile b/sysutils/google-cloud-sdk/Makefile
index 8f5e6d1e140..d749a391ffc 100644
--- a/sysutils/google-cloud-sdk/Makefile
+++ b/sysutils/google-cloud-sdk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.152 2020/02/08 12:07:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.153 2020/02/11 20:48:30 sthen Exp $
 
 COMMENT=		manage resources on Google Cloud Platform
 
@@ -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
 
diff --git a/sysutils/google-cloud-sdk/pkg/PLIST b/sysutils/google-cloud-sdk/pkg/PLIST
index 60166e4cd17..b55ca98de07 100644
--- a/sysutils/google-cloud-sdk/pkg/PLIST
+++ b/sysutils/google-cloud-sdk/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.139 2020/02/08 12:07:25 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.140 2020/02/11 20:48:30 sthen Exp $
+@conflict gsutil-*
 bin/bq
 bin/gcloud
 bin/git-credential-gcloud.sh
diff --git a/telephony/gsutil/Makefile b/telephony/gsutil/Makefile
index 9a9c7f3c902..2ee37a98595 100644
--- a/telephony/gsutil/Makefile
+++ b/telephony/gsutil/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2019/07/12 20:49:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2020/02/11 20:48:30 sthen Exp $
 
 COMMENT =		dump/restore Grandstream device configurations
 
 DISTNAME =		gsutil-3.1
+REVISION =		0
 
 CATEGORIES =		telephony
 
diff --git a/telephony/gsutil/pkg/PLIST b/telephony/gsutil/pkg/PLIST
index 5a54192bc53..9ebed091e31 100644
--- a/telephony/gsutil/pkg/PLIST
+++ b/telephony/gsutil/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/03/20 18:59:15 ian Exp $
+@comment $OpenBSD: PLIST,v 1.2 2020/02/11 20:48:30 sthen Exp $
+@conflict google-cloud-sdk-*
 bin/gsutil
 share/doc/gsutil/
 share/doc/gsutil/README