From owner-freebsd-ports Sun Aug 23 18:43:15 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id SAA23575 for freebsd-ports-outgoing; Sun, 23 Aug 1998 18:43:15 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from catastrophe.gelemna.ft-wayne.in.us (fortwayne-max-4-44.fwi.com [209.84.173.142]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id SAA23529; Sun, 23 Aug 1998 18:43:06 -0700 (PDT) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: from emerson.gelemna.ft-wayne.in.us (emerson.gelemna.ft-wayne.in.us [10.23.42.2]) by catastrophe.gelemna.ft-wayne.in.us (8.8.8/8.8.8) with ESMTP id UAA09972; Sun, 23 Aug 1998 20:42:20 -0500 (EST) (envelope-from croyle@gelemna.ft-wayne.in.us) Received: (from croyle@localhost) by emerson.gelemna.ft-wayne.in.us (8.9.1/8.9.1) id UAA02653; Sun, 23 Aug 1998 20:42:19 -0500 (EST) (envelope-from croyle@gelemna.ft-wayne.in.us) To: Steve Price Cc: freebsd-ports@FreeBSD.ORG Subject: Re: ports/7655 References: <199808240050.RAA05379@freefall.freebsd.org> Mime-Version: 1.0 (generated by tm-edit 7.108) Content-Type: text/plain; charset=US-ASCII From: Don Croyle Date: 23 Aug 1998 20:42:18 -0500 Organization: Minimal at best In-Reply-To: Steve Price's message of "Sun, 23 Aug 1998 17:50:07 -0700 (PDT)" Message-ID: <86u33340lh.fsf@emerson.gelemna.ft-wayne.in.us> Lines: 102 X-Mailer: Gnus v5.6.36/XEmacs 20.4 - "Emerald" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Steve Price writes: > Synopsis: net/cnet doesn't build under -current (with fix) > > State-Changed-From-To: open-feedback > State-Changed-By: steve > State-Changed-When: Sun Aug 23 17:49:24 PDT 1998 > State-Changed-Why: > Perhaps I'm just blind but I don't see any diffs. Where did you > put them? > Um. It looks like I forgot to attach them. I hate it when that happens. -- I've always wanted to be a dilettante, but I've never quite been ready to make the commitment. diff -ruN cnet.old/patches/patch-aa cnet/patches/patch-aa --- cnet.old/patches/patch-aa Sun Feb 8 15:02:50 1998 +++ cnet/patches/patch-aa Sun Aug 16 23:26:28 1998 @@ -40,20 +40,6 @@ address.o: $(ALLH) address.c -diff -ur src/cnetheader.h src/cnetheader.h ---- src/cnetheader.h Thu Jul 24 07:15:13 1997 -+++ src/cnetheader.h Sun Feb 8 06:07:04 1998 -@@ -22,6 +22,10 @@ - #define NDATASEGS 1 - #define LENDATA_EVER_0 FALSE - -+#elif defined(USE_FREEBSD) -+#define NDATASEGS 1 -+#define LENDATA_EVER_0 FALSE -+ - #elif defined(USE_SOLARIS2) - #define NDATASEGS 1 - #define LENDATA_EVER_0 FALSE diff -ur src/compile.c src/compile.c --- src/compile.c Sun Jan 26 03:42:23 1997 +++ src/compile.c Sun Feb 8 06:52:49 1998 diff -ruN cnet.old/patches/patch-ab cnet/patches/patch-ab --- cnet.old/patches/patch-ab Wed Dec 31 19:00:00 1969 +++ cnet/patches/patch-ab Sun Aug 16 23:31:46 1998 @@ -0,0 +1,22 @@ +--- src/cnetheader.h.orig Thu Jul 24 09:15:13 1997 ++++ src/cnetheader.h Sun Aug 16 23:27:41 1998 +@@ -22,6 +22,10 @@ + #define NDATASEGS 1 + #define LENDATA_EVER_0 FALSE + ++#elif defined(USE_FREEBSD) ++#define NDATASEGS 1 ++#define LENDATA_EVER_0 FALSE ++ + #elif defined(USE_SOLARIS2) + #define NDATASEGS 1 + #define LENDATA_EVER_0 FALSE +@@ -196,7 +200,7 @@ + int nlinks; + int *links; + +- int errno; ++ int errorno; + CnetError cnet_errno; + + unsigned long length_data[NDATASEGS]; diff -ruN cnet.old/patches/patch-ac cnet/patches/patch-ac --- cnet.old/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ cnet/patches/patch-ac Sun Aug 16 23:31:27 1998 @@ -0,0 +1,29 @@ +--- src/scheduler.c.orig Sat Aug 23 21:38:36 1997 ++++ src/scheduler.c Sun Aug 16 23:28:00 1998 +@@ -613,7 +613,7 @@ + + reboot_stdio_layer(); + +- np->errno = 0; ++ np->errorno = 0; + np->cnet_errno = + cnet_errno = ER_OK; + HANDLER(EV_REBOOT, NULLTIMESTAMP, NP[THISNODE].data[(int)EV_REBOOT]); +@@ -653,7 +653,7 @@ + + /* swap out SWAPPED_IN process, swap in THISNODE process */ + +- NP[SWAPPED_IN].errno = errno; ++ NP[SWAPPED_IN].errorno = errno; + NP[SWAPPED_IN].cnet_errno = cnet_errno; + + swapout_data(SWAPPED_IN); +@@ -693,7 +693,7 @@ + WHICH(thislinkattr->transmitbufsize, DEFAULTLINK.transmitbufsize); + } + +- errno = np->errno; ++ errno = np->errorno; + cnet_errno = np->cnet_errno; + NNODES = tell_nnodes; + SWAPPED_IN = THISNODE; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message