From owner-svn-ports-all@freebsd.org Tue Dec 5 16:15:37 2017 Return-Path: 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 80039E6F590; Tue, 5 Dec 2017 16:15:37 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from onlyone.not-for.work (onlyone.not-for.work [148.251.9.81]) by mx1.freebsd.org (Postfix) with ESMTP id 4A6B1114A; Tue, 5 Dec 2017 16:15:37 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from [192.168.23.186] (unknown [89.113.128.32]) (Authenticated sender: lev@serebryakov.spb.ru) by onlyone.not-for.work (Postfix) with ESMTPSA id 22EF5574; Tue, 5 Dec 2017 19:15:30 +0300 (MSK) Reply-To: lev@FreeBSD.org Subject: Re: svn commit: r455587 - in head/devel/msp430-debug-stack: . files To: Jan Beich Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201712051557.vB5FvQUH076158@repo.freebsd.org> From: Lev Serebryakov Organization: FreeBSD Message-ID: <8af64b17-cb6b-001c-a113-a5fe3f3b11fc@FreeBSD.org> Date: Tue, 5 Dec 2017 19:15:29 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Dec 2017 16:15:37 -0000 On 05.12.2017 19:06, Jan Beich wrote: I stop to understand how does "update-patches" work. Also, don't do anything in last daty before month-long AFK vacations :-) Thank you! > "Lev A. Serebryakov" writes: > >> Modified: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp >> ============================================================================== >> --- head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp Tue Dec 5 15:56:04 2017 (r455586) >> +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp Tue Dec 5 15:57:25 2017 (r455587) >> @@ -1,33 +1,20 @@ >> ---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2016-05-02 09:51:53.763023000 +0200 >> -+++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp 2016-05-02 09:53:56.332580000 +0200 >> -@@ -303,6 +303,22 @@ >> - } >> - #else >> - stringstream cdcIdStream; >> -+ >> -+#ifdef __FreeBSD__ >> -+ >> -+ path p( "/dev" ); >> -+ if( exists(p) && is_directory(p) ) { >> -+ >> -+ cdcIdStream << hex << setfill('0') << "mspfet" << setw(4) << productId; >> -+ >> -+ const directory_iterator end; >> -+ for( directory_iterator it(p); it != end; ++it ) { >> -+ >> -+ string dir = it->path().string(); >> -+ if( dir.find( cdcIdStream.str() ) != string::npos ) { >> -+ { >> -+ >> -+#else >> - cdcIdStream << hex << setfill('0') << "usb:v" << setw(4) << vendorId << "p" << setw(4) << productId; > > I think, you've accidentally removed existing patch against this file. > -- // Lev Serebryakov