aboutsummaryrefslogtreecommitdiff
path: root/multimedia/mplex
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2005-03-11 00:44:44 +0000
committerMichael Johnson <ahze@FreeBSD.org>2005-03-11 00:44:44 +0000
commit68cba097a0ae57a41888e8489d8ce63baa2ab59d (patch)
treeb71490fe71cf03c0282fa0a03891105a14817216 /multimedia/mplex
parent58af965bcc00775779c7adeaffe76f51b20e6619 (diff)
downloadports-68cba097a0ae57a41888e8489d8ce63baa2ab59d.tar.gz
ports-68cba097a0ae57a41888e8489d8ce63baa2ab59d.zip
- Add CONFLICTS= mjpegtools-*
PR: ports/76709 Submitted by: Ulrich Spoerlein <q@uni.de>
Notes
Notes: svn path=/head/; revision=130839
Diffstat (limited to 'multimedia/mplex')
-rw-r--r--multimedia/mplex/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 9213a5d115a5..136352eb329f 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES= ftp://ftp.leo.org/pub/comp/general/graphics/mpeg/mplex/
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiplexes MPEG component streams into system layers
+CONFLICTS= mjpegtools-*
+
MAN1= mplex.1
PLIST_FILES= bin/mplex