mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix to make this run Ok on both -stable and -current with -stable's

Browse Source 
new __FreeBSD_version.  (Gee, why do these things always have to be
committed right before the release? ;)

Submitted by:	peter
This commit is contained in:
Satoshi Asami 1996-07-12 10:58:54 +00:00
parent 564d57404c
commit 806ff5f8c8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=3380
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysutils/xperfmon/files/patch-aa
View File

@ -102,9 +102,9 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ * 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.
+ * NFSv3. (FreeBSD-2.1.5 is 199607)
+ */
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ # define HAS_NFS_V3
+ #endif /* FreeBSD_version */
+
@ -488,7 +488,7 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ struct swdevt *sw;
+ long blocksize, *perdev;
+ struct rlist head;
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ struct rlisthdr swaplist;
+ struct rlist *swapptr;
+ #else
@ -507,14 +507,14 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ /* Count up swap space. */
+ nfree = 0;
+ memset(perdev, 0, nswdev * sizeof(*perdev));
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ swapptr = swaplist.rlh_list;
+ while (swapptr) {
+ #else
+ while (swaplist) {
+ #endif
+ int top, bottom, next_block;
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ kvm_read(kd, (u_long)swapptr, &head, sizeof(struct rlist));
+ #else
+ kvm_read(kd, (u_long)swaplist, &head, sizeof(struct rlist));
@ -544,7 +544,7 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ }
+ perdev[(bottom / dmmax) % nswdev] +=
+ top - bottom + 1;
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ swapptr = head.rl_next;
+ #else
+ swaplist = head.rl_next;

12
sysutils/xperfmon3/files/patch-aa
View File

@ -102,9 +102,9 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ * 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.
+ * NFSv3. (FreeBSD-2.1.5 is 199607)
+ */
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ # define HAS_NFS_V3
+ #endif /* FreeBSD_version */
+
@ -488,7 +488,7 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ struct swdevt *sw;
+ long blocksize, *perdev;
+ struct rlist head;
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ struct rlisthdr swaplist;
+ struct rlist *swapptr;
+ #else
@ -507,14 +507,14 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ /* Count up swap space. */
+ nfree = 0;
+ memset(perdev, 0, nswdev * sizeof(*perdev));
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ swapptr = swaplist.rlh_list;
+ while (swapptr) {
+ #else
+ while (swaplist) {
+ #endif
+ int top, bottom, next_block;
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ kvm_read(kd, (u_long)swapptr, &head, sizeof(struct rlist));
+ #else
+ kvm_read(kd, (u_long)swaplist, &head, sizeof(struct rlist));
@ -544,7 +544,7 @@ diff -cd -N ../xperfmon++/freebsd_system.c ./freebsd_system.c
+ }
+ perdev[(bottom / dmmax) % nswdev] +=
+ top - bottom + 1;
+ #if __FreeBSD_version > 199511 || __FreeBSD_version == 199508
+ #if __FreeBSD_version > 199607 || __FreeBSD_version == 199508
+ swapptr = head.rl_next;
+ #else
+ swaplist = head.rl_next;