From owner-freebsd-hackers Thu Apr 30 13:36:11 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id NAA16468 for freebsd-hackers-outgoing; Thu, 30 Apr 1998 13:36:11 -0700 (PDT) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from cerebus.nectar.com (cerebus.nectar.com [204.27.67.90]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA16364 for ; Thu, 30 Apr 1998 13:35:59 -0700 (PDT) (envelope-from nectar@cerebus.nectar.com) Received: from cerebus.nectar.com (localhost.communique.net [127.0.0.1]) by cerebus.nectar.com (8.8.8/8.8.8) with ESMTP id PAA11632 for ; Thu, 30 Apr 1998 15:35:50 -0500 (CDT) Message-Id: <199804302035.PAA11632@cerebus.nectar.com> X-PGP-RSAfprint: 00 F9 E6 A2 C5 4D 0A 76 26 8B 8B 57 73 D0 DE EE X-PGP-RSAkey: http://pgp.ai.mit.edu:11371/pks/lookup?op=get&search=0x094724A9 From: Jacques Vidrine To: freebsd-hackers@FreeBSD.ORG Subject: OK, I must be stupid (ports/6430) Date: Thu, 30 Apr 1998 15:35:50 -0500 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG I just want to fix PR ports/6430. It is an easy fix, requiring an additional patchfile in trafshow/patches. But I'm stumped ... there must be something I'm missing. If I stick my patch file in trafshow/patches (as the last one, patch-ae), I get: ---- # make patch >> Checksum OK for trafshow-2.0.tgz. ===> Patching for trafshow-2.0 ===> Applying FreeBSD patches for trafshow-2.0 1 out of 1 hunks failed--saving rejects to lib/interfaces.c.rej *** Error code 1 Stop. ---- If I apply the same patch manually, without having it in trafshow/patches: ---- # make patch >> Checksum OK for trafshow-2.0.tgz. ===> Patching for trafshow-2.0 ===> Applying FreeBSD patches for trafshow-2.0 # patch -d $PWD/work/trafshow-2.0 -p0 -E < ~/trafshow.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- lib/interfaces.c.ae Wed Apr 29 13:56:21 1998 |+++ lib/interfaces.c Wed Apr 29 13:56:30 1998 -------------------------- Patching file lib/interfaces.c using Plan A... Hunk #1 succeeded at 23. done ---- I don't get it. Can someone help? I am obviously lost, and I think I am missing something magic in bsd.ports.mk. The trivial patch file: --- lib/interfaces.c.ae Wed Apr 29 13:56:21 1998 +++ lib/interfaces.c Wed Apr 29 13:56:30 1998 @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef __FreeBSD__ #include #else Jacques Vidrine To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message