From owner-freebsd-ports@FreeBSD.ORG Fri Jul 25 14:13:12 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC2D7829 for ; Fri, 25 Jul 2014 14:13:12 +0000 (UTC) Received: from sam.nabble.com (sam.nabble.com [216.139.236.26]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B08DF2608 for ; Fri, 25 Jul 2014 14:13:12 +0000 (UTC) Received: from [192.168.236.26] (helo=sam.nabble.com) by sam.nabble.com with esmtp (Exim 4.72) (envelope-from ) id 1XAgFD-0004gE-Gk for freebsd-ports@freebsd.org; Fri, 25 Jul 2014 07:13:11 -0700 Date: Fri, 25 Jul 2014 07:13:11 -0700 (PDT) From: Beeblebrox To: freebsd-ports@freebsd.org Message-ID: <1406297591500-5931719.post@n5.nabble.com> Subject: Merging several branches with ports tree MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 14:13:12 -0000 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? ----- FreeBSD-11-current_amd64_root-on-zfs_RadeonKMS -- View this message in context: http://freebsd.1045724.n5.nabble.com/Merging-several-branches-with-ports-tree-tp5931719.html Sent from the freebsd-ports mailing list archive at Nabble.com.