Bug 102984 - Update port: sysutils/freeipmi update to 0.2.3
Summary: Update port: sysutils/freeipmi update to 0.2.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Boris Samorodov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-09-07 17:20 UTC by Dmitry Frolov
Modified: 2006-09-09 13:22 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dmitry Frolov 2006-09-07 17:20:20 UTC 
	- Update freeipmi to 0.2.3

Fix: 

Following is the patch relative to ports/sysutils/freeipmi.
	Please don't forget to remove empty files/patch-*.in.
Comment 1 Dmitry Frolov 2006-09-07 17:23:48 UTC 
Sorry, forgot the actual patch. Here it is:

diff -u -ruN /usr/ports/sysutils/freeipmi/Makefile ./Makefile
--- /usr/ports/sysutils/freeipmi/Makefile	Sun May 14 01:29:14 2006
+++ ./Makefile	Thu Sep  7 22:48:05 2006
@@ -6,45 +6,56 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTVERSION=	0.2.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
 
 PATCH_SITES=	ftp://ftp.riss-telecom.ru/pub/patches/
-PATCHFILES=	${DISTNAME}-fbsd.diff
+PATCHFILES=	${DISTNAME}-fbsd1.diff
 
 MAINTAINER=	frolov@riss-telecom.ru
 COMMENT=	Library and tools to support IPMI-capable hardware
 
-LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 
+OPTIONS+=	FISH "Build fish (FreeIPMI shell) and scripts" on
+
+USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 NOT_FOR_ARCHS=	ia64 sparc64 alpha
-PLIST_SUB+=	SHLIBVER=${SHLIBVER} RUNDIR=${RUNDIR} LOGDIR=${LOGDIR}
-MAN1+=		bmc-config.1 bmc-info.1 fish.1 sel.1 sensors.1
-MAN5+=		ipmipower.conf.5
-MAN8+=		bmc-watchdog.8 ipmipower.8 ipmiping.8 rmcpping.8
-INFO+=		freeipmi
+PLIST_SUB+=	SHLIBVER=${SHLIBVER}
+MAN5+=	ipmipower.conf.5
+MAN8+=	bmc-info.8 bmc-watchdog.8 ipmi-locate.8 ipmi-raw.8 \
+	ipmiping.8 ipmipower.8 rmcpping.8
+INFO+=		freeipmi freeipmi-faq
 PORTDOCS=	*
 PKGDEINSTALL=	${PKGINSTALL}
 
-#OPTIONS+=	IOPERM "Use i386_set_ioperm(2) instead of io(4)" off
-
-SHLIBVER=	1
+SHLIBVER=	2
 
 .include <bsd.port.pre.mk>
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -largp
+LDFLAGS+=	-L${LOCALBASE}/lib
 .if defined(WITH_IOPERM)
 CPPFLAGS+=	-DUSE_IOPERM
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.if defined(WITH_FISH)
+LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+CONFIGURE_ARGS+=	--enable-fish
+PLIST_SUB+=	FISH=""
+MAN5+=	bmc-config.conf.5
+MAN8+=	bmc-config.8 fish.8 ipmi-sel.8 ipmi-sensors.8
+.else
+CONFIGURE_ARGS+=	--disable-fish
+PLIST_SUB+=	FISH="@comment "
+.endif
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
diff -u -ruN /usr/ports/sysutils/freeipmi/distinfo ./distinfo
--- /usr/ports/sysutils/freeipmi/distinfo	Wed Jan 25 01:29:35 2006
+++ ./distinfo	Sun Aug 13 14:13:44 2006
@@ -1,6 +1,6 @@
-MD5 (freeipmi-0.1.3.tar.gz) = c4b088f806253971759c60263722e63d
-SHA256 (freeipmi-0.1.3.tar.gz) = a8a8689afbccb837ff396c87563b73cdb158955d23285c288ebe6fb9edd78742
-SIZE (freeipmi-0.1.3.tar.gz) = 888728
-MD5 (freeipmi-0.1.3-fbsd.diff) = 346f5a774eccce9f8e2451f37c447192
-SHA256 (freeipmi-0.1.3-fbsd.diff) = c03267d1eaf123ee745a93d80d6fc480308c5f8869f03a7e95d390440c03a70d
-SIZE (freeipmi-0.1.3-fbsd.diff) = 15746
+MD5 (freeipmi-0.2.3.tar.gz) = aa3d093e835f9e75301d5cab02c09c68
+SHA256 (freeipmi-0.2.3.tar.gz) = 4333609231797b3cdc17f76856af5d6ed60e337d606870fcc19e441e00f9d334
+SIZE (freeipmi-0.2.3.tar.gz) = 1081539
+MD5 (freeipmi-0.2.3-fbsd1.diff) = a879f7f68b4bc45cfad8203b455984f3
+SHA256 (freeipmi-0.2.3-fbsd1.diff) = 699bbe1e5d503f292b4d564dc6e81e35e3e4b43309d6b7d9a96fd6933917f5b2
+SIZE (freeipmi-0.2.3-fbsd1.diff) = 12707
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-Makefile.am ./files/patch-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Mon Jun 26 19:07:22 2006
++++ Makefile.am	Sat Aug 12 23:16:07 2006
+@@ -7,7 +7,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO THANKS COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
++EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO THANKS DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
+ 
+ docdir   = $(datadir)/doc/$(PACKAGE)
+ doc_DATA = $(EXTRA)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Oct  9 11:24:48 2004
-+++ Makefile.in	Thu Oct 21 01:50:36 2004
-@@ -144,7 +144,7 @@
- target_alias = @target_alias@
- SUBDIRS = doc libfreeipmi fish bmc-watchdog ipmipower ipmiping rmcpping
- 
--EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
-+EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
- 
- docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = $(EXTRA)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am ./files/patch-bmc--watchdog-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-bmc--watchdog-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,19 @@
+--- bmc-watchdog/Makefile.am.orig	Sun Mar 13 10:19:53 2005
++++ bmc-watchdog/Makefile.am	Sat Aug 12 23:24:11 2006
+@@ -10,13 +10,13 @@
+ #TESTS=chk
+ 
+ DEFINITSCRIPT = bmc-watchdog
+-DEFINITSCRIPTdir = $(sysconfdir)/init.d
+-DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
++#DEFINITSCRIPTdir = $(sysconfdir)/init.d
++#DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
+ 
+ BMCWATCHDOGLOGdir = /var/log/$(PACKAGE)
+ 
+ EXTRA_DIST = $(DEFINITSCRIPT)
+ 
+ install-data-hook:
+-	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
++#	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
+ 	$(top_srcdir)/install-sh -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-bmc-watchdog-Makefile.in ./files/patch-bmc-watchdog-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-bmc-watchdog-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-bmc-watchdog-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,25 +0,0 @@
---- bmc-watchdog/Makefile.in.orig	Mon Oct 25 12:42:31 2004
-+++ bmc-watchdog/Makefile.in	Mon Oct 25 20:58:48 2004
-@@ -436,7 +436,8 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir) $(DESTDIR)$(DEFINITSCRIPTdir)
-+	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-+#	$(mkinstalldirs) $(DESTDIR)$(man8dir) $(DESTDIR)$(DEFINITSCRIPTdir)
- 
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -481,9 +482,10 @@
- 
- info-am:
- 
--install-data-am: install-DEFINITSCRIPTDATA install-man
-+#install-data-am: install-DEFINITSCRIPTDATA install-man
-+install-data-am: install-man
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+#	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am:
- 
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.am ./files/patch-fish-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-fish-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,13 @@
+--- fish/Makefile.am.orig	Fri Dec 30 17:16:08 2005
++++ fish/Makefile.am	Sun Aug 13 00:58:12 2006
+@@ -19,5 +19,8 @@
+ 
+ DEFCONF = fish.scm
+ EXTRA_DIST = $(DEFCONF) 
+-Defconfdir = $(sysconfdir)/fish
+-Defconf_DATA = $(DEFCONF)
++#Defconfdir = $(sysconfdir)/fish
++#Defconf_DATA = $(DEFCONF)
++install-data-local:
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/fish
++	$(INSTALL_DATA) $(DEFCONF) $(DESTDIR)$(sysconfdir)/fish/$(DEFCONF)-dist
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.in ./files/patch-fish-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-fish-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,13 +0,0 @@
---- fish/Makefile.in.orig	Sat Oct  9 11:24:50 2004
-+++ fish/Makefile.in	Thu Oct 21 02:02:55 2004
-@@ -198,8 +198,8 @@
- 	@list='$(Defconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f"; \
--	  $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f; \
-+	  echo " $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f-dist"; \
-+	  $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f-dist; \
- 	done
- 
- uninstall-DefconfDATA:
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am ./files/patch-fish-extensions-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-fish-extensions-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,17 @@
+--- fish/extensions/Makefile.am.orig	Sun Oct 16 08:04:04 2005
++++ fish/extensions/Makefile.am	Sun Aug 13 00:58:59 2006
+@@ -13,8 +13,12 @@
+ Extensions_DATA = $(EXTENSIONS)
+ 
+ EXTENSIONSCONF = ipmi-sensors-conf.scm
+-Extensionsconfdir = $(sysconfdir)/fish
+-Extensionsconf_DATA = $(EXTENSIONSCONF)
++#Extensionsconfdir = $(sysconfdir)/fish
++#Extensionsconf_DATA = $(EXTENSIONSCONF)
++install-data-local:
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/fish
++	$(INSTALL_DATA) $(EXTENSIONSCONF) $(DESTDIR)$(sysconfdir)/fish/$(EXTENSIONSCONF)-dist
++
+ 
+ EXTRA_DIST = $(EXTENSIONS) $(EXTENSIONSCONF) 
+ 
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.in ./files/patch-fish-extensions-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-fish-extensions-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,13 +0,0 @@
---- fish/extensions/Makefile.in.orig	Sat Oct  9 11:24:50 2004
-+++ fish/extensions/Makefile.in	Thu Oct 21 02:06:48 2004
-@@ -212,8 +212,8 @@
- 	@list='$(Extensionsconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f"; \
--	  $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f; \
-+	  echo " $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f-dist"; \
-+	  $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f-dist; \
- 	done
- 
- uninstall-ExtensionsconfDATA:
diff -u -ruN /usr/ports/sysutils/freeipmi/pkg-install ./pkg-install
--- /usr/ports/sysutils/freeipmi/pkg-install	Thu Dec 23 16:55:44 2004
+++ ./pkg-install	Sun Aug 13 13:50:42 2006
@@ -7,7 +7,7 @@
 case "$2" in
 POST-INSTALL)
 	for file in $conffiles; do
