From owner-freebsd-ports@FreeBSD.ORG  Mon Mar 31 08:32:43 2014
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 003E1F02
 for <freebsd-ports@freebsd.org>; Mon, 31 Mar 2014 08:32:42 +0000 (UTC)
Received: from forward6l.mail.yandex.net (forward6l.mail.yandex.net
 [IPv6:2a02:6b8:0:1819::6])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client CN "forwards.mail.yandex.net",
 Issuer "Certum Level IV CA" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id B1168B7A
 for <freebsd-ports@freebsd.org>; Mon, 31 Mar 2014 08:32:42 +0000 (UTC)
Received: from smtp12.mail.yandex.net (smtp12.mail.yandex.net [95.108.131.191])
 by forward6l.mail.yandex.net (Yandex) with ESMTP id 42D3414E0E5F
 for <freebsd-ports@freebsd.org>; Mon, 31 Mar 2014 12:32:40 +0400 (MSK)
Received: from smtp12.mail.yandex.net (localhost [127.0.0.1])
 by smtp12.mail.yandex.net (Yandex) with ESMTP id EAD8316A03DC
 for <freebsd-ports@freebsd.org>; Mon, 31 Mar 2014 12:32:39 +0400 (MSK)
Received: from 46.38.38.120.tel.ru (46.38.38.120.tel.ru [46.38.38.120])
 by smtp12.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id t5uS0aw2lF-WdIGql8a; 
 Mon, 31 Mar 2014 12:32:39 +0400
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (Client certificate not present)
X-Yandex-Uniq: 982ef6bb-59df-49fc-b3e8-b8d05175c672
Message-ID: <53392827.4010202@passap.ru>
Date: Mon, 31 Mar 2014 12:32:39 +0400
From: Boris Samorodov <bsam@passap.ru>
Organization: =?UTF-8?B?0JfQkNCeICLQktCQ0KDQoiI=?=
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.3.0
MIME-Version: 1.0
To: freebsd-ports@freebsd.org
Subject: Re: cups update
References: <6831529.v4E7LXfo3f@lumiwa.farms.net> <53391B6A.7020108@gmail.com>
 <533920B3.1060400@passap.ru> <533926C8.5000802@gmail.com>
In-Reply-To: <533926C8.5000802@gmail.com>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Mar 2014 08:32:43 -0000

31.03.2014 12:26, Johan Hendriks пишет:
> Boris Samorodov schreef:
>> 31.03.2014 11:38, Johan Hendriks пишет:
>>
>>> Installing cups-client-1.7.1...pkg-static: cups-client-1.7.1 conflicts
>>> with cups-image-1.5.4_1 (installs files into the same place).
>>> Problematic file: /usr/local/include/cups/raster.h
>> Yep, the problematic file has moved form cups-image (1.5.x) to
>> cups-client (1.7.x). So before upgrading cups-image should be
>> removed. A note to UPDATING would be a nice idea too...
>>
> Ok that worked.
> pkg delete -f cups-image
> portmaster print/cups-image  installed both ports.

Thanks for confirmation. I've just committed a note to UPDATING.
Sorry for inconsistency.

-- 
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve