ports/150634: [patch] multimedia/ffmpeg - fix CONFLICTS

[Alberto Villa]

>Number:         150634
>Category:       ports
>Synopsis:       [patch] multimedia/ffmpeg - fix CONFLICTS
>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:   Fri Sep 17 01:20:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Alberto Villa
>Release:        FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD echo.hoth 9.0-CURRENT FreeBSD 9.0-CURRENT #6 r212559: Mon Sep 13 22:05:23 CEST 2010     root at echo.hoth:/usr/obj/usr/src/sys/TPR60  i386
>Description:
ffmpeg sets ffmpeg-devel-20* in CONFLICTS, but ffmpeg-devel PORTNAME is simply ffmpeg, and then the conflict is not correctly recognised
>How-To-Repeat:
cd /usr/ports/multimedia/ffmpeg-devel &&
cd /usr/ports/multimedia/ffmpeg
>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/ffmpeg/Makefile,v
retrieving revision 1.114
diff -u -r1.114 Makefile
--- Makefile	1 Aug 2010 20:41:25 -0000	1.114
+++ Makefile	17 Sep 2010 01:08:14 -0000
@@ -17,7 +17,7 @@
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
 
-CONFLICTS=	ffmpeg-devel-20*
+CONFLICTS=	ffmpeg-20*
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err


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