From owner-freebsd-ports@FreeBSD.ORG Fri Jul 25 20:35:42 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3D508812 for ; Fri, 25 Jul 2014 20:35:42 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CD4562B03 for ; Fri, 25 Jul 2014 20:35:41 +0000 (UTC) Received: from [192.168.0.100] ([87.139.233.65]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0LqQnR-1WXIWg04Ib-00e760; Fri, 25 Jul 2014 22:35:39 +0200 Message-ID: <53D2BF9A.7030702@gmx.de> Date: Fri, 25 Jul 2014 22:35:38 +0200 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Beeblebrox Subject: Re: Merging several branches with ports tree References: <1406297591500-5931719.post@n5.nabble.com> In-Reply-To: <1406297591500-5931719.post@n5.nabble.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ctCRlc3vgabjO2w1IOLHCqMonfFCSRhSWvjxhW6f+iTJty7EmXi rGTYFYAW1Wy/Yk6CHG0WIW3kwEZcjGT48kJ3C00yRN3Z15QnwqCVCmt3l5yE7sugngB4OyJ kpseJysxD9CGEigEaZ7z+QOc2CJYS+fFr9jMiqmvy8j/5sfcqElDGwuQHWWMiTAN5xN7eON Na4jO7MuH+RdyBKZzb9jQ== Cc: freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 20:35:42 -0000 On 2014-07-25 16:13, Beeblebrox wrote: > I have several ports branches that get merged to the ports tree. The > structure is such that a pristine (un-merged) copy of each branch is located > under: /asp/git/ports, /asp/git/marcuscom, /asp/git/linux-c6, /asp/git/my-pc > > I then want to copy all files under each branch to /usr/ports using a > combination of rsync and the marcusmerge script. The steps I wish to run: > 1. rsync -uav --exclude=.git /asp/git/ports/ /usr/ports/ > 2. marcusmerge (works, no problem) > 3. rsync -av --exclude=.git/ /asp/git/linux-c6/ /usr/ports/ (works, no > problem) > 4. rsync -av /asp/git/my-pc/ /usr/ports/ > > Steps #1 and #4 are the problem. > * a simple "rsync -a OR -ua" in step 1 does not seem to work when rsyncing > onto a merged structure and causes problems. What can I use here, so as to > ensure updates to the primary port tree get written to the combined folder > (/usr/ports)? > * my-pc is a self maintained my ports collection. It has one folder with my > collection in it, but the problem is that the top-level Makefile and > Mk/bsd.port.mk "VALID_CATEGORIES" must be modified to include the myports > collection. How can I merge this set to /usr/ports? > > Perhaps ports-mgmt/portshaker is a possible tool. With the line in make.conf there is no need to patch bsd.port.mk for own $CAT VALID_CATEGORIES+=foo bar Use .sinclude instead .include for own Makefile extensions, then there is no issue in case the file is missing. -- olli