From owner-freebsd-ports  Fri Jan 16 09:19:15 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id JAA29586
          for freebsd-ports-outgoing; Fri, 16 Jan 1998 09:19:15 -0800 (PST)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from mail.westbend.net (ns1.westbend.net [207.217.224.194])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id JAA29574
          for <freebsd-ports@freebsd.org>; Fri, 16 Jan 1998 09:19:04 -0800 (PST)
          (envelope-from hetzels@westbend.net)
Received: from admin (admin.WestBend.NET [207.217.224.195])
	by mail.westbend.net (8.8.8/8.8.7) with SMTP id MAA17287
	for <freebsd-ports@freebsd.org>; Fri, 16 Jan 1998 12:26:38 -0600 (CST)
	(envelope-from hetzels@westbend.net)
Message-ID: <001a01bd22a2$b01d52c0$c3e0d9cf@admin.westbend.net>
From: "Scot W. Hetzel" <hetzels@westbend.net>
To: <freebsd-ports@FreeBSD.ORG>
Subject: Patch Problem
Date: Fri, 16 Jan 1998 11:17:56 -0600
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 4.72.2106.4
X-MimeOLE: Produced By Microsoft MimeOLE V4.72.2106.4
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

I made a patch for a port I created, but when I tried to apply the patch to
the original sources it didn't work as it was patching the wrong Makefile.

The problem:

Directories in "port.cat":

-rwxrwxr-- Makefile
drwxrwxr-x myport
drwxrwxr-x myport.orig
-rwxrwxr-- myport.orig.tgz

I create the patch as follows:

diff -ruN myport.orig myport > myport.diff

I then do

mv myport myport.new
mv myport.orig myport
patch < myport.diff

Patch creates 2 *.rej files (Makefile.rej, Makefile.orig.rej) in the
"port.cat" directory.

How do I create a patch that will work correctly?

Scot