From owner-svn-ports-head@freebsd.org  Sun Sep 25 21:34:27 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA752BE9A2F;
 Sun, 25 Sep 2016 21:34:27 +0000 (UTC) (envelope-from kwm@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 mx1.freebsd.org (Postfix) with ESMTPS id A83A92A1;
 Sun, 25 Sep 2016 21:34:27 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8PLYQSc017398;
 Sun, 25 Sep 2016 21:34:26 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8PLYQr8017397;
 Sun, 25 Sep 2016 21:34:26 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201609252134.u8PLYQr8017397@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Sun, 25 Sep 2016 21:34:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r422756 - head/devel/libgtop/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Sep 2016 21:34:28 -0000

Author: kwm
Date: Sun Sep 25 21:34:26 2016
New Revision: 422756
URL: https://svnweb.freebsd.org/changeset/ports/422756

Log:
  Fix the build after 305902 change ufs inode related structs.
  
  https://svnweb.freebsd.org/changeset/base/305902
  
  Submitted by:	antoine@

Added:
  head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c   (contents, props changed)

Added: head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c	Sun Sep 25 21:34:26 2016	(r422756)
@@ -0,0 +1,31 @@
+--- sysdeps/freebsd/procmap.c.orig	2015-08-17 18:59:37 UTC
++++ sysdeps/freebsd/procmap.c
+@@ -52,6 +52,8 @@
+ #include <sys/mount.h>
+ #include <ufs/ufs/quota.h>
+ #include <ufs/ufs/inode.h>
++#include <ufs/ufs/extattr.h>
++#include <ufs/ufs/ufsmount.h>
+ #include <fs/devfs/devfs.h>
+ #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__)
+ #include <fs/devfs/devfs_int.h>
+@@ -86,6 +88,8 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+         struct cdev_priv priv;
+ #if __FreeBSD_version < 800039
+         struct cdev si;
++#else
++        struct ufsmount um;
+ #endif
+ 
+         *inum = 0;
+@@ -167,7 +171,9 @@ _glibtop_sysdeps_freebsd_dev_inode (glib
+ 
+ 
+ #if (__FreeBSD_version >= 800039) || (__FreeBSD_kernel_version >= 800039)
+-        if (kvm_read (server->machine->kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
++        if (kvm_read (server->machine->kd, (gulong) inode.i_ump, (char *) &um,
++		      sizeof (um)) != sizeof (um) ||
++            kvm_read (server->machine->kd, (gulong) cdev2priv(um.um_dev), (char *) &priv,
+ 		      sizeof (priv))
+ #else
+         if (kvm_read (server->machine->kd, (gulong) inode.i_dev, (char *) &si,