diff options
| author | John W. De Boskey <jwd@FreeBSD.org> | 2001-11-25 02:51:42 +0000 |
|---|---|---|
| committer | John W. De Boskey <jwd@FreeBSD.org> | 2001-11-25 02:51:42 +0000 |
| commit | 7ba3cdea26f6651d079c0e790a71e80149c8f820 (patch) | |
| tree | bb9d76488005dced90388670e9165d2ad974e498 /lang/pm3-base | |
| parent | Argh. Bump PORTREVISION. I forgot to apply this in the last commit. (diff) | |
Support new <nfsclient/nfs.h> in -current.
PR: 30899
Submitted by: Motoyuki Konno <motoyuki@FreeBSD.org>
Approved by: jdp
Notes
Notes:
svn path=/head/; revision=50511
Diffstat (limited to 'lang/pm3-base')
| -rw-r--r-- | lang/pm3-base/files/patch-l1 | 20 | ||||
| -rw-r--r-- | lang/pm3-base/files/patch-l2 | 20 |
2 files changed, 32 insertions, 8 deletions
diff --git a/lang/pm3-base/files/patch-l1 b/lang/pm3-base/files/patch-l1 index 8c4736032cfa..fa1d6f316a4b 100644 --- a/lang/pm3-base/files/patch-l1 +++ b/lang/pm3-base/files/patch-l1 @@ -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 Wed May 31 13:54:33 2000 ++++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Fri Nov 23 22:45:32 2001 +@@ -98,7 +98,11 @@ + #include <sys/time.h> + #include <nfs/rpcv2.h> + #include <nfs/nfsproto.h> ++#if __FreeBSD_version >= 500023 ++#include <nfsclient/nfs.h> ++#else + #include <nfs/nfs.h> ++#endif + #include <ufs/ufs/ufsmount.h> + #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); diff --git a/lang/pm3-base/files/patch-l2 b/lang/pm3-base/files/patch-l2 index 949e8c15b61c..19cb94256238 100644 --- a/lang/pm3-base/files/patch-l2 +++ b/lang/pm3-base/files/patch-l2 @@ -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 13:54:24 2000 ++++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Fri Nov 23 22:37:31 2001 +@@ -98,7 +98,11 @@ + #include <sys/time.h> + #include <nfs/rpcv2.h> + #include <nfs/nfsproto.h> ++#if __FreeBSD_version >= 500023 ++#include <nfsclient/nfs.h> ++#else + #include <nfs/nfs.h> ++#endif + #include <ufs/ufs/ufsmount.h> + #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); |