diff options
| author | cy <cy@FreeBSD.org> | 2017-06-14 10:07:14 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2017-06-14 10:07:14 +0800 |
| commit | b38598af97fd31ccd79a7c41b585f2dfb56e0cf8 (patch) | |
| tree | 55832de0e42809cb0e114fb752d2581a4b8c5196 /sysutils | |
| parent | 547b7cfe6a25de62a09f690d2331bb182049f459 (diff) | |
| download | freebsd-ports-gnome-b38598af97fd31ccd79a7c41b585f2dfb56e0cf8.tar.gz freebsd-ports-gnome-b38598af97fd31ccd79a7c41b585f2dfb56e0cf8.tar.zst freebsd-ports-gnome-b38598af97fd31ccd79a7c41b585f2dfb56e0cf8.zip | |
Revert r443550. An unintended patch was included. Will try again.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nut/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/nut/files/nut.in | 11 | ||||
| -rw-r--r-- | sysutils/nut/files/nut_upslog.in | 10 | ||||
| -rw-r--r-- | sysutils/nut/files/nut_upsmon.in | 4 |
4 files changed, 11 insertions, 16 deletions
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index b6ed07ca0f2e..e9a194f475e4 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -3,7 +3,7 @@ PORTNAME= nut PORTVERSION= 2.7.4 -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig diff --git a/sysutils/nut/files/nut.in b/sysutils/nut/files/nut.in index 3a5f93635f04..5b0e3cb86050 100644 --- a/sysutils/nut/files/nut.in +++ b/sysutils/nut/files/nut.in @@ -15,9 +15,8 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -nut_enable=${nut_enable:-"NO"} -nut_prefix=${nut_prefix:-"%%PREFIX%%"} -nut_upsshut=${nut_upsshut:-"NO"} +nut_enable=${nut_enable-"NO"} +nut_prefix=${nut_prefix-"%%PREFIX%%"} . /etc/rc.subr @@ -39,11 +38,7 @@ nut_prestart() { } nut_poststop() { - if ${nut_prefix}/sbin/upsdrvctl stop && checkyesno nut_upsshut; then - if ${nut_prefix}/sbin/upsmon -K; then - ${nut_prefix}/sbin/upsdrvctl shutdown - fi - fi + ${nut_prefix}/sbin/upsdrvctl stop } extra_commands=reload diff --git a/sysutils/nut/files/nut_upslog.in b/sysutils/nut/files/nut_upslog.in index 2dbd79645549..9bb361e1d3be 100644 --- a/sysutils/nut/files/nut_upslog.in +++ b/sysutils/nut/files/nut_upslog.in @@ -15,11 +15,11 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -nut_upslog_enable=${nut_upslog_enable:-"NO"} -nut_upslog_prefix=${nut_upslog_prefix:-"%%PREFIX%%"} -nut_upslog_logfile=${nut_upslog_logfile:-"/var/log/ups.log"} -nut_upslog_interval=${nut_upslog_interval:-"300"} -nut_upslog_ups=${nut_upslog_ups:-"myups@localhost"} +nut_upslog_enable=${nut_upslog_enable-"NO"} +nut_upslog_prefix=${nut_upslog_prefix-"%%PREFIX%%"} +nut_upslog_logfile=${nut_upslog_logfile-"/var/log/ups.log"} +nut_upslog_interval=${nut_upslog_interval-"300"} +nut_upslog_ups=${nut_upslog_ups-"myups@localhost"} . /etc/rc.subr diff --git a/sysutils/nut/files/nut_upsmon.in b/sysutils/nut/files/nut_upsmon.in index 57f454480cbb..8cf393a5b799 100644 --- a/sysutils/nut/files/nut_upsmon.in +++ b/sysutils/nut/files/nut_upsmon.in @@ -15,8 +15,8 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -nut_upsmon_enable=${nut_upsmon_enable:-"NO"} -nut_upsmon_prefix=${nut_upsmon_prefix:-"%%PREFIX%%"} +nut_upsmon_enable=${nut_upsmon_enable-"NO"} +nut_upsmon_prefix=${nut_upsmon_prefix-"%%PREFIX%%"} . /etc/rc.subr |