From a5e800a5c5e187731154fa7272ec9d9ee15e99a0 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 29 Mar 2013 16:53:22 +0000
Subject: [PATCH] Fix @conflict marker.

---
 net/telepathy/folks/Makefile  | 4 ++--
 net/telepathy/folks/pkg/PLIST | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/telepathy/folks/Makefile b/net/telepathy/folks/Makefile
index 61ae6c320c3..1209c750635 100644
--- a/net/telepathy/folks/Makefile
+++ b/net/telepathy/folks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2013/03/29 16:48:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.53 2013/03/29 16:53:22 ajacoutot Exp $
 
 COMMENT=		people aggregation library
 
@@ -7,7 +7,7 @@ GNOME_VERSION=		0.8.0
 # MODULE_VERSION in config.h
 API_V=			37
 
-REVISION=		4
+REVISION=		5
 
 SHARED_LIBS +=  folks-telepathy           5.0 # 37.0
 SHARED_LIBS +=  folks                     5.1 # 37.0
diff --git a/net/telepathy/folks/pkg/PLIST b/net/telepathy/folks/pkg/PLIST
index c60ed8ffbfa..f6b970440f8 100644
--- a/net/telepathy/folks/pkg/PLIST
+++ b/net/telepathy/folks/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.13 2013/03/29 16:48:27 jasper Exp $
-@conflict net/telepathy/folks,-tracker
+@comment $OpenBSD: PLIST,v 1.14 2013/03/29 16:53:22 ajacoutot Exp $
+@conflict folks-meta-tracker-*
 @pkgpath net/telepathy/folks,-main
 @pkgpath net/telepathy/folks,-tracker
 @bin bin/folks-import