From owner-freebsd-ports@FreeBSD.ORG Mon Jun 1 20:45:11 2015 Return-Path: Delivered-To: freebsd-ports@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 062819BA for ; Mon, 1 Jun 2015 20:45:11 +0000 (UTC) (envelope-from freebsd-ports-local@be-well.ilk.org) Received: from be-well.ilk.org (be-well.ilk.org [23.30.133.173]) by mx1.freebsd.org (Postfix) with ESMTP id D40F11469 for ; Mon, 1 Jun 2015 20:45:10 +0000 (UTC) (envelope-from freebsd-ports-local@be-well.ilk.org) Received: from lowell-desk.lan (router.lan [172.30.250.2]) by be-well.ilk.org (Postfix) with ESMTP id 2213033C1D; Mon, 1 Jun 2015 16:44:59 -0400 (EDT) Received: by lowell-desk.lan (Postfix, from userid 1147) id 2BC2C3985F; Mon, 1 Jun 2015 16:44:57 -0400 (EDT) From: Lowell Gilbert To: freebsd-ports@freebsd.org Cc: Jeffrey Bouquet Subject: Re: SOLVED: pkg version mismatch [succeeds port...] References: <1433158692.84575.YahooMailBasic@web140904.mail.bf1.yahoo.com> Reply-To: freebsd-ports@freebsd.org Date: Mon, 01 Jun 2015 16:44:57 -0400 In-Reply-To: <1433158692.84575.YahooMailBasic@web140904.mail.bf1.yahoo.com> (Jeffrey Bouquet via freebsd-ports's message of "Mon, 1 Jun 2015 04:38:12 -0700") Message-ID: <44iob7upiu.fsf@lowell-desk.lan> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2015 20:45:11 -0000 [pkg@ snipped, because it's irrelevant] Jeffrey Bouquet via freebsd-ports writes: > I noticed the ports tree here had net/uget 1.10.4_1 even after "svn up"... while > pkg upgrading installed 2.0. "pkg version" (one of 3 ways) reported > "succeeds port"... was about to post a question about pkg, but it can be fixed > by > > cd /usr/ports/net/uget > svn revert . -R > > [found at stackoverflow] > > [I've about thirty of so of those directories to fix up, for installed ports... it seems]. > > Wondering if the fix can be put in CAVEATS or something in the pkg version > man page... "for those using subversion..." > > also if ever a man page with many examples is crafted for subversion on FreeBSD, > that could be one of them. > > Others: > > cd /usr/ports > svn resolve . These would not be useful to document unless you can document how you got into those situations in the first place. "svn revert" is only necessary if you made local changes to the sources under svn control, and even then usually if svn can't automatically merge upstream changes into yours. "svn resolve" is the way to sort out the merge if svn can't do it. It sounds like you're not intending to make local changes at all. In that case, I'd recommend you use something else (probably portsnap) to maintain your ports tree.