-		[ -f "$PKG_PREFIX/$file" ] || \
+		[ -f "$PKG_PREFIX/$file-dist" -a ! -f "$PKG_PREFIX/$file" ] && \
 			cp "$PKG_PREFIX/$file-dist" "$PKG_PREFIX/$file"
 	done
 
@@ -17,7 +17,8 @@
 	;;
 DEINSTALL)
 	for file in etc/fish/fish.scm etc/fish/sensors-conf.scm; do
-		cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
+		[ -f "$PKG_PREFIX/$file-dist" ] && \
+			cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
 			rm -f $PKG_PREFIX/$file
 	done
 
diff -u -ruN /usr/ports/sysutils/freeipmi/pkg-plist ./pkg-plist
--- /usr/ports/sysutils/freeipmi/pkg-plist	Sat Feb 25 01:29:11 2006
+++ ./pkg-plist	Sun Aug 13 13:50:42 2006
@@ -1,32 +1,40 @@
-etc/fish/fish.scm-dist
-etc/fish/sensors-conf.scm-dist
+%%FISH%%etc/fish/fish.scm-dist
+%%FISH%%etc/fish/ipmi-sensors-conf.scm-dist
+include/freeipmi/acpi-spmi-locate.h
 include/freeipmi/bit-ops.h
+include/freeipmi/defaults-locate.h
 include/freeipmi/fiid.h
 include/freeipmi/freeipmi.h
 include/freeipmi/ipmi-chassis-cmds.h
 include/freeipmi/ipmi-cmd-spec.h
+include/freeipmi/ipmi-comp-code-spec.h
 include/freeipmi/ipmi-debug.h
 include/freeipmi/ipmi-dev-global-cmds.h
 include/freeipmi/ipmi-error.h
+include/freeipmi/ipmi-interface.h
 include/freeipmi/ipmi-ipmb-interface.h
 include/freeipmi/ipmi-kcs-interface.h
 include/freeipmi/ipmi-lan-cmds.h
 include/freeipmi/ipmi-lan-interface.h
 include/freeipmi/ipmi-lan-param-spec.h
+include/freeipmi/ipmi-locate.h
 include/freeipmi/ipmi-md2.h
 include/freeipmi/ipmi-md5.h
 include/freeipmi/ipmi-msg-interface-desc.h
 include/freeipmi/ipmi-msg-support-cmds.h
 include/freeipmi/ipmi-netfn-spec.h
-include/freeipmi/ipmi-ping.h
-include/freeipmi/ipmi-probe.h
+include/freeipmi/ipmi-pef-cmds.h
+include/freeipmi/ipmi-pef-param-spec.h
 include/freeipmi/ipmi-sdr-record-types.h
 include/freeipmi/ipmi-sdr-repo-cache.h
 include/freeipmi/ipmi-sdr-repo-cmds.h
+include/freeipmi/ipmi-sel-api.h
 include/freeipmi/ipmi-sel-cmds.h
 include/freeipmi/ipmi-sel-record-types.h
 include/freeipmi/ipmi-semaphores.h
+include/freeipmi/ipmi-sensor-api.h
 include/freeipmi/ipmi-sensor-cmds.h
+include/freeipmi/ipmi-sensor-event-messages.h
 include/freeipmi/ipmi-sensor-types.h
 include/freeipmi/ipmi-sensor-utils.h
 include/freeipmi/ipmi-serial-cmds.h
@@ -34,44 +42,55 @@
 include/freeipmi/ipmi-sessions.h
 include/freeipmi/ipmi-smic-interface.h
 include/freeipmi/ipmi-sol-cmds.h
+include/freeipmi/ipmi-ssif-interface.h
 include/freeipmi/ipmi-utils.h
 include/freeipmi/ipmi-watchdog.h
-include/freeipmi/pcilocate.h
+include/freeipmi/pci-locate.h
 include/freeipmi/rmcp.h
-include/freeipmi/smbios.h
+include/freeipmi/smbios-locate.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
 lib/libfreeipmi.so.%%SHLIBVER%%
-sbin/bmc-config
+%%FISH%%sbin/bmc-autoconfig
+%%FISH%%sbin/bmc-config
 sbin/bmc-info
 sbin/bmc-watchdog
-sbin/fish
+%%FISH%%sbin/fish
+sbin/ipmi-locate
+%%FISH%%sbin/ipmi-pef
+sbin/ipmi-raw
+%%FISH%%sbin/ipmi-sel
+%%FISH%%sbin/ipmi-sensors
 sbin/ipmiping
 sbin/ipmipower
 sbin/rmcpping
