[59005] trunk/dports/multimedia

[devans at macports.org]

Revision: 59005
          http://trac.macports.org/changeset/59005
Author:   devans at macports.org
Date:     2009-10-08 06:59:37 -0700 (Thu, 08 Oct 2009)
Log Message:
-----------
ffmpeg, ffmpeg-devel: mark as conflicting.

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile
    trunk/dports/multimedia/ffmpeg-devel/Portfile

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2009-10-08 13:53:59 UTC (rev 59004)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2009-10-08 13:59:37 UTC (rev 59005)
@@ -4,6 +4,7 @@
 PortSystem 1.0
 
 name            ffmpeg
+conflicts       ffmpeg-devel
 epoch           1
 version         0.5
 revision        5

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-10-08 13:53:59 UTC (rev 59004)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2009-10-08 13:59:37 UTC (rev 59005)
@@ -4,6 +4,7 @@
 PortSystem 1.0
 
 name            ffmpeg-devel
+conflicts       ffmpeg
 set svn_rev     19824
 set swscale_rev 29665
 version         ${svn_rev}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091008/6db89d86/attachment.html>