Index: branches/2019Q1/devel/libstatgrab/Makefile =================================================================== --- branches/2019Q1/devel/libstatgrab/Makefile (revision 491357) +++ branches/2019Q1/devel/libstatgrab/Makefile (revision 491358) @@ -1,34 +1,41 @@ # Created by: Tim Bishop # $FreeBSD$ PORTNAME= libstatgrab PORTVERSION= 0.91 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://ftp.mirrorservice.org/pub/i-scream/libstatgrab/ \ http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/ \ http://ftp.i-scream.org/pub/i-scream/libstatgrab/ MAINTAINER= tdb@FreeBSD.org COMMENT= Provides a useful interface to system statistics LICENSE= LGPL21 -USE_LDCONFIG= yes -GNU_CONFIGURE= yes USES= pathfix pkgconfig libtool +USE_LDCONFIG= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} OPTIONS_DEFINE= TOOLS DOCS OPTIONS_DEFAULT= TOOLS TOOLS_DESC= Build and install statgrab and saidar TOOLS_CONFIGURE_ENABLE= statgrab saidar TOOLS_USES= shebangfix perl5 ncurses TOOLS_VARS= SHEBANG_FILES+="src/statgrab/statgrab-make-mrtg-config.in \ src/statgrab/statgrab-make-mrtg-index.in" \ LICENSE+=GPLv2 LICENSE_COMB=multi OPTIONS_SUB= yes + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200016 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_libstatgrab_memory__stats.c +.endif .include Index: branches/2019Q1/devel/libstatgrab/files/extra-patch-src_libstatgrab_memory__stats.c =================================================================== --- branches/2019Q1/devel/libstatgrab/files/extra-patch-src_libstatgrab_memory__stats.c (nonexistent) +++ branches/2019Q1/devel/libstatgrab/files/extra-patch-src_libstatgrab_memory__stats.c (revision 491358) @@ -0,0 +1,14 @@ +--- src/libstatgrab/memory_stats.c.orig 2019-01-21 17:51:57 UTC ++++ src/libstatgrab/memory_stats.c +@@ -323,10 +323,7 @@ sg_get_mem_stats_int(sg_mem_stats *mem_stats_buf) { + RETURN_WITH_SET_ERROR_WITH_ERRNO("mem", SG_ERROR_SYSCTLBYNAME, "vm.stats.vm.v_inactive_count"); + } + +- size = sizeof(cache_count); +- if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0) { +- RETURN_WITH_SET_ERROR_WITH_ERRNO("mem", SG_ERROR_SYSCTLBYNAME, "vm.stats.vm.v_cache_count"); +- } ++ cache_count = 0; + + /* Of couse nothing is ever that simple :) And I have inactive pages to + * deal with too. So I'm going to add them to free memory :) Property changes on: branches/2019Q1/devel/libstatgrab/files/extra-patch-src_libstatgrab_memory__stats.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: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 491357) +++ branches/2019Q1 (revision 491358) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r490904-490905