-sbin/sel
-sbin/sensors
-share/fish/extensions/bc-common.scm
-share/fish/extensions/bc-lan-conf-auth-section.scm
-share/fish/extensions/bc-lan-conf-misc-section.scm
-share/fish/extensions/bc-lan-conf-section.scm
-share/fish/extensions/bc-lan-serial-channel-section.scm
-share/fish/extensions/bc-misc-section.scm
-share/fish/extensions/bc-section.scm
-share/fish/extensions/bc-serial-conf-section.scm
-share/fish/extensions/bc-user-section.scm
-share/fish/extensions/bc2.scm
-share/fish/extensions/bmc-config.scm
-share/fish/extensions/bmc-info.scm
-share/fish/extensions/discovery.scm
-share/fish/extensions/init.scm
-share/fish/extensions/sel.scm
-share/fish/extensions/sensors-utils.scm
-share/fish/extensions/sensors.scm
-share/fish/extensions/shell.scm
-share/fish/extensions/utils.scm
-@dirrm share/fish/extensions
-@dirrm share/fish
+%%FISH%%share/fish/extensions/bc-common.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-auth-section.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-misc-section.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-section.scm
+%%FISH%%share/fish/extensions/bc-lan-serial-channel-section.scm
+%%FISH%%share/fish/extensions/bc-misc-section.scm
+%%FISH%%share/fish/extensions/bc-pef-conf-section.scm
+%%FISH%%share/fish/extensions/bc-section.scm
+%%FISH%%share/fish/extensions/bc-serial-conf-section.scm
+%%FISH%%share/fish/extensions/bc-user-section.scm
+%%FISH%%share/fish/extensions/bmc-config.scm
+%%FISH%%share/fish/extensions/bmc-info.scm
+%%FISH%%share/fish/extensions/discovery.scm
+%%FISH%%share/fish/extensions/init.scm
+%%FISH%%share/fish/extensions/pef.scm
+%%FISH%%share/fish/extensions/sdr.scm
+%%FISH%%share/fish/extensions/sel.scm
+%%FISH%%share/fish/extensions/sensors-alias.scm
+%%FISH%%share/fish/extensions/sensors-common.scm
+%%FISH%%share/fish/extensions/sensors-simple-display.scm
+%%FISH%%share/fish/extensions/sensors-verbose-display.scm
+%%FISH%%share/fish/extensions/sensors-very-verbose-display.scm
+%%FISH%%share/fish/extensions/sensors.scm
+%%FISH%%share/fish/extensions/shell.scm
+%%FISH%%share/fish/extensions/utils.scm
+%%FISH%%@dirrm etc/fish
 @dirrm include/freeipmi
-@dirrm etc/fish
+%%FISH%%@dirrm share/fish/extensions
+%%FISH%%@dirrm share/fish

    wbr&w, dmitry.
-- 
Dmitry Frolov <frolov@riss-telecom.ru>
RISS-Telecom Network, Novosibirsk, Russia
66415911@ICQ, +7 383 2278800, DVF-RIPE
Comment 2 Boris Samorodov freebsd_committer freebsd_triage 2006-09-07 20:36:40 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->bsam

Take.
Comment 3 Boris B.Samorodov 2006-09-07 20:54:55 UTC 
Hello, Dmitry!

Can you please investigate it, running at a 6.x tinderbox shows a
plist error:
-----
====================<phase 7: make package>====================
===>  Building package for freeipmi-0.2.3
tar: etc/fish/fish.scm-dist: Cannot stat: No such file or directory
tar: etc/fish/ipmi-sensors-conf.scm-dist: Cannot stat: No such file or directory
pkg_create: make_dist: tar command failed with code 256
Creating package /tmp/packages/All/freeipmi-0.2.3.tbz
Registering depends: guile-1.6.7_1 libltdl-1.5.22.
Creating bzip'd tar ball in '/tmp/packages/All/freeipmi-0.2.3.tbz'
*** Error code 1

Stop in /a/ports/sysutils/freeipmi.
================================================================
build of /usr/ports/sysutils/freeipmi ended at Thu Sep  7 19:13:49 UTC 2006
-----

WBR
-- 
bsam
Comment 4 Boris Samorodov freebsd_committer freebsd_triage 2006-09-07 21:32:47 UTC 
State Changed
From-To: open->feedback

Awaiting for a feedback.
Comment 5 Dmitry Frolov 2006-09-08 05:25:13 UTC 
* Boris B. Samorodov <bsam@ipt.ru> [08.09.2006 02:52]:

> Hello, Dmitry!
> 
> Can you please investigate it, running at a 6.x tinderbox shows a
> plist error:
> -----
> ====================<phase 7: make package>====================
> ===>  Building package for freeipmi-0.2.3
> tar: etc/fish/fish.scm-dist: Cannot stat: No such file or directory
> tar: etc/fish/ipmi-sensors-conf.scm-dist: Cannot stat: No such file or directory
> pkg_create: make_dist: tar command failed with code 256
> Creating package /tmp/packages/All/freeipmi-0.2.3.tbz
> Registering depends: guile-1.6.7_1 libltdl-1.5.22.
> Creating bzip'd tar ball in '/tmp/packages/All/freeipmi-0.2.3.tbz'
> *** Error code 1
> 
> Stop in /a/ports/sysutils/freeipmi.
> ================================================================
> build of /usr/ports/sysutils/freeipmi ended at Thu Sep  7 19:13:49 UTC 2006
> -----

Sorry for not testing it enough. Port's DESTDIR seems to clash with
autotools one.

Anyway here is the new patch that should work:

diff -u -ruN /usr/ports/sysutils/freeipmi/Makefile ./Makefile
--- /usr/ports/sysutils/freeipmi/Makefile	Sun May 14 01:29:14 2006
+++ ./Makefile	Fri Sep  8 10:52:17 2006
@@ -6,47 +6,63 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTVERSION=	0.2.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
 
 PATCH_SITES=	ftp://ftp.riss-telecom.ru/pub/patches/
-PATCHFILES=	${DISTNAME}-fbsd.diff
+PATCHFILES=	${DISTNAME}-fbsd1.diff
 
 MAINTAINER=	frolov@riss-telecom.ru
 COMMENT=	Library and tools to support IPMI-capable hardware
 
-LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 
+OPTIONS+=	FISH "Build fish (FreeIPMI shell) and scripts" on
+
+USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 NOT_FOR_ARCHS=	ia64 sparc64 alpha
-PLIST_SUB+=	SHLIBVER=${SHLIBVER} RUNDIR=${RUNDIR} LOGDIR=${LOGDIR}
-MAN1+=		bmc-config.1 bmc-info.1 fish.1 sel.1 sensors.1
-MAN5+=		ipmipower.conf.5
-MAN8+=		bmc-watchdog.8 ipmipower.8 ipmiping.8 rmcpping.8
-INFO+=		freeipmi
+PLIST_SUB+=	SHLIBVER=${SHLIBVER}
+MAN5+=	ipmipower.conf.5
+MAN8+=	bmc-info.8 bmc-watchdog.8 ipmi-locate.8 ipmi-raw.8 \
+	ipmiping.8 ipmipower.8 rmcpping.8
+INFO+=		freeipmi freeipmi-faq
 PORTDOCS=	*
 PKGDEINSTALL=	${PKGINSTALL}
 
