From 2226c6841fb9fa51335be48b3d06799e5fd9f145 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 18 Sep 2004 12:57:32 +0000
Subject: [PATCH] new-style conflict

---
 multimedia/mjpegtools/pkg/PLIST | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multimedia/mjpegtools/pkg/PLIST b/multimedia/mjpegtools/pkg/PLIST
index 6ffc9fb3f5c..1321002afdf 100644
--- a/multimedia/mjpegtools/pkg/PLIST
+++ b/multimedia/mjpegtools/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:04:35 espie Exp $
-@pkgcfl mplex-*
+@comment $OpenBSD: PLIST,v 1.3 2004/09/18 12:57:32 espie Exp $
+@conflict mplex-*
 bin/glav
 bin/jpeg2yuv
 bin/lav2avi.sh