From owner-svn-ports-all@FreeBSD.ORG  Fri May  1 21:14:02 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CE22FAB7;
 Fri,  1 May 2015 21:14:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 BC3211DBA;
 Fri,  1 May 2015 21:14:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41LE2Gw083698;
 Fri, 1 May 2015 21:14:02 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41LE2qr083697;
 Fri, 1 May 2015 21:14:02 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201505012114.t41LE2qr083697@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: grembo set sender to
 grembo@FreeBSD.org using -f
From: Michael Gmelin <grembo@FreeBSD.org>
Date: Fri, 1 May 2015 21:14:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385148 - head/sysutils/healthd/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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 May 2015 21:14:02 -0000

Author: grembo
Date: Fri May  1 21:14:01 2015
New Revision: 385148
URL: https://svnweb.freebsd.org/changeset/ports/385148

Log:
  Fix build on HEAD after SMBus change (r281985/r282256).
  
  Approved by:    mentors (implicit)

Added:
  head/sysutils/healthd/files/patch-getSMB-smb.c   (contents, props changed)

Added: head/sysutils/healthd/files/patch-getSMB-smb.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/healthd/files/patch-getSMB-smb.c	Fri May  1 21:14:01 2015	(r385148)
@@ -0,0 +1,45 @@
+--- getMB-smb.c.orig	2004-08-17 03:32:39.000000000 +0200
++++ getMB-smb.c	2015-05-01 22:56:04.200695000 +0200
+@@ -31,6 +31,7 @@
+ #endif
+ 
+ #ifdef HAVE_SMBUS
++#include <osreldate.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+@@ -90,7 +91,9 @@
+   }
+ 
+   cmd.cmd = 0x47;
++#if (__FreeBSD_version < 1100071)
+   cmd.data.byte_ptr = &byte;
++#endif
+   for (i = 0; i < sizeof(addrs); i++) {
+     cmd.slave = addrs[i];
+     if (ioctl(iosmb, SMB_READB, (caddr_t)&cmd) != -1) {
+@@ -115,7 +118,11 @@
+   count = 0;
+   cmd.slave = smb_addr;
+   cmd.cmd = addr;
++#if (__FreeBSD_version >= 1100071)
++  cmd.wdata.byte = value;
++#else
+   cmd.data.byte = value;
++#endif
+   while (ioctl(iosmb, SMB_WRITEB, &cmd) == -1) {
+     if (++count < 3) {
+       sleep(1);
+@@ -136,7 +143,12 @@
+ 
+   cmd.slave = smb_addr;
+   cmd.cmd = addr;
++#if (__FreeBSD_version >= 1100071)
++  cmd.rbuf = &ret; 
++  cmd.rcount = 1;
++#else
+   cmd.data.byte_ptr = &ret;
++#endif
+   while (ioctl(iosmb, SMB_READB, &cmd) == -1) {
+     if (++count < 3) {
+       sleep(1);