- more recent snapshot of the code from -current, containing much new code

  recently committed;
- the port will no longer build on FreeBSD 6-stable for versions after ipmi
  was MFC'd into the base system.

PR:		103708
Submitted by:	Nick Barkas <snb at threerings.net> (maintainer)

5 files changed, 40 insertions, 10 deletions

diff --git a/sysutils/ipmi-kmod/Makefile b/sysutils/ipmi-kmod/Makefile
index 87024b9cc57b..b29dbcb5e88e 100644
--- a/sysutils/ipmi-kmod/Makefile
+++ b/sysutils/ipmi-kmod/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	ipmi-kmod
-PORTVERSION=	20060418
-PORTREVISION=	1
+PORTVERSION=	20060926
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dpw.threerings.net/projects/ipmi-kmod/
 
 MAINTAINER=	snb@threerings.net
-COMMENT=	Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.x/6.x
+COMMENT=	Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.3 - 6.1
 
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST+=	KMODDIR=${KMODDIR}
@@ -29,8 +28,7 @@ KMODDIR=	/boot/modules
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-# Don't strip module on amd64 systems to prevent segmentation faults when
-# running kldxref
+# Don't strip module on amd64 systems
 .if ${ARCH} == "amd64"
 STRIP=
 .endif
@@ -39,7 +37,7 @@ STRIP=
 IGNORE=		requires kernel source to be installed
 .endif
 
-.if ${OSVERSION} >= 700014
+.if ${OSVERSION} >= 601102
 IGNORE=		already in the base system
 .elif ${OSVERSION} < 503000
 IGNORE=		does not support FreeBSD before 5.3
diff --git a/sysutils/ipmi-kmod/distinfo b/sysutils/ipmi-kmod/distinfo
index 6ec037dc8ddd..09602e30a022 100644
--- a/sysutils/ipmi-kmod/distinfo
+++ b/sysutils/ipmi-kmod/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipmi-kmod-20060418.tar.gz) = adefe4ddc9360f1fbc3817e0b031eeef
-SHA256 (ipmi-kmod-20060418.tar.gz) = 460a0082139047051bdabea75b4696f9e76139380e33e392ee9d56b02f089cea
-SIZE (ipmi-kmod-20060418.tar.gz) = 13597
+MD5 (ipmi-kmod-20060926.tar.gz) = 1fe14087e9f6d616353448fbd6916ba8
+SHA256 (ipmi-kmod-20060926.tar.gz) = bd3c88b5cff906e73ca88aa9bdabee5d8ca3e0b79a4580febbbbe014dd68d4cb
+SIZE (ipmi-kmod-20060926.tar.gz) = 22803
diff --git a/sysutils/ipmi-kmod/files/patch-Makefile b/sysutils/ipmi-kmod/files/patch-Makefile
new file mode 100644
index 000000000000..92308c04e7aa
--- /dev/null
+++ b/sysutils/ipmi-kmod/files/patch-Makefile
@@ -0,0 +1,12 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 1137)
++++ Makefile	(working copy)
+@@ -1,6 +1,6 @@
+ # $FreeBSD: /tmp/pcvs/ports/sysutils/ipmi-kmod/files/Attic/patch-Makefile,v 1.1 2006-09-27 15:18:37 bsam Exp $
+ 
+-.PATH: ${.CURDIR}/../../dev/ipmi
++.PATH: ${.CURDIR}/dev/ipmi
+ 
+ # XXX - ipmi_smbus and ipmi_ssif depend on smbus
+ # XXX - ipmi_acpi depends on acpi
diff --git a/sysutils/ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c b/sysutils/ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c
new file mode 100644
index 000000000000..39185d2c775a
--- /dev/null
+++ b/sysutils/ipmi-kmod/files/patch-dev-ipmi-ipmi_ssif.c
@@ -0,0 +1,20 @@
+--- dev/ipmi/ipmi_ssif.c.orig	2006-09-22 15:11:29.000000000 -0700
++++ dev/ipmi/ipmi_ssif.c	2006-09-25 19:10:59.000000000 -0700
+@@ -183,7 +183,7 @@
+ 		return (0);
+ 	count = SMBUS_DATA_SIZE;
+ 	error = smbus_error(smbus_bread(smbus,
+-	    sc->ipmi_ssif_smbus_address, SMBUS_READ_START, &count, ssif_buf));
++	    sc->ipmi_ssif_smbus_address, SMBUS_READ_START, count, ssif_buf));
+ 	if (error == ENXIO || error == EBUSY) {
+ 		smbus_release_bus(smbus, dev);
+ #ifdef SSIF_DEBUG
+@@ -259,7 +259,7 @@
+ 		/* Read another packet via READ_CONT. */
+ 		count = SMBUS_DATA_SIZE;
+ 		error = smbus_error(smbus_bread(smbus,
+-		    sc->ipmi_ssif_smbus_address, SMBUS_READ_CONT, &count,
++		    sc->ipmi_ssif_smbus_address, SMBUS_READ_CONT, count,
+ 		    ssif_buf));
+ 		if (error) {
+ #ifdef SSIF_ERROR_DEBUG
diff --git a/sysutils/ipmi-kmod/pkg-descr b/sysutils/ipmi-kmod/pkg-descr
index 255f967eae82..e3b5dceefd22 100644
--- a/sysutils/ipmi-kmod/pkg-descr
+++ b/sysutils/ipmi-kmod/pkg-descr
@@ -1,3 +1,3 @@
-Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.x/6.x.
+Backport of ipmi driver from FreeBSD 7-CURRENT for FreeBSD 5.3 - 6.1.
 
 WWW: http://dpw.threerings.net/projects/ipmi-kmod/