From owner-svn-ports-head@FreeBSD.ORG  Wed Nov 26 17:43:50 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EDEC45A7;
 Wed, 26 Nov 2014 17:43:50 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D5030A25;
 Wed, 26 Nov 2014 17:43:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQHhoQJ072923;
 Wed, 26 Nov 2014 17:43:50 GMT (envelope-from xmj@FreeBSD.org)
Received: (from xmj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQHho6Z072922;
 Wed, 26 Nov 2014 17:43:50 GMT (envelope-from xmj@FreeBSD.org)
Message-Id: <201411261743.sAQHho6Z072922@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org
 using -f
From: Johannes Jost Meixner <xmj@FreeBSD.org>
Date: Wed, 26 Nov 2014 17:43:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373455 - head
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.18-1
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: Wed, 26 Nov 2014 17:43:51 -0000

Author: xmj
Date: Wed Nov 26 17:43:49 2014
New Revision: 373455
URL: https://svnweb.freebsd.org/changeset/ports/373455
QAT: https://qat.redports.org/buildarchive/r373455/

Log:
  Add UPDATING entry for the x264 split in two ports
  
  Submitted by:	Andrew Berg <aberg010@my.hennepintech.edu>
  Approved by:	swills (mentor)

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Nov 26 17:05:59 2014	(r373454)
+++ head/UPDATING	Wed Nov 26 17:43:49 2014	(r373455)
@@ -6,6 +6,20 @@ You should get into the habit of checkin
 you update your ports collection, before attempting any port upgrades.
 
 20141126:
+  AFFECTS: users of multimedia/x264
+  AUTHOR: xmj@FreeBSD.org
+
+  With the recent split of multimedia/x264 in library and binary and library
+  components, if an application that uses libx264 is updated before x264 itself,
+  multimedia/libx264 will conflict with the existing x264 package. Delete
+  this package before continuing any update that depends on it: 
+  
+  # pkg delete -f x264
+  
+  Install the updated x264 and/or upgrade the other applications that
+  depend on libx264, such as ffmpeg.
+
+20141126:
   AFFECTS: users of lang/perl5.*
   AUTHOR: mat@FreeBSD.org