Index: head/sysutils/htop/Makefile =================================================================== --- head/sysutils/htop/Makefile (revision 408754) +++ head/sysutils/htop/Makefile (revision 408755) @@ -1,24 +1,27 @@ # Created by: Tony Shadwick # $FreeBSD$ PORTNAME= htop PORTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= gaod@hychen.org COMMENT= Better top(1) - interactive process viewer LICENSE= GPLv2 NOT_FOR_ARCHS= ia64 powerpc sparc64 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lexecinfo CONFIGURE_ARGS= --enable-unicode USES= autoreconf execinfo libtool ncurses python:2,build shebangfix +SHEBANG_LANG= python2 +SHEBANG_FILES= scripts/MakeHeader.py USE_GITHUB= yes GH_ACCOUNT= hishamhm .include Index: head/sysutils/htop/files/patch-freebsd__Battery.c =================================================================== --- head/sysutils/htop/files/patch-freebsd__Battery.c (nonexistent) +++ head/sysutils/htop/files/patch-freebsd__Battery.c (revision 408755) @@ -0,0 +1,27 @@ +--- freebsd/Battery.c.orig 2016-02-13 00:30:03.804015000 +0800 ++++ freebsd/Battery.c 2016-02-13 00:31:05.662396000 +0800 +@@ -6,10 +6,21 @@ + */ + + #include "BatteryMeter.h" ++#include + + void Battery_getData(double* level, ACPresence* isOnAC) { +- // TODO +- *level = -1; +- *isOnAC = AC_ERROR; ++ int life; ++ size_t life_len = sizeof(life); ++ if (sysctlbyname("hw.acpi.battery.life", &life, &life_len, NULL, 0) == -1) ++ *level = -1; ++ else ++ *level = life; ++ ++ int acline; ++ size_t acline_len = sizeof(acline); ++ if (sysctlbyname("hw.acpi.acline", &acline, &acline_len, NULL, 0) == -1) ++ *isOnAC = AC_ERROR; ++ else ++ *isOnAC = acline == 0 ? AC_ABSENT : AC_PRESENT; + } + Property changes on: head/sysutils/htop/files/patch-freebsd__Battery.c ___________________________________________________________________ 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: head/sysutils/htop/files/patch-freebsd__FreeBSDProcessList.c =================================================================== --- head/sysutils/htop/files/patch-freebsd__FreeBSDProcessList.c (nonexistent) +++ head/sysutils/htop/files/patch-freebsd__FreeBSDProcessList.c (revision 408755) @@ -0,0 +1,13 @@ +--- freebsd/FreeBSDProcessList.c.orig 2016-02-13 00:37:56.160832000 +0800 ++++ freebsd/FreeBSDProcessList.c 2016-02-13 00:38:19.671290000 +0800 +@@ -477,8 +477,8 @@ + } + + // from FreeBSD source /src/usr.bin/top/machine.c +- proc->m_size = kproc->ki_size / 1024; +- proc->m_resident = kproc->ki_rssize * pageSizeKb; ++ proc->m_size = kproc->ki_size / 1024 / pageSizeKb; ++ proc->m_resident = kproc->ki_rssize; + proc->nlwp = kproc->ki_numthreads; + proc->time = (kproc->ki_runtime + 5000) / 10000; + Property changes on: head/sysutils/htop/files/patch-freebsd__FreeBSDProcessList.c ___________________________________________________________________ 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