From owner-freebsd-current Wed Nov 21 9:11:15 2001 Delivered-To: freebsd-current@freebsd.org Received: from Awfulhak.org (gw.Awfulhak.org [217.204.245.18]) by hub.freebsd.org (Postfix) with ESMTP id 821B937B417 for ; Wed, 21 Nov 2001 09:11:07 -0800 (PST) Received: from hak.lan.Awfulhak.org (root@hak.lan.Awfulhak.org [fec0::1:12]) by Awfulhak.org (8.11.6/8.11.6) with ESMTP id fALHB3P08342; Wed, 21 Nov 2001 17:11:04 GMT (envelope-from brian@freebsd-services.com) Received: from hak.lan.Awfulhak.org (brian@localhost [127.0.0.1]) by hak.lan.Awfulhak.org (8.11.6/8.11.6) with ESMTP id fALHB4x01357; Wed, 21 Nov 2001 17:11:04 GMT (envelope-from brian@freebsd-services.com) Message-Id: <200111211711.fALHB4x01357@hak.lan.Awfulhak.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Mark Murray Cc: John Polstra , current@freebsd.org, Brian Somers Subject: Re: cvsup-devel port build problem (pm3-base) In-Reply-To: Message from John Polstra of "Wed, 21 Nov 2001 08:06:49 PST." <200111211606.fALG6nH29776@vashon.polstra.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Date: Wed, 21 Nov 2001 17:11:04 +0000 From: Brian Somers Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Polstra wrote: > In article <200111211603.fALG3nj06238@hak.lan.Awfulhak.org>, > Brian Somers wrote: > > I sent John Polstra a similar patch some time ago.... Any news about= = > > getting this committed John (P) ? > = > There is already an open PR with a patch. I think Mark Murray is > working on committing it. I don't have the systems needed to test > it myself at the moment. Mark, any news on this ? FWIW, I've attached the patch that makes = things work here. > John > -- = > John Polstra > John D. Polstra & Co., Inc. Seattle, Washingto= n USA > "Disappointment is a good sign of basic intelligence." -- Ch=F6gyam = Trungpa Cheers. -- = Brian http://www.freebsd-services.com/ Don't _EVER_ lose your sense of humour ! Index: patch-l1 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/lang/pm3-base/files/patch-l1,v retrieving revision 1.1 diff -u -r1.1 patch-l1 --- patch-l1 21 Jul 2001 21:07:55 -0000 1.1 +++ patch-l1 11 Oct 2001 00:01:13 -0000 @@ -1,6 +1,18 @@ ---- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.old Thu Jun 1 02:54:= 33 2000 -+++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Tue Jun 12 14:07:= 31 2001 -@@ -693,7 +693,9 @@ +--- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.orig Thu Oct 11 00:59:= 24 2001 ++++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Thu Oct 11 01:00:50 20= 01 +@@ -98,7 +98,11 @@ + #include + #include + #include ++#if __FreeBSD_version >=3D 500024 ++#include ++#else + #include ++#endif + #include + #endif + = +@@ -693,7 +697,9 @@ void *data; { int result; struct ufs_args *u_data; @@ -10,7 +22,7 @@ struct nfs_args *n_data; = ENTER_CRITICAL; -@@ -704,11 +706,13 @@ +@@ -704,11 +710,13 @@ MAKE_READABLE(u_data); MAKE_READABLE(u_data->fspec); result =3D syscall(SYS_mount, type, dir, flags, data); Index: patch-l2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/ports/lang/pm3-base/files/patch-l2,v retrieving revision 1.2 diff -u -r1.2 patch-l2 --- patch-l2 10 Sep 2001 21:37:26 -0000 1.2 +++ patch-l2 11 Oct 2001 00:04:58 -0000 @@ -1,6 +1,18 @@ ---- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.old Thu Jun 1 02:5= 4:33 2000 -+++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Tue Jun 12 14:0= 7:31 2001 -@@ -693,7 +693,9 @@ +--- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.orig Wed May 31 18:5= 4:24 2000 ++++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Thu Oct 11 00:29:03 = 2001 +@@ -98,7 +98,11 @@ + #include + #include + #include ++#if __FreeBSD_version >=3D 500024 ++#include ++#else + #include ++#endif + #include + #endif + = +@@ -693,7 +697,9 @@ void *data; { int result; struct ufs_args *u_data; @@ -10,7 +22,7 @@ struct nfs_args *n_data; = ENTER_CRITICAL; -@@ -704,11 +706,13 @@ +@@ -704,11 +710,13 @@ MAKE_READABLE(u_data); MAKE_READABLE(u_data->fspec); result =3D syscall(SYS_mount, type, dir, flags, data); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message