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

Update ports to new __FreeBSD_version numbering scheme (220000 for

Browse Source 
2.2-RELEASE, 300000 for 3.0-current for now).
This commit is contained in:
Satoshi Asami 1997-02-21 08:48:03 +00:00
parent c5777122e6
commit 62ca955f04
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=5708
6 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/cap/files/patch-ad
View File

@ -8,7 +8,7 @@
+#if __FreeBSD__ >= 2
+#include <osreldate.h>
+#endif
+#if __FreeBSD_version >= 199702
+#if __FreeBSD_version >= 300000
+#include <net/if_var.h>
+#endif
+#endif /*__FreeBSD__*/

2
net/cap/files/patch-ah
View File

@ -8,7 +8,7 @@
+#if __FreeBSD__ >= 2
+#include <osreldate.h>
+#endif
+#if __FreeBSD_version >= 199702
+#if __FreeBSD_version >= 300000
+#include <net/if_var.h>
+#endif
+#endif /*__FreeBSD__*/

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

@ -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;

4
sysutils/xperfmon/files/patch-ac
View File

@ -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;

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

@ -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;

4
sysutils/xperfmon3/files/patch-ac
View File

@ -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;