ports/81591: [patch] new sysutils/nut 2.0.1
Dmitry A Grigorovich
odip at bionet.nsc.ru
Sat May 28 17:02:56 UTC 2005
>Number: 81591
>Category: ports
>Synopsis: [patch] new sysutils/nut 2.0.1
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat May 28 16:50:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Dmitry A Grigorovich
>Release: FreeBSD 5.4-RELEASE-p1 i386
>Organization:
ICiG SB RAS
>Environment:
System: FreeBSD hydra2.bionet.nsc.ru 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0
>Description:
New port for NUT version 2.0.1
Also RC-old nut.sh.sample replaced by RC-NG nut.sh
>How-To-Repeat:
N/A
>Fix:
remove port nut
cd /usr/ports/sysutils/nut
rm files/nut.sh.sample
copy new files/nut.sh
patch directory /usr/ports/sysutils/nut
build and install new nut
--- nut.sh begins here ---
#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: nut
# REQUIRE: NETWORKING
# BEFORE: LOGIN
# KEYWORD: FreeBSD shutdown
# Define these nut_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/nut
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
nut_enable=${nut_enable-"NO"}
nut_prefix=${nut_prefix-"%%PREFIX%%"}
nut_pidfile=${nut_pidfile-"/var/db/nut/nut.pid"}
nut_upslog=${nut_upslog-"/var/log/ups.log"}
nut_upsloginterval=${nut_upsloginterval-"300"}
nut_upslogmail=${nut_upslogmail-"backups at localhost"}
. %%RC_SUBR%%
name="nut"
rcvar=`set_rcvar`
start_cmd="nut_start"
stop_cmd="nut_stop"
load_rc_config $name
run_rc_command "$1"
nut_start() {
${nut_prefix}/libexec/nut/upsdrvctl start
${nut_prefix}/sbin/upsd
${nut_prefix}/sbin/upsmon localhost
${nut_prefix}/upslog -s ${nut_upslogmail} -l ${upslog} -i ${upsloginterval}
}
nut_stop() {
/usr/bin/killall upslog upsmon upsd
${nut_prefix}/libexec/nut/upsdrvctl stop
}
--- nut.sh ends here ---
--- patch-200-201 begins here ---
diff -ur nut/Makefile nut201/Makefile
--- nut/Makefile Sun Aug 29 08:55:45 2004
+++ nut201/Makefile Fri May 27 16:04:58 2005
@@ -6,7 +6,7 @@
#
PORTNAME= nut
-PORTVERSION= 2.0.0
+PORTVERSION= 2.0.1
CATEGORIES= sysutils
MASTER_SITES= http://us1.networkupstools.org/source/${PORTVERSION:R}/ \
http://eu1.networkupstools.org/source/${PORTVERSION:R}/
@@ -22,16 +22,17 @@
--with-statepath=/var/db/nut \
--with-altpidpath=/var/db/nut \
--with-pidpath=/var/db/nut
+USE_RC_SUBR= yes
MAN5= ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
upssched.conf.5
MAN8= apcsmart.8 belkin.8 belkinunv.8 bestuferrups.8 bestups.8 \
- cyberpower.8 cyberpower1100.8 etapro.8 everups.8 \
+ bestfcom.8 cpsups.8 cyberpower.8 etapro.8 everups.8 \
fentonups.8 genericups.8 ippon.8 isbmex.8 liebert.8 \
- masterguard.8 mge-shut.8 mge-utalk.8 nutupsdrv.8 oneac.8 \
- powercom.8 sms.8 snmp-ups.8 tripplite.8 tripplitesu.8 \
- upsc.8 upscmd.8 upsd.8 upsdrvctl.8 upslog.8 upsmon.8 \
- upsrw.8 upssched.8 victronups.8 safenet.8
+ masterguard.8 metasys.8 mge-shut.8 mge-utalk.8 mustek.8 \
+ nutupsdrv.8 oneac.8 powercom.8 powermust.8 safenet.8 sms.8 \
+ snmp-ups.8 tripplite.8 tripplitesu.8 upsc.8 upscmd.8 upsd.8 \
+ upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8
ALL_TARGET= all
INSTALL_TARGET= install install-conf
@@ -65,12 +66,14 @@
.endif
@${MKDIR} ${PREFIX}/libexec/nut
@${MKDIR} /var/db/nut
- @${CHOWN} uucp /var/db/nut
+ @${CHOWN} uucp:wheel /var/db/nut
+ @${CHMOD} 0755 /var/db/nut
post-install:
@${SED} -e "s#%%PREFIX%%#${PREFIX}#g" \
- ${FILESDIR}/nut.sh.sample > ${PREFIX}/etc/rc.d/nut.sh.sample
- @${CHMOD} 0755 ${PREFIX}/etc/rc.d/nut.sh.sample
+ -e "s#%%RC_SUBR%%#${RC_SUBR}#g" \
+ <${FILESDIR}/nut.sh >${WRKSRC}/nut.sh
+ ${INSTALL_SCRIPT} ${WRKSRC}/nut.sh ${PREFIX}/etc/rc.d/nut.sh
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/cables
@${MKDIR} ${DOCSDIR}/drivers
diff -ur nut/distinfo nut201/distinfo
--- nut/distinfo Sun Aug 29 08:55:45 2004
+++ nut201/distinfo Fri May 27 13:07:05 2005
@@ -1,2 +1,2 @@
-MD5 (nut-2.0.0.tar.gz) = 84649ad95809737b5ffc19efdd9e9952
-SIZE (nut-2.0.0.tar.gz) = 530492
+MD5 (nut-2.0.1.tar.gz) = fe28e182ab31015cfcfad5870a2322a2
+SIZE (nut-2.0.1.tar.gz) = 564545
Only in nut201/files: nut.sh
Only in nut/files: nut.sh.sample
diff -ur nut/pkg-plist nut201/pkg-plist
--- nut/pkg-plist Sun Aug 29 08:55:45 2004
+++ nut201/pkg-plist Fri May 27 15:40:57 2005
@@ -9,15 +9,17 @@
etc/nut/upsd.users.sample
etc/nut/upsmon.conf.sample
etc/nut/upssched.conf.sample
-etc/rc.d/nut.sh.sample
+ at unexec rmdir %D/etc/nut 2>/dev/null || true
+etc/rc.d/nut.sh
libexec/nut/apcsmart
libexec/nut/belkin
libexec/nut/belkinunv
+libexec/nut/bestfcom
libexec/nut/bestuferrups
libexec/nut/bestups
libexec/nut/blazer
+libexec/nut/cpsups
libexec/nut/cyberpower
-libexec/nut/cyberpower1100
libexec/nut/esupssmart
libexec/nut/etapro
libexec/nut/everups
@@ -27,10 +29,13 @@
libexec/nut/isbmex
libexec/nut/liebert
libexec/nut/masterguard
+libexec/nut/metasys
libexec/nut/mge-shut
libexec/nut/mge-utalk
+libexec/nut/mustek
libexec/nut/oneac
libexec/nut/powercom
+libexec/nut/powermust
libexec/nut/safenet
libexec/nut/sms
libexec/nut/tripplite
@@ -47,6 +52,9 @@
%%CGIETC%%upsset.conf.sample
%%CGIETC%%upsstats.html.sample
%%CGIETC%%upsstats-single.html.sample
+%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%
+%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/cables
+%%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/drivers
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -55,6 +63,7 @@
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%PORTDOCS%%%%DOCSDIR%%/big-servers.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/apc-rs500-serial.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/apc.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/ge-imv-victron.txt
%%PORTDOCS%%%%DOCSDIR%%/cables/imv.txt
@@ -82,9 +91,10 @@
%%PORTDOCS%%%%DOCSDIR%%/sock-protocol.txt
%%PORTDOCS%%%%DOCSDIR%%/ssl.txt
%%PORTDOCS%%%%DOCSDIR%%/upssched.txt
- at dirrm %%DOCSDIR%%/cables
- at dirrm %%DOCSDIR%%/drivers
- at dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cables
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/nut
+ at exec if [ ! -d /var/db/nut ]; then mkdir /var/db/nut; chown uucp:wheel /var/db/nut; chmod 0755 /var/db/nut; fi
+ at unexec rmdir /var/db/nut 2>/dev/null || true
%%CGIDIRRM%%
- at unexec rmdir %D/etc/nut 2>/dev/null || true
--- patch-200-201 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list