aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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