Attachment 183490 Details for Bug 220002 – apcupsd-3.14.14_1.patch

[patch] apcupsd-3.14.14_1.patch

apcupsd-3.14.14_1.patch (text/plain), 5.98 KB, created by takefu on 2017-06-15 07:41:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2017-06-15 07:41:43 UTC

Size: 5.98 KB

patch

obsolete

>diff -udprN /usr/ports/sysutils/apcupsd/Makefile ./Makefile
>--- /usr/ports/sysutils/apcupsd/Makefile	2017-03-07 14:16:42.000000000 +0000
>+++ ./Makefile	2017-06-15 07:09:50.530583000 +0000
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	apcupsd
> PORTVERSION=	3.14.14
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
> 
>@@ -11,6 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Set of programs for controlling APC UPS
> 
> LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		gmake
> GNU_CONFIGURE=	yes
>@@ -28,9 +29,9 @@ SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=	APCSMART_DRV APCDUMB_DRV CLIENT_ONLY CGI PCNET_DRV USB_DRV \
> 		SNMP_DRV SNMP_DRV_OLD TCP_WRAPPERS TEST_DRV GAPCMON \
>-		DOCS MODBUS
>+		DOCS MODBUS MODBUS_USB
> OPTIONS_DEFAULT=	APCSMART_DRV APCDUMB_DRV PCNET_DRV SNMP_DRV USB_DRV \
>-		TCP_WRAPPERS MODBUS
>+		TCP_WRAPPERS MODBUS MODBUS_USB
> OPTIONS_SUB=	yes
> 
> APCSMART_DRV_DESC=	APC SmartUPS serial driver support
>@@ -45,8 +46,7 @@ TCP_WRAPPERS_DESC=	${LIBWRAP_DESC}
> TEST_DRV_DESC=		Test driver support
> GAPCMON_DESC=		Build GTK GUI front-end
> MODBUS_DESC=		MODBUS driver support
>-
>-#PORTDOCS=	${PORTNAME}.pdf
>+MODBUS_USB_DESC=	MODBUS USB driver support
> 
> APCSMART_DRV_CONFIGURE_ENABLE=	apcsmart
> APCDUMB_DRV_CONFIGURE_ENABLE=	dumb
>@@ -64,15 +64,12 @@ PCNET_DRV_CONFIGURE_ENABLE=	pcnet
> USB_DRV_CONFIGURE_ENABLE=	usb
> SNMP_DRV_CONFIGURE_ENABLE=	snmp
> MODBUS_CONFIGURE_ENABLE=	modbus
>+MODBUS_USB_CONFIGURE_ENABLE=	modbus-usb
> SNMP_DRV_OLD_CONFIGURE_ENABLE=	net-snmp
> SNMP_DRV_OLD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
> TCP_WRAPPERS_CONFIGURE_WITH=	libwrap=yes
> TEST_DRV_CONFIGURE_ENABLE=	test
> 
>-#CONFIGURE_ARGS+=	--with-libwrap=yes
>-#CONFIGURE_ENV+=		LIBS="-lcurses -lmenu"
>-#PLIST_SUB+=		POWERFL=""
>-
> .include <bsd.port.options.mk>
> 
> pre-configure:
>@@ -86,4 +83,12 @@ pre-configure:
> 	@${FALSE}
> .endif
> 
>+pre-install:
>+	${MKDIR} ${STAGEDIR}/${ETCDIR}
>+	${CP} ${WRKSRC}/platforms/freebsd/apccontrol\
>+		${STAGEDIR}${ETCDIR}/apccontrol.sample
>+.for a in changeme commfailure commok offbattery onbattery
>+	${CP} ${WRKSRC}/platforms/etc/${a} ${STAGEDIR}${ETCDIR}/${a}.sample
>+.endfor
>+
> .include <bsd.port.mk>
>diff -udprN /usr/ports/sysutils/apcupsd/files/apcupsd.in ./files/apcupsd.in
>--- /usr/ports/sysutils/apcupsd/files/apcupsd.in	2014-01-24 00:14:07.000000000 +0000
>+++ ./files/apcupsd.in	2017-06-15 05:53:55.244007000 +0000
>@@ -11,24 +11,73 @@
> #
> # apcupsd_enable (bool):	Set to "NO" by default.
> #				Set it to "YES" to enable apcupsd.
>-# apcupsd_args (str):		Custom additional arguments to be passed
>-#				to apcupsd (default empty).
>+# apcupsd_flags (str):		Custom additional arguments to be passed
>+#				to apcupsd (default --kill-on-powerfail).
>+# apcupsd_configs (str):	A list of configs to run multiple instances.
> #
> 
> . /etc/rc.subr
> 
>-name="apcupsd"
>+name=apcupsd
> rcvar=apcupsd_enable
> 
> load_rc_config $name
> 
> : ${apcupsd_enable="NO"}
> : ${apcupsd_flags="--kill-on-powerfail"}
>-: ${apcupsd_pidfile="/var/run/apcupsd.pid"}
>-: ${apcupsd_lockfile="/var/spool/lock/apcupsd.lock"}
> 
>-pidfile="/var/run/apcupsd.pid"
>-required_files="%%ETCDIR%%/apcupsd.conf"
>-command="%%PREFIX%%/sbin/apcupsd"
>+pidfile=/var/run/${name}.pid
>+required_files="${apcupsd_configs:-%%ETCDIR%%/apcupsd.conf}"
>+command=%%PREFIX%%/sbin/${name}
>+restart_cmd=${name}_restart_cmd
> 
>-run_rc_command "$1"
>+apcupsd_precmd()
>+{
>+	config=$1
>+
>+	dn="`/usr/bin/dirname ${pidfile}`"
>+	if [ -n "${config}" ]; then
>+		# Specific config
>+		base="`/usr/bin/basename ${config} .conf`"
>+		pidfile="${dn}/${base}.pid"
>+		command_args="-f ${config} -P ${pidfile}"
>+	else
>+		# Default config
>+		command_args=""
>+	fi
>+}
>+
>+apcupsd_restart_cmd()
>+{
>+	if [ -n "${apcupsd_configs}" ]; then
>+		# One or more named configs
>+		for config in ${apcupsd_configs}; do
>+			apcupsd_precmd ${config}
>+			run_rc_command stop
>+		done
>+		for config in ${apcupsd_configs}; do
>+			apcupsd_precmd ${config}
>+			run_rc_command start
>+		done
>+	else
>+		# Default config
>+		apcupsd_precmd
>+		run_rc_command stop
>+		run_rc_command start
>+	fi
>+}
>+
>+if [ "$1" = restart ]; then
>+	apcupsd_precmd
>+	run_rc_command $1
>+elif [ -n "${apcupsd_configs}" ]; then
>+	# One or more named configs
>+	for config in ${apcupsd_configs}; do
>+		apcupsd_precmd ${config}
>+		run_rc_command $1
>+	done
>+else
>+	# Default config
>+	apcupsd_precmd
>+	run_rc_command $1
>+fi
>diff -udprN /usr/ports/sysutils/apcupsd/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/sysutils/apcupsd/files/pkg-message.in	2016-05-19 11:09:14.000000000 +0000
>+++ ./files/pkg-message.in	2017-06-14 22:59:15.765989000 +0000
>@@ -1,7 +1,9 @@
> **********************************************************************
> Read the manual
> 
>-  %%DOCSDIR%%/apcupsd.pdf
>+http://apcupsd.com/manual/
>+or
>+http://apcupsd.com/manual/apcupsd.pdf
> 
> to do site specific configuration assigenments! Especially have a
> detailed look into the chapter describing the shutdown procedure.
>diff -udprN /usr/ports/sysutils/apcupsd/pkg-descr ./pkg-descr
>--- /usr/ports/sysutils/apcupsd/pkg-descr	2014-07-06 13:14:34.000000000 +0000
>+++ ./pkg-descr	2014-07-07 06:19:16.000000000 +0000
>@@ -4,4 +4,4 @@ It can monitor and log the current power
> automatic shutdown, and can run in network mode in order to power down
> other hosts on a LAN
> 
>-WWW: http://www.apcupsd.com
>+WWW: http://apcupsd.com
>diff -udprN /usr/ports/sysutils/apcupsd/pkg-plist ./pkg-plist
>--- /usr/ports/sysutils/apcupsd/pkg-plist	2014-11-22 09:13:35.000000000 +0000
>+++ ./pkg-plist	2017-06-15 05:50:58.709483000 +0000
>@@ -3,12 +3,12 @@ sbin/apcaccess
> sbin/apctest
> sbin/smtp
> @sample %%ETCDIR%%/apcupsd.conf.sample
>-%%ETCDIR%%/apccontrol
>-%%ETCDIR%%/changeme
>-%%ETCDIR%%/commfailure
>-%%ETCDIR%%/commok
>-%%ETCDIR%%/onbattery
>-%%ETCDIR%%/offbattery
>+@sample %%ETCDIR%%/apccontrol.sample
>+@sample %%ETCDIR%%/changeme.sample
>+@sample %%ETCDIR%%/commfailure.sample
>+@sample %%ETCDIR%%/commok.sample
>+@sample %%ETCDIR%%/onbattery.sample
>+@sample %%ETCDIR%%/offbattery.sample
> %%CGI%%@sample %%ETCDIR%%/apcupsd.css.sample
> %%CGI%%@sample %%ETCDIR%%/hosts.conf.sample
> %%CGI%%@sample %%ETCDIR%%/multimon.conf.sample

Actions: View | Diff

Attachments on bug 220002: 183490