Index: branches/2020Q3/sysutils/htop/files/patch-CRT.h
===================================================================
--- branches/2020Q3/sysutils/htop/files/patch-CRT.h	(nonexistent)
+++ branches/2020Q3/sysutils/htop/files/patch-CRT.h	(revision 545749)
@@ -0,0 +1,27 @@
+--- CRT.h.orig	2018-04-10 13:42:59 UTC
++++ CRT.h
+@@ -140,7 +140,7 @@ extern const char **CRT_treeStr;
+ 
+ extern int CRT_delay;
+ 
+-int* CRT_colors;
++extern int* CRT_colors;
+ 
+ extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
+ 
+@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount;
+ 
+ extern int CRT_scrollWheelVAmount;
+ 
+-char* CRT_termType;
++extern char* CRT_termType;
+ 
+ // TODO move color scheme to Settings, perhaps?
+ 
+ extern int CRT_colorScheme;
+ 
+-void *backtraceArray[128];
++extern void *backtraceArray[128];
+ 
+ #if HAVE_SETUID_ENABLED
+ 

Property changes on: branches/2020Q3/sysutils/htop/files/patch-CRT.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c
===================================================================
--- branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c	(revision 545748)
+++ branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c	(revision 545749)
@@ -1,67 +1,78 @@
 Fix memory display in the header on FreeBSD/powerpc
 
 https://github.com/hishamhm/htop/pull/871
 
 --- freebsd/FreeBSDProcessList.c.orig	2018-04-10 13:42:59 UTC
 +++ freebsd/FreeBSDProcessList.c
-@@ -296,31 +296,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
+@@ -28,8 +28,9 @@ in the source distribution for its full text.
+ #include <sys/resource.h>
+ 
+ #define JAIL_ERRMSGLEN	1024
++*/
+ char jail_errmsg[JAIL_ERRMSGLEN];
+-
++/*
+ typedef struct CPUData_ {
+ 
+    double userPercent;
+@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
     //
     // htop_used   = active + (wired - arc)
     // htop_cache  = buffers + cache + arc
 -   size_t len = sizeof(pl->totalMem);
 +   u_long totalMem;
 +   u_int memActive, memWire, cachedMem;
 +   long buffersMem;
 +   uint64_t memZfsArc;
 +   size_t len;
  
     //disabled for now, as it is always smaller than phycal amount of memory...
     //...to avoid "where is my memory?" questions
     //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(pl->totalMem), &len, NULL, 0);
     //pl->totalMem *= pageSizeKb;
 -   sysctl(MIB_hw_physmem, 2, &(pl->totalMem), &len, NULL, 0);
 -   pl->totalMem /= 1024;
 +   len = sizeof(totalMem);
 +   sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0);
 +   totalMem /= 1024;
 +   pl->totalMem = totalMem;
  
 -   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(fpl->memActive), &len, NULL, 0);
 -   fpl->memActive *= pageSizeKb;
 +   len = sizeof(memActive);
 +   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
 +   memActive *= pageSizeKb;
 +   fpl->memActive = memActive;
  
 -   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(fpl->memWire), &len, NULL, 0);
 -   fpl->memWire *= pageSizeKb;
 +   len = sizeof(memWire);
 +   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
 +   memWire *= pageSizeKb;
 +   fpl->memWire = memWire;
  
 -   sysctl(MIB_vfs_bufspace, 2, &(pl->buffersMem), &len, NULL, 0);
 -   pl->buffersMem /= 1024;
 +   len = sizeof(buffersMem);
 +   sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
 +   buffersMem /= 1024;
 +   pl->buffersMem = buffersMem;
  
 -   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(pl->cachedMem), &len, NULL, 0);
 -   pl->cachedMem *= pageSizeKb;
 +   len = sizeof(cachedMem);
 +   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
 +   cachedMem *= pageSizeKb;
 +   pl->cachedMem = cachedMem;
  
     if (fpl->zfsArcEnabled) {
 -      len = sizeof(fpl->memZfsArc);
 -      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(fpl->memZfsArc), &len , NULL, 0);
 -      fpl->memZfsArc /= 1024;
 +      len = sizeof(memZfsArc);
 +      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(memZfsArc), &len , NULL, 0);
 +      memZfsArc /= 1024;
 +      fpl->memZfsArc = memZfsArc;
        fpl->memWire -= fpl->memZfsArc;
        pl->cachedMem += fpl->memZfsArc;
        // maybe when we learn how to make custom memory meter
Index: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h
===================================================================
--- branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h	(nonexistent)
+++ branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h	(revision 545749)
@@ -0,0 +1,11 @@
+--- freebsd/FreeBSDProcessList.h.orig	2018-04-10 13:42:59 UTC
++++ freebsd/FreeBSDProcessList.h
+@@ -17,7 +17,7 @@ in the source distribution for its full text.
+ #include <sys/resource.h>
+ 
+ #define JAIL_ERRMSGLEN	1024
+-char jail_errmsg[JAIL_ERRMSGLEN];
++extern char jail_errmsg[JAIL_ERRMSGLEN];
+ 
+ typedef struct CPUData_ {
+ 

Property changes on: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 545748)
+++ branches/2020Q3	(revision 545749)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r545744