From owner-freebsd-current@FreeBSD.ORG Tue Sep 7 16:06:06 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C049C16A4CE for ; Tue, 7 Sep 2004 16:06:06 +0000 (GMT) Received: from hak.cnd.mcgill.ca (hak.cnd.McGill.CA [132.216.11.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED16343D45 for ; Tue, 7 Sep 2004 16:06:05 +0000 (GMT) (envelope-from mat@hak.cnd.mcgill.ca) Received: from hak.cnd.mcgill.ca (localhost [127.0.0.1]) by hak.cnd.mcgill.ca (8.12.9/8.12.8) with ESMTP id i87GD81M029316; Tue, 7 Sep 2004 12:13:08 -0400 (EDT) (envelope-from mat@hak.cnd.mcgill.ca) Received: (from mat@localhost) by hak.cnd.mcgill.ca (8.12.9/8.12.8/Submit) id i87GD87Z029315; Tue, 7 Sep 2004 12:13:08 -0400 (EDT) Date: Tue, 7 Sep 2004 12:13:07 -0400 From: Mathew Kanner To: "Conrad J. Sabatier" Message-ID: <20040907161307.GJ19729@cnd.mcgill.ca> References: <20040907092833.3fb290fc@dolphin.local.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040907092833.3fb290fc@dolphin.local.net> User-Agent: Mutt/1.4.1i Organization: I speak for myself, operating in Montreal, CANADA X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.62 X-Spam-Checker-Version: SpamAssassin 2.62 (2004-01-11) on hak.cnd.mcgill.ca cc: freebsd-current@freebsd.org Subject: Re: Problems applying Mat's MIDI test patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2004 16:06:06 -0000 On Sep 07, Conrad J. Sabatier wrote: > > > Begin forwarded message: > > Date: Mon, 6 Sep 2004 12:07:28 -0500 > From: "Conrad J. Sabatier" > To: Mathew Kanner > Subject: Re: MIDI test patch > > > On Mon, 6 Sep 2004 12:03:01 -0500 > "Conrad J. Sabatier" wrote: > > > > Hmmm, very strange. I just noticed that when I did the following: > > > > cd /usr/src > > patch < ~conrads/midi2-patch-aug22.diff > > > > Some of the patches seem to be applying in the wrong directories. I > > ended up with Makefile.orig and Makefile.rej, as well as several *.c > > and*.h and *.m files, in the top-level /usr/src directory. > > > > Am I doing something wrong here? > > I notice some of the diffs are against "/dev/null". These seem to be > the files that are ending up in /usr/src. For instance: > > --- /dev/null Sun Aug 22 22:22:01 2004 > +++ sys/dev/sound/midi/mpu_if.m Sun Aug 22 16:12:00 2004 > > OK, obviously, some of the patches are creating entirely new files, but > they're not being created in the correct locations. For instance, the > mpu_if.m file in this particular hunk is winding up in /usr/src. > > Was the patch simply not created properly, or is there an option to > "patch" that will take care of this case? Hi Conrad, Sorry I missed your message. I just did a checkout and then cd /top level of source/ bunzip2 -c ~/midi2-patch-aug22.diff.bz2 | patch -p0 And it worked out for me. Maybe your aren't using the -p0 (I'm not sure what the problem is). Please try again, and let me know. I'm leaving to go camping for a few days so I might take some time for a reply. --Mat -- Having your book made into a movie is like having your ox made into a bouillon cube. - Bill Neely