From owner-svn-ports-all@freebsd.org  Sat Sep 19 23:38:54 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61CCAA057A0;
 Sat, 19 Sep 2015 23:38:54 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 5301A1890;
 Sat, 19 Sep 2015 23:38:54 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8JNcsOu059874;
 Sat, 19 Sep 2015 23:38:54 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8JNcsT7059873;
 Sat, 19 Sep 2015 23:38:54 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201509192338.t8JNcsT7059873@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 19 Sep 2015 23:38:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397341 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Sep 2015 23:38:54 -0000

Author: bapt
Date: Sat Sep 19 23:38:53 2015
New Revision: 397341
URL: https://svnweb.freebsd.org/changeset/ports/397341

Log:
  Define a 100% working workaround for jpeg->jpeg-turbo which confuse pkg too much

Modified:
  head/UPDATING

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Sep 19 22:56:19 2015	(r397340)
+++ head/UPDATING	Sat Sep 19 23:38:53 2015	(r397341)
@@ -28,7 +28,7 @@ you update your ports collection, before
 
   If using binary packages: 'pkg upgrade' will do the right thing.  If it
   doesn't and complains about 'Cannot solve problem using SAT solver', run
-  'pkg install jpeg-turbo' before 'pkg upgrade'.
+  'pkg delete -f jpeg' before 'pkg upgrade'.
 
   If using portmaster:
   # portmaster -o graphics/jpeg-turbo graphics/jpeg