From ab13e83864fa4116d5bcd8aee337b4c718b08c69 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 11 Apr 2017 13:56:52 +0000
Subject: [PATCH] textproc/tre no longer needs @conflict agrep. (this has its
 own version of the agrep tool).

---
 textproc/tre/Makefile  | 4 ++--
 textproc/tre/pkg/PLIST | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/textproc/tre/Makefile b/textproc/tre/Makefile
index 5bda59c00ec..18b879fb894 100644
--- a/textproc/tre/Makefile
+++ b/textproc/tre/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2015/03/16 18:07:57 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2017/04/11 13:56:52 sthen Exp $
 
 COMMENT=	lightweight regexp matching library with additional features
 
 DISTNAME=		tre-0.8.0
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		textproc
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://laurikari.net/tre/
 
diff --git a/textproc/tre/pkg/PLIST b/textproc/tre/pkg/PLIST
index 2ddc2643a90..15f52152f89 100644
--- a/textproc/tre/pkg/PLIST
+++ b/textproc/tre/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2015/03/16 18:07:57 naddy Exp $
-@conflict agrep-*
+@comment $OpenBSD: PLIST,v 1.5 2017/04/11 13:56:52 sthen Exp $
 @conflict glimpse-*
 @bin bin/agrep
 include/tre/