- Update to 1.0.1

- Add LICENSE
- Cosmetic changes
- Do not use dirrmtry directly for {CACHE|LOG|RUN}_DIR

Changes:	http://savannah.gnu.org/forum/forum.php?forum_id=6691
Feature safe:	yes

7 files changed, 78 insertions, 95 deletions

diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index fdd96bf9cdcc..e3e8f5e87e6b 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.8.12
+PORTVERSION=	1.0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU/${PORTNAME}/ \
 		http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/ \
@@ -18,6 +18,11 @@ COMMENT=	Library and tools to support IPMI-capable hardware
 LIB_DEPENDS=	argp:${PORTSDIR}/devel/argp-standalone \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
+LICENSE=	GPLv3
+
+OPTIONS=	DEBUG	"Debugging features" off \
+		IOPERM	"Use i386_set_ioperm (i386/amd64 only)" off
+
 CONFIGURE_ARGS=	--disable-init-scripts \
 		--disable-logdir \
 		--disable-logrotate-config \
@@ -34,36 +39,28 @@ USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	DEBUG	"Debugging features" off \
-		IOPERM	"Use i386_set_ioperm (i386/amd64 only)" off
-
 INFO=		freeipmi-faq
 MAN3=		libfreeipmi.3 libipmiconsole.3 libipmidetect.3 libipmimonitoring.3
-MAN5=		bmc-config.conf.5 freeipmi.conf.5 ipmi_monitoring_sensors.conf.5 \
+MAN5=		bmc-config.conf.5 freeipmi.conf.5 freeipmi_interpret_sel.conf.5 \
+		freeipmi_interpret_sensor.conf.5 ipmi_monitoring_sensors.conf.5 \
 		ipmiconsole.conf.5 ipmidetect.conf.5 ipmidetectd.conf.5 \
 		ipmimonitoring.conf.5 ipmimonitoring_sensors.conf.5 \
-		ipmipower.conf.5 libipmimonitoring.conf.5
+		ipmipower.conf.5 libipmiconsole.conf.5 libipmimonitoring.conf.5
 MAN7=		freeipmi.7
 MAN8=		bmc-config.8 bmc-device.8 bmc-info.8 bmc-watchdog.8 \
-		ipmi-chassis-config.8 ipmi-chassis.8 ipmi-dcmi.8 ipmi-fru.8 \
-		ipmi-locate.8 ipmi-oem.8 ipmi-pef-config.8 ipmi-raw.8 ipmi-sel.8 \
-		ipmi-sensors-config.8 ipmi-sensors.8 ipmiconsole.8 ipmidetect.8 \
-		ipmidetectd.8 ipmimonitoring.8 ipmiping.8 ipmipower.8 \
-		pef-config.8 rmcpping.8
-PLIST_SUB+=	FREEIPMI_SHLIBVER=${FREEIPMI_SHLIBVER} \
-		IPMICONSOLE_SHLIBVER=${IPMICONSOLE_SHLIBVER} \
-		IPMIDETECT_SHLIBVER=${IPMIDETECT_SHLIBVER} \
-		IPMIMONITORING_SHLIBVER=${IPMIMONITORING_SHLIBVER} \
-		CACHE_DIR=${CACHE_DIR} LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR}
+		ipmi-chassis-config.8 ipmi-chassis.8 ipmi-console.8 \
+		ipmi-dcmi.8 ipmi-detect.8 ipmi-fru.8 ipmi-locate.8 ipmi-oem.8 \
+		ipmi-pef-config.8 ipmi-ping.8 ipmi-power.8 ipmi-raw.8 \
+		ipmi-sel.8 ipmi-sensors-config.8 ipmi-sensors.8 ipmiconsole.8 \
+		ipmidetect.8 ipmidetectd.8 ipmimonitoring.8 ipmiping.8 \
+		ipmipower.8 pef-config.8 rmcp-ping.8 rmcpping.8
+PLIST_SUB=	CACHE_DIR=${CACHE_DIR} CONF_DIR=${ETCDIR:S/^${PREFIX}\///} \
+		LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR}
 
 CACHE_DIR?=	/var/db/${PORTNAME}
+CONF_DIR?=	${ETCDIR}
 LOG_DIR=	/var/log/${PORTNAME}
 RUN_DIR=	/var/lib/${PORTNAME}
-CONF_DIR?=	${PREFIX}/etc/${PORTNAME}
-FREEIPMI_SHLIBVER=		10
-IPMICONSOLE_SHLIBVER=		3
-IPMIDETECT_SHLIBVER=		0
-IPMIMONITORING_SHLIBVER=	4
 
 .include <bsd.port.pre.mk>
 
@@ -81,8 +78,12 @@ 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
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s| install-docDATA||' \
+	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-docDATA||' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/doc/Makefile.in
 .endif
 
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index eb8f37f9c39e..f4b50fce1f5a 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeipmi-0.8.12.tar.gz) = a958ecef9e979ce4789f8ca659b9379f4952e4ad0964761640686c87dcd21578
-SIZE (freeipmi-0.8.12.tar.gz) = 2831164
+SHA256 (freeipmi-1.0.1.tar.gz) = ba022ada0a6c8e307018c6b4c8d46c92be723e7c893c275842f2ef9ed5964086
+SIZE (freeipmi-1.0.1.tar.gz) = 3053737
diff --git a/sysutils/freeipmi/files/patch-etc-Makefile.in b/sysutils/freeipmi/files/patch-etc-Makefile.in
deleted file mode 100644
index 7cbbc1828027..000000000000
--- a/sysutils/freeipmi/files/patch-etc-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- etc/Makefile.in.orig	2010-05-25 01:46:21.000000000 +0800
-+++ etc/Makefile.in	2010-06-06 13:56:52.000000000 +0800
-@@ -241,8 +241,8 @@
- 	@list='$(Freeipmiconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(FreeipmiconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Freeipmiconfdir)/$$f'"; \
--	  $(FreeipmiconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Freeipmiconfdir)/$$f"; \
-+	  echo " $(FreeipmiconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Freeipmiconfdir)/$$f.sample'"; \
-+	  $(FreeipmiconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Freeipmiconfdir)/$$f.sample"; \
- 	done
- 
- uninstall-FreeipmiconfDATA:
-@@ -380,8 +380,6 @@
- 
- 
- install-data-local:
--	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 755 $(srcdir)/freeipmi.conf $(DESTDIR)$(sysconfdir)
- 
- uninstall-local:
- 	$(RM) -f $(DESTDIR)$(sysconfdir)/freeipmi.conf
diff --git a/sysutils/freeipmi/files/patch-ipmi-oem-src-ipmi-oem.h b/sysutils/freeipmi/files/patch-ipmi-oem-src-ipmi-oem.h
new file mode 100644
index 000000000000..c87ba1e9585d
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-ipmi-oem-src-ipmi-oem.h
@@ -0,0 +1,10 @@
+--- ipmi-oem/src/ipmi-oem.h.orig	2011-01-21 05:38:30.000000000 +0800
++++ ipmi-oem/src/ipmi-oem.h	2011-01-24 12:06:25.000000000 +0800
+@@ -20,6 +20,7 @@
+ #define _IPMI_OEM_H
+ 
+ #include <freeipmi/freeipmi.h>
++#include <sys/limits.h>
+ 
+ #include "tool-cmdline-common.h"
+ #include "pstdout.h"
diff --git a/sysutils/freeipmi/files/patch-ipmimonitorig-Makefile.in b/sysutils/freeipmi/files/patch-ipmimonitorig-Makefile.in
deleted file mode 100644
index 412182485deb..000000000000
--- a/sysutils/freeipmi/files/patch-ipmimonitorig-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- ipmimonitoring/Makefile.in.orig	2010-05-25 01:46:25.000000000 +0800
-+++ ipmimonitoring/Makefile.in	2010-06-06 13:58:07.000000000 +0800
-@@ -423,8 +423,8 @@
- 	@list='$(Monitoringconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(MonitoringconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Monitoringconfdir)/$$f'"; \
--	  $(MonitoringconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Monitoringconfdir)/$$f"; \
-+	  echo " $(MonitoringconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Monitoringconfdir)/$$f.sample'"; \
-+	  $(MonitoringconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Monitoringconfdir)/$$f.sample"; \
- 	done
- 
- uninstall-MonitoringconfDATA:
-@@ -717,8 +717,6 @@
- 	$(CPP) -C -P -I. $@.pre  $@
- 
- install-data-local:
--	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 755 $(srcdir)/ipmi_monitoring_sensors.conf $(DESTDIR)$(IPMI_MONITORING_SENSOR_CONFIG_FILE_DEFAULT)
- 
- uninstall-local:
- 	$(RM) -f $(DESTDIR)$(IPMI_MONITORING_SENSOR_CONFIG_FILE_DEFAULT)/ipmi_monitoring_sensors.conf
diff --git a/sysutils/freeipmi/files/patch-libfreeipmi-src-driver-ipmi-kcs-driver.c b/sysutils/freeipmi/files/patch-libfreeipmi-src-driver-ipmi-kcs-driver.c
index 8c90c02aa7e0..13587988bf27 100644
--- a/sysutils/freeipmi/files/patch-libfreeipmi-src-driver-ipmi-kcs-driver.c
+++ b/sysutils/freeipmi/files/patch-libfreeipmi-src-driver-ipmi-kcs-driver.c
@@ -1,6 +1,6 @@
---- libfreeipmi/src/driver/ipmi-kcs-driver.c.orig	2010-09-29 05:11:01.000000000 +0800
-+++ libfreeipmi/src/driver/ipmi-kcs-driver.c	2010-10-01 17:51:46.000000000 +0800
-@@ -485,7 +485,7 @@
+--- libfreeipmi/src/driver/ipmi-kcs-driver.c.orig	2011-01-21 05:38:22.000000000 +0800
++++ libfreeipmi/src/driver/ipmi-kcs-driver.c	2011-01-24 09:49:23.000000000 +0800
+@@ -484,7 +484,7 @@
  #ifdef __FreeBSD__
  #ifdef USE_IOPERM
    /* i386_set_ioperm has known problems on FBSD 5.x (bus errors). */
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index 9782e4a63132..f7df0703be84 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -1,7 +1,10 @@
 @comment $FreeBSD$
