svn commit: r515728 - in head/sysutils/powerman: . files

[Mateusz Piotrowski]

Author: 0mp
Date: Sat Oct 26 20:52:47 2019
New Revision: 515728
URL: https://svnweb.freebsd.org/changeset/ports/515728

Log:
  Clean up
  
  - Use USES=localbase instead of setting CPPFLAGS and LDFLAGS manually.
  - Pet portlint, portfmt, and portclippy.
  - Regenerate patches with makepatch.
  - Define TEST_TARGET and disable failing tests.
  - Set USES=fakeroot to address some errors during installation.

Added:
  head/sysutils/powerman/files/patch-man_powerman.conf.5.in   (contents, props changed)
  head/sysutils/powerman/files/patch-man_powermand.8.in   (contents, props changed)
Deleted:
  head/sysutils/powerman/files/patch-man-powerman.conf.5
  head/sysutils/powerman/files/patch-man-powermand.8
Modified:
  head/sysutils/powerman/Makefile

Modified: head/sysutils/powerman/Makefile
==============================================================================
--- head/sysutils/powerman/Makefile	Sat Oct 26 20:08:43 2019	(r515727)
+++ head/sysutils/powerman/Makefile	Sat Oct 26 20:52:47 2019	(r515728)
@@ -15,22 +15,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		libtool perl5 shebangfix
-SHEBANG_FILES=	heartbeat/powerman
+USES=		fakeroot libtool localbase:ldflags perl5 shebangfix
+USE_LDCONFIG=	yes
 USE_PERL5=	build
+USE_RC_SUBR=	powerman
+SHEBANG_FILES=	heartbeat/powerman
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-httppower --localstatedir=/var \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
-USE_LDCONFIG=	yes
+
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
-USE_RC_SUBR=	powerman
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^install-data-am/s|:.*|:|' ${WRKSRC}/scripts/Makefile.in
+	# Disable failing tests.
+.for test_case in t50 t53 t56 t57 t58 t59
+	@${REINPLACE_CMD} -E -e 's/${test_case}(.conf)?//' \
+		${WRKSRC}/test/Makefile.in
+.endfor
 
 .include <bsd.port.mk>

Added: head/sysutils/powerman/files/patch-man_powerman.conf.5.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/powerman/files/patch-man_powerman.conf.5.in	Sat Oct 26 20:52:47 2019	(r515728)
@@ -0,0 +1,20 @@
+--- man/powerman.conf.5.in.orig	2012-01-13 23:01:47 UTC
++++ man/powerman.conf.5.in
+@@ -5,7 +5,7 @@ powerman.conf \- configuration file for PowerMan
+ 
+ .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 @@ The following example is a 16-node cluster that uses t
+ 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
+ 

Added: head/sysutils/powerman/files/patch-man_powermand.8.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/powerman/files/patch-man_powermand.8.in	Sat Oct 26 20:52:47 2019	(r515728)
@@ -0,0 +1,11 @@
+--- man/powermand.8.in.orig	2012-01-13 23:01:52 UTC
++++ man/powermand.8.in
+@@ -12,7 +12,7 @@ provides power management in a data center or compute 
+ .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.