From owner-freebsd-current@FreeBSD.ORG Tue Sep 7 14:28:40 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 7B7B516A4CE for ; Tue, 7 Sep 2004 14:28:40 +0000 (GMT) Received: from lakermmtao04.cox.net (lakermmtao04.cox.net [68.230.240.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDB5643D1D for ; Tue, 7 Sep 2004 14:28:39 +0000 (GMT) (envelope-from conrads@cox.net) Received: from dolphin.local.net ([68.11.71.51]) by lakermmtao04.cox.net (InterMail vM.6.01.03.02.01 201-2131-111-104-103-20040709) with ESMTP id <20040907142837.QGDY4754.lakermmtao04.cox.net@dolphin.local.net> for ; Tue, 7 Sep 2004 10:28:37 -0400 Received: from dolphin.local.net (localhost.local.net [127.0.0.1]) by dolphin.local.net (8.13.1/8.13.1) with SMTP id i87EScbA091616 for ; Tue, 7 Sep 2004 09:28:38 -0500 (CDT) (envelope-from conrads@cox.net) Date: Tue, 7 Sep 2004 09:28:33 -0500 From: "Conrad J. Sabatier" To: freebsd-current@freebsd.org Message-ID: <20040907092833.3fb290fc@dolphin.local.net> X-Mailer: Sylpheed-Claws 0.9.12a (GTK+ 1.2.10; amd64-portbld-freebsd6.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: 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 14:28:40 -0000 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? Thanks. -- Conrad J. Sabatier -- "In Unix veritas"