Re: cvsup-devel port build problem (pm3-base)

2001-11-21 Thread Brian Somers

John Polstra <[EMAIL PROTECTED]> wrote:
> In article <[EMAIL PROTECTED]>,
> Brian Somers  <[EMAIL PROTECTED]> 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, Washington USA
>   "Disappointment is a good sign of basic intelligence."  -- Chögyam Trungpa

Cheers.

-- 
Brian <[EMAIL PROTECTED]><[EMAIL PROTECTED]>
  http://www.freebsd-services.com/
Don't _EVER_ lose your sense of humour !  

Index: patch-l1
===
RCS file: /home/ncvs/ports/lang/pm3-base/files/patch-l1,v
retrieving revision 1.1
diff -u -r1.1 patch-l1
--- patch-l121 Jul 2001 21:07:55 -  1.1
+++ patch-l111 Oct 2001 00:01:13 -
@@ -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 2001
+@@ -98,7 +98,11 @@
+ #include 
+ #include 
+ #include 
++#if __FreeBSD_version >= 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 = syscall(SYS_mount, type, dir, flags, data);
Index: patch-l2
===
RCS file: /home/ncvs/ports/lang/pm3-base/files/patch-l2,v
retrieving revision 1.2
diff -u -r1.2 patch-l2
--- patch-l210 Sep 2001 21:37:26 -  1.2
+++ patch-l211 Oct 2001 00:04:58 -
@@ -1,6 +1,18 @@
 libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.old  Thu Jun  1 02:54:33 2000
-+++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c  Tue Jun 12 14:07:31 2001
-@@ -693,7 +693,9 @@
+--- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.orig   Wed May 31 18:54:24 
+2000
 libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.cThu Oct 11 00:29:03 2001
+@@ -98,7 +98,11 @@
+ #include 
+ #include 
+ #include 
++#if __FreeBSD_version >= 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 = syscall(SYS_mount, type, dir, flags, data);



To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: cvsup-devel port build problem (pm3-base)

2001-11-21 Thread John Polstra

In article <[EMAIL PROTECTED]>,
Brian Somers  <[EMAIL PROTECTED]> 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.

John
-- 
  John Polstra
  John D. Polstra & Co., Inc.Seattle, Washington USA
  "Disappointment is a good sign of basic intelligence."  -- Chögyam Trungpa


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: cvsup-devel port build problem (pm3-base)

2001-11-21 Thread Brian Somers

I sent John Polstra a similar patch some time ago  Any news about 
getting this committed John (P) ?

> Hi,
> 
> I ran into some problems building the cvsup-devel
> port. In one of it's dependants, the c file is attempting
> to include  which is nolonger valid.
> 
> /usr/ports/lang/pm3-base/work/pm3-1.1.15/boot-FreeBSD4/m3core/FreeBSD4/RTHeapDepC.c
> 
> As a quick fix I symlinked nfs.h -> ../nfsclient/nfs.h
> which allowed the compile to complete.
> 
> The following more generic/correct fix could probably
> be dropped into the files directory as patch-XX:
> 
> --- RTHeapDepC.c.orig   Mon Nov 19 00:27:30 2001
> +++ RTHeapDepC.cMon Nov 19 00:28:21 2001
> @@ -98,7 +98,11 @@
>  #include 
>  #include 
>  #include 
> +#if __FreeBSD__ >= 5
> +#include 
> +#else
>  #include 
> +#endif
>  #include 
>  #endif
>  
> 
> -John
> 
> ps: I also ran into problems with libutil.h but I haven't
> determined where the actual problem is coming from.
> Copying /usr/src/lib/libutil/libutil.h to /usr/include
> avoids the immediate problem.

-- 
Brian <[EMAIL PROTECTED]><[EMAIL PROTECTED]>
  http://www.freebsd-services.com/
Don't _EVER_ lose your sense of humour !  



To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message