Date: Thu, 30 Apr 1998 15:35:50 -0500 From: Jacques Vidrine <n@nectar.com> To: freebsd-hackers@FreeBSD.ORG Subject: OK, I must be stupid (ports/6430) Message-ID: <199804302035.PAA11632@cerebus.nectar.com>
next in thread | raw e-mail | index | archive | help
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 <net/if.h> #include <net/slip.h> #include <net/if_var.h> -#include <net/if_slvar.h> #ifdef __FreeBSD__ #include <net/if_ppp.h> #else Jacques Vidrine <n@nectar.com> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199804302035.PAA11632>