5 files changed, 19 insertions, 29 deletions

diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 09b4dec7933d..2c627d17f2aa 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerman
-PORTVERSION=	1.0.19
+PORTVERSION=	1.0.20
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	ftp://ftp.llnl.gov/pub/linux/powerman/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/powerman/distinfo b/sysutils/powerman/distinfo
index eee46b26232c..889669d6eabd 100644
--- a/sysutils/powerman/distinfo
+++ b/sysutils/powerman/distinfo
@@ -1,2 +1,2 @@
-MD5 (powerman-1.0.19.tgz) = ee43b5770315cd4320eca9dad7070c8f
-SIZE (powerman-1.0.19.tgz) = 144047
+MD5 (powerman-1.0.20.tgz) = 6b33b4d0376e2578e93fc32071c719b2
+SIZE (powerman-1.0.20.tgz) = 148573
diff --git a/sysutils/powerman/files/patch-Makefile b/sysutils/powerman/files/patch-Makefile
index 660e1b2426b8..4ca481a7ee72 100644
--- a/sysutils/powerman/files/patch-Makefile
+++ b/sysutils/powerman/files/patch-Makefile
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- Makefile.orig	Thu Dec  4 08:55:02 2003
-+++ Makefile	Tue Mar 30 16:31:45 2004
+--- 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)
@@ -22,22 +22,21 @@ $FreeBSD$
 +prefix		=	${PREFIX}
  exec_prefix	=	${prefix}
  bindir		=	${exec_prefix}/bin
- sbindir		= 	${exec_prefix}/sbin
+-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,40 +25,39 @@
+@@ -26,38 +25,38 @@
  	$(MAKE) -C test
  
  install: all
 -	$(mkinstalldirs) 			$(DESTDIR)$(bindir)
 -	$(INSTALL) src/powerman			$(DESTDIR)$(bindir)/
--	ln -s $(bindir)/powerman		$(DESTDIR)$(bindir)/off
--	ln -s $(bindir)/powerman		$(DESTDIR)$(bindir)/on
 -	ln -s $(bindir)/powerman		$(DESTDIR)$(bindir)/pm
 -	$(mkinstalldirs) 			$(DESTDIR)$(sbindir)
 -	$(INSTALL) src/powermand		$(DESTDIR)$(sbindir)/
@@ -68,12 +67,10 @@ $FreeBSD$
 -	$(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)
++	$(mkinstalldirs)				$(bindir)
 +	${BSD_INSTALL_PROGRAM} src/powerman		$(bindir)/
-+	ln -s $(bindir)/powerman			$(bindir)/off
-+	ln -s $(bindir)/powerman			$(bindir)/on
 +	ln -s $(bindir)/powerman			$(bindir)/pm
-+	$(mkinstalldirs) 				$(sbindir)
++	$(mkinstalldirs)				$(sbindir)
 +	${BSD_INSTALL_PROGRAM} src/powermand		$(sbindir)/
 +	$(mkinstalldirs)				$(packagedir)
 +	${BSD_INSTALL_DATA} etc/baytech.dev		$(packagedir)
@@ -85,7 +82,7 @@ $FreeBSD$
 +	${BSD_INSTALL_DATA} etc/wti-rps10.dev		$(packagedir)
 +	${BSD_INSTALL_DATA} etc/apc.dev			$(packagedir)
 +	${BSD_INSTALL_DATA} etc/apcnew.dev		$(packagedir)
-+#	$(INSTALL) etc/vicebox.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)
@@ -95,10 +92,11 @@ $FreeBSD$
 +	${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
++	$(mkinstalldirs)				$(mandir)/man5
 +	${BSD_INSTALL_DATA} man/powerman.conf.5		$(mandir)/man5
-+	$(mkinstalldirs) 				$(mandir)/man7
++	$(mkinstalldirs)				$(mandir)/man7
 +	${BSD_INSTALL_DATA} man/powerman-devices.7	$(mandir)/man7
 +	${BSD_INSTALL_SCRIPT} scripts/powerman.init	$(etcdir)/rc.d/powermand.sh
  
diff --git a/sysutils/powerman/files/patch-man-powerman.1 b/sysutils/powerman/files/patch-man-powerman.1
index 85533db5534a..2400270a5022 100644
--- a/sysutils/powerman/files/patch-man-powerman.1
+++ b/sysutils/powerman/files/patch-man-powerman.1
@@ -1,8 +1,8 @@
 $FreeBSD$
 
---- man/powerman.1.orig	Fri Oct 17 12:42:58 2003
-+++ man/powerman.1	Thu Jun 10 08:38:06 2004
-@@ -152,22 +152,22 @@
+--- 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"
@@ -15,14 +15,8 @@ $FreeBSD$
 -/usr/bin/pm
 +%%PREFIX%%/bin/pm
  .br
--/usr/bin/on
-+%%PREFIX%%/bin/on
- .br
--/usr/bin/off
-+%%PREFIX%%/bin/off
- .br
 -/etc/powerman/powerman.conf
-+%%PREFIX%%/etc/powerman.conf
++%%PREFIX%%/etc/powerman/powerman.conf
  .br
 -/etc/powerman/*.dev
 +%%PREFIX%%/etc/powerman/*.dev
diff --git a/sysutils/powerman/pkg-plist b/sysutils/powerman/pkg-plist
index b82f30f65f7a..c734290730a5 100644
--- a/sysutils/powerman/pkg-plist
+++ b/sysutils/powerman/pkg-plist
@@ -1,7 +1,5 @@
-bin/powerman
-bin/off
-bin/on
 bin/pm
+bin/powerman
 etc/powerman/apc.dev
 etc/powerman/apcnew.dev
 etc/powerman/baytech-rpc28-nc.dev