-#OPTIONS+=	IOPERM "Use i386_set_ioperm(2) instead of io(4)" off
-
-SHLIBVER=	1
+SHLIBVER=	2
 
 .include <bsd.port.pre.mk>
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -largp
+LDFLAGS+=	-L${LOCALBASE}/lib
 .if defined(WITH_IOPERM)
 CPPFLAGS+=	-DUSE_IOPERM
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.if defined(WITH_FISH)
+LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+CONFIGURE_ARGS+=	--enable-fish
+PLIST_SUB+=	FISH=""
+MAN5+=	bmc-config.conf.5
+MAN8+=	bmc-config.8 fish.8 ipmi-sel.8 ipmi-sensors.8
+.else
+CONFIGURE_ARGS+=	--disable-fish
+PLIST_SUB+=	FISH="@comment "
+.endif
 
 post-install:
+	@${MKDIR} ${PREFIX}/etc/fish
+	${INSTALL_DATA} ${WRKSRC}/fish/fish.scm \
+		${PREFIX}/etc/fish/fish.scm-dist
+	${INSTALL_DATA} ${WRKSRC}/fish/extensions/ipmi-sensors-conf.scm \
+		${PREFIX}/etc/fish/ipmi-sensors-conf.scm-dist
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff -u -ruN /usr/ports/sysutils/freeipmi/distinfo ./distinfo
--- /usr/ports/sysutils/freeipmi/distinfo	Wed Jan 25 01:29:35 2006
+++ ./distinfo	Sun Aug 13 14:13:44 2006
@@ -1,6 +1,6 @@
-MD5 (freeipmi-0.1.3.tar.gz) = c4b088f806253971759c60263722e63d
-SHA256 (freeipmi-0.1.3.tar.gz) = a8a8689afbccb837ff396c87563b73cdb158955d23285c288ebe6fb9edd78742
-SIZE (freeipmi-0.1.3.tar.gz) = 888728
-MD5 (freeipmi-0.1.3-fbsd.diff) = 346f5a774eccce9f8e2451f37c447192
-SHA256 (freeipmi-0.1.3-fbsd.diff) = c03267d1eaf123ee745a93d80d6fc480308c5f8869f03a7e95d390440c03a70d
-SIZE (freeipmi-0.1.3-fbsd.diff) = 15746
+MD5 (freeipmi-0.2.3.tar.gz) = aa3d093e835f9e75301d5cab02c09c68
+SHA256 (freeipmi-0.2.3.tar.gz) = 4333609231797b3cdc17f76856af5d6ed60e337d606870fcc19e441e00f9d334
+SIZE (freeipmi-0.2.3.tar.gz) = 1081539
+MD5 (freeipmi-0.2.3-fbsd1.diff) = a879f7f68b4bc45cfad8203b455984f3
+SHA256 (freeipmi-0.2.3-fbsd1.diff) = 699bbe1e5d503f292b4d564dc6e81e35e3e4b43309d6b7d9a96fd6933917f5b2
+SIZE (freeipmi-0.2.3-fbsd1.diff) = 12707
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-Makefile.am ./files/patch-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Mon Jun 26 19:07:22 2006
++++ Makefile.am	Sat Aug 12 23:16:07 2006
+@@ -7,7 +7,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO THANKS COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
++EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO THANKS DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
+ 
+ docdir   = $(datadir)/doc/$(PACKAGE)
+ doc_DATA = $(EXTRA)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Oct  9 11:24:48 2004
-+++ Makefile.in	Thu Oct 21 01:50:36 2004
-@@ -144,7 +144,7 @@
- target_alias = @target_alias@
- SUBDIRS = doc libfreeipmi fish bmc-watchdog ipmipower ipmiping rmcpping
- 
--EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
-+EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
- 
- docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = $(EXTRA)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am ./files/patch-bmc--watchdog-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-bmc--watchdog-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,19 @@
+--- bmc-watchdog/Makefile.am.orig	Sun Mar 13 10:19:53 2005
++++ bmc-watchdog/Makefile.am	Sat Aug 12 23:24:11 2006
+@@ -10,13 +10,13 @@
+ #TESTS=chk
+ 
+ DEFINITSCRIPT = bmc-watchdog
+-DEFINITSCRIPTdir = $(sysconfdir)/init.d
+-DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
++#DEFINITSCRIPTdir = $(sysconfdir)/init.d
++#DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
+ 
+ BMCWATCHDOGLOGdir = /var/log/$(PACKAGE)
+ 
+ EXTRA_DIST = $(DEFINITSCRIPT)
+ 
+ install-data-hook:
+-	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
++#	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
+ 	$(top_srcdir)/install-sh -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-bmc-watchdog-Makefile.in ./files/patch-bmc-watchdog-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-bmc-watchdog-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-bmc-watchdog-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,25 +0,0 @@
---- bmc-watchdog/Makefile.in.orig	Mon Oct 25 12:42:31 2004
-+++ bmc-watchdog/Makefile.in	Mon Oct 25 20:58:48 2004
-@@ -436,7 +436,8 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir) $(DESTDIR)$(DEFINITSCRIPTdir)
-+	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-+#	$(mkinstalldirs) $(DESTDIR)$(man8dir) $(DESTDIR)$(DEFINITSCRIPTdir)
- 
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -481,9 +482,10 @@
- 
- info-am:
- 
--install-data-am: install-DEFINITSCRIPTDATA install-man
-+#install-data-am: install-DEFINITSCRIPTDATA install-man
-+install-data-am: install-man
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+#	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am:
- 
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.am ./files/patch-fish-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-fish-Makefile.am	Fri Sep  8 10:48:44 2006
@@ -0,0 +1,10 @@
+--- fish/Makefile.am.orig	Fri Dec 30 17:16:08 2005
++++ fish/Makefile.am	Sun Aug 13 00:58:12 2006
+@@ -19,5 +19,5 @@
+ 
+ DEFCONF = fish.scm
+ EXTRA_DIST = $(DEFCONF) 
+-Defconfdir = $(sysconfdir)/fish
+-Defconf_DATA = $(DEFCONF)
++#Defconfdir = $(sysconfdir)/fish
++#Defconf_DATA = $(DEFCONF)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.in ./files/patch-fish-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-fish-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,13 +0,0 @@
---- fish/Makefile.in.orig	Sat Oct  9 11:24:50 2004
-+++ fish/Makefile.in	Thu Oct 21 02:02:55 2004
-@@ -198,8 +198,8 @@
- 	@list='$(Defconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f"; \
--	  $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f; \
-+	  echo " $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f-dist"; \
-+	  $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f-dist; \
- 	done
- 
- uninstall-DefconfDATA:
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am ./files/patch-fish-extensions-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-fish-extensions-Makefile.am	Fri Sep  8 10:49:11 2006
@@ -0,0 +1,13 @@
+--- fish/extensions/Makefile.am.orig	Sun Oct 16 08:04:04 2005
++++ fish/extensions/Makefile.am	Sun Aug 13 00:58:59 2006
+@@ -13,8 +13,8 @@
+ Extensions_DATA = $(EXTENSIONS)
+ 
+ EXTENSIONSCONF = ipmi-sensors-conf.scm
+-Extensionsconfdir = $(sysconfdir)/fish
+-Extensionsconf_DATA = $(EXTENSIONSCONF)
++#Extensionsconfdir = $(sysconfdir)/fish
++#Extensionsconf_DATA = $(EXTENSIONSCONF)
+ 
+ EXTRA_DIST = $(EXTENSIONS) $(EXTENSIONSCONF) 
+ 
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.in ./files/patch-fish-extensions-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-fish-extensions-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,13 +0,0 @@
---- fish/extensions/Makefile.in.orig	Sat Oct  9 11:24:50 2004
-+++ fish/extensions/Makefile.in	Thu Oct 21 02:06:48 2004
-@@ -212,8 +212,8 @@
- 	@list='$(Extensionsconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f"; \
--	  $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f; \
-+	  echo " $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f-dist"; \
-+	  $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f-dist; \
- 	done
- 
- uninstall-ExtensionsconfDATA:
diff -u -ruN /usr/ports/sysutils/freeipmi/pkg-install ./pkg-install
--- /usr/ports/sysutils/freeipmi/pkg-install	Thu Dec 23 16:55:44 2004
+++ ./pkg-install	Fri Sep  8 10:54:41 2006
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-conffiles="etc/fish/fish.scm etc/fish/sensors-conf.scm"
+conffiles="etc/fish/fish.scm etc/fish/ipmi-sensors-conf.scm"
 rundir="/var/lib/freeipmi"
 logdir="/var/log/freeipmi"
 
 case "$2" in
 POST-INSTALL)
 	for file in $conffiles; do