-etc/freeipmi/freeipmi.conf.sample
-etc/freeipmi/ipmi_monitoring_sensors.conf.sample
-etc/freeipmi/ipmidetectd.conf
+%%CONF_DIR%%/freeipmi.conf.sample
+%%CONF_DIR%%/freeipmi_interpret_sel.conf
+%%CONF_DIR%%/freeipmi_interpret_sensor.conf
+%%CONF_DIR%%/ipmidetect.conf
+%%CONF_DIR%%/ipmidetectd.conf
+%%CONF_DIR%%/libipmiconsole.conf
 include/freeipmi/api/ipmi-api.h
 include/freeipmi/api/ipmi-chassis-cmds-api.h
 include/freeipmi/api/ipmi-dcmi-cmds-api.h
@@ -10,6 +13,7 @@ include/freeipmi/api/ipmi-event-cmds-api.h
 include/freeipmi/api/ipmi-fru-inventory-device-cmds-api.h
 include/freeipmi/api/ipmi-lan-cmds-api.h
 include/freeipmi/api/ipmi-messaging-support-cmds-api.h
+include/freeipmi/api/ipmi-oem-intel-node-manager-cmds-api.h
 include/freeipmi/api/ipmi-pef-and-alerting-cmds-api.h
 include/freeipmi/api/ipmi-rmcpplus-support-and-payload-cmds-api.h
 include/freeipmi/api/ipmi-sdr-repository-cmds-api.h
@@ -26,6 +30,7 @@ include/freeipmi/cmds/ipmi-event-cmds.h
 include/freeipmi/cmds/ipmi-fru-inventory-device-cmds.h
 include/freeipmi/cmds/ipmi-lan-cmds.h
 include/freeipmi/cmds/ipmi-messaging-support-cmds.h
+include/freeipmi/cmds/ipmi-oem-intel-node-manager-cmds.h
 include/freeipmi/cmds/ipmi-pef-and-alerting-cmds.h
 include/freeipmi/cmds/ipmi-rmcpplus-support-and-payload-cmds.h
 include/freeipmi/cmds/ipmi-sdr-repository-cmds.h
@@ -47,7 +52,9 @@ include/freeipmi/interface/ipmi-kcs-interface.h
 include/freeipmi/interface/ipmi-lan-interface.h
 include/freeipmi/interface/ipmi-rmcpplus-interface.h
 include/freeipmi/interface/rmcp-interface.h
+include/freeipmi/interpret/ipmi-interpret.h
 include/freeipmi/locate/ipmi-locate.h
+include/freeipmi/payload/ipmi-sol-payload.h
 include/freeipmi/record-format/ipmi-cipher-suite-record-format.h
 include/freeipmi/record-format/ipmi-fru-information-record-format.h
 include/freeipmi/record-format/ipmi-sdr-oem-record-format.h
@@ -59,8 +66,6 @@ include/freeipmi/sel-parse/ipmi-sel-parse.h
 include/freeipmi/sensor-read/ipmi-sensor-read.h
 include/freeipmi/spec/ipmi-authentication-type-spec.h
 include/freeipmi/spec/ipmi-channel-spec.h
