diff options
| author | bp <bp@FreeBSD.org> | 2001-01-04 06:14:59 +0000 |
|---|---|---|
| committer | bp <bp@FreeBSD.org> | 2001-01-04 06:14:59 +0000 |
| commit | abe4bb04624396c806664f42102586431188b6f8 (patch) | |
| tree | 788441a6313394bedea6432e2ba80cec53953643 /sysutils/nut/files | |
| parent | c7362b76f2c1c90fc9faba8b0fb55b8f6163a580 (diff) | |
| download | FreeBSD-ports-abe4bb04624396c806664f42102586431188b6f8.zip FreeBSD-ports-abe4bb04624396c806664f42102586431188b6f8.tar.gz | |
Update to 0.44.2.
File layout changed again: all ups drivers now located in the
${PREFIX}/libexec/nut. Some of the tools moved to ${PREFIX}/bin directory.
Startup script renamed to nut.sh.sample.
Diffstat (limited to 'sysutils/nut/files')
| -rw-r--r-- | sysutils/nut/files/patch-aa | 73 |
1 files changed, 39 insertions, 34 deletions
diff --git a/sysutils/nut/files/patch-aa b/sysutils/nut/files/patch-aa index 16ed429..89b9820 100644 --- a/sysutils/nut/files/patch-aa +++ b/sysutils/nut/files/patch-aa @@ -1,30 +1,19 @@ -diff -ur ../441/Makefile.in ./Makefile.in ---- ../441/Makefile.in Sun Jul 30 10:10:14 2000 -+++ ./Makefile.in Mon Oct 16 11:41:03 2000 +diff -ur ../442/Makefile.in ./Makefile.in +--- ../442/Makefile.in Sat Dec 23 00:40:24 2000 ++++ ./Makefile.in Thu Jan 4 11:25:54 2001 @@ -5,7 +5,7 @@ - BASEPATH = $(INSTALLROOT)@prefix@ - CONFPATH = $(INSTALLROOT)@sysconfdir@ - CGIPATH = $(INSTALLROOT)@CGIPATH@ --INSTALLDIRS=$(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/bin $(BASEPATH)/misc -+INSTALLDIRS=$(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/bin + BASEPATH = $(INSTALLROOT)@prefix@ + CONFPATH = $(INSTALLROOT)@sysconfdir@ + CGIPATH = $(INSTALLROOT)@CGIPATH@ +-INSTALLDIRS = $(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ $(BASEPATH)/misc ++INSTALLDIRS = $(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ + STATEPATH = $(INSTALLROOT)@STATEPATH@ - STATEPATH = $(INSTALLROOT)@STATEPATH@ - SUBDIRS = common models server clients -diff -ur ../441/clients/Makefile.in ./clients/Makefile.in ---- ../441/clients/Makefile.in Fri Jul 14 05:55:41 2000 -+++ ./clients/Makefile.in Mon Oct 16 11:42:15 2000 -@@ -57,7 +57,7 @@ - - install: all - @for f in $(PROGS) ; do \ -- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(BASEPATH)/bin; \ -+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(BASEPATH)/sbin; \ - done - - install-cgi: cgi -diff -ur ../441/conf/Makefile.in ./conf/Makefile.in ---- ../441/conf/Makefile.in Mon May 8 04:17:20 2000 -+++ ./conf/Makefile.in Mon Oct 16 11:43:25 2000 + SUBDIRS = common models server clients man +Only in .: a +diff -ur ../442/conf/Makefile.in ./conf/Makefile.in +--- ../442/conf/Makefile.in Mon May 8 04:17:20 2000 ++++ ./conf/Makefile.in Thu Jan 4 11:26:54 2001 @@ -13,17 +13,9 @@ install: @@ -45,13 +34,29 @@ diff -ur ../441/conf/Makefile.in ./conf/Makefile.in - fi; \ + $(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \ done -diff -ur ../441/server/Makefile.in ./server/Makefile.in ---- ../441/server/Makefile.in Fri Jul 14 05:30:40 2000 -+++ ./server/Makefile.in Mon Oct 16 11:44:41 2000 -@@ -24,5 +24,5 @@ +diff -ur ../442/scripts/FreeBSD/upsd.sh.sample ./scripts/FreeBSD/upsd.sh.sample +--- ../442/scripts/FreeBSD/upsd.sh.sample Sun Jan 16 04:22:27 2000 ++++ ./scripts/FreeBSD/upsd.sh.sample Thu Jan 4 11:51:18 2001 +@@ -2,7 +2,9 @@ - install: all - @for f in $(PROGS) ; do \ -- $(INSTALLCMD) $$f $(BASEPATH)/bin; \ -+ $(INSTALLCMD) $$f $(BASEPATH)/sbin; \ - done + PREFIX=%%PREFIX%% + ++BIN=${PREFIX}/bin + SBIN=${PREFIX}/sbin ++MODELS=${PREFIX}/libexec/nut + UPSTYPE="apcsmart" + UPSFLAGS="" + UPSDEV="/dev/cuaa3" +@@ -10,10 +12,10 @@ + UPSLOGINTERVAL="300" + + if [ x$1 = xstart ]; then +- ${SBIN}/$UPSTYPE $UPSFLAGS $UPSDEV ++ ${MODELS}/$UPSTYPE $UPSFLAGS $UPSDEV + ${SBIN}/upsd + ${SBIN}/upsmon localhost +- ${SBIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL ++ ${BIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL + elif [ "x$1" = "xstop" ]; then + /usr/bin/killall upslog upsmon upsd $UPSTYPE + fi |
