svn commit: r516204 - in head/sysutils: . apcctrl apcctrl/files apcupsd

Thu Oct 31 23:43:58 UTC 2019

Author: dbaio
Date: Thu Oct 31 23:43:55 2019
New Revision: 516204
URL: https://svnweb.freebsd.org/changeset/ports/516204

Log:
  Add sysutils/apcctrl: Fork of apcupsd 3.14.x with support for Brazilian APC nobreaks
  
  ApcCtrl is an unofficial branch from apcupsd 3.14.x. It can be
  used for controlling Brazilian APC UPS models (herited from Microsol).
  
  Models supported or in tests:
    - BACK-UPS BR 1200VA (BZ1200BI-BR)
    - BACK-UPS BR 1500VA (BZ1500PBI-BR)
    - BACK-UPS BR 2200VA (BZ2200BI-BR and BZ2200I-BR)
    - SMART-UPS BR 1000VA (SUA1000BI-BR and SOLIS1000BI)
    - SMART-UPS BR 1500VA (SUA1500BI-BR and SOLIS1500BI)
    - SMART-UPS BR 2000VA (SUA2000BI-BR)
    - SMART-UPS BR 3000VA (SUA3000BI-BR)
    - STAY 800 (PS800)
    - STAY 700 (PS700)
  
  WWW: http://www.apcctrl.com.br
  
  PR:		241623
  Submitted by:	Mario Lobo <lobo at bsd.com.br>

Added:
  head/sysutils/apcctrl/
     - copied from r516203, head/sysutils/apcupsd/
  head/sysutils/apcctrl/files/apcctrl.in
     - copied, changed from r516203, head/sysutils/apcupsd/files/apcupsd.in
Deleted:
  head/sysutils/apcctrl/files/apcupsd.conf.net-slave.sample
  head/sysutils/apcctrl/files/apcupsd.in
  head/sysutils/apcctrl/files/patch-include_apc.h
Modified:
  head/sysutils/Makefile
  head/sysutils/apcctrl/Makefile
  head/sysutils/apcctrl/distinfo
  head/sysutils/apcctrl/files/patch-configure
  head/sysutils/apcctrl/files/patch-platforms_etc_Makefile
  head/sysutils/apcctrl/files/patch-src_cgi_Makefile
  head/sysutils/apcctrl/files/pkg-message.in
  head/sysutils/apcctrl/pkg-descr
  head/sysutils/apcctrl/pkg-plist
  head/sysutils/apcupsd/Makefile

Modified: head/sysutils/Makefile
==============================================================================

--- head/sysutils/Makefile	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/Makefile	Thu Oct 31 23:43:55 2019	(r516204)
@@ -46,6 +46,7 @@
     SUBDIR += anvil
     SUBDIR += apache-mesos
     SUBDIR += apachetop
+    SUBDIR += apcctrl
     SUBDIR += apcpwr
     SUBDIR += apcupsd
     SUBDIR += aptly

Modified: head/sysutils/apcctrl/Makefile
==============================================================================
--- head/sysutils/apcupsd/Makefile	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/Makefile	Thu Oct 31 23:43:55 2019	(r516204)
@@ -1,14 +1,13 @@
 # Created by: Lars Köller <Lars.Koeller at Uni-Bielefeld.DE>
 # $FreeBSD$
 
-PORTNAME=	apcupsd
-PORTVERSION=	3.14.14
-PORTREVISION=	2
+PORTNAME=	apcctrl
+PORTVERSION=	0.8.21
 CATEGORIES=	sysutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}
 
-MAINTAINER=	dbaio at FreeBSD.org
-COMMENT=	Set of programs for controlling APC UPS
+MAINTAINER=	lobo at bsd.com.br
+COMMENT=	Fork of apcupsd 3.14.x with support for Brazilian APC nobreaks
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -18,26 +17,26 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/sbin \
 		--with-nologin=/var/run \
 		--disable-install-distdir \
-		--sysconfdir=${ETCDIR} \
-		--with-serial-dev=/dev/usv
+		--sysconfdir=${ETCDIR}
 
 CONFIGURE_ENV+=	LD="${CXX}" \
 		ac_cv_path_SHUTDOWN="/sbin/shutdown"
 
