From owner-svn-ports-head@FreeBSD.ORG  Sun Oct 27 12:17:50 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 114DB19F;
 Sun, 27 Oct 2013 12:17:50 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F199F258A;
 Sun, 27 Oct 2013 12:17:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RCHn71052943;
 Sun, 27 Oct 2013 12:17:49 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RCHnKD052938;
 Sun, 27 Oct 2013 12:17:49 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201310271217.r9RCHnKD052938@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sun, 27 Oct 2013 12:17:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331765 - in head: . multimedia multimedia/ffmpeg1
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Oct 2013 12:17:50 -0000

Author: wg
Date: Sun Oct 27 12:17:49 2013
New Revision: 331765
URL: http://svnweb.freebsd.org/changeset/ports/331765

Log:
  multimedia/ffmpeg1: Use multimedia/ffmpeg instead
  
  - Use multimedia/ffmpeg instead
  
  Approved by:	portmgr (bapt, implicit)

Deleted:
  head/multimedia/ffmpeg1/
Modified:
  head/MOVED
  head/multimedia/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Oct 27 12:10:31 2013	(r331764)
+++ head/MOVED	Sun Oct 27 12:17:49 2013	(r331765)
@@ -5145,3 +5145,4 @@ www/rubygem-mongrel||2013-10-22|Removed
 www/rubygem-rails-app-installer||2013-10-22|Has expired: Does not work with Ruby 1.9
 www/typo||2013-10-22|Has expired: Does not work with Ruby 1.9
 graphics/ruby-opengl||2013-10-25|Has expired: Does not work with Ruby 1.9
+multimedia/ffmpeg1|multimedia/ffmpeg|2013-10-27|Use multimedia/ffmpeg instead

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Sun Oct 27 12:10:31 2013	(r331764)
+++ head/multimedia/Makefile	Sun Oct 27 12:17:49 2013	(r331765)
@@ -55,7 +55,6 @@
     SUBDIR += emovix
     SUBDIR += ffmpeg
     SUBDIR += ffmpeg0
-    SUBDIR += ffmpeg1
     SUBDIR += ffmpeg2theora
     SUBDIR += ffmpegthumbnailer
     SUBDIR += flvmeta