4 files changed, 30 insertions, 15 deletions

diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index e806fa42bae8..3e52ee1677f9 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	powerman
-PORTVERSION=	2.3.16
-PORTREVISION=	2
+PORTVERSION=	2.3.20
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	https://github.com/chaos/powerman/releases/download/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for doing remote power control
@@ -17,9 +16,10 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 USES=		libtool perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-httppower --localstatedir=${DESTDIR}/var \
+CONFIGURE_ARGS=	--with-httppower --localstatedir=/var \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 USE_RC_SUBR=	powerman
 
@@ -27,6 +27,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
+	@${REINPLACE_CMD} -e 's,GREP "GNU strip",EGREP "GNU|elftoolchain",' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/^install-data-am/s|:.*|:|' ${WRKSRC}/scripts/Makefile.in
 
diff --git a/sysutils/powerman/distinfo b/sysutils/powerman/distinfo
index 3a4b70590fdf..69853af037fb 100644
--- a/sysutils/powerman/distinfo
+++ b/sysutils/powerman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (powerman-2.3.16.tar.gz) = 5ab2846d15a93917fe79190f7a7609c3c2e128c03d040edf365fbd4f80a985b2
-SIZE (powerman-2.3.16.tar.gz) = 615696
+SHA256 (powerman-2.3.20.tar.gz) = a4b0858d1214aab18e2673596b00ac9bad976cb7b777209e10732467c3551b88
+SIZE (powerman-2.3.20.tar.gz) = 620248
diff --git a/sysutils/powerman/pkg-descr b/sysutils/powerman/pkg-descr
index 2f97777fe3b5..087697dc7dba 100644
--- a/sysutils/powerman/pkg-descr
+++ b/sysutils/powerman/pkg-descr
@@ -1,6 +1,18 @@
-PowerMan is a tool for manipulating remote power control (RPC)
-devices from a central location. Several RPC varieties are supported
-natively by PowerMan and Expect-like configurability simplifies the
-addition of new devices.
+powerman is free Unix/Linux software that controls (remotely and in
+parallel) switched power distribution units.  It was designed for remote
+power control of Linux systems in a data center or cluster environment, but
+has been used in other environments such as embedded management appliances,
+home automation, and high availability service management.
 
-WWW: http://code.google.com/p/powerman/
+powerman can be extended to support new devices using an expect-like
+scripting language.  It communicates with devices natively using telnet,
+raw socket, and serial protocols.  It also can drive virtual power control
+devices via a coprocess interface.  The coprocess mechanism has been used
+to extend powerman to communicate with devices using other protocols such
+as SNMP, IPMI, Insteon, X-10, and VXI-11.
+
+powerman can control equipment connected using any combination of the above
+methods and provide unified naming for the equipment and parallel execution
+of control actions.
+
+WWW: https://github.com/chaos/powerman
diff --git a/sysutils/powerman/pkg-plist b/sysutils/powerman/pkg-plist
index ed4afa332eab..a7f8fae09960 100644
--- a/sysutils/powerman/pkg-plist
+++ b/sysutils/powerman/pkg-plist
@@ -5,6 +5,7 @@ bin/powerman
 %%ETCDIR%%/apc7900.dev
 %%ETCDIR%%/apc7900v3.dev
 %%ETCDIR%%/apc7920.dev
+%%ETCDIR%%/apc8941.dev
 %%ETCDIR%%/apcnew.dev
 %%ETCDIR%%/apcold.dev
 %%ETCDIR%%/apcpdu.dev
@@ -59,10 +60,6 @@ lib/libpowerman.so.0
 lib/libpowerman.so.0.0.0
 lib/stonith/plugins/external/powerman
 libdata/pkgconfig/libpowerman.pc
-sbin/httppower
-sbin/plmpower
-sbin/powermand
-sbin/vpcd
 man/man1/pm.1.gz
 man/man1/powerman.1.gz
 man/man3/libpowerman.3.gz
@@ -72,4 +69,8 @@ man/man8/httppower.8.gz
 man/man8/plmpower.8.gz
 man/man8/powermand.8.gz
 man/man8/vpcd.8.gz
+sbin/httppower
+sbin/plmpower
+sbin/powermand
+sbin/vpcd
 @dir /var/run/powerman