Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Jan 2019 15:25:34 +0000 (UTC)
From:      Tim Bishop <tdb@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r491358 - in branches/2019Q1/devel/libstatgrab: . files
Message-ID:  <201901271525.x0RFPYA2069024@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tdb
Date: Sun Jan 27 15:25:33 2019
New Revision: 491358
URL: https://svnweb.freebsd.org/changeset/ports/491358

Log:
  MFH: r490904 r490905
  
  Fix libstatgrab on FreeBSD 12
  
  On FreeBSD 12 (since r309017) v_cache_count no longer exists. A
  compatibility shim is in place if COMPAT_FREEBSD11 is defined in
  the kernel, but if not libstatgrab fails to return any memory
  statistics. This patch modifies libstatgrab to mimic this compatibility
  behaviour (ie. return 0), regardless of whether COMPAT_FREEBSD11
  is defined, which ensures the remaining statistics are returned
  correctly.
  
  A more complete solution will be considered upstream and hopefully
  be included in the next release.
  
  Reported by:	Alexey Milevsky <a.milevsky@gmail.com>
  Approved by:	ports-secteam (miwi)

Added:
  branches/2019Q1/devel/libstatgrab/files/
     - copied from r490905, head/devel/libstatgrab/files/
Modified:
  branches/2019Q1/devel/libstatgrab/Makefile
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/devel/libstatgrab/Makefile
==============================================================================
--- branches/2019Q1/devel/libstatgrab/Makefile	Sun Jan 27 15:21:16 2019	(r491357)
+++ branches/2019Q1/devel/libstatgrab/Makefile	Sun Jan 27 15:25:33 2019	(r491358)
@@ -3,6 +3,7 @@
 
 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/ \
@@ -13,10 +14,10 @@ COMMENT=	Provides a useful interface to system statist
 
 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
@@ -30,5 +31,11 @@ TOOLS_VARS=	SHEBANG_FILES+="src/statgrab/statgrab-make
 		LICENSE+=GPLv2 LICENSE_COMB=multi
 
 OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200016
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_libstatgrab_memory__stats.c
+.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901271525.x0RFPYA2069024>