From owner-freebsd-arch Sun Sep 3 23:21:10 2000 Delivered-To: freebsd-arch@freebsd.org Received: from rover.village.org (rover.village.org [204.144.255.49]) by hub.freebsd.org (Postfix) with ESMTP id 0EABF37B424 for ; Sun, 3 Sep 2000 23:21:08 -0700 (PDT) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.9.3/8.9.3) with ESMTP id AAA20702; Mon, 4 Sep 2000 00:21:06 -0600 (MDT) (envelope-from imp@harmony.village.org) Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.9.3/8.8.3) with ESMTP id AAA22097; Mon, 4 Sep 2000 00:20:29 -0600 (MDT) Message-Id: <200009040620.AAA22097@harmony.village.org> To: Peter Jeremy Subject: Re: Local changes to the contrib tree(s) Cc: freebsd-arch@FreeBSD.ORG In-reply-to: Your message of "Mon, 04 Sep 2000 17:07:32 +1100." <00Sep4.170723est.115265@border.alcanet.com.au> References: <00Sep4.170723est.115265@border.alcanet.com.au> Date: Mon, 04 Sep 2000 00:20:29 -0600 From: Warner Losh Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG In message <00Sep4.170723est.115265@border.alcanet.com.au> Peter Jeremy writes: : As an example, given: : /usr/src/contrib/utility/somefile.c : /usr/src/usr.bin/utility/somefile.pch : the make would start by applying somefile.pch to somefile.c, creating : /usr/obj/usr/src/usr.bin/utility/somefile.c, which is then compiled. : : The downside is that maintaining the patches requires more effort than : just editing the files in place, though a make target could be created : to create the .pch file from the patched source. : : What do other people think of this? I find it esthetically displeasing. It would be less ugly to commit it to /usr/src/usr.bin/utility/somefile.c and control things with Makefile .PATH. This way it is easy to generate patches for the maintainer and we don't have to maintain patch files which is a major major pita. This is similar to how we do added files. These files can come and go w/o any CVS difficulties. -D still works. branches still work. The only cost is a slight bit of potential confusion with having two copies in the tree. Sure, this file would live in the Attic when it is deleted, but we have lots of files there already. Hmmm, people importing new versions of the package would need to merge into this file too, which is also a disadvantage. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message