From owner-freebsd-ports@FreeBSD.ORG Tue Jun 7 19:50:18 2005 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF10416A41C for ; Tue, 7 Jun 2005 19:50:18 +0000 (GMT) (envelope-from lorenl@alzatex.com) Received: from hosea.tallye.com (joel.tallye.com [216.99.199.78]) by mx1.FreeBSD.org (Postfix) with ESMTP id A561743D1D for ; Tue, 7 Jun 2005 19:50:18 +0000 (GMT) (envelope-from lorenl@alzatex.com) Received: from hosea.tallye.com (hosea.tallye.com [127.0.0.1]) by hosea.tallye.com (8.12.8/8.12.10) with ESMTP id j57JoDDV026711 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 7 Jun 2005 12:50:16 -0700 Received: (from sttng359@localhost) by hosea.tallye.com (8.12.8/8.12.8/Submit) id j57JoDuO026709 for freebsd-ports@freebsd.org; Tue, 7 Jun 2005 12:50:13 -0700 Date: Tue, 7 Jun 2005 12:50:13 -0700 From: "Loren M. Lang" To: freebsd-ports@freebsd.org Message-ID: <20050607195013.GA26626@alzatex.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-GPG-Key: ftp://ftp.tallye.com/pub/lorenl_pubkey.asc X-GPG-Fingerprint: B3B9 D669 69C9 09EC 1BCD 835A FAF3 7A46 E4A3 280C Subject: Breaking up a monolithic patch X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2005 19:50:19 -0000 I have been working on porting Cinelerra to freebsd and I currently have one large monolithic patch that will make cinelerra compile and run on freebsd. Now I am trying to figure out how to break it up. It looks like the simplest method would be to break it up for each file that's modified, then I could use the existing update-patches framework to maintain it. But I think the better solution would be to break it up functionally, though it's harder to maintain. I could make a series of patches to be applied in order, where one patch would modify cinelerra to have a customizable prefix, another would disable the linux firewire support. This approach would make several patches that will overlap some and touch some of the same files, but it would be more useful in the long run. It would be easy to see what was modified to disable firewire and figure out how to update it to use the freebsd firewire support instead of disabling it. If I do this though, I'll probably need to spend some time making a script to help generate the patches appropriately. -- I sense much NT in you. NT leads to Bluescreen. Bluescreen leads to downtime. Downtime leads to suffering. NT is the path to the darkside. Powerful Unix is. Public Key: ftp://ftp.tallye.com/pub/lorenl_pubkey.asc Fingerprint: CEE1 AAE2 F66C 59B5 34CA C415 6D35 E847 0118 A3D2