diff options
| author | asami <asami@FreeBSD.org> | 1997-02-21 16:48:03 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-02-21 16:48:03 +0800 |
| commit | f011a342e33cf58956dbfe2e70c2db672c455549 (patch) | |
| tree | 2ca3817d3e5b4cda9392526bb534cf50a4c6d462 /sysutils/xperfmon | |
| parent | 6d5bad138a565c72dc68ca41438a741b6458c4b8 (diff) | |
| download | freebsd-ports-gnome-f011a342e33cf58956dbfe2e70c2db672c455549.tar.gz freebsd-ports-gnome-f011a342e33cf58956dbfe2e70c2db672c455549.tar.zst freebsd-ports-gnome-f011a342e33cf58956dbfe2e70c2db672c455549.zip | |
Update ports to new __FreeBSD_version numbering scheme (220000 for
2.2-RELEASE, 300000 for 3.0-current for now).
Diffstat (limited to 'sysutils/xperfmon')
| -rw-r--r-- | sysutils/xperfmon/files/patch-aa | 21 | ||||
| -rw-r--r-- | sysutils/xperfmon/files/patch-ac | 4 |
2 files changed, 8 insertions, 17 deletions
diff --git a/sysutils/xperfmon/files/patch-aa b/sysutils/xperfmon/files/patch-aa index 5a44adbca135..6bd96e2a096b 100644 --- a/sysutils/xperfmon/files/patch-aa +++ b/sysutils/xperfmon/files/patch-aa @@ -3,7 +3,7 @@ diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c --- ./freebsd_system.c Sun Sep 22 17:14:41 1996 *************** *** 0 **** ---- 1,581 ---- +--- 1,572 ---- + /* + * Perfmon Performance Monitor + * @@ -96,16 +96,7 @@ diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c + #define CTL_FS CTL_VFS /* compatibility w/ Lite1 */ + #endif + -+ /* -+ * XXX temporary hack: FreeBSD-2.2-current has been floating around -+ * with 199508 for some time; FreeBSD-2.1 will be 199511 however (so -+ * 2.2-current has been bumped to 199512 recently). Recognize the old -+ * 2.2-current as NFSv3 for a grace period. -+ * FreeBSD 2.0.5 was 199504, btw. Both, 2.0.5 and 2.1 don't have -+ * NFSv3. -+ * Also 2.1.5 which is 199607 don't have NFSv3! So check > 199607 -+ */ -+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508 ++ #if __FreeBSD_version >= 220000 + # define HAS_NFS_V3 + #endif /* FreeBSD_version */ + @@ -489,7 +480,7 @@ diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c + struct swdevt *sw; + long blocksize, *perdev; + struct rlist head; -+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508 ++ #if __FreeBSD_version >= 220000 + struct rlisthdr swaplist; + struct rlist *swapptr; + #else @@ -508,14 +499,14 @@ diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c + /* Count up swap space. */ + nfree = 0; + memset(perdev, 0, nswdev * sizeof(*perdev)); -+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508 ++ #if __FreeBSD_version >= 220000 + swapptr = swaplist.rlh_list; + while (swapptr) { + #else + while (swaplist) { + #endif + int top, bottom, next_block; -+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508 ++ #if __FreeBSD_version >= 220000 + kvm_read(kd, (u_long)swapptr, &head, sizeof(struct rlist)); + #else + kvm_read(kd, (u_long)swaplist, &head, sizeof(struct rlist)); @@ -545,7 +536,7 @@ diff -c -N ../xperfmon++/freebsd_system.c ./freebsd_system.c + } + perdev[(bottom / dmmax) % nswdev] += + top - bottom + 1; -+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508 ++ #if __FreeBSD_version >= 220000 + swapptr = head.rl_next; + #else + swaplist = head.rl_next; diff --git a/sysutils/xperfmon/files/patch-ac b/sysutils/xperfmon/files/patch-ac index 1b74333552d9..c2cc4b6f7632 100644 --- a/sysutils/xperfmon/files/patch-ac +++ b/sysutils/xperfmon/files/patch-ac @@ -14,7 +14,7 @@ - if (nl[N_IFNET].n_value != 0) { + if ((ifnetaddr = nl[N_IFNET].n_value) != 0) { -+#if __FreeBSD_version <= 199701 ++#if __FreeBSD_version < 300000 struct ifnet ifnet; kread(N_IFNET, &ifnetaddr, sizeof(ifnetaddr)); old_packets = packets; @@ -22,7 +22,7 @@ packets.collisions += ifnet.if_collisions; ifnetaddr = (u_long) ifnet.if_next; } -+#else /* 3.0-current, Jan 1997 */ ++#else /* 3.0-* */ + /* Stolen from netstat/if.c */ + struct ifnet ifnet; + struct ifnethead ifnethead; |