-USE_RC_SUBR=	apcupsd
+USE_RC_SUBR=	apcctrl
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY DOCS GAPCMON MODBUS \
+CONFLICTS_INSTALL=	apcupsd
+
+OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV BRAZIL_DRV CGI GAPCMON MODBUS \
 		MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \
 		TCP_WRAPPERS TEST_DRV USB_DRV
-OPTIONS_DEFAULT=	APCDUMB_DRV APCSMART_DRV MODBUS MODBUS_USB PCNET_DRV \
-		SNMP_DRV TCP_WRAPPERS USB_DRV
+OPTIONS_DEFAULT=	BRAZIL_DRV
 OPTIONS_SUB=	yes
 
 APCDUMB_DRV_DESC=	Dumb UPS driver support
 APCSMART_DRV_DESC=	APC SmartUPS serial driver support
+BRAZIL_DRV_DESC=	Brazilian APC-Microsol support
 CGI_DESC=		Build CGI programs to show status
-CLIENT_ONLY_DESC=	Only NIS client (no network server or drivers)
 GAPCMON_DESC=		Build GTK GUI front-end
 MODBUS_DESC=		MODBUS driver support
 MODBUS_USB_DESC=	MODBUS USB driver support
@@ -51,16 +50,16 @@ USB_DRV_DESC=		USB driver support
 
 APCDUMB_DRV_CONFIGURE_ENABLE=	dumb
 APCSMART_DRV_CONFIGURE_ENABLE=	apcsmart
+BRAZIL_DRV_CONFIGURE_ENABLE=	brazil
 CGI_CONFIGURE_ENABLE=		cgi
 CGI_CONFIGURE_ON=		--with-cgi-bin=${ETCDIR}/cgi
 CGI_LIB_DEPENDS=		libgd.so:graphics/gd
-CLIENT_ONLY_CONFIGURE_ON=	--enable-net \
-				--disable-apcsmart --disable-dumb --disable-usb \
-				--disable-snmp --disable-test --disable-pcnet
 GAPCMON_CONFIGURE_ENABLE=	gapcmon
-GAPCMON_USES=			pkgconfig
-GAPCMON_USE=			GNOME=gconf2
-GAPCMON_CONFLICTS=		gapcmon-[0-9]*
+GAPCMON_USES=			gnome pkgconfig xorg
+GAPCMON_USE=			GNOME=cairo,gconf2,gdkpixbuf2 XORG=x11,xext
+GAPCMON_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig \
+				libfreetype.so:print/freetype2
+GAPCMON_CONFLICTS=		gapcmon
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_USB_CONFIGURE_ENABLE=	modbus-usb
 PCNET_DRV_CONFIGURE_ENABLE=	pcnet
@@ -76,16 +75,5 @@ USB_DRV_CONFIGURE_ENABLE=	usb
 post-patch-SHUTDOWN_POWEROFF-on:
 	${REINPLACE_CMD} -e 's|-h now|-p now|' \
 		${WRKSRC}/platforms/freebsd/apccontrol.in
-
-pre-configure:
-.if ${PORT_OPTIONS:MCLIENT_ONLY} && ( ${PORT_OPTIONS:MAPCSMART_DRV} || \
-	${PORT_OPTIONS:MAPCDUMB_DRV} || ${PORT_OPTIONS:MPCNET_DRV} || \
-	${PORT_OPTIONS:MUSB_DRV} || \
-	${PORT_OPTIONS:MSNMP_DRV} || ${PORT_OPTIONS:MTEST_DRV} )
-	@${ECHO_CMD} "It doesn't make sense to build drivers if all you want is"
-	@${ECHO_CMD} "the client; please do make config and select either"
-	@${ECHO_CMD} "CLIENT_ONLY or the *_DRV you need"
-	@${FALSE}
-.endif
 
 .include <bsd.port.mk>

