svn commit: r444332 - in head/sysutils/atop: . files
Mark Linimon
linimon at FreeBSD.org
Mon Jun 26 00:42:54 UTC 2017
Author: linimon
Date: Mon Jun 26 00:42:53 2017
New Revision: 444332
URL: https://svnweb.freebsd.org/changeset/ports/444332
Log:
Attempt to fix build on -current. Remove BROKEN_<arch> false positives.
PR: 219270
Submitted by: vladislav.movchan at gmail.com
Approved by: maintainer
Added:
head/sysutils/atop/files/patch-photosyst.c (contents, props changed)
Modified:
head/sysutils/atop/Makefile
Modified: head/sysutils/atop/Makefile
==============================================================================
--- head/sysutils/atop/Makefile Mon Jun 26 00:11:22 2017 (r444331)
+++ head/sysutils/atop/Makefile Mon Jun 26 00:42:53 2017 (r444332)
@@ -11,11 +11,6 @@ COMMENT= ASCII Monitor for system resources and proces
LICENSE= GPLv2
-BROKEN_armv6= fails to build: photosyst.c: 'struct xtcpcb' has no member named 'xt_tp'
-BROKEN_mips= fails to build: photosyst.c: 'struct xtcpcb' has no member named 'xt_tp'
-BROKEN_mips64= fails to build: photosyst.c: 'struct xtcpcb' has no member named 'xt_tp'
-BROKEN_powerpc64= fails to build: photosyst.c: 'struct xtcpcb' has no member named 'xt_tp'
-
USE_GITHUB= yes
GH_ACCOUNT= samm-git
GH_PROJECT= atop-freebsd
Added: head/sysutils/atop/files/patch-photosyst.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/atop/files/patch-photosyst.c Mon Jun 26 00:42:53 2017 (r444332)
@@ -0,0 +1,56 @@
+--- photosyst.c.orig 2014-01-15 16:05:34 UTC
++++ photosyst.c
+@@ -1118,7 +1118,11 @@ photosyst(struct sstat *si)
+ si->cpu.nrcpu = ncpu;
+ if (si->cpu.nrcpu == 0)
+ si->cpu.nrcpu = 1;
++#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
++ count_t forks = 0;
++#else
+ int forks = 0;
++#endif
+ GETSYSCTL("vm.stats.vm.v_forkpages", forks);
+ si->cpu.nprocs = forks;
+ GETSYSCTL("kern.smp.maxcpus", maxcpus);
+@@ -1154,7 +1158,11 @@ photosyst(struct sstat *si)
+ si->cpu.lavg5 = (double) sysload.ldavg[1] / sysload.fscale;
+ si->cpu.lavg15 = (double) sysload.ldavg[2] / sysload.fscale;
+
++#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
++ count_t devint = 0, csw = 0;
++#else
+ int devint = 0, csw = 0;
++#endif
+ GETSYSCTL("vm.stats.sys.v_intr", devint);
+ if(devint)
+ si->cpu.devint = devint;
+@@ -1263,7 +1271,11 @@ photosyst(struct sstat *si)
+ si->mem.freeswap=swapary[0].ksw_total - swapary[0].ksw_used;
+ }
+ /* swap statistic */
++#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
++ count_t pswapin = 0, pswapout = 0;
++#else
+ int pswapin = 0, pswapout = 0;
++#endif
+ GETSYSCTL("vm.stats.vm.v_swapin",pswapin);
+ if(pswapin)
+ si->mem.swins = pswapin;
+@@ -1593,8 +1605,15 @@ photosyst(struct sstat *si)
+ continue;
+
+ tcp_total++;
+- if (tp->xt_tp.t_state == TCPS_ESTABLISHED ||
+- tp->xt_tp.t_state == TCPS_CLOSE_WAIT)
++ if (
++#if defined(__FreeBSD__) && __FreeBSD_version >= 1200026
++ tp->t_state == TCPS_ESTABLISHED ||
++ tp->t_state == TCPS_CLOSE_WAIT
++#else
++ tp->xt_tp.t_state == TCPS_ESTABLISHED ||
++ tp->xt_tp.t_state == TCPS_CLOSE_WAIT
++#endif
++ )
+ tcp_count++;
+ }
+ si->net.tcp.CurrEstab = tcp_count;
More information about the svn-ports-head
mailing list