-		[ -f "$PKG_PREFIX/$file" ] || \
+		[ -f "$PKG_PREFIX/$file-dist" -a ! -f "$PKG_PREFIX/$file" ] && \
 			cp "$PKG_PREFIX/$file-dist" "$PKG_PREFIX/$file"
 	done
 
@@ -16,8 +16,9 @@
 	touch "$rundir/ipckey"
 	;;
 DEINSTALL)
-	for file in etc/fish/fish.scm etc/fish/sensors-conf.scm; do
-		cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
+	for file in $conffiles; do
+		[ -f "$PKG_PREFIX/$file-dist" ] && \
+			cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
 			rm -f $PKG_PREFIX/$file
 	done
 
diff -u -ruN /usr/ports/sysutils/freeipmi/pkg-plist ./pkg-plist
--- /usr/ports/sysutils/freeipmi/pkg-plist	Sat Feb 25 01:29:11 2006
+++ ./pkg-plist	Sun Aug 13 13:50:42 2006
@@ -1,32 +1,40 @@
-etc/fish/fish.scm-dist
-etc/fish/sensors-conf.scm-dist
+%%FISH%%etc/fish/fish.scm-dist
+%%FISH%%etc/fish/ipmi-sensors-conf.scm-dist
+include/freeipmi/acpi-spmi-locate.h
 include/freeipmi/bit-ops.h
+include/freeipmi/defaults-locate.h
 include/freeipmi/fiid.h
 include/freeipmi/freeipmi.h
 include/freeipmi/ipmi-chassis-cmds.h
 include/freeipmi/ipmi-cmd-spec.h
+include/freeipmi/ipmi-comp-code-spec.h
 include/freeipmi/ipmi-debug.h
 include/freeipmi/ipmi-dev-global-cmds.h
 include/freeipmi/ipmi-error.h
+include/freeipmi/ipmi-interface.h
 include/freeipmi/ipmi-ipmb-interface.h
 include/freeipmi/ipmi-kcs-interface.h
 include/freeipmi/ipmi-lan-cmds.h
 include/freeipmi/ipmi-lan-interface.h
 include/freeipmi/ipmi-lan-param-spec.h
+include/freeipmi/ipmi-locate.h
 include/freeipmi/ipmi-md2.h
 include/freeipmi/ipmi-md5.h
 include/freeipmi/ipmi-msg-interface-desc.h
 include/freeipmi/ipmi-msg-support-cmds.h
 include/freeipmi/ipmi-netfn-spec.h
-include/freeipmi/ipmi-ping.h
-include/freeipmi/ipmi-probe.h
+include/freeipmi/ipmi-pef-cmds.h
+include/freeipmi/ipmi-pef-param-spec.h
 include/freeipmi/ipmi-sdr-record-types.h
 include/freeipmi/ipmi-sdr-repo-cache.h
 include/freeipmi/ipmi-sdr-repo-cmds.h
+include/freeipmi/ipmi-sel-api.h
 include/freeipmi/ipmi-sel-cmds.h
 include/freeipmi/ipmi-sel-record-types.h
 include/freeipmi/ipmi-semaphores.h
+include/freeipmi/ipmi-sensor-api.h
 include/freeipmi/ipmi-sensor-cmds.h
+include/freeipmi/ipmi-sensor-event-messages.h
 include/freeipmi/ipmi-sensor-types.h
 include/freeipmi/ipmi-sensor-utils.h
 include/freeipmi/ipmi-serial-cmds.h
@@ -34,44 +42,55 @@
 include/freeipmi/ipmi-sessions.h
 include/freeipmi/ipmi-smic-interface.h
 include/freeipmi/ipmi-sol-cmds.h
+include/freeipmi/ipmi-ssif-interface.h
 include/freeipmi/ipmi-utils.h
 include/freeipmi/ipmi-watchdog.h
-include/freeipmi/pcilocate.h
+include/freeipmi/pci-locate.h
 include/freeipmi/rmcp.h
-include/freeipmi/smbios.h
+include/freeipmi/smbios-locate.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
 lib/libfreeipmi.so.%%SHLIBVER%%
-sbin/bmc-config
+%%FISH%%sbin/bmc-autoconfig
+%%FISH%%sbin/bmc-config
 sbin/bmc-info
 sbin/bmc-watchdog
-sbin/fish
+%%FISH%%sbin/fish
+sbin/ipmi-locate
+%%FISH%%sbin/ipmi-pef
+sbin/ipmi-raw
+%%FISH%%sbin/ipmi-sel
+%%FISH%%sbin/ipmi-sensors
 sbin/ipmiping
 sbin/ipmipower
 sbin/rmcpping
-sbin/sel
-sbin/sensors
-share/fish/extensions/bc-common.scm
-share/fish/extensions/bc-lan-conf-auth-section.scm
-share/fish/extensions/bc-lan-conf-misc-section.scm
-share/fish/extensions/bc-lan-conf-section.scm
-share/fish/extensions/bc-lan-serial-channel-section.scm
-share/fish/extensions/bc-misc-section.scm
-share/fish/extensions/bc-section.scm
-share/fish/extensions/bc-serial-conf-section.scm
-share/fish/extensions/bc-user-section.scm
-share/fish/extensions/bc2.scm
-share/fish/extensions/bmc-config.scm
-share/fish/extensions/bmc-info.scm
-share/fish/extensions/discovery.scm
-share/fish/extensions/init.scm
-share/fish/extensions/sel.scm
-share/fish/extensions/sensors-utils.scm
-share/fish/extensions/sensors.scm
-share/fish/extensions/shell.scm
-share/fish/extensions/utils.scm
-@dirrm share/fish/extensions
-@dirrm share/fish
+%%FISH%%share/fish/extensions/bc-common.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-auth-section.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-misc-section.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-section.scm
+%%FISH%%share/fish/extensions/bc-lan-serial-channel-section.scm
+%%FISH%%share/fish/extensions/bc-misc-section.scm
+%%FISH%%share/fish/extensions/bc-pef-conf-section.scm
+%%FISH%%share/fish/extensions/bc-section.scm
+%%FISH%%share/fish/extensions/bc-serial-conf-section.scm
+%%FISH%%share/fish/extensions/bc-user-section.scm
+%%FISH%%share/fish/extensions/bmc-config.scm
+%%FISH%%share/fish/extensions/bmc-info.scm
+%%FISH%%share/fish/extensions/discovery.scm
+%%FISH%%share/fish/extensions/init.scm
+%%FISH%%share/fish/extensions/pef.scm
+%%FISH%%share/fish/extensions/sdr.scm
+%%FISH%%share/fish/extensions/sel.scm
+%%FISH%%share/fish/extensions/sensors-alias.scm
+%%FISH%%share/fish/extensions/sensors-common.scm
+%%FISH%%share/fish/extensions/sensors-simple-display.scm
+%%FISH%%share/fish/extensions/sensors-verbose-display.scm
+%%FISH%%share/fish/extensions/sensors-very-verbose-display.scm
+%%FISH%%share/fish/extensions/sensors.scm
+%%FISH%%share/fish/extensions/shell.scm
+%%FISH%%share/fish/extensions/utils.scm
+%%FISH%%@dirrm etc/fish
 @dirrm include/freeipmi
-@dirrm etc/fish
+%%FISH%%@dirrm share/fish/extensions
+%%FISH%%@dirrm share/fish

    wbr&w, dmitry.
-- 
Dmitry Frolov <frolov@riss-telecom.ru>
RISS-Telecom Network, Novosibirsk, Russia
66415911@ICQ, +7 383 2278800, DVF-RIPE
Comment 6 Boris Samorodov freebsd_committer freebsd_triage 2006-09-08 06:03:23 UTC 
State Changed
From-To: feedback->open

Feedback received.
Comment 7 Boris B.Samorodov 2006-09-08 06:15:03 UTC 
One more issue, if you won't mind :-)
-----
===>  Building package for freeipmi-0.2.3
Creating package /tmp/packages/All/freeipmi-0.2.3.tbz
Registering depends: guile-1.6.7_1 libltdl-1.5.22.
Creating bzip'd tar ball in '/tmp/packages/All/freeipmi-0.2.3.tbz'
Deleting freeipmi-0.2.3
================================================================

=== Checking filesystem state
list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
6571239        4 drwxr-xr-x    2 root             wheel                 512 Sep  8 05:05 usr/local/etc/init.d
6571240        4 -rwxr-xr-x    1 root             wheel                1209 Sep  8 05:05 usr/local/etc/init.d/bmc-watchdog
-----

WBR
-- 
bsam
Comment 8 Dmitry Frolov 2006-09-09 03:39:40 UTC 
* Boris B. Samorodov <bsam@ipt.ru> [08.09.2006 12:12]:

> One more issue, if you won't mind :-)
> -----
> ===>  Building package for freeipmi-0.2.3
> Creating package /tmp/packages/All/freeipmi-0.2.3.tbz
> Registering depends: guile-1.6.7_1 libltdl-1.5.22.
> Creating bzip'd tar ball in '/tmp/packages/All/freeipmi-0.2.3.tbz'
> Deleting freeipmi-0.2.3
> ================================================================
> 
> === Checking filesystem state
> list of extra files and directories in / (not present before this port was installed but present after it was deinstalled)
> 6571239        4 drwxr-xr-x    2 root             wheel                 512 Sep  8 05:05 usr/local/etc/init.d
> 6571240        4 -rwxr-xr-x    1 root             wheel                1209 Sep  8 05:05 usr/local/etc/init.d/bmc-watchdog
> -----

Sorry again. Here is the new patch:

diff -u -ruN /usr/ports/sysutils/freeipmi/Makefile ./Makefile
--- /usr/ports/sysutils/freeipmi/Makefile	Sun May 14 01:29:14 2006
+++ ./Makefile	Fri Sep  8 10:52:17 2006
@@ -6,47 +6,63 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTVERSION=	0.2.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
 
 PATCH_SITES=	ftp://ftp.riss-telecom.ru/pub/patches/
-PATCHFILES=	${DISTNAME}-fbsd.diff
+PATCHFILES=	${DISTNAME}-fbsd1.diff
 
 MAINTAINER=	frolov@riss-telecom.ru
 COMMENT=	Library and tools to support IPMI-capable hardware
 
-LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
 
+OPTIONS+=	FISH "Build fish (FreeIPMI shell) and scripts" on
+
+USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 NOT_FOR_ARCHS=	ia64 sparc64 alpha
-PLIST_SUB+=	SHLIBVER=${SHLIBVER} RUNDIR=${RUNDIR} LOGDIR=${LOGDIR}
-MAN1+=		bmc-config.1 bmc-info.1 fish.1 sel.1 sensors.1
-MAN5+=		ipmipower.conf.5
-MAN8+=		bmc-watchdog.8 ipmipower.8 ipmiping.8 rmcpping.8
-INFO+=		freeipmi
+PLIST_SUB+=	SHLIBVER=${SHLIBVER}
+MAN5+=	ipmipower.conf.5
+MAN8+=	bmc-info.8 bmc-watchdog.8 ipmi-locate.8 ipmi-raw.8 \
+	ipmiping.8 ipmipower.8 rmcpping.8
+INFO+=		freeipmi freeipmi-faq
 PORTDOCS=	*
 PKGDEINSTALL=	${PKGINSTALL}
 
-#OPTIONS+=	IOPERM "Use i386_set_ioperm(2) instead of io(4)" off
-
-SHLIBVER=	1
+SHLIBVER=	2
 
 .include <bsd.port.pre.mk>
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -largp
+LDFLAGS+=	-L${LOCALBASE}/lib
 .if defined(WITH_IOPERM)
 CPPFLAGS+=	-DUSE_IOPERM
 .endif
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.if defined(WITH_FISH)
+LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
+CONFIGURE_ARGS+=	--enable-fish
+PLIST_SUB+=	FISH=""
+MAN5+=	bmc-config.conf.5
+MAN8+=	bmc-config.8 fish.8 ipmi-sel.8 ipmi-sensors.8
+.else
+CONFIGURE_ARGS+=	--disable-fish
+PLIST_SUB+=	FISH="@comment "
+.endif
 
 post-install:
+	@${MKDIR} ${PREFIX}/etc/fish
+	${INSTALL_DATA} ${WRKSRC}/fish/fish.scm \
+		${PREFIX}/etc/fish/fish.scm-dist
+	${INSTALL_DATA} ${WRKSRC}/fish/extensions/ipmi-sensors-conf.scm \
+		${PREFIX}/etc/fish/ipmi-sensors-conf.scm-dist
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff -u -ruN /usr/ports/sysutils/freeipmi/distinfo ./distinfo
--- /usr/ports/sysutils/freeipmi/distinfo	Wed Jan 25 01:29:35 2006
+++ ./distinfo	Sun Aug 13 14:13:44 2006
@@ -1,6 +1,6 @@
-MD5 (freeipmi-0.1.3.tar.gz) = c4b088f806253971759c60263722e63d
-SHA256 (freeipmi-0.1.3.tar.gz) = a8a8689afbccb837ff396c87563b73cdb158955d23285c288ebe6fb9edd78742
-SIZE (freeipmi-0.1.3.tar.gz) = 888728
-MD5 (freeipmi-0.1.3-fbsd.diff) = 346f5a774eccce9f8e2451f37c447192
-SHA256 (freeipmi-0.1.3-fbsd.diff) = c03267d1eaf123ee745a93d80d6fc480308c5f8869f03a7e95d390440c03a70d
-SIZE (freeipmi-0.1.3-fbsd.diff) = 15746
+MD5 (freeipmi-0.2.3.tar.gz) = aa3d093e835f9e75301d5cab02c09c68
+SHA256 (freeipmi-0.2.3.tar.gz) = 4333609231797b3cdc17f76856af5d6ed60e337d606870fcc19e441e00f9d334
+SIZE (freeipmi-0.2.3.tar.gz) = 1081539
+MD5 (freeipmi-0.2.3-fbsd1.diff) = a879f7f68b4bc45cfad8203b455984f3
+SHA256 (freeipmi-0.2.3-fbsd1.diff) = 699bbe1e5d503f292b4d564dc6e81e35e3e4b43309d6b7d9a96fd6933917f5b2
+SIZE (freeipmi-0.2.3-fbsd1.diff) = 12707
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-Makefile.am ./files/patch-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-Makefile.am	Sun Aug 13 13:50:42 2006
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Mon Jun 26 19:07:22 2006
++++ Makefile.am	Sat Aug 12 23:16:07 2006
+@@ -7,7 +7,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO THANKS COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
++EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO THANKS DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
+ 
+ docdir   = $(datadir)/doc/$(PACKAGE)
+ doc_DATA = $(EXTRA)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Oct  9 11:24:48 2004
-+++ Makefile.in	Thu Oct 21 01:50:36 2004
-@@ -144,7 +144,7 @@
- target_alias = @target_alias@
- SUBDIRS = doc libfreeipmi fish bmc-watchdog ipmipower ipmiping rmcpping
- 
--EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
-+EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
- 
- docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = $(EXTRA)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am ./files/patch-bmc--watchdog-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-bmc--watchdog-Makefile.am	Fri Sep  8 14:04:07 2006
@@ -0,0 +1,28 @@
+--- ./bmc-watchdog/Makefile.am.orig	Sun Mar 13 10:19:53 2005
++++ ./bmc-watchdog/Makefile.am	Fri Sep  8 14:03:23 2006
+@@ -9,14 +9,14 @@
+ #  following and add `chk' to the EXTRA_DIST list
+ #TESTS=chk
+ 
+-DEFINITSCRIPT = bmc-watchdog
+-DEFINITSCRIPTdir = $(sysconfdir)/init.d
+-DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
+-
+-BMCWATCHDOGLOGdir = /var/log/$(PACKAGE)
+-
+-EXTRA_DIST = $(DEFINITSCRIPT)
+-
+-install-data-hook:
+-	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
+-	$(top_srcdir)/install-sh -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
++#DEFINITSCRIPT = bmc-watchdog
++#DEFINITSCRIPTdir = $(sysconfdir)/init.d
++#DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
++#
++#BMCWATCHDOGLOGdir = /var/log/$(PACKAGE)
++#
++#EXTRA_DIST = $(DEFINITSCRIPT)
++#
++#install-data-hook:
++#	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
++#	$(top_srcdir)/install-sh -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-bmc-watchdog-Makefile.in ./files/patch-bmc-watchdog-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-bmc-watchdog-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-bmc-watchdog-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,25 +0,0 @@
---- bmc-watchdog/Makefile.in.orig	Mon Oct 25 12:42:31 2004
-+++ bmc-watchdog/Makefile.in	Mon Oct 25 20:58:48 2004
-@@ -436,7 +436,8 @@
- all-am: Makefile $(MANS) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	$(mkinstalldirs) $(DESTDIR)$(man8dir) $(DESTDIR)$(DEFINITSCRIPTdir)
-+	$(mkinstalldirs) $(DESTDIR)$(man8dir)
-+#	$(mkinstalldirs) $(DESTDIR)$(man8dir) $(DESTDIR)$(DEFINITSCRIPTdir)
- 
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -481,9 +482,10 @@
- 
- info-am:
- 
--install-data-am: install-DEFINITSCRIPTDATA install-man
-+#install-data-am: install-DEFINITSCRIPTDATA install-man
-+install-data-am: install-man
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+#	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am:
- 
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.am ./files/patch-fish-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-fish-Makefile.am	Fri Sep  8 10:48:44 2006
@@ -0,0 +1,10 @@
+--- fish/Makefile.am.orig	Fri Dec 30 17:16:08 2005
++++ fish/Makefile.am	Sun Aug 13 00:58:12 2006
+@@ -19,5 +19,5 @@
+ 
+ DEFCONF = fish.scm
+ EXTRA_DIST = $(DEFCONF) 
+-Defconfdir = $(sysconfdir)/fish
+-Defconf_DATA = $(DEFCONF)
++#Defconfdir = $(sysconfdir)/fish
++#Defconf_DATA = $(DEFCONF)
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.in ./files/patch-fish-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-fish-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-fish-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,13 +0,0 @@
---- fish/Makefile.in.orig	Sat Oct  9 11:24:50 2004
-+++ fish/Makefile.in	Thu Oct 21 02:02:55 2004
-@@ -198,8 +198,8 @@
- 	@list='$(Defconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f"; \
--	  $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f; \
-+	  echo " $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f-dist"; \
-+	  $(DefconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Defconfdir)/$$f-dist; \
- 	done
- 
- uninstall-DefconfDATA:
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am ./files/patch-fish-extensions-Makefile.am
--- /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am	Thu Jan  1 07:00:00 1970
+++ ./files/patch-fish-extensions-Makefile.am	Fri Sep  8 10:49:11 2006
@@ -0,0 +1,13 @@
+--- fish/extensions/Makefile.am.orig	Sun Oct 16 08:04:04 2005
++++ fish/extensions/Makefile.am	Sun Aug 13 00:58:59 2006
+@@ -13,8 +13,8 @@
+ Extensions_DATA = $(EXTENSIONS)
+ 
+ EXTENSIONSCONF = ipmi-sensors-conf.scm
+-Extensionsconfdir = $(sysconfdir)/fish
+-Extensionsconf_DATA = $(EXTENSIONSCONF)
++#Extensionsconfdir = $(sysconfdir)/fish
++#Extensionsconf_DATA = $(EXTENSIONSCONF)
+ 
+ EXTRA_DIST = $(EXTENSIONS) $(EXTENSIONSCONF) 
+ 
diff -u -ruN /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.in ./files/patch-fish-extensions-Makefile.in
--- /usr/ports/sysutils/freeipmi/files/patch-fish-extensions-Makefile.in	Thu Dec 23 16:55:45 2004
+++ ./files/patch-fish-extensions-Makefile.in	Thu Jan  1 07:00:00 1970
@@ -1,13 +0,0 @@
---- fish/extensions/Makefile.in.orig	Sat Oct  9 11:24:50 2004
-+++ fish/extensions/Makefile.in	Thu Oct 21 02:06:48 2004
-@@ -212,8 +212,8 @@
- 	@list='$(Extensionsconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f"; \
--	  $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f; \
-+	  echo " $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f-dist"; \
-+	  $(ExtensionsconfDATA_INSTALL) $$d$$p $(DESTDIR)$(Extensionsconfdir)/$$f-dist; \
- 	done
- 
- uninstall-ExtensionsconfDATA:
diff -u -ruN /usr/ports/sysutils/freeipmi/pkg-install ./pkg-install
--- /usr/ports/sysutils/freeipmi/pkg-install	Thu Dec 23 16:55:44 2004
+++ ./pkg-install	Fri Sep  8 10:54:41 2006
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-conffiles="etc/fish/fish.scm etc/fish/sensors-conf.scm"
+conffiles="etc/fish/fish.scm etc/fish/ipmi-sensors-conf.scm"
 rundir="/var/lib/freeipmi"
 logdir="/var/log/freeipmi"
 
 case "$2" in
 POST-INSTALL)
 	for file in $conffiles; do
-		[ -f "$PKG_PREFIX/$file" ] || \
+		[ -f "$PKG_PREFIX/$file-dist" -a ! -f "$PKG_PREFIX/$file" ] && \
 			cp "$PKG_PREFIX/$file-dist" "$PKG_PREFIX/$file"
 	done
 
@@ -16,8 +16,9 @@
 	touch "$rundir/ipckey"
 	;;
 DEINSTALL)