Modified: head/sysutils/apcctrl/distinfo
==============================================================================
--- head/sysutils/apcupsd/distinfo	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/distinfo	Thu Oct 31 23:43:55 2019	(r516204)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480843790
-SHA256 (apcupsd-3.14.14.tar.gz) = db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867
-SIZE (apcupsd-3.14.14.tar.gz) = 1843409
+TIMESTAMP = 1572562006
+SHA256 (apcctrl-0.8.21.tar.gz) = ad3bc43de922f25e98db6e97390034600d094b257458b25ee8677b1c63b0f1bf
+SIZE (apcctrl-0.8.21.tar.gz) = 3531048

Copied and modified: head/sysutils/apcctrl/files/apcctrl.in (from r516203, head/sysutils/apcupsd/files/apcupsd.in)
==============================================================================
--- head/sysutils/apcupsd/files/apcupsd.in	Thu Oct 31 23:04:52 2019	(r516203, copy source)
+++ head/sysutils/apcctrl/files/apcctrl.in	Thu Oct 31 23:43:55 2019	(r516204)
@@ -2,36 +2,36 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: apcupsd
+# PROVIDE: apcctrl
 # REQUIRE: SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 #
-# Add the following line to /etc/rc.conf[.local] to enable apcupsd
+# Add the following line to /etc/rc.conf[.local] to enable apcctrl
 #
-# apcupsd_enable (bool):	Set to "NO" by default.
-#				Set it to "YES" to enable apcupsd.
-# 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.
+# apcctrl_enable (bool):	Set to "NO" by default.
+#				Set it to "YES" to enable apcctrl.
+# apcctrl_flags (str):		Custom additional arguments to be passed
+#				to apcctrl (default --kill-on-powerfail).
+# apcctrl_configs (str):	A list of configs to run multiple instances.
 #
 
 . /etc/rc.subr
 
-name=apcupsd
-rcvar=apcupsd_enable
+name=apcctrl
+rcvar=apcctrl_enable
 
 load_rc_config $name
 
-: ${apcupsd_enable="NO"}
-: ${apcupsd_flags="--kill-on-powerfail"}
+: ${apcctrl_enable="NO"}
+: ${apcctrl_flags="--kill-on-powerfail"}
 
 pidfile=/var/run/${name}.pid
-required_files="${apcupsd_configs:-%%ETCDIR%%/apcupsd.conf}"
+required_files="${apcctrl_configs:-%%ETCDIR%%/apcctrl.conf}"
 command=%%PREFIX%%/sbin/${name}
 restart_cmd=${name}_restart_cmd
 
-apcupsd_precmd()
+apcctrl_precmd()
 {
 	config=$1
 
@@ -47,37 +47,37 @@ apcupsd_precmd()
 	fi
 }
 
-apcupsd_restart_cmd()
+apcctrl_restart_cmd()
 {
-	if [ -n "${apcupsd_configs}" ]; then
+	if [ -n "${apcctrl_configs}" ]; then
 		# One or more named configs
-		for config in ${apcupsd_configs}; do
-			apcupsd_precmd ${config}
+		for config in ${apcctrl_configs}; do
+			apcctrl_precmd ${config}
 			run_rc_command stop
 		done
-		for config in ${apcupsd_configs}; do
-			apcupsd_precmd ${config}
+		for config in ${apcctrl_configs}; do
+			apcctrl_precmd ${config}
 			run_rc_command start
 		done
 	else
 		# Default config
-		apcupsd_precmd
+		apcctrl_precmd
 		run_rc_command stop
 		run_rc_command start
 	fi
 }
 
 if [ "$1" = restart ]; then
-	apcupsd_precmd
+	apcctrl_precmd
 	run_rc_command $1
-elif [ -n "${apcupsd_configs}" ]; then
+elif [ -n "${apcctrl_configs}" ]; then
 	# One or more named configs
-	for config in ${apcupsd_configs}; do
-		apcupsd_precmd ${config}
+	for config in ${apcctrl_configs}; do
+		apcctrl_precmd ${config}
 		run_rc_command $1
 	done
 else
 	# Default config
-	apcupsd_precmd
+	apcctrl_precmd
 	run_rc_command $1
 fi

Modified: head/sysutils/apcctrl/files/patch-configure
==============================================================================
--- head/sysutils/apcupsd/files/patch-configure	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/files/patch-configure	Thu Oct 31 23:43:55 2019	(r516204)
@@ -1,24 +1,24 @@
 --- configure.orig	2016-04-18 20:26:31 UTC
 +++ configure