-include/freeipmi/spec/ipmi-chassis-boot-options-parameter-oem-spec.h
-include/freeipmi/spec/ipmi-chassis-boot-options-parameter-spec.h
 include/freeipmi/spec/ipmi-cmd-dcmi-spec.h
 include/freeipmi/spec/ipmi-cmd-oem-spec.h
 include/freeipmi/spec/ipmi-cmd-spec.h
@@ -76,12 +81,12 @@ include/freeipmi/spec/ipmi-fru-chassis-types-spec.h
 include/freeipmi/spec/ipmi-fru-language-codes-spec.h
 include/freeipmi/spec/ipmi-iana-enterprise-numbers-spec.h
 include/freeipmi/spec/ipmi-ipmb-lun-spec.h
-include/freeipmi/spec/ipmi-lan-parameter-oem-spec.h
-include/freeipmi/spec/ipmi-lan-parameter-spec.h
+include/freeipmi/spec/ipmi-lan-configuration-parameters-oem-spec.h
+include/freeipmi/spec/ipmi-lan-configuration-parameters-spec.h
 include/freeipmi/spec/ipmi-netfn-oem-spec.h
 include/freeipmi/spec/ipmi-netfn-spec.h
-include/freeipmi/spec/ipmi-pef-parameter-oem-spec.h
-include/freeipmi/spec/ipmi-pef-parameter-spec.h
+include/freeipmi/spec/ipmi-pef-configuration-parameters-oem-spec.h
+include/freeipmi/spec/ipmi-pef-configuration-parameters-spec.h
 include/freeipmi/spec/ipmi-privilege-level-spec.h
 include/freeipmi/spec/ipmi-product-id-spec.h
 include/freeipmi/spec/ipmi-rmcpplus-status-spec.h
@@ -91,14 +96,16 @@ include/freeipmi/spec/ipmi-sensor-numbers-oem-spec.h
 include/freeipmi/spec/ipmi-sensor-types-oem-spec.h
 include/freeipmi/spec/ipmi-sensor-types-spec.h
 include/freeipmi/spec/ipmi-sensor-units-spec.h
-include/freeipmi/spec/ipmi-serial-modem-parameter-oem-spec.h
-include/freeipmi/spec/ipmi-serial-modem-parameter-spec.h
+include/freeipmi/spec/ipmi-serial-modem-configuration-parameters-oem-spec.h
+include/freeipmi/spec/ipmi-serial-modem-configuration-parameters-spec.h
 include/freeipmi/spec/ipmi-slave-address-oem-spec.h
 include/freeipmi/spec/ipmi-slave-address-spec.h
-include/freeipmi/spec/ipmi-sol-parameter-oem-spec.h
-include/freeipmi/spec/ipmi-sol-parameter-spec.h
-include/freeipmi/spec/ipmi-system-info-parameter-oem-spec.h
-include/freeipmi/spec/ipmi-system-info-parameter-spec.h
+include/freeipmi/spec/ipmi-sol-configuration-parameters-oem-spec.h
+include/freeipmi/spec/ipmi-sol-configuration-parameters-spec.h
+include/freeipmi/spec/ipmi-system-boot-option-parameters-oem-spec.h
+include/freeipmi/spec/ipmi-system-boot-option-parameters-spec.h
+include/freeipmi/spec/ipmi-system-info-parameters-oem-spec.h
+include/freeipmi/spec/ipmi-system-info-parameters-spec.h
 include/freeipmi/spec/ipmi-system-software-id-spec.h
 include/freeipmi/templates/ipmi-bmc-watchdog-timer-cmds-templates.h
 include/freeipmi/templates/ipmi-chassis-cmds-templates.h
@@ -113,6 +120,7 @@ include/freeipmi/templates/ipmi-kcs-interface-templates.h
 include/freeipmi/templates/ipmi-lan-cmds-templates.h
 include/freeipmi/templates/ipmi-lan-interface-templates.h
 include/freeipmi/templates/ipmi-messaging-support-cmds-templates.h
+include/freeipmi/templates/ipmi-oem-intel-node-manager-cmds-templates.h
 include/freeipmi/templates/ipmi-pef-and-alerting-cmds-templates.h
 include/freeipmi/templates/ipmi-rmcpplus-interface-templates.h
 include/freeipmi/templates/ipmi-rmcpplus-support-and-payload-cmds-templates.h
@@ -124,6 +132,7 @@ include/freeipmi/templates/ipmi-sel-record-format-templates.h
 include/freeipmi/templates/ipmi-sensor-cmds-templates.h
 include/freeipmi/templates/ipmi-serial-modem-cmds-templates.h
 include/freeipmi/templates/ipmi-sol-cmds-templates.h
