From owner-freebsd-ports  Sat Jan 17 08:38:26 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id IAA08689
          for freebsd-ports-outgoing; Sat, 17 Jan 1998 08:38:26 -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 IAA08683
          for <freebsd-ports@FreeBSD.ORG>; Sat, 17 Jan 1998 08:38:22 -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 KAA02695
	for <freebsd-ports@FreeBSD.ORG>; Sat, 17 Jan 1998 10:38:22 -0600 (CST)
	(envelope-from hetzels@westbend.net)
Message-ID: <001201bd2366$2be05380$c3e0d9cf@admin.westbend.net>
From: "Scot W. Hetzel" <hetzels@westbend.net>
To: <freebsd-ports@FreeBSD.ORG>
Subject: Re: Patch Problem
Date: Sat, 17 Jan 1998 10:37:16 -0600
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
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

From: Андрей Чернов <ache@nagual.pp.ru>

>On Fri, 16 Jan 1998, Scot W. Hetzel wrote:
>
>> I tried it both ways and still had the same problem.
>>
>> diff -ruN myport.orig myport > myport.diff
>>
>> diff -ruN myport myport.orig > myport.diff
>>
>> Both patches tried to patch the Makefile in root of the port.cat
directory,
>> instead of the Makefile in the myport subdirectory.
>
>Wrong. In your case the command should be
>
>diff -ruN myport myport.new > myport.diff
>
>where myport contains old variant and myport.new updated one.
>Then patch < myport.diff will patch myport as you suppose.
>
Tried it, but the patch still doesn't work.  What is happening is patch is
seeing the Makefile in the root of the port.cat dir instead of the looking
at Makefile's in the myport & myport/files subdirectories.

patch finds the other files and patches them with no problems.

Now if I move myport subdir to another subdir with out a Makefile in the
root, it will patch the port.

Scot