Index: head/misc/hxtools/Makefile =================================================================== --- head/misc/hxtools/Makefile (revision 556433) +++ head/misc/hxtools/Makefile (revision 556434) @@ -1,52 +1,52 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= hxtools -DISTVERSION= 20200712 +PORTVERSION= 20201116 CATEGORIES= misc MASTER_SITES= http://inai.de/files/hxtools/ MAINTAINER= danfe@FreeBSD.org COMMENT= Collection of miscellaneous tools and scripts LIB_DEPENDS= libHX.so:lang/libhx libpci.so:devel/libpci RUN_DEPENDS= bash:shells/bash USES= compiler:c++11-lang iconv perl5 pkgconfig shebangfix \ tar:xz xorg GNU_CONFIGURE= yes SHEBANG_FILES= data/hxtools_bashrc.bash data/hxtools_profile.bash \ examples/colortable examples/git-deconstruct examples/neon \ examples/rc4 examples/unitable sadmin/hxnetload \ sadmin/ldif-duplicate-attrs sadmin/ldif-leading-spaces \ sadmin/logontime sadmin/pmap_dirty sadmin/recursive_lower \ sadmin/vcsaview sdevel/checkbrack sdevel/cwdiff \ sdevel/diff2php sdevel/doxygen-kerneldoc-filter \ sdevel/git-author-stat sdevel/git-blame-stats \ sdevel/git-forest sdevel/git-revert-stats \ sdevel/git-track sdevel/man2html sdevel/paddrspacesize \ sdevel/proc_stat_signal_decode sdevel/sourcefuncsize \ sdevel/spec-beautifier smm/aumeta smm/extract_d3pkg \ smm/extract_dfqshared.pm smm/extract_dxhog \ smm/extract_f3pod smm/extract_qupak smm/gpsh smm/mkvappend \ smm/mod2opus smm/ssa2srt suser/fxterm suser/mailsplit \ suser/pegrep suser/pesubst suser/qpdecode suser/qtar \ suser/rezip suser/wktimer USE_PERL5= run USE_XORG= xcb OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -E 's,(/usr)?/bin,${LOCALBASE}/bin,g' \ ${WRKSRC}/sadmin/su1 post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.txt ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .include Index: head/misc/hxtools/distinfo =================================================================== --- head/misc/hxtools/distinfo (revision 556433) +++ head/misc/hxtools/distinfo (revision 556434) @@ -1,3 +1,3 @@ -TIMESTAMP = 1594547101 -SHA256 (hxtools-20200712.tar.xz) = 08bdbd32b54daf39bc44e222e7cc95e1d53dd2892ee075b70f479899567e62d0 -SIZE (hxtools-20200712.tar.xz) = 208032 +TIMESTAMP = 1605482105 +SHA256 (hxtools-20201116.tar.xz) = c4bf0de4b39892eacb74a148d2587f0611f0abd2a2c4919a0e8e6639a74b7c69 +SIZE (hxtools-20201116.tar.xz) = 208540 Index: head/misc/hxtools/files/patch-suser_sysinfo.c =================================================================== --- head/misc/hxtools/files/patch-suser_sysinfo.c (revision 556433) +++ head/misc/hxtools/files/patch-suser_sysinfo.c (revision 556434) @@ -1,42 +1,33 @@ --- suser/sysinfo.c.orig 2020-07-12 09:44:16 UTC +++ suser/sysinfo.c @@ -48,9 +48,9 @@ struct sy_block { unsigned int display_width, display_height; }; -static const char *sy_osrelease_file = "/etc/os-release"; -static const char *sy_cpuinfo_file = "/proc/cpuinfo"; -static const char sysfs_cpu_dir[] = "/sys/devices/system/cpu"; +static const char *sy_osrelease_file = "/var/run/os-release"; +static const char *sy_cpuinfo_file = "/compat/linux/proc/cpuinfo"; +static const char sysfs_cpu_dir[] = "/compat/linux/sys/devices/system/cpu"; static unsigned int sy_verbose; static void sy_num_cpu_threads(struct sy_block *sib) @@ -190,7 +190,7 @@ static void sy_loadavg(struct sy_block *sib) { double avg5, avg15; unsigned int run; - FILE *fp = fopen("/proc/loadavg", "r"); + FILE *fp = fopen("/compat/linux/proc/loadavg", "r"); if (fp == NULL) return; @@ -202,7 +202,7 @@ static void sy_loadavg(struct sy_block *sib) static void sy_memory(struct sy_block *sib) { unsigned long long mem_free = 0, mem_buf = 0, mem_cac = 0, mem_shm = 0; - FILE *fp = fopen("/proc/meminfo", "r"); + FILE *fp = fopen("/compat/linux/proc/meminfo", "r"); hxmc_t *line = NULL; char *key, *value; -@@ -448,6 +448,7 @@ int main(int argc, const char **argv) - sy_gfx_hardware(&sib); - sy_display_size(&sib); - sy_dump(&sib); -- HXmap_free(sib.osrel); -+ if (sib.osrel) -+ HXmap_free(sib.osrel); - return EXIT_SUCCESS; - }