+include/freeipmi/templates/ipmi-sol-payload-templates.h
 include/freeipmi/templates/rmcp-cmds-templates.h
 include/freeipmi/templates/rmcp-interface-templates.h
 include/freeipmi/util/ipmi-channel-util.h
@@ -143,35 +152,41 @@ include/freeipmi/util/ipmi-sensor-util.h
 include/freeipmi/util/ipmi-util.h
 include/freeipmi/util/rmcp-util.h
 include/ipmi_monitoring.h
+include/ipmi_monitoring_bitmasks.h
+include/ipmi_monitoring_offsets.h
 include/ipmiconsole.h
 include/ipmidetect.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
-lib/libfreeipmi.so.%%FREEIPMI_SHLIBVER%%
+lib/libfreeipmi.so.11
 lib/libipmiconsole.a
 lib/libipmiconsole.la
 lib/libipmiconsole.so
-lib/libipmiconsole.so.%%IPMICONSOLE_SHLIBVER%%
+lib/libipmiconsole.so.3
 lib/libipmidetect.a
 lib/libipmidetect.la
 lib/libipmidetect.so
-lib/libipmidetect.so.%%IPMIDETECT_SHLIBVER%%
+lib/libipmidetect.so.0
 lib/libipmimonitoring.a
 lib/libipmimonitoring.la
 lib/libipmimonitoring.so
-lib/libipmimonitoring.so.%%IPMIMONITORING_SHLIBVER%%
+lib/libipmimonitoring.so.5
 sbin/bmc-config
 sbin/bmc-device
 sbin/bmc-info
 sbin/bmc-watchdog
 sbin/ipmi-chassis
 sbin/ipmi-chassis-config
+sbin/ipmi-console
 sbin/ipmi-dcmi
+sbin/ipmi-detect
 sbin/ipmi-fru
 sbin/ipmi-locate
 sbin/ipmi-oem
 sbin/ipmi-pef-config
+sbin/ipmi-ping
+sbin/ipmi-power
 sbin/ipmi-raw
 sbin/ipmi-sel
 sbin/ipmi-sensors
@@ -183,6 +198,7 @@ sbin/ipmimonitoring
 sbin/ipmiping
 sbin/ipmipower
 sbin/pef-config
+sbin/rmcp-ping
 sbin/rmcpping
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -196,7 +212,6 @@ sbin/rmcpping
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmiping
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.ipmipower
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.pstdout
-%%PORTDOCS%%%%DOCSDIR%%/COPYING.rmcpping
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.sunbmc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
@@ -217,8 +232,6 @@ sbin/rmcpping
 %%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.ipmipower.UC
 %%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.pstdout
 %%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.pstdout.UC
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.rmcpping
-%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER.rmcpping.UC
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -228,6 +241,7 @@ sbin/rmcpping
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%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
@@ -237,7 +251,7 @@ sbin/rmcpping
 @exec touch %%RUN_DIR%%/ipckey
 @exec chmod 0700 %%CACHE_DIR%% %%LOG_DIR%% %%RUN_DIR%%
 @unexec rm -f %%RUN_DIR%%/ipckey
-@dirrmtry %%CACHE_DIR%%/ipmimonitoringsdrcache %%CACHE_DIR%% %%LOG_DIR%% %%RUN_DIR%%
+@unexec rmdir %%CACHE_DIR%%/ipmimonitoringsdrcache %%CACHE_DIR%% %%LOG_DIR%% %%RUN_DIR%% 2>/dev/null || true
 @dirrm include/freeipmi/util
 @dirrm include/freeipmi/templates
 @dirrm include/freeipmi/spec
@@ -246,7 +260,9 @@ sbin/rmcpping
 @dirrm include/freeipmi/sdr-parse
 @dirrm include/freeipmi/sdr-cache
 @dirrm include/freeipmi/record-format
+@dirrm include/freeipmi/payload
 @dirrm include/freeipmi/locate
+@dirrm include/freeipmi/interpret
 @dirrm include/freeipmi/interface
 @dirrm include/freeipmi/fru-parse
 @dirrm include/freeipmi/fiid
@@ -255,4 +271,4 @@ sbin/rmcpping
 @dirrm include/freeipmi/cmds
 @dirrm include/freeipmi/api
 @dirrm include/freeipmi
-@dirrmtry etc/freeipmi
+@dirrmtry %%CONF_DIR%%