ports/131654: sysutils/powerman: update to v2.3.4
Joerg Pulz
Joerg.Pulz at frm2.tum.de
Fri Feb 13 18:40:02 UTC 2009
>Number: 131654
>Category: ports
>Synopsis: sysutils/powerman: update to v2.3.4
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 13 18:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Joerg Pulz
>Release: FreeBSD 7.1-RELEASE-p2 i386
>Organization:
Technische Universitaet Muenchen / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 7.1-RELEASE-p2 FreeBSD 7.1-RELEASE-p2 #0: Mon Jan 19 12:01:54 CET 2009 root at hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386
>Description:
Update sysutils/powerman to the latest version 2.3.4.
This update is a requirement for the Powerman PDU feature for
the next update of sysutils/nut to version 2.4.0. PR coming soon.
Changes:
Makefile
- fix MASTER_SITES (project moved to SF)
- update dependencies
- add CONFIGURE_ARGS and CONFIGURE_ENV
- help configure to find everything using CFLAGS and LDFLAGS
- use USE_LDCONFIG as port installs a library
- let the port handle the (de)installation of the rc script
- update manpages
- remove now useless old stuff
distinfo
- regen for the new version
pkg-descr
- update WWW
pkg-plist
- update for the new version
- add all the new files alphabetically
>How-To-Repeat:
>Fix:
- apply the patch
- remove all zero-sized patches from the ${FILESDIR}
- add ${FILESDIR}/patch-man-powermand.8
- add ${FILESDIR}/patch-scripts-Makefile.in
- add ${FILESDIR}/powerman.sh.in
--- sysutils_powerman.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/powerman/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 20 Mar 2008 10:03:45 -0000 1.7
+++ Makefile 13 Feb 2009 18:07:11 -0000
@@ -5,36 +5,31 @@
# $FreeBSD: ports/sysutils/powerman/Makefile,v 1.7 2008/03/20 10:03:45 pav Exp $
PORTNAME= powerman
-PORTVERSION= 1.0.20
-PORTREVISION= 1
+PORTVERSION= 2.3.4
+#PORTREVISION= 1
CATEGORIES= sysutils parallel
-MASTER_SITES= ftp://ftp.llnl.gov/pub/linux/powerman/
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SF/powerman
MAINTAINER= ports at FreeBSD.org
COMMENT= PowerMan is a tool for doing remote power control
-USE_BISON= build
-USE_GMAKE= yes
-USE_RC_SUBR= yes
-
-MAKE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
+LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl
-MAN1= powerman.1
-MAN5= powerman.conf.5
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-httppower --localstatedir=${DESTDIR}/var \
+ --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
+CONFIGURE_ENV= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_LDCONFIG= yes
+USE_RC_SUBR= powerman.sh
+
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+MAN1= pm.1 powerman.1
+MAN3= libpowerman.3
+MAN5= powerman.conf.5 powerman.dev.5
MAN7= powerman-devices.7
-MAN8= powermand.8
-
-post-patch:
-.for file in ${MAN1} ${MAN5} powermand.1
- @${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:" "${WRKSRC}/man/${file}"
-.endfor
- @${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:" \
- "${WRKSRC}/src/powerman.h"
- @${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:" \
- -e "s:%%RC_SUBR%%:${RC_SUBR}:" \
- "${WRKSRC}/scripts/powerman.init"
+MAN8= httppower.8 plmpower.8 powermand.8 vpcd.8
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/powerman/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 16 Nov 2005 06:03:41 -0000 1.3
+++ distinfo 13 Feb 2009 18:07:11 -0000
@@ -1,3 +1,3 @@
-MD5 (powerman-1.0.20.tgz) = 6b33b4d0376e2578e93fc32071c719b2
-SHA256 (powerman-1.0.20.tgz) = c69db4fcb8f93a13913f6f6990d5152e482cbca4b844cfb199679586e7107915
-SIZE (powerman-1.0.20.tgz) = 148573
+MD5 (powerman-2.3.4.tar.bz2) = f47c7725b426b0a776a4980d8628471e
+SHA256 (powerman-2.3.4.tar.bz2) = 449fd9c2fa1ba4d3bd366fc5421fbf4fb185e28aa16188fb68dd55fe1fc71d88
+SIZE (powerman-2.3.4.tar.bz2) = 405351
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/sysutils/powerman/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr 17 Jun 2004 16:14:12 -0000 1.1
+++ pkg-descr 13 Feb 2009 18:07:11 -0000
@@ -3,4 +3,4 @@
natively by PowerMan and Expect-like configurability simplifies the
addition of new devices.
-WWW: http://www.llnl.gov/linux/powerman/
+WWW: http://powerman.sf.net/
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/powerman/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 24 Aug 2004 15:21:13 -0000 1.2
+++ pkg-plist 13 Feb 2009 18:07:11 -0000
@@ -1,21 +1,49 @@
+ at stopdaemon powerman
bin/pm
bin/powerman
etc/powerman/apc.dev
+etc/powerman/apc7900.dev
etc/powerman/apcnew.dev
+etc/powerman/apcold.dev
+etc/powerman/apcpdu.dev
+etc/powerman/apcpdu3.dev
+etc/powerman/bashfun.dev
etc/powerman/baytech-rpc28-nc.dev
etc/powerman/baytech-rpc3-nc.dev
etc/powerman/baytech.dev
+etc/powerman/cb-7050.dev
+etc/powerman/cyclades-pm10.dev
+etc/powerman/cyclades-pm20.dev
+etc/powerman/cyclades-pm42.dev
etc/powerman/cyclades-pm8.dev
-etc/powerman/ibmh8.dev
+etc/powerman/dli.dev
+etc/powerman/hp3488.dev
+etc/powerman/ibmbladecenter.dev
etc/powerman/icebox.dev
etc/powerman/icebox3.dev
+etc/powerman/ics8064.dev
+etc/powerman/ilom.dev
etc/powerman/ipmi.dev
etc/powerman/ipmipower.dev
etc/powerman/phantom.dev
-etc/powerman/phantom4.dev
+etc/powerman/plmpower.dev
+etc/powerman/powerman.conf.example
+etc/powerman/powerman.dev
+etc/powerman/swpdu.dev
etc/powerman/vpc.dev
etc/powerman/wti-rps10.dev
etc/powerman/wti.dev
-etc/rc.d/powermand.sh
+include/libpowerman.h
+lib/libpowerman.a
+lib/libpowerman.la
+lib/libpowerman.so
+lib/libpowerman.so.0
+libdata/pkgconfig/libpowerman.pc
+sbin/httppower
+sbin/plmpower
sbin/powermand
- at dirrm etc/powerman
+sbin/vpcd
+ at dirrmtry etc/powerman
+ at cwd /
+ at dirrmtry /var/run/powerman
+ at cwd %%PREFIX%%
Index: files/patch-Makefile
===================================================================
RCS file: files/patch-Makefile
diff -N files/patch-Makefile
--- files/patch-Makefile 24 Aug 2004 15:21:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,104 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-Makefile,v 1.2 2004/08/24 15:21:13 glewis Exp $
-
---- Makefile.orig Fri Dec 19 09:39:10 2003
-+++ Makefile Thu Aug 5 14:57:44 2004
-@@ -1,20 +1,19 @@
- PROJECT = powerman
- VERSION = $(shell perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' META)
- RELEASE = $(shell perl -ne 'print,exit if s/^\s*RELEASE:\s*(\S*).*/\1/i' META)
--SHELL= /bin/sh
--MAKE= /usr/bin/make
--CC= gcc
--INSTALL= /usr/bin/install -c
-+SHELL?= /bin/sh
-+CC?= gcc
-+INSTALL?=/usr/bin/install -c
- mkinstalldirs= $(SHELL) $(top_srcdir)/aux/mkinstalldirs
--CFLAGS= -g -O2 -Wall
-+CFLAGS?= -g -O2 -Wall
-
- top_srcdir = .
--prefix = /usr
-+prefix = ${PREFIX}
- exec_prefix = ${prefix}
- bindir = ${exec_prefix}/bin
--sbindir = ${exec_prefix}/sbin
--mandir = $(prefix)/man
--etcdir = /etc
-+sbindir = ${exec_prefix}/sbin
-+mandir = ${prefix}/man
-+etcdir = ${prefix}/etc
- packagedir = ${etcdir}/${PROJECT}
-
- all: progs tests
-@@ -26,38 +25,38 @@
- $(MAKE) -C test
-
- install: all
-- $(mkinstalldirs) $(DESTDIR)$(bindir)
-- $(INSTALL) src/powerman $(DESTDIR)$(bindir)/
-- ln -s $(bindir)/powerman $(DESTDIR)$(bindir)/pm
-- $(mkinstalldirs) $(DESTDIR)$(sbindir)
-- $(INSTALL) src/powermand $(DESTDIR)$(sbindir)/
-- $(mkinstalldirs) $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/baytech.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/baytech-rpc28-nc.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/baytech-rpc3-nc.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/icebox.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/icebox3.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/wti.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/wti-rps10.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/apc.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/apcnew.dev $(DESTDIR)$(packagedir)
--# $(INSTALL) etc/vicebox.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/vpc.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/ibmh8.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/phantom.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/phantom4.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/ipmi.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/cyclades-pm8.dev $(DESTDIR)$(packagedir)
-- $(INSTALL) etc/ipmipower.dev $(DESTDIR)$(packagedir)
-- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-- $(INSTALL) -m 644 man/powerman.1 $(DESTDIR)$(mandir)/man1
-- $(INSTALL) -m 644 man/powermand.1 $(DESTDIR)$(mandir)/man1
-- $(mkinstalldirs) $(DESTDIR)$(mandir)/man5
-- $(INSTALL) -m 644 man/powerman.conf.5 $(DESTDIR)$(mandir)/man5
-- $(mkinstalldirs) $(DESTDIR)$(mandir)/man7
-- $(INSTALL) -m 644 man/powerman-devices.7 $(DESTDIR)$(mandir)/man7
-- $(mkinstalldirs) $(DESTDIR)/etc/rc.d/init.d
-- $(INSTALL) -m 755 scripts/powerman.init $(DESTDIR)/etc/rc.d/init.d/powerman
-+ $(mkinstalldirs) $(bindir)
-+ ${BSD_INSTALL_PROGRAM} src/powerman $(bindir)/
-+ ln -s $(bindir)/powerman $(bindir)/pm
-+ $(mkinstalldirs) $(sbindir)
-+ ${BSD_INSTALL_PROGRAM} src/powermand $(sbindir)/
-+ $(mkinstalldirs) $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/baytech.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/baytech-rpc28-nc.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/baytech-rpc3-nc.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/icebox.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/icebox3.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/wti.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/wti-rps10.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/apc.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/apcnew.dev $(packagedir)
-+# ${BSD_INSTALL_DATA} etc/vicebox.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/vpc.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/ibmh8.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/phantom.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/phantom4.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/ipmi.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/cyclades-pm8.dev $(packagedir)
-+ ${BSD_INSTALL_DATA} etc/ipmipower.dev $(packagedir)
-+ $(mkinstalldirs) $(mandir)/man1
-+ ${BSD_INSTALL_DATA} man/powerman.1 $(mandir)/man1
-+ $(mkinstalldirs) $(mandir)/man8
-+ ${BSD_INSTALL_DATA} man/powermand.1 $(mandir)/man8/powermand.8
-+ $(mkinstalldirs) $(mandir)/man5
-+ ${BSD_INSTALL_DATA} man/powerman.conf.5 $(mandir)/man5
-+ $(mkinstalldirs) $(mandir)/man7
-+ ${BSD_INSTALL_DATA} man/powerman-devices.7 $(mandir)/man7
-+ ${BSD_INSTALL_SCRIPT} scripts/powerman.init $(etcdir)/rc.d/powermand.sh
-
- clean:
- make -C src clean
Index: files/patch-man-powerman.1
===================================================================
RCS file: files/patch-man-powerman.1
diff -N files/patch-man-powerman.1
--- files/patch-man-powerman.1 24 Aug 2004 15:21:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-man-powerman.1,v 1.2 2004/08/24 15:21:13 glewis Exp $
-
---- man/powerman.1.orig Fri Dec 19 09:39:10 2003
-+++ man/powerman.1 Mon Aug 23 16:19:38 2004
-@@ -146,18 +146,18 @@
- powerman --on "foo[0,4-5]"
- .fi
- .SH "FILES"
--/usr/sbin/powermand
-+%%PREFIX%%/sbin/powermand
- .br
--/usr/bin/powerman
-+%%PREFIX%%/bin/powerman
- .br
--/usr/bin/pm
-+%%PREFIX%%/bin/pm
- .br
--/etc/powerman/powerman.conf
-+%%PREFIX%%/etc/powerman/powerman.conf
- .br
--/etc/powerman/*.dev
-+%%PREFIX%%/etc/powerman/*.dev
- .SH "ORIGIN"
- Developed by Andrew Uselton <useton2 at llnl.gov> on LLNL's Linux
- clusters. This software is open source and distributed under
- the terms of the Gnu GPL.
- .SH "SEE ALSO"
--powermand(1) powerman.conf(5)
-+powermand(8) powerman.conf(5)
Index: files/patch-man-powerman.conf.5
===================================================================
RCS file: /home/ncvs/ports/sysutils/powerman/files/patch-man-powerman.conf.5,v
retrieving revision 1.1
diff -u -r1.1 patch-man-powerman.conf.5
--- files/patch-man-powerman.conf.5 17 Jun 2004 16:14:13 -0000 1.1
+++ files/patch-man-powerman.conf.5 13 Feb 2009 18:07:11 -0000
@@ -1,21 +1,20 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-man-powerman.conf.5,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- man/powerman.conf.5.orig Wed Aug 6 16:56:56 2003
-+++ man/powerman.conf.5 Thu Jun 10 08:38:10 2004
-@@ -90,13 +90,13 @@
- node "pengra15" "pow1" "8" \fR
- .fi
- .SH "FILES"
--/etc/powerman/powerman.conf
-+%%PREFIX%%/etc/powerman/powerman.conf
- .br
--/etc/powerman/*.dev
-+%%PREFIX%%/etc/powerman/*.dev
- .SH "ORIGIN"
- Developed by Andrew Uselton <useton2 at llnl.gov> on LLNL's Linux
- clusters. This software is open source and distributed under
- the terms of the Gnu GPL.
- .SH "SEE ALSO"
--powermand(1) powerman(1)
-+powermand(8) powerman(1)
+--- man/powerman.conf.5.in.orig 2009-02-13 18:31:28.000000000 +0100
++++ man/powerman.conf.5.in 2009-02-13 18:34:28.000000000 +0100
+@@ -5,7 +5,7 @@
+
+ .SH DESCRIPTION
+ The powerman.conf file typically includes one or more of the remote power
+-controller (RPC) device files provided in the /etc/powerman directory;
++controller (RPC) device files provided in the @X_SYSCONFDIR@/powerman directory;
+ sets a few global options;
+ instantiates RPC devices with unique names, hostnames, and ports;
+ and maps node names to RPC's and plug numbers.
+@@ -32,7 +32,7 @@
+ Baytech RPC-3 remote power controllers.
+ .LP
+ .nf
+-include "/etc/powerman/baytech.dev" # include def for "baytech" RPC
++include "@X_SYSCONFDIR@/powerman/baytech.dev" # include def for "baytech" RPC
+
+ tcpwrappers yes # enable TCP wrappers
Index: files/patch-man-powermand.1
===================================================================
RCS file: files/patch-man-powermand.1
diff -N files/patch-man-powermand.1
--- files/patch-man-powermand.1 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-man-powermand.1,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- man/powermand.1.orig Mon Dec 23 11:26:15 2002
-+++ man/powermand.1 Thu Jun 10 08:38:20 2004
-@@ -25,7 +25,7 @@
- \." 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- \."#################################################################
- .\"
--.TH PowerMan 1 "Release 1.0" "LLNL" "PowerMan"
-+.TH PowerMan 8 "Release 1.0" "LLNL" "PowerMan"
- .SH NAME
- powermand \- power control and monitoring daemon
- .SH SYNOPSIS
-@@ -56,11 +56,11 @@
- .B PowerMan
- and exit.
- .SH "FILES"
--/usr/sbin/powermand
-+%%PREFIX%%/sbin/powermand
- .br
--/usr/bin/powerman
-+%%PREFIX%%/bin/powerman
- .br
--/etc/powerman/powerman.conf
-+%%PREFIX%%/etc/powerman/powerman.conf
- .SH "ORIGIN"
- Developed by Andrew Uselton <useton2 at llnl.gov> on LLNL's Linux
- clusters. This software is open source and distributed under
Index: files/patch-man-powermand.8
===================================================================
RCS file: files/patch-man-powermand.8
diff -N files/patch-man-powermand.8
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-man-powermand.8 13 Feb 2009 18:07:11 -0000
@@ -0,0 +1,11 @@
+--- man/powermand.8.in.orig 2009-02-13 18:33:44.000000000 +0100
++++ man/powermand.8.in 2009-02-13 18:34:09.000000000 +0100
+@@ -12,7 +12,7 @@
+ .TP
+ .I "-c, --conf filename"
+ Override the default location of the powerman configuration file
+-.I /etc/powerman/powerman.conf.
++.I @X_SYSCONFDIR@/powerman/powerman.conf.
+ .TP
+ .I "-f, --foreground"
+ Do not daemonize, and send debugging/error messages to stderr instead of syslog.
Index: files/patch-scripts-Makefile.in
===================================================================
RCS file: files/patch-scripts-Makefile.in
diff -N files/patch-scripts-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-scripts-Makefile.in 13 Feb 2009 18:07:11 -0000
@@ -0,0 +1,13 @@
+--- scripts/Makefile.in.orig 2009-02-13 18:58:48.000000000 +0100
++++ scripts/Makefile.in 2009-02-13 18:59:00.000000000 +0100
+@@ -371,10 +371,6 @@
+
+ install-data-local:
+ -$(top_srcdir)/config/install-sh -m 755 -d \
+- $(DESTDIR)$(sysconfdir)/init.d
+- $(top_srcdir)/config/install-sh -m 755 $(srcdir)/powerman.init \
+- $(DESTDIR)$(sysconfdir)/init.d/powerman
+- -$(top_srcdir)/config/install-sh -m 755 -d \
+ $(DESTDIR)$(localstatedir)/run
+ -$(top_srcdir)/config/install-sh -o $(RUN_AS_USER) -m 755 -d \
+ $(DESTDIR)$(localstatedir)/run/powerman
Index: files/patch-scripts-powerman.init
===================================================================
RCS file: files/patch-scripts-powerman.init
diff -N files/patch-scripts-powerman.init
--- files/patch-scripts-powerman.init 20 Feb 2006 20:47:43 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-scripts-powerman.init,v 1.2 2006/02/20 20:47:43 dougb Exp $
-
---- scripts/powerman.init.orig Thu Jun 10 08:16:04 2004
-+++ scripts/powerman.init Thu Jun 10 08:28:08 2004
-@@ -1,61 +1,27 @@
- #!/bin/sh
--##
--# powerman.init,v 1.3 2001/12/12 20:08:46 dun Exp
--##
--# chkconfig: 345 95 5
--# description: PowerMan manages Remote Power Controller (RPC) devices
--# processname: /usr/sbin/powermand
--# config: /etc/powerman/powerman.conf
--##
-+# $FreeBSD: ports/sysutils/powerman/files/patch-scripts-powerman.init,v 1.2 2006/02/20 20:47:43 dougb Exp $
-
--# Source function library.
--. /etc/rc.d/init.d/functions
-+# PROVIDE: powermand
-+# REQUIRE: DAEMON
-+# BEFORE: LOGIN
-+# KEYWORD: shutdown
-+
-+# Define these powermand_* variables in one of these files:
-+# /etc/rc.conf
-+# /etc/rc.conf.local
-+# /etc/rc.conf.d/powermand
-+#
-+# DO NOT CHANGE THESE DEFAULT VALUES HERE
-+#
-+powermand_enable=${powermand_enable:-"NO"}
-+powermand_flags=${powermand_flags:-""}
-+
-+. %%RC_SUBR%%
-+
-+name="powermand"
-+rcvar=`set_rcvar`
-+command="%%PREFIX%%/sbin/powermand"
-+required_files="%%PREFIX%%/etc/powerman.conf"
-
--# Source networking configuration.
--. /etc/sysconfig/network
--
--# Check that networking is up.
--[ ${NETWORKING} = "no" ] && exit 0
--
--DAEMON=powermand
--RETVAL=0
--
--[ -x "/usr/sbin/$DAEMON" ] || exit 0
--
--# See how we were called.
--case "$1" in
-- start)
-- echo -n "Starting PowerMan: "
-- daemon $DAEMON
-- RETVAL=$?
-- echo
-- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$DAEMON
-- ;;
-- stop)
-- echo -n "Shutting down PowerMan: "
-- killproc $DAEMON
-- RETVAL=$?
-- echo
-- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$DAEMON
-- ;;
-- status)
-- status $DAEMON
-- RETVAL=$?
-- ;;
-- restart)
-- $0 stop
-- $0 start
-- RETVAL=$?
-- ;;
-- reload)
-- echo -n "Reloading PowerMan: "
-- killproc $DAEMON -HUP
-- RETVAL=$?
-- echo
-- ;;
-- *)
-- echo "Usage: $DAEMON {start|stop|status|restart|reload}"
-- exit 1
--esac
--
--exit $RETVAL
-+load_rc_config $name
-+run_rc_command "$1"
Index: files/patch-src-Makefile
===================================================================
RCS file: files/patch-src-Makefile
diff -N files/patch-src-Makefile
--- files/patch-src-Makefile 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-Makefile,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/Makefile.orig Mon Dec 8 20:30:51 2003
-+++ src/Makefile Mon Mar 29 22:04:15 2004
-@@ -3,11 +3,11 @@
- ####################################################################
-
- PROJECT= powerman
--SHELL= /bin/sh
--CC= gcc
--MAKE= /usr/bin/make
--LEX= /usr/bin/flex
--YACC= /usr/bin/bison
-+SHELL?= /bin/sh
-+CC?= gcc
-+MAKE?= /usr/bin/make
-+LEX?= /usr/bin/flex
-+YACC?= /usr/bin/bison
-
- VERSTR= $(shell if test -n "$(VERSION)"; then \
- if test -n "$(RELEASE)"; then \
-@@ -18,10 +18,10 @@
-
- DEFS= -DHAVE_CONFIG_H -DPOWERMAN_VERSION=\"$(VERSTR)\"
- #DEFS+= -DNDEBUG
--CFLAGS= -g -Wall $(DEFS)
-+CFLAGS+= $(DEFS)
- #CFLAGS+= -pg
-
--LIBS= -lfl -lwrap -lnsl -lutil
-+LIBS= -lfl -lwrap -lutil
-
- COMMON_OBJS = wrappers.o error.o hostlist.o debug.o
-
-@@ -37,10 +37,10 @@
- all: powerman powermand
-
- powermand: $(SERVER_OBJS)
-- $(CC) $(CFLAGS) -o $@ $(SERVER_OBJS) $(LIBS)
-+ $(CC) $(CFLAGS) -o $@ $(SERVER_OBJS) $(LDFLAGS) $(LIBS)
-
- powerman: $(CLIENT_OBJS)
-- $(CC) -o $@ $(CLIENT_OBJS) $(LIBS)
-+ $(CC) -o $@ $(CLIENT_OBJS) $(LDFLAGS) $(LIBS)
-
- parse_lex.c: parse.lex
- $(LEX) -oparse_lex.c parse.lex
Index: files/patch-src-client.c
===================================================================
RCS file: files/patch-src-client.c
diff -N files/patch-src-client.c
--- files/patch-src-client.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-client.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/client.c.orig Mon Mar 29 14:25:54 2004
-+++ src/client.c Mon Mar 29 14:27:27 2004
-@@ -31,10 +31,14 @@
- #include <syslog.h>
- #include <stdarg.h>
-
-+#include <sys/types.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <tcpd.h>
- #include <stdio.h>
- #include <fcntl.h>
-+#include <sys/socket.h>
-+#include <limits.h>
-
- #include "powerman.h"
- #include "wrappers.h"
Index: files/patch-src-device_pipe.c
===================================================================
RCS file: files/patch-src-device_pipe.c
diff -N files/patch-src-device_pipe.c
--- files/patch-src-device_pipe.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-device_pipe.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/device_pipe.c.orig Mon Mar 29 22:02:27 2004
-+++ src/device_pipe.c Mon Mar 29 22:02:48 2004
-@@ -38,7 +38,10 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <signal.h>
-+#ifdef __linux__
- #include <pty.h>
-+#endif
-
-
- #include "powerman.h"
Index: files/patch-src-hostlist.c
===================================================================
RCS file: files/patch-src-hostlist.c
diff -N files/patch-src-hostlist.c
--- files/patch-src-hostlist.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-hostlist.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/hostlist.c.orig Mon Mar 29 13:50:02 2004
-+++ src/hostlist.c Mon Mar 29 13:50:18 2004
-@@ -43,7 +43,7 @@
- #include <assert.h>
- #include <errno.h>
- #include <ctype.h>
--#include <sys/param.h>
-+#include <limits.h>
- #include <unistd.h>
-
- #include "hostlist.h"
Index: files/patch-src-parse.lex
===================================================================
RCS file: files/patch-src-parse.lex
diff -N files/patch-src-parse.lex
--- files/patch-src-parse.lex 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-parse.lex,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/parse.lex.orig Mon Mar 29 21:57:12 2004
-+++ src/parse.lex Mon Mar 29 21:57:46 2004
-@@ -41,6 +41,7 @@
- #include "error.h"
- #include "parse_util.h"
- extern void yyerror();
-+extern YYSTYPE yylval;
-
- #define MAX_INCLUDE_DEPTH 10
- static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
Index: files/patch-src-parse.y
===================================================================
RCS file: files/patch-src-parse.y
diff -N files/patch-src-parse.y
--- files/patch-src-parse.y 5 Sep 2004 20:26:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-
-$FreeBSD: ports/sysutils/powerman/files/patch-src-parse.y,v 1.2 2004/09/05 20:26:13 krion Exp $
-
---- src/parse.y.orig Fri Feb 20 00:01:26 2004
-+++ src/parse.y Sun Sep 5 22:24:43 2004
-@@ -37,6 +37,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <unistd.h>
-+#include <limits.h>
-
- #include "powerman.h"
- #include "list.h"
-@@ -50,6 +51,10 @@
- #include "error.h"
- #include "string.h"
-
-+#ifdef __FreeBSD__
-+typedef int reg_syntax_t;
-+#endif
-+
- /*
- * A PreScript is a list of PreStmts.
- */
-@@ -754,6 +759,7 @@
- case EPL_NONODES:
- _errormsg("more plugs than nodes");
- default:
-+ break;
- }
-
- if (!conf_addnodes(nodestr))
Index: files/patch-src-powerman.c
===================================================================
RCS file: files/patch-src-powerman.c
diff -N files/patch-src-powerman.c
--- files/patch-src-powerman.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-powerman.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/powerman.c.orig Sun Nov 30 16:13:28 2003
-+++ src/powerman.c Thu Jun 17 09:11:40 2004
-@@ -34,6 +34,8 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <libgen.h>
-+#include <limits.h>
-+#include <sys/socket.h>
-
- #include "powerman.h"
- #include "wrappers.h"
-@@ -78,6 +80,24 @@
- };
-
- static const struct option *longopts = long_options;
-+
-+#ifdef __FreeBSD__
-+#include <stdarg.h>
-+
-+#define BUF_MAX 1024
-+
-+static int dprintf(int fd, char *const fmt, ...)
-+{
-+ int ret;
-+ va_list ap;
-+ char buf[BUF_MAX];
-+
-+ va_start(ap, fmt);
-+ ret = vsnprintf(buf, BUF_MAX, fmt, ap);
-+ va_end(ap);
-+ return (int) write(fd, buf, (ret > BUF_MAX) ? BUF_MAX : ret);
-+}
-+#endif
-
- int main(int argc, char **argv)
- {
Index: files/patch-src-powerman.h
===================================================================
RCS file: files/patch-src-powerman.h
diff -N files/patch-src-powerman.h
--- files/patch-src-powerman.h 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-powerman.h,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/powerman.h.orig Thu Jun 10 08:57:15 2004
-+++ src/powerman.h Thu Jun 10 08:57:55 2004
-@@ -39,10 +39,10 @@
- #endif /* MIN */
-
- #define DAEMON_NAME "powermand"
--#define PID_FILE_NAME "/var/run/powerman/powerman.pid"
--#define PID_DIR "/var/run/powerman"
--#define ROOT_DIR "/etc/powerman"
--#define DFLT_CONFIG_FILE "/etc/powerman/powerman.conf"
-+#define PID_FILE_NAME "/var/run/powerman.pid"
-+#define PID_DIR "/var/run"
-+#define ROOT_DIR "%%PREFIX%%/etc/powerman"
-+#define DFLT_CONFIG_FILE "%%PREFIX%%/etc/powerman.conf"
-
- #define DFLT_PORT "10101"
- #define DFLT_HOSTNAME "localhost"
Index: files/patch-src-powermand.c
===================================================================
RCS file: files/patch-src-powermand.c
diff -N files/patch-src-powermand.c
--- files/patch-src-powermand.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-powermand.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/powermand.c.orig Mon Mar 29 14:23:55 2004
-+++ src/powermand.c Mon Mar 29 14:24:44 2004
-@@ -35,6 +35,10 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <assert.h>
-+#ifdef __linux__
-+#include <list.h>
-+#endif
-+#include <limits.h>
-
- #include "powerman.h"
- #include "list.h"
Index: files/patch-src-wrappers.c
===================================================================
RCS file: files/patch-src-wrappers.c
diff -N files/patch-src-wrappers.c
--- files/patch-src-wrappers.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-wrappers.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/wrappers.c.orig Mon Mar 29 12:59:20 2004
-+++ src/wrappers.c Mon Mar 29 13:47:54 2004
-@@ -42,6 +42,7 @@
- #if HAVE_POLL
- #include <sys/poll.h>
- #endif
-+#include <limits.h>
-
- #include "wrappers.h"
- #include "cbuf.h"
-@@ -486,7 +487,10 @@
- */
- if (!((errno == EWOULDBLOCK) ||
- (errno == ECONNABORTED) ||
-- (errno == EPROTO) || (errno == EINTR)))
-+#ifdef __linux__
-+ (errno == EPROTO) ||
-+#endif
-+ (errno == EINTR)))
- lsd_fatal_error(__FILE__, __LINE__, "accept");
- }
- return new;
-@@ -639,8 +643,10 @@
- int n;
- char buf[MAX_REG_BUF];
-
-+#ifdef __linux__
- /* Review: undocumented, is it needed? */
- re_syntax_options = RE_SYNTAX_POSIX_EXTENDED;
-+#endif
- Strncpy(buf, string, MAX_REG_BUF);
- n = regexec(preg, buf, nmatch, pmatch, eflags);
- return n;
Index: files/patch-src-wrappers.h
===================================================================
RCS file: files/patch-src-wrappers.h
diff -N files/patch-src-wrappers.h
--- files/patch-src-wrappers.h 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-src-wrappers.h,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- src/wrappers.h.orig Mon Mar 29 12:57:11 2004
-+++ src/wrappers.h Mon Mar 29 13:46:45 2004
-@@ -35,9 +35,14 @@
- #include <sys/time.h>
- #include <time.h>
- #include <regex.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #if HAVE_POLL
- #include <sys/poll.h>
-+#endif
-+
-+#ifdef __FreeBSD__
-+#define REG_NOERROR 0
- #endif
-
- /*
Index: files/patch-test-Makefile
===================================================================
RCS file: files/patch-test-Makefile
diff -N files/patch-test-Makefile
--- files/patch-test-Makefile 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-test-Makefile,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- test/Makefile.orig Mon Dec 8 20:30:52 2003
-+++ test/Makefile Tue Mar 30 10:19:02 2004
-@@ -1,10 +1,13 @@
--CFLAGS= -g -Wall -I../src
-+#CFLAGS= -g -Wall -I../src
-+CFLAGS+= -Wall -I../src
- VICEOBJS = vicebox.o wrappers.o error.o debug.o
-
- all: vpcd
-
- vpcd: vpcd.o
-- $(CC) -o $@ $< -lpthread
-+ $(CC) -o $@ $< ${LDFLAGS} ${PTHREAD_LIBS}
-+vpcd.o: vpcd.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) ${PTHREAD_CFLAGS} -c -o $@ $<
-
- vicebox : $(VICEOBJS)
- $(CC) $(CFLAGS) -o $@ $(VICEOBJS)
Index: files/patch-test-vpcd.c
===================================================================
RCS file: files/patch-test-vpcd.c
diff -N files/patch-test-vpcd.c
--- files/patch-test-vpcd.c 17 Jun 2004 16:14:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$FreeBSD: ports/sysutils/powerman/files/patch-test-vpcd.c,v 1.1 2004/06/17 16:14:13 glewis Exp $
-
---- test/vpcd.c.orig Mon Dec 1 01:16:33 2003
-+++ test/vpcd.c Thu Jun 17 09:38:30 2004
-@@ -16,6 +16,8 @@
- #include <getopt.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -49,6 +51,24 @@
-
- static int errcount = 0;
-
-+#ifdef __FreeBSD__
-+#include <stdarg.h>
-+
-+#define BUF_MAX 1024
-+
-+static int dprintf(int fd, char *const fmt, ...)
-+{
-+ int ret;
-+ va_list ap;
-+ char buf[BUF_MAX];
-+
-+ va_start(ap, fmt);
-+ ret = vsnprintf(buf, BUF_MAX, fmt, ap);
-+ va_end(ap);
-+ return (int) write(fd, buf, (ret > BUF_MAX) ? BUF_MAX : ret);
-+}
-+#endif
-+
- static void _noop_handler(int signum)
- {
- fprintf(stderr, "vpcd: received signal %d\n", signum);
-@@ -392,7 +412,7 @@
- case 'n': /* --num_threads n */
- num_threads = strtol(optarg, NULL, 0);
- if (num_threads < MIN_THREADS || num_threads > MAX_THREADS) {
-- fprintf(stderr, "num_threads value out of range (%d-%d)\n",
-+ fprintf(stderr, "num_threads value out of range (%d-%ld)\n",
- MIN_THREADS, MAX_THREADS);
- exit(1);
- }
Index: files/powerman.sh.in
===================================================================
RCS file: files/powerman.sh.in
diff -N files/powerman.sh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/powerman.sh.in 13 Feb 2009 18:07:11 -0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $FreeBSD$
+
+# PROVIDE: powermand
+# REQUIRE: NETWORKING
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Define these powermand_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/powermand
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+powermand_enable=${powermand_enable:-"NO"}
+powermand_flags=${powermand_flags:-""}
+
+. %%RC_SUBR%%
+
+name="powermand"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/powermand"
+required_files="%%PREFIX%%/etc/powerman.conf"
+
+load_rc_config $name
+run_rc_command "$1"
--- sysutils_powerman.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list