ports/76709: multimedia/mplex conflicts with multimedia/mjpegtools

[Ulrich Spoerlein]

>Number:         76709
>Category:       ports
>Synopsis:       multimedia/mplex conflicts with multimedia/mjpegtools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 26 13:00:32 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
>Description:
Both install ${LOCALBASE}/bin/mplex
>How-To-Repeat:
>Fix:
--- mplex.patch begins here ---
Index: mjpegtools/Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/mjpegtools/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- mjpegtools/Makefile	15 Dec 2004 01:42:49 -0000	1.38
+++ mjpegtools/Makefile	26 Jan 2005 12:52:39 -0000
@@ -18,6 +18,8 @@
 LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
+CONFLICTS=	mplex-*
+
 USE_GNOME=	glib12
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
Index: mplex/Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/mplex/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- mplex/Makefile	5 Feb 2004 20:37:38 -0000	1.13
+++ mplex/Makefile	26 Jan 2005 12:52:39 -0000
@@ -13,6 +13,8 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Multiplexes MPEG component streams into system layers
 
+CONFLICTS=	mjpegtools-*
+
 MAN1=		mplex.1
 PLIST_FILES=	bin/mplex
 
--- mplex.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: