Index: head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c =================================================================== --- head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c (revision 548773) +++ head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c (nonexistent) @@ -1,78 +0,0 @@ -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 -@@ -28,8 +28,9 @@ in the source distribution for its full text. - #include - - #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 Property changes on: head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h =================================================================== --- head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h (revision 548773) +++ head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h (nonexistent) @@ -1,11 +0,0 @@ ---- 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 - - #define JAIL_ERRMSGLEN 1024 --char jail_errmsg[JAIL_ERRMSGLEN]; -+extern char jail_errmsg[JAIL_ERRMSGLEN]; - - typedef struct CPUData_ { - Property changes on: head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/htop/files/patch-CRT.h =================================================================== --- head/sysutils/htop/files/patch-CRT.h (revision 548773) +++ head/sysutils/htop/files/patch-CRT.h (nonexistent) @@ -1,27 +0,0 @@ ---- 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: head/sysutils/htop/files/patch-CRT.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/htop/Makefile =================================================================== --- head/sysutils/htop/Makefile (revision 548773) +++ head/sysutils/htop/Makefile (revision 548774) @@ -1,32 +1,30 @@ # Created by: Tony Shadwick # $FreeBSD$ PORTNAME= htop -DISTVERSION= 2.2.0 -PORTREVISION= 1 +DISTVERSION= 3.0.2 CATEGORIES= sysutils MAINTAINER= gaod@hychen.org COMMENT= Better top(1) - interactive process viewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf libtool localbase ncurses pkgconfig python:build shebangfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-unicode USE_GITHUB= yes -GH_ACCOUNT= hishamhm -SHEBANG_FILES= scripts/MakeHeader.py +GH_ACCOUNT= htop-dev PLIST_FILES= bin/htop \ man/man1/htop.1.gz \ share/applications/htop.desktop \ share/pixmaps/htop.png OPTIONS_DEFINE= LSOF OPTIONS_DEFAULT= LSOF LSOF_RUN_DEPENDS= lsof:sysutils/lsof .include Index: head/sysutils/htop/distinfo =================================================================== --- head/sysutils/htop/distinfo (revision 548773) +++ head/sysutils/htop/distinfo (revision 548774) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524217137 -SHA256 (hishamhm-htop-2.2.0_GH0.tar.gz) = fb23275090ee5fb19266384c39c69519c8b3844b8f6444730094949c621197c0 -SIZE (hishamhm-htop-2.2.0_GH0.tar.gz) = 172913 +TIMESTAMP = 1600219337 +SHA256 (htop-dev-htop-3.0.2_GH0.tar.gz) = b4744a3bea279f2a3725ed8e5e35ffd9cb10d66673bf07c8fe21feb3c4661305 +SIZE (htop-dev-htop-3.0.2_GH0.tar.gz) = 176132 Index: head/sysutils/htop/pkg-descr =================================================================== --- head/sysutils/htop/pkg-descr (revision 548773) +++ head/sysutils/htop/pkg-descr (revision 548774) @@ -1,20 +1,20 @@ htop is an enhanced version of top, the interactive process viewer, which can display the list of processes in a tree form. Comparison between 'htop' and 'top' * In 'htop' you can scroll the list vertically and horizontally to see all processes and full command lines. * In 'top' you are subject to a delay for each unassigned key you press (especially annoying when multi-key escape sequences are triggered by accident). * 'htop' starts faster ('top' seems to collect data for a while before displaying anything). * In 'htop' you don't need to type the process number to kill a process, in 'top' you do. * In 'htop' you don't need to type the process number or the priority value to renice a process, in 'top' you do. * In 'htop' you can kill multiple processes at once. * 'top' is older, hence, more tested. -WWW: https://hisham.hm/htop/ +WWW: https://htop.dev/