Index: head/sysutils/freeipmi/Makefile
===================================================================
--- head/sysutils/freeipmi/Makefile	(revision 385950)
+++ head/sysutils/freeipmi/Makefile	(revision 385951)
@@ -1,62 +1,61 @@
 # Created by: Dmitry Frolov <frol@nov.net>
 # $FreeBSD$
 
 PORTNAME=	freeipmi
 PORTVERSION=	1.4.8
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU/${PORTNAME}/ \
 		http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library and tools to support IPMI-capable hardware
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 OPTIONS_DEFINE=	DEBUG DOCS IOPERM
 IOPERM_DESC=	Use i386_set_ioperm
 
 CONFIGURE_ARGS=	--disable-init-scripts \
-		--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
 		--with-ipmiseld-cache-dir=${CACHE_DIR}/ipmiseld \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
 CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread ac_cv_path_CPP=${CPP}
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	invokes i386 asm
 USE_LDCONFIG=	yes
 USES=		gmake libtool shebangfix
 
 INFO=		freeipmi-faq
 PLIST_SUB=	CACHE_DIR=${CACHE_DIR}
 PORTDOCS=	*
 
 CACHE_DIR?=	/var/db/${PORTNAME}
 
 SHEBANG_FILES=	contrib/ganglia/ganglia_ipmi_sensors.pl \
 		contrib/nagios/nagios_ipmi_sensors.pl \
 		contrib/pet/check_rmcpping \
 		contrib/pet/petalert.pl
 
 DEBUG_CONFIGURE_ARGS=	--enable-debug --enable-trace
 DEBUG_INSTALL_TARGET=	install
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 IOPERM_CPPFLAGS=	-DUSE_IOPERM
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.man' -o -name '*.pre.in' | ${XARGS} -I % ${REINPLACE_CMD} -e '/^\.\\\"/ s|$$|"|' %
 	@${REINPLACE_CMD} \
 		-e '/^FREEIPMI_SYSCONFDIR/ s|/freeipmi/$$||' \
 		-e '/FREEIPMI_CONFIG_FILE_DEFAULT_TMP1=/ s|freeipmi.conf|&.sample|' \
 			${WRKSRC}/configure
 
 post-install:
 	${MKDIR} -m 0700 -p ${STAGEDIR}${CACHE_DIR}/ipmimonitoringsdrcache/ ${STAGEDIR}${CACHE_DIR}/ipmiseld/ ${STAGEDIR}/var/lib/freeipmi/ ${STAGEDIR}/var/run/freeipmi/
 
 .include <bsd.port.mk>
Index: head/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h
===================================================================
--- head/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h	(revision 385950)
+++ head/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h	(revision 385951)
@@ -1,10 +1,10 @@
---- ipmi-oem/ipmi-oem.h.orig	2014-03-04 03:36:03.000000000 +0800
-+++ ipmi-oem/ipmi-oem.h	2014-03-06 04:16:04.700980190 +0800
+--- ipmi-oem/ipmi-oem.h.orig	2014-01-03 23:45:22 UTC
++++ ipmi-oem/ipmi-oem.h
 @@ -20,6 +20,7 @@
  #define IPMI_OEM_H
  
  #include <freeipmi/freeipmi.h>
 +#include <sys/limits.h>
  
  #include "tool-cmdline-common.h"
  #include "pstdout.h"
Index: head/sysutils/freeipmi/files/patch-libfreeipmi-driver-ipmi-kcs-driver.c
===================================================================
--- head/sysutils/freeipmi/files/patch-libfreeipmi-driver-ipmi-kcs-driver.c	(revision 385950)
+++ head/sysutils/freeipmi/files/patch-libfreeipmi-driver-ipmi-kcs-driver.c	(revision 385951)
@@ -1,11 +1,11 @@
---- libfreeipmi/driver/ipmi-kcs-driver.c.orig	2012-01-03 03:25:58.000000000 +0800
-+++ libfreeipmi/driver/ipmi-kcs-driver.c	2012-01-06 04:38:31.485000601 +0800
-@@ -491,7 +491,7 @@
+--- libfreeipmi/driver/ipmi-kcs-driver.c.orig	2014-01-03 23:45:22 UTC
++++ libfreeipmi/driver/ipmi-kcs-driver.c
+@@ -491,7 +491,7 @@ ipmi_kcs_ctx_io_init (ipmi_kcs_ctx_t ctx
  #ifdef __FreeBSD__
  #ifdef USE_IOPERM
    /* i386_set_ioperm has known problems on FBSD 5.x (bus errors). */
 -  if (i386_set_ioperm (ctx->driver_address, 0x02, 0x01))
 +  if (sysarch (I386_SET_IOPERM, (void *) (ctx->driver_address, 0x02, 0x01)))
      {
        KCS_ERRNO_TO_KCS_ERRNUM (ctx, errno);
        return (-1);
Index: head/sysutils/freeipmi/files/patch-man-Makefile.in
===================================================================
--- head/sysutils/freeipmi/files/patch-man-Makefile.in	(revision 385950)
+++ head/sysutils/freeipmi/files/patch-man-Makefile.in	(revision 385951)
@@ -1,11 +1,11 @@
---- man/Makefile.in.orig	2014-03-04 03:36:13.000000000 +0800
-+++ man/Makefile.in	2014-03-06 04:17:01.801977380 +0800
-@@ -885,7 +885,7 @@
+--- man/Makefile.in.orig	2015-01-07 18:23:47 UTC
++++ man/Makefile.in
+@@ -885,7 +885,7 @@ uninstall-man: uninstall-man3 uninstall-
  
  
  $(MANS_CPP): $(MANS_CPP:%=%.pre)
 -	$(CPP) -nostdinc -w -C -P -I$(top_srcdir)/man $@.pre  $@
 +	$(CPP) -nostdinc -w -C -I$(top_srcdir)/man $@.pre | grep -v '^#' > $@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.