-@@ -10584,7 +10584,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -7470,7 +7470,7 @@
+ $as_echo_n "checking for libwrap... " >&6; }
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 - #include <tcpd.h>
 + #include "tcpd.h"
                int deny_severity = 0;
                int allow_severity = 0;
                struct request_info *req;
-@@ -10636,7 +10636,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -7493,7 +7493,7 @@
+    LIBS="$saved_LIBS -lwrap -lnsl"
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 - #include <tcpd.h>
-+ #include "tcpd.h"
++ ##include "tcpd.h"
                     int deny_severity = 0;
                     int allow_severity = 0;
                     struct request_info *req;
-@@ -12397,55 +12397,6 @@ $as_echo "$as_me: error: gethostbyname_r
+@@ -8548,55 +8548,6 @@
     ;;
  esac
  
@@ -32,7 +32,7 @@
 -   #
 -   # Previous versions of GCC do not have the reliance on the stdc++
 -   # or g++ libraries, so the extra supc++ library is not needed.
--   { $as_echo "$as_me:$LINENO: checking if libsupc++ is required" >&5
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libsupc++ is required" >&5
 -$as_echo_n "checking if libsupc++ is required... " >&6; }
 -
 -   SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
@@ -40,28 +40,28 @@
 -   libsupc++.a*)
 -      # Library not found, so this is an older GCC...
 -      LD="$CXX"
--      { $as_echo "$as_me:$LINENO: result: no" >&5
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -      ;;
 -   *)
 -      # This is gcc 3.x, and it knows of libsupc++, so we need it
 -      LIBS="$LIBS -lsupc++"
 -      LD="$CC"
--      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
 -
 -      # See if this system has a broken libsupc++ that requires
 -      # a workaround (FreeBSD 5.x, 6.x)
 -      case $host in
 -         *-*-freebsd*)
--            { $as_echo "$as_me:$LINENO: checking if libsupc++ is missing __terminate_handler" >&5
+-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libsupc++ is missing __terminate_handler" >&5
 -$as_echo_n "checking if libsupc++ is missing __terminate_handler... " >&6; }
 -            nm -C --defined-only "$SUPC" 2>/dev/null | grep __terminate_handler > /dev/null
 -            if test $? -eq 0 ; then
--               { $as_echo "$as_me:$LINENO: result: no" >&5
+-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -            else
--               { $as_echo "$as_me:$LINENO: result: yes -- will attempt workaround" >&5
+-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes -- will attempt workaround" >&5
 -$as_echo "yes -- will attempt workaround" >&6; }
 -               LIBEXTRAOBJ="$LIBEXTRAOBJ libsupc++fix.cpp"
 -            fi
@@ -71,6 +71,6 @@
 -   esac
 -fi
 -
- { $as_echo "$as_me:$LINENO: checking whether C compiler accepts -fno-exceptions" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-exceptions" >&5
  $as_echo_n "checking whether C compiler accepts -fno-exceptions... " >&6; }
- if test "${ax_cv_check_cflags___fno_exceptions+set}" = set; then
+ if ${ax_cv_check_cflags___fno_exceptions+:} false; then :

Modified: head/sysutils/apcctrl/files/patch-platforms_etc_Makefile
==============================================================================
--- head/sysutils/apcupsd/files/patch-platforms_etc_Makefile	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/files/patch-platforms_etc_Makefile	Thu Oct 31 23:43:55 2019	(r516204)
@@ -4,13 +4,13 @@
  
  install-etc:
  	$(call MKDIR,$(sysconfdir))
--	$(call INSTNEW,644,apcupsd.conf,$(sysconfdir))
+-	$(call INSTNEW,644,apcctrl.conf,$(sysconfdir))
 -	$(call INSTORIG,744,changeme,$(sysconfdir))
 -	$(call INSTORIG,744,commfailure,$(sysconfdir))
 -	$(call INSTORIG,744,commok,$(sysconfdir))
 -	$(call INSTORIG,744,offbattery,$(sysconfdir))
 -	$(call INSTORIG,744,onbattery,$(sysconfdir))
-+	$(call INSTDATA,644,apcupsd.conf,$(sysconfdir)/apcupsd.conf.sample)
++	$(call INSTDATA,644,apcctrl.conf,$(sysconfdir)/apcctrl.conf.sample)
 +	$(call INSTDATA,744,changeme,$(sysconfdir)/changeme.sample)
 +	$(call INSTDATA,744,commfailure,$(sysconfdir)/commfailure.sample)
 +	$(call INSTDATA,744,commok,$(sysconfdir)/commok.sample)

Modified: head/sysutils/apcctrl/files/patch-src_cgi_Makefile
==============================================================================
--- head/sysutils/apcupsd/files/patch-src_cgi_Makefile	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/files/patch-src_cgi_Makefile	Thu Oct 31 23:43:55 2019	(r516204)
@@ -4,10 +4,10 @@
  	$(call INSTPROG,755,upsfstats.cgi,$(cgibin))
  	$(call INSTPROG,755,upsimage.cgi,$(cgibin))
  	$(call MKDIR,$(sysconfdir))
--	$(call INSTNEW,644,apcupsd.css,$(sysconfdir))
+-	$(call INSTNEW,644,apcctrl.css,$(sysconfdir))
 -	$(call INSTNEW,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir))
 -	$(call INSTNEW,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir))
