From owner-svn-ports-all@freebsd.org Mon Jan 21 22:00:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D17A41481399; Mon, 21 Jan 2019 22:00:44 +0000 (UTC) (envelope-from tdb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 770C884797; Mon, 21 Jan 2019 22:00:44 +0000 (UTC) (envelope-from tdb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 69AD11F9C2; Mon, 21 Jan 2019 22:00:44 +0000 (UTC) (envelope-from tdb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0LM0iCw023416; Mon, 21 Jan 2019 22:00:44 GMT (envelope-from tdb@FreeBSD.org) Received: (from tdb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0LM0iTP023415; Mon, 21 Jan 2019 22:00:44 GMT (envelope-from tdb@FreeBSD.org) Message-Id: <201901212200.x0LM0iTP023415@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tdb set sender to tdb@FreeBSD.org using -f From: Tim Bishop Date: Mon, 21 Jan 2019 22:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490904 - head/devel/libstatgrab X-SVN-Group: ports-head X-SVN-Commit-Author: tdb X-SVN-Commit-Paths: head/devel/libstatgrab X-SVN-Commit-Revision: 490904 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 770C884797 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2019 22:00:45 -0000 Author: tdb Date: Mon Jan 21 22:00:43 2019 New Revision: 490904 URL: https://svnweb.freebsd.org/changeset/ports/490904 Log: 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 Modified: head/devel/libstatgrab/Makefile Modified: head/devel/libstatgrab/Makefile ============================================================================== --- head/devel/libstatgrab/Makefile Mon Jan 21 22:00:40 2019 (r490903) +++ head/devel/libstatgrab/Makefile Mon Jan 21 22:00:43 2019 (r490904) @@ -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 + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200016 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_libstatgrab_memory__stats.c +.endif .include