From owner-svn-ports-all@FreeBSD.ORG  Fri May  1 20:41:14 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 B673ECDB;
 Fri,  1 May 2015 20:41:14 +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 8A85B1A51;
 Fri,  1 May 2015 20:41:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41KfELL067605;
 Fri, 1 May 2015 20:41:14 GMT (envelope-from grembo@FreeBSD.org)
Received: (from grembo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41KfEhf067604;
 Fri, 1 May 2015 20:41:14 GMT (envelope-from grembo@FreeBSD.org)
Message-Id: <201505012041.t41KfEhf067604@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 20:41:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385147 - head/sysutils/consolehm/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 20:41:14 -0000

Author: grembo
Date: Fri May  1 20:41:13 2015
New Revision: 385147
URL: https://svnweb.freebsd.org/changeset/ports/385147

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

Modified:
  head/sysutils/consolehm/files/patch-chm.c

Modified: head/sysutils/consolehm/files/patch-chm.c
==============================================================================
--- head/sysutils/consolehm/files/patch-chm.c	Fri May  1 20:27:08 2015	(r385146)
+++ head/sysutils/consolehm/files/patch-chm.c	Fri May  1 20:41:13 2015	(r385147)
@@ -1,5 +1,13 @@
---- chm.c.orig	Sat Jun 12 22:53:48 2004
-+++ chm.c	Sat Jun 12 22:54:11 2004
+--- chm.c.orig	2000-12-23 07:51:45.000000000 +0100
++++ chm.c	2015-05-01 22:23:03.577465000 +0200
+@@ -25,6 +25,7 @@
+  *
+  */
+ 
++#include <osreldate.h>
+ #include "chm.h"
+ 
+ static int io_file;
 @@ -165,6 +165,7 @@
  			printf("Delay: %d microseconds. \n\n",delay);
  			break;
@@ -8,3 +16,44 @@
  	}
  	
  	file_handle = OpenIO();
+@@ -279,7 +280,12 @@
+ 		u_char smb_return;
+ 		struct smbcmd cmd;
+ 		cmd.slave=0x5a;
++#if (__FreeBSD_version >= 1100071)
++		cmd.rbuf = &smb_return; 
++		cmd.rcount = 1;
++#else
+ 		cmd.data.byte_ptr=&smb_return;
++#endif
+ 		if((open_smb=open("/dev/smb0",000))<0){
+ 			fprintf(stderr, "Failed to open /dev/smb0.\n");
+ 			exit (-1);
+@@ -315,7 +321,12 @@
+ 				u_char smb_return;
+ 				struct smbcmd cmd;
+ 				cmd.slave=0x5a;
++#if (__FreeBSD_version >= 1100071)
++				cmd.rbuf = &smb_return; 
++				cmd.rcount = 1;
++#else
+ 				cmd.data.byte_ptr=&smb_return;
++#endif
+                                 cmd.cmd=addr;
+                                 if(ioctl(open_smb,SMB_READB,&cmd)==-1){
+                                         perror("IOCTL");
+@@ -342,9 +353,13 @@
+ 		u_char smb_return;
+ 		struct smbcmd cmd;
+ 		cmd.slave=0x5a;
++#if (__FreeBSD_version >= 1100071)
++		cmd.wdata.byte = value;
++#else
+ 		cmd.data.byte_ptr=&smb_return;
+-		cmd.cmd=addr;
+ 		cmd.data.byte=value;
++#endif
++		cmd.cmd=addr;
+ 		if(ioctl(open_smb,SMB_WRITEB,&cmd)==-1){
+ 			perror("IOCTL");
+ 			return -1;