- Update to 1.4.1

- Use PORTDOCS
- Simplify Makefile

Changes:	http://savannah.gnu.org/forum/forum.php?forum_id=7899

6 files changed, 21 insertions, 96 deletions

diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 606aa876245..08d168fd670 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeipmi
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4.1
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU/${PORTNAME}/ \
 		http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/
@@ -36,6 +36,7 @@ USES=		gmake shebangfix
 
 INFO=		freeipmi-faq
 PLIST_SUB=	CACHE_DIR=${CACHE_DIR} LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR}
+PORTDOCS=	*
 
 CACHE_DIR?=	/var/db/${PORTNAME}
 LOG_DIR=	/var/log/${PORTNAME}
@@ -50,17 +51,11 @@ DEBUG_CONFIGURE_ARGS=	--enable-debug --enable-trace
 DEBUG_MAKE_ENV=		INSTALL_STRIP_FLAG=""
 IOPERM_CPPFLAGS=	-DUSE_IOPERM
 
-.include <bsd.port.options.mk>
-
 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
-.if !${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-docDATA||' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index c2f2b94abf3..7972b55cc85 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeipmi-1.3.4.tar.gz) = c3c0deac9db9e4b877a3dc1a0fb335175c01caec970cf7761e3e0520fd704d3d
-SIZE (freeipmi-1.3.4.tar.gz) = 3091593
+SHA256 (freeipmi-1.4.1.tar.gz) = a6ad19d92dbe6f56aebe366adb1cc8fedda67f8d325e47b84073d56f0824f9e2
+SIZE (freeipmi-1.4.1.tar.gz) = 3085238
diff --git a/sysutils/freeipmi/files/patch-common-toolcommon-tool-daemon-common.h b/sysutils/freeipmi/files/patch-common-toolcommon-tool-daemon-common.h
deleted file mode 100644
index ce2b996c309..00000000000
--- a/sysutils/freeipmi/files/patch-common-toolcommon-tool-daemon-common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/toolcommon/tool-daemon-common.h.orig	2012-06-01 05:33:32.000000000 +0800
-+++ common/toolcommon/tool-daemon-common.h	2012-10-10 21:47:30.807406009 +0800
-@@ -22,6 +22,8 @@
- #include <stdint.h>
- #include <signal.h>
- 
-+typedef void (*sighandler_t)(int);
-+
- int daemonize_common (const char *pidfile);
- 
- /* can pass NULL for no callback */
diff --git a/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h b/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h
index 4ed8cb23b91..b1653204b26 100644
--- a/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h
+++ b/sysutils/freeipmi/files/patch-ipmi-oem-ipmi-oem.h
@@ -1,7 +1,7 @@
---- ipmi-oem/ipmi-oem.h.orig	2012-01-03 03:26:10.000000000 +0800
-+++ ipmi-oem/ipmi-oem.h	2012-01-06 04:36:44.994004384 +0800
+--- 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
 @@ -20,6 +20,7 @@
- #define _IPMI_OEM_H
+ #define IPMI_OEM_H
  
  #include <freeipmi/freeipmi.h>
 +#include <sys/limits.h>
diff --git a/sysutils/freeipmi/files/patch-man-Makefile.in b/sysutils/freeipmi/files/patch-man-Makefile.in
index 4ad374aaf68..f8869b1090b 100644
--- a/sysutils/freeipmi/files/patch-man-Makefile.in
+++ b/sysutils/freeipmi/files/patch-man-Makefile.in
@@ -1,11 +1,11 @@
---- man/Makefile.in.orig	2013-01-11 03:00:35.000000000 +0800
-+++ man/Makefile.in	2013-02-02 03:18:42.250624916 +0800
-@@ -896,7 +896,7 @@
+--- 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 @@
  
  
  $(MANS_CPP): $(MANS_CPP:%=%.pre)
--	$(CPP) -w -C -P -I$(top_srcdir)/man $@.pre  $@
-+	$(CPP) -w -C -I$(top_srcdir)/man $@.pre | grep -v '^#' > $@
+-	$(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.
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index 7c0c9888790..3f9f12c5275 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -1,9 +1,9 @@
 %%ETCDIR%%/freeipmi.conf.sample
-%%ETCDIR%%/ipmiseld.conf
 %%ETCDIR%%/freeipmi_interpret_sel.conf
 %%ETCDIR%%/freeipmi_interpret_sensor.conf
 %%ETCDIR%%/ipmidetect.conf
 %%ETCDIR%%/ipmidetectd.conf
+%%ETCDIR%%/ipmiseld.conf
 %%ETCDIR%%/libipmiconsole.conf
 include/freeipmi/api/ipmi-api.h
 include/freeipmi/api/ipmi-chassis-cmds-api.h
@@ -42,6 +42,7 @@ include/freeipmi/cmds/ipmi-serial-modem-cmds.h
 include/freeipmi/cmds/ipmi-sol-cmds.h
 include/freeipmi/cmds/rmcp-cmds.h
 include/freeipmi/debug/ipmi-debug.h
+include/freeipmi/driver/ipmi-inteldcmi-driver.h
 include/freeipmi/driver/ipmi-kcs-driver.h
 include/freeipmi/driver/ipmi-openipmi-driver.h
 include/freeipmi/driver/ipmi-ssif-driver.h
@@ -65,6 +66,7 @@ include/freeipmi/record-format/ipmi-fru-oem-record-format.h
 include/freeipmi/record-format/ipmi-platform-event-trap-record-format.h
 include/freeipmi/record-format/ipmi-sdr-oem-record-format.h
 include/freeipmi/record-format/ipmi-sdr-record-format.h
+include/freeipmi/record-format/ipmi-sel-oem-record-format.h
 include/freeipmi/record-format/ipmi-sel-record-format.h
 include/freeipmi/sdr/ipmi-sdr-oem.h
 include/freeipmi/sdr/ipmi-sdr.h
@@ -172,7 +174,7 @@ include/ipmidetect.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
-lib/libfreeipmi.so.15
+lib/libfreeipmi.so.16
 lib/libipmiconsole.a
 lib/libipmiconsole.la
 lib/libipmiconsole.so
@@ -197,6 +199,7 @@ man/man5/bmc-config.conf.5.gz
 man/man5/freeipmi.conf.5.gz
 man/man5/freeipmi_interpret_sel.conf.5.gz
 man/man5/freeipmi_interpret_sensor.conf.5.gz
+man/man5/ipmi-config.conf.5.gz
 man/man5/ipmi_monitoring_sensors.conf.5.gz
 man/man5/ipmiconsole.conf.5.gz
 man/man5/ipmidetect.conf.5.gz
@@ -212,8 +215,9 @@ man/man8/bmc-config.8.gz
 man/man8/bmc-device.8.gz
 man/man8/bmc-info.8.gz
 man/man8/bmc-watchdog.8.gz
-man/man8/ipmi-chassis.8.gz
 man/man8/ipmi-chassis-config.8.gz
+man/man8/ipmi-chassis.8.gz
+man/man8/ipmi-config.8.gz
 man/man8/ipmi-console.8.gz
 man/man8/ipmi-dcmi.8.gz
 man/man8/ipmi-detect.8.gz
@@ -226,8 +230,8 @@ man/man8/ipmi-ping.8.gz
 man/man8/ipmi-power.8.gz
 man/man8/ipmi-raw.8.gz
 man/man8/ipmi-sel.8.gz
-man/man8/ipmi-sensors.8.gz
 man/man8/ipmi-sensors-config.8.gz
+man/man8/ipmi-sensors.8.gz
 man/man8/ipmiconsole.8.gz
 man/man8/ipmidetect.8.gz
 man/man8/ipmidetectd.8.gz
@@ -244,6 +248,7 @@ sbin/bmc-info
 sbin/bmc-watchdog
 sbin/ipmi-chassis
 sbin/ipmi-chassis-config
+sbin/ipmi-config
 sbin/ipmi-console
 sbin/ipmi-dcmi
 sbin/ipmi-detect
@@ -268,74 +273,10 @@ sbin/ipmiseld
 sbin/pef-config
 sbin/rmcp-ping
 sbin/rmcpping
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ZRESEARCH
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.bmc-watchdog
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmi-dcmi
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmi-fru
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmiconsole
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmidetect
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmimonitoring
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmiping
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmipower
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmiseld
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.pstdout
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.sunbmc
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.bmc-watchdog
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.bmc-watchdog.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmi-dcmi
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmi-fru
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmi-fru.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmiconsole
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmiconsole.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmidetect
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmidetect.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmimonitoring
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmimonitoring.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmiping
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmiping.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmipower
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmipower.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmiseld
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.pstdout
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.pstdout.UC
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.argp
-%%PORTDOCS%%%%DOCSDIR%%/README.build
-%%PORTDOCS%%%%DOCSDIR%%/README.openipmi
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/contrib/ganglia/README
-%%PORTDOCS%%%%DOCSDIR%%/contrib/ganglia/ganglia_ipmi_sensors.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/libipmimonitoring/ipmimonitoring-sel.c
-%%PORTDOCS%%%%DOCSDIR%%/contrib/libipmimonitoring/ipmimonitoring-sensors.c
-%%PORTDOCS%%%%DOCSDIR%%/contrib/nagios/README
-%%PORTDOCS%%%%DOCSDIR%%/contrib/nagios/nagios_ipmi_sensors.pl
-%%PORTDOCS%%%%DOCSDIR%%/contrib/pet/README
-%%PORTDOCS%%%%DOCSDIR%%/contrib/pet/check_rmcpping
-%%PORTDOCS%%%%DOCSDIR%%/contrib/pet/ipminodes.cfg
-%%PORTDOCS%%%%DOCSDIR%%/contrib/pet/petalert.pl
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-bugs-issues-and-workarounds.txt
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-coding.txt
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-design.txt
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-hostrange.txt
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-libraries.txt
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-oem-documentation-requirements.txt
-%%PORTDOCS%%%%DOCSDIR%%/freeipmi-testing.txt
 @exec mkdir -m 0700 -p %%CACHE_DIR%%/ipmimonitoringsdrcache %%LOG_DIR%% %%RUN_DIR%%
 @exec touch %%RUN_DIR%%/ipckey
 @unexec rm -f %%RUN_DIR%%/ipckey
 @unexec rmdir %%CACHE_DIR%%/ipmimonitoringsdrcache %%CACHE_DIR%% %%LOG_DIR%% %%RUN_DIR%% 2>/dev/null || true
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib/pet
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib/nagios
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib/libipmimonitoring
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib/ganglia
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/freeipmi/util
 @dirrm include/freeipmi/templates
 @dirrm include/freeipmi/spec