Missing @conflict marker for mplex.

(mplex already has the @conflict marker.)
This commit is contained in:
bernd 2007-02-08 11:31:16 +00:00
parent e5b5710544
commit 40f1272bd7
2 changed files with 4 additions and 3 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2006/12/22 16:30:17 steven Exp $
# $OpenBSD: Makefile,v 1.12 2007/02/08 11:31:16 bernd Exp $
COMMENT= "tools to edit/modify/encode video streams"
DISTNAME= mjpegtools-1.8.0
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= multimedia
SHARED_LIBS= lavfile 3.0 \
lavfile-1.8 3.0 \

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2006/02/03 05:08:41 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/02/08 11:31:16 bernd Exp $
@conflict mplex-*
bin/anytovcd.sh
bin/glav
bin/jpeg2yuv