From 98afa6b86e361e46fb1715699730d86deed0fe4b Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 26 Sep 2011 15:10:34 +0000
Subject: [PATCH] Fix conflict marker.

---
 devel/vte3/Makefile  | 4 ++--
 devel/vte3/pkg/PLIST | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/devel/vte3/Makefile b/devel/vte3/Makefile
index 8b16ec2ab7e..3b5905999fd 100644
--- a/devel/vte3/Makefile
+++ b/devel/vte3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2011/09/26 14:41:57 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/26 15:10:34 ajacoutot Exp $
 
 COMMENT=		terminal emulation library
 
 GNOME_PROJECT=		vte
 GNOME_VERSION=		0.30.0
-REVISION=		0
+REVISION=		1
 
 PKGNAME=		vte3-${GNOME_VERSION}
 
diff --git a/devel/vte3/pkg/PLIST b/devel/vte3/pkg/PLIST
index bc4e89d24cd..92af022b73e 100644
--- a/devel/vte3/pkg/PLIST
+++ b/devel/vte3/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/09/26 14:41:57 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/09/26 15:10:34 ajacoutot Exp $
 @conflict devel/vte,-main,gtk2-<=0.28.2
-@conflict devel/vte,-pty-helper-*
+@conflict vte-ptyhelper-*
 @pkgpath devel/vte,-main
 @bin bin/vte2_90
 include/vte-2.90/