-+	$(call INSTDATA,644,apcupsd.css,$(sysconfdir)/apcupsd.css.sample)
++	$(call INSTDATA,644,apcctrl.css,$(sysconfdir)/apcctrl.css.sample)
 +	$(call INSTDATA,644,$(topdir)/platforms/etc/hosts.conf,$(sysconfdir)/hosts.conf.sample)
 +	$(call INSTDATA,644,$(topdir)/platforms/etc/multimon.conf,$(sysconfdir)/multimon.conf.sample)
  

Modified: head/sysutils/apcctrl/files/pkg-message.in
==============================================================================
--- head/sysutils/apcupsd/files/pkg-message.in	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/files/pkg-message.in	Thu Oct 31 23:43:55 2019	(r516204)
@@ -1,33 +1,32 @@
 [
 { type: install
   message: <<EOM
-Read the manual: http://www.apcupsd.org/manual/manual.html
-                 http://www.apcupsd.org/manual/manual.pdf
 
 Sample files and scripts are installed in %%ETCDIR%%.
-You need to modify %%ETCDIR%%/apcupsd.conf as follows:
 
-  For serial cable: DEVICE /dev/cuadX (or /dev/cuaaX for [45.]x)
-  For USB cable: DEVICE (yes, leave it blank after DEVICE)
-  NOTE that for USB cable you need uhid support.
+Some examples of devices:
+ /dev/ttyU0    /dev/ttyUSB.nobreak
+ /dev/ttyUSB0  /dev/ttyUSB1  /dev/ttyUSB2
+ /dev/ttyACM0  /dev/ttyACM1  /dev/ttyACM2
 
-Add apcupsd_enable=YES to your /etc/rc.conf[.local] to have apcupsd
+Add apcctrl_enable=YES to your /etc/rc.conf[.local] to have apcctrl
 starting up at boot time.
 
-For default, apcupsd starts with `--kill-on-powerfail` parameter.
+For default, apcctrl starts with `--kill-on-powerfail` parameter.
 Please, read its man page, and if this is not the intended behavior you want,
 change it accordingly.
 
 In some systems where the shutdown can take a while (like in bhyve environment),
 you may want to change this behavior as follows:
 
-Set apcupsd_flags="--term-on-powerfail" on your /etc/rc.conf[.local].
+Set apcctrl_flags="--term-on-powerfail" on your /etc/rc.conf[.local].
 
 Add this to /etc/rc.shutdown, after the "Insert other shutdown procedures here"
 line:
-  test -f /var/run/powerfail && /usr/local/sbin/apcupsd --hibernate
+  test -f /var/run/powerfail && /usr/local/sbin/apcctrl --hibernate
   or
-  test -f /var/run/powerfail && /usr/local/sbin/apcupsd --power-off
+  test -f /var/run/powerfail && /usr/local/sbin/apcctrl --power-off
+
 EOM
 }
 ]

