From owner-freebsd-ports@FreeBSD.ORG Tue Jan 22 12:27:16 2013 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4CFB7151 for ; Tue, 22 Jan 2013 12:27:16 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id 02517ECE for ; Tue, 22 Jan 2013 12:27:15 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3Yr85R6TkgzFTSq; Tue, 22 Jan 2013 13:27:07 +0100 (CET) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nmte_Axa1EMb; Tue, 22 Jan 2013 13:27:06 +0100 (CET) Received: from vwg82.hq.ignesti.it (unknown [80.74.176.55]) by winston.madpilot.net (Postfix) with ESMTPSA; Tue, 22 Jan 2013 13:27:06 +0100 (CET) Message-ID: <50FE859B.7010607@madpilot.net> Date: Tue, 22 Jan 2013 13:27:07 +0100 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130115 Thunderbird/17.0.2 MIME-Version: 1.0 To: Oliver Lehmann Subject: Re: portsnap - overwrite local changes References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net> In-Reply-To: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 12:27:16 -0000 On 01/22/13 13:10, Oliver Lehmann wrote: > Hi, > > in case I made some local modifications to a ports Makefile.... in the > past with CVSup it was "easy" to get everything back in-sync by just > running CVSup. With portsnap fetch update, my modified Makefile stays > modified. What is the suggested way in syncing my local portstree 1:1 > with the official portstree? > If you use small modifications on a ingle system(or just a few) you could track the ports tree with subversion, which will be happy to keep and try to merge your local modifcations. You can also diff and revert your modifications using it, which can be quite handy. Disvantage is you will sometime need to merge conflicts which could require you to study subversion more than what you really want. If instead you have modifications to your ports tree you want to merge to more than just a few machines(more than two, is already enough) I suggest you investigate ports-mgmt/portshaker. It allows you to overlay the ports tree with your modifications. You can track your modifications using some VCS (subversion, or git if you lke it more for example) and just make the various machines pull the official tree, your modifications and merge them. It does require that you keep your local modifications up to date anyway though. Hope this helps. -- Guido Falsi