-	for file in etc/fish/fish.scm etc/fish/sensors-conf.scm; do
-		cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
+	for file in $conffiles; do
+		[ -f "$PKG_PREFIX/$file-dist" ] && \
+			cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
 			rm -f $PKG_PREFIX/$file
 	done
 
diff -u -ruN /usr/ports/sysutils/freeipmi/pkg-plist ./pkg-plist
--- /usr/ports/sysutils/freeipmi/pkg-plist	Sat Feb 25 01:29:11 2006
+++ ./pkg-plist	Sun Aug 13 13:50:42 2006
@@ -1,32 +1,40 @@
-etc/fish/fish.scm-dist
-etc/fish/sensors-conf.scm-dist
+%%FISH%%etc/fish/fish.scm-dist
+%%FISH%%etc/fish/ipmi-sensors-conf.scm-dist
+include/freeipmi/acpi-spmi-locate.h
 include/freeipmi/bit-ops.h
+include/freeipmi/defaults-locate.h
 include/freeipmi/fiid.h
 include/freeipmi/freeipmi.h
 include/freeipmi/ipmi-chassis-cmds.h
 include/freeipmi/ipmi-cmd-spec.h
+include/freeipmi/ipmi-comp-code-spec.h
 include/freeipmi/ipmi-debug.h
 include/freeipmi/ipmi-dev-global-cmds.h
 include/freeipmi/ipmi-error.h
+include/freeipmi/ipmi-interface.h
 include/freeipmi/ipmi-ipmb-interface.h
 include/freeipmi/ipmi-kcs-interface.h
 include/freeipmi/ipmi-lan-cmds.h
 include/freeipmi/ipmi-lan-interface.h
 include/freeipmi/ipmi-lan-param-spec.h
+include/freeipmi/ipmi-locate.h
 include/freeipmi/ipmi-md2.h
 include/freeipmi/ipmi-md5.h
 include/freeipmi/ipmi-msg-interface-desc.h
 include/freeipmi/ipmi-msg-support-cmds.h
 include/freeipmi/ipmi-netfn-spec.h
-include/freeipmi/ipmi-ping.h
-include/freeipmi/ipmi-probe.h
+include/freeipmi/ipmi-pef-cmds.h
+include/freeipmi/ipmi-pef-param-spec.h
 include/freeipmi/ipmi-sdr-record-types.h
 include/freeipmi/ipmi-sdr-repo-cache.h
 include/freeipmi/ipmi-sdr-repo-cmds.h
+include/freeipmi/ipmi-sel-api.h
 include/freeipmi/ipmi-sel-cmds.h
 include/freeipmi/ipmi-sel-record-types.h
 include/freeipmi/ipmi-semaphores.h
+include/freeipmi/ipmi-sensor-api.h
 include/freeipmi/ipmi-sensor-cmds.h
+include/freeipmi/ipmi-sensor-event-messages.h
 include/freeipmi/ipmi-sensor-types.h
 include/freeipmi/ipmi-sensor-utils.h
 include/freeipmi/ipmi-serial-cmds.h
@@ -34,44 +42,55 @@
 include/freeipmi/ipmi-sessions.h
 include/freeipmi/ipmi-smic-interface.h
 include/freeipmi/ipmi-sol-cmds.h
+include/freeipmi/ipmi-ssif-interface.h
 include/freeipmi/ipmi-utils.h
 include/freeipmi/ipmi-watchdog.h
-include/freeipmi/pcilocate.h
+include/freeipmi/pci-locate.h
 include/freeipmi/rmcp.h
-include/freeipmi/smbios.h
+include/freeipmi/smbios-locate.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
 lib/libfreeipmi.so.%%SHLIBVER%%
-sbin/bmc-config
+%%FISH%%sbin/bmc-autoconfig
+%%FISH%%sbin/bmc-config
 sbin/bmc-info
 sbin/bmc-watchdog
-sbin/fish
+%%FISH%%sbin/fish
+sbin/ipmi-locate
+%%FISH%%sbin/ipmi-pef
+sbin/ipmi-raw
+%%FISH%%sbin/ipmi-sel
+%%FISH%%sbin/ipmi-sensors
 sbin/ipmiping
 sbin/ipmipower
 sbin/rmcpping
-sbin/sel
-sbin/sensors
-share/fish/extensions/bc-common.scm
-share/fish/extensions/bc-lan-conf-auth-section.scm
-share/fish/extensions/bc-lan-conf-misc-section.scm
-share/fish/extensions/bc-lan-conf-section.scm
-share/fish/extensions/bc-lan-serial-channel-section.scm
-share/fish/extensions/bc-misc-section.scm
-share/fish/extensions/bc-section.scm
-share/fish/extensions/bc-serial-conf-section.scm
-share/fish/extensions/bc-user-section.scm
-share/fish/extensions/bc2.scm
-share/fish/extensions/bmc-config.scm
-share/fish/extensions/bmc-info.scm
-share/fish/extensions/discovery.scm
-share/fish/extensions/init.scm
-share/fish/extensions/sel.scm
-share/fish/extensions/sensors-utils.scm
-share/fish/extensions/sensors.scm
-share/fish/extensions/shell.scm
-share/fish/extensions/utils.scm
-@dirrm share/fish/extensions
-@dirrm share/fish
+%%FISH%%share/fish/extensions/bc-common.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-auth-section.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-misc-section.scm
+%%FISH%%share/fish/extensions/bc-lan-conf-section.scm
+%%FISH%%share/fish/extensions/bc-lan-serial-channel-section.scm
+%%FISH%%share/fish/extensions/bc-misc-section.scm
+%%FISH%%share/fish/extensions/bc-pef-conf-section.scm
+%%FISH%%share/fish/extensions/bc-section.scm
+%%FISH%%share/fish/extensions/bc-serial-conf-section.scm
+%%FISH%%share/fish/extensions/bc-user-section.scm
+%%FISH%%share/fish/extensions/bmc-config.scm
+%%FISH%%share/fish/extensions/bmc-info.scm
+%%FISH%%share/fish/extensions/discovery.scm
+%%FISH%%share/fish/extensions/init.scm
+%%FISH%%share/fish/extensions/pef.scm
+%%FISH%%share/fish/extensions/sdr.scm
+%%FISH%%share/fish/extensions/sel.scm
+%%FISH%%share/fish/extensions/sensors-alias.scm
+%%FISH%%share/fish/extensions/sensors-common.scm
+%%FISH%%share/fish/extensions/sensors-simple-display.scm
+%%FISH%%share/fish/extensions/sensors-verbose-display.scm
+%%FISH%%share/fish/extensions/sensors-very-verbose-display.scm
+%%FISH%%share/fish/extensions/sensors.scm
+%%FISH%%share/fish/extensions/shell.scm
+%%FISH%%share/fish/extensions/utils.scm
+%%FISH%%@dirrm etc/fish
 @dirrm include/freeipmi
-@dirrm etc/fish
+%%FISH%%@dirrm share/fish/extensions
+%%FISH%%@dirrm share/fish

    wbr&w, dmitry.
-- 
Dmitry Frolov <frolov@riss-telecom.ru>
RISS-Telecom Network, Novosibirsk, Russia
66415911@ICQ, +7 383 2278800, DVF-RIPE
Comment 9 Boris Samorodov freebsd_committer freebsd_triage 2006-09-09 13:21:13 UTC 
State Changed
From-To: open->closed

Committed, thanks! 
Added by me: s/INSTALLS_SHLIB/USE_LDCONFIG as the former is deprecated.