Modified: head/sysutils/apcctrl/pkg-descr
==============================================================================
--- head/sysutils/apcupsd/pkg-descr	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/pkg-descr	Thu Oct 31 23:43:55 2019	(r516204)
@@ -1,7 +1,15 @@
-"apcupsd" can be used for controlling all APC UPS models
+ApcCtrl is an unofficial branch from apcupsd 3.14.x. It can be
+used for controlling Brazilian APC UPS models (herited from Microsol).
 
-It can monitor and log the current power and battery status, perform
-automatic shutdown, and can run in network mode in order to power down
-other hosts on a LAN
+Models supported or in tests:
+  - BACK-UPS BR 1200VA (BZ1200BI-BR)
+  - BACK-UPS BR 1500VA (BZ1500PBI-BR)
+  - BACK-UPS BR 2200VA (BZ2200BI-BR and BZ2200I-BR)
+  - SMART-UPS BR 1000VA (SUA1000BI-BR and SOLIS1000BI)
+  - SMART-UPS BR 1500VA (SUA1500BI-BR and SOLIS1500BI)
+  - SMART-UPS BR 2000VA (SUA2000BI-BR)
+  - SMART-UPS BR 3000VA (SUA3000BI-BR)
+  - STAY 800 (PS800)
+  - STAY 700 (PS700)
 
-WWW: http://www.apcupsd.com
+WWW: http://www.apcctrl.com.br

Modified: head/sysutils/apcctrl/pkg-plist
==============================================================================
--- head/sysutils/apcupsd/pkg-plist	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcctrl/pkg-plist	Thu Oct 31 23:43:55 2019	(r516204)
@@ -1,15 +1,14 @@
-sbin/apcupsd
+sbin/apcctrl
 sbin/apcaccess
 sbin/apctest
-sbin/smtp
- at sample %%ETCDIR%%/apcupsd.conf.sample
+ at sample %%ETCDIR%%/apcctrl.conf.sample
 %%ETCDIR%%/apccontrol
 @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%%/apcctrl.css.sample
 %%CGI%%@sample %%ETCDIR%%/hosts.conf.sample
 %%CGI%%@sample %%ETCDIR%%/multimon.conf.sample
 %%CGI%%%%ETCDIR%%/cgi/multimon.cgi
@@ -18,14 +17,14 @@ sbin/smtp
 %%CGI%%%%ETCDIR%%/cgi/upsstats.cgi
 %%GAPCMON%%bin/gapcmon
 %%GAPCMON%%share/applications/gapcmon.desktop
-%%GAPCMON%%share/pixmaps/apcupsd.png
+%%GAPCMON%%share/pixmaps/apcctrl.png
 %%GAPCMON%%share/pixmaps/charging.png
 %%GAPCMON%%share/pixmaps/gapc_prefs.png
 %%GAPCMON%%share/pixmaps/onbatt.png
 %%GAPCMON%%share/pixmaps/online.png
 %%GAPCMON%%share/pixmaps/unplugged.png
-man/man5/apcupsd.conf.5.gz
+man/man5/apcctrl.conf.5.gz
 man/man8/apcaccess.8.gz
 man/man8/apccontrol.8.gz
 man/man8/apctest.8.gz
-man/man8/apcupsd.8.gz
+man/man8/apcctrl.8.gz

Modified: head/sysutils/apcupsd/Makefile
==============================================================================
--- head/sysutils/apcupsd/Makefile	Thu Oct 31 23:04:52 2019	(r516203)
+++ head/sysutils/apcupsd/Makefile	Thu Oct 31 23:43:55 2019	(r516204)
@@ -27,6 +27,8 @@ CONFIGURE_ENV+=	LD="${CXX}" \
 USE_RC_SUBR=	apcupsd
 SUB_FILES=	pkg-message
 
+CONFLICTS_INSTALL=	apcctrl
+
 OPTIONS_DEFINE=	APCDUMB_DRV APCSMART_DRV CGI CLIENT_ONLY DOCS GAPCMON MODBUS \
 		MODBUS_USB PCNET_DRV SHUTDOWN_POWEROFF SNMP_DRV SNMP_DRV_OLD \
 		TCP_WRAPPERS TEST_DRV USB_DRV
