From 7b9e4e1601d85cfc6fc98dfcad53e3fd9ad57781 Mon Sep 17 00:00:00 2001 From: Boris Popov Date: Thu, 4 Jan 2001 06:14:59 +0000 Subject: [PATCH] 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. --- sysutils/nut/Makefile | 8 ++-- sysutils/nut/distinfo | 2 +- sysutils/nut/files/patch-aa | 73 +++++++++++++++++++---------------- sysutils/nut/pkg-plist | 47 ++++++++++++---------- sysutils/nut/pkg-plist.doc | 6 ++- sysutils/nut22/Makefile | 8 ++-- sysutils/nut22/distinfo | 2 +- sysutils/nut22/files/patch-aa | 73 +++++++++++++++++++---------------- sysutils/nut22/pkg-plist | 47 ++++++++++++---------- sysutils/nut22/pkg-plist.doc | 6 ++- 10 files changed, 148 insertions(+), 124 deletions(-) diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 794958397a0f..87b6ea774835 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 0.44.1 +PORTVERSION= 0.44.2 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ @@ -19,7 +19,7 @@ LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-cgipath=${PREFIX}/share/nut/cgi \ - --with-modelpath=${PREFIX}/sbin \ + --with-modelpath=${PREFIX}/libexec/nut \ --with-statepath=/var/db ALL_TARGET= all @@ -50,8 +50,8 @@ pre-install: post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \ ${WRKSRC}/scripts/FreeBSD/upsd.sh.sample \ - >${PREFIX}/etc/rc.d/upsd.sh.sample - @${CHMOD} 0755 ${PREFIX}/etc/rc.d/upsd.sh.sample + >${PREFIX}/etc/rc.d/nut.sh.sample + @${CHMOD} 0755 ${PREFIX}/etc/rc.d/nut.sh.sample .if !defined(NOPORTDOCS) @if ! [ -d ${NDOCDIR} ]; then ${MKDIR} ${NDOCDIR}; fi @if ! [ -d ${NDOCDIR}/cables ]; then ${MKDIR} ${NDOCDIR}/cables; fi diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo index 15a91fc9551a..c1f6bd84c5ba 100644 --- a/sysutils/nut/distinfo +++ b/sysutils/nut/distinfo @@ -1 +1 @@ -MD5 (nut-0.44.1.tar.gz) = f34b5c9c4fd55b9763bd801bf88f4ed5 +MD5 (nut-0.44.2.tar.gz) = e426128d0a203b6d3dd5f641c2b17fd0 diff --git a/sysutils/nut/files/patch-aa b/sysutils/nut/files/patch-aa index 16ed4293bf15..89b982062e3b 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 diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index 81e0ef91c233..b495263cd015 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -1,27 +1,32 @@ -sbin/apcsmart -sbin/belkin -sbin/bestfort -sbin/bestups -sbin/engetron -sbin/fentonups -sbin/genericups -sbin/ipt-anzen -sbin/mustekups -sbin/optiups -sbin/powercom -sbin/ups-trust425+625 -sbin/victronups -sbin/upsc -sbin/upscmd -sbin/upslog -sbin/upsmon -sbin/upsct -sbin/upsct2 -sbin/upsd +bin/upsc +bin/upscmd +bin/upsct +bin/upsct2 +bin/upslog etc/nut/hosts.conf.sample etc/nut/multimon.conf.sample etc/nut/upsd.conf.sample etc/nut/upsmon.conf.sample etc/nut/upsset.passwd.sample -etc/rc.d/upsd.sh.sample +etc/rc.d/nut.sh.sample +libexec/nut/apcsmart +libexec/nut/belkin +libexec/nut/bestfort +libexec/nut/bestuferrups +libexec/nut/bestups +libexec/nut/engetron +libexec/nut/fentonups +libexec/nut/genericups +libexec/nut/ipt-anzen +libexec/nut/mustekups +libexec/nut/newapc +libexec/nut/optiups +libexec/nut/powercom +libexec/nut/toshiba1500 +libexec/nut/ups-trust425+625 +libexec/nut/victronups +sbin/upsd +sbin/upsmon +sbin/upssched @dirrm etc/nut +@dirrm libexec/nut diff --git a/sysutils/nut/pkg-plist.doc b/sysutils/nut/pkg-plist.doc index 703131ed35fe..d1b1724ce29a 100644 --- a/sysutils/nut/pkg-plist.doc +++ b/sysutils/nut/pkg-plist.doc @@ -1,5 +1,7 @@ share/doc/nut/Changes.trust share/doc/nut/FAQ +share/doc/nut/QUICKSTART +share/doc/nut/README share/doc/nut/access.txt share/doc/nut/belkin.txt share/doc/nut/big-servers.txt @@ -8,6 +10,7 @@ share/doc/nut/configure.txt share/doc/nut/data-room.txt share/doc/nut/dummyups.txt share/doc/nut/generic-ups.txt +share/doc/nut/model-arguments.txt share/doc/nut/new-modules.txt share/doc/nut/pager.txt share/doc/nut/powercom.txt @@ -16,8 +19,7 @@ share/doc/nut/shutdown.txt share/doc/nut/tips.txt share/doc/nut/todo.txt share/doc/nut/ups-trust425+625.txt -share/doc/nut/README -share/doc/nut/QUICKSTART +share/doc/nut/upssched.txt share/doc/nut/cables/powerware.txt share/doc/nut/cables/victron.txt @dirrm share/doc/nut/cables diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile index 794958397a0f..87b6ea774835 100644 --- a/sysutils/nut22/Makefile +++ b/sysutils/nut22/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 0.44.1 +PORTVERSION= 0.44.2 CATEGORIES= sysutils MASTER_SITES= http://www.exploits.org/nut/release/ @@ -19,7 +19,7 @@ LIB_DEPENDS= gd.1:${PORTSDIR}/graphics/gd GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-cgipath=${PREFIX}/share/nut/cgi \ - --with-modelpath=${PREFIX}/sbin \ + --with-modelpath=${PREFIX}/libexec/nut \ --with-statepath=/var/db ALL_TARGET= all @@ -50,8 +50,8 @@ pre-install: post-install: @${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \ ${WRKSRC}/scripts/FreeBSD/upsd.sh.sample \ - >${PREFIX}/etc/rc.d/upsd.sh.sample - @${CHMOD} 0755 ${PREFIX}/etc/rc.d/upsd.sh.sample + >${PREFIX}/etc/rc.d/nut.sh.sample + @${CHMOD} 0755 ${PREFIX}/etc/rc.d/nut.sh.sample .if !defined(NOPORTDOCS) @if ! [ -d ${NDOCDIR} ]; then ${MKDIR} ${NDOCDIR}; fi @if ! [ -d ${NDOCDIR}/cables ]; then ${MKDIR} ${NDOCDIR}/cables; fi diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo index 15a91fc9551a..c1f6bd84c5ba 100644 --- a/sysutils/nut22/distinfo +++ b/sysutils/nut22/distinfo @@ -1 +1 @@ -MD5 (nut-0.44.1.tar.gz) = f34b5c9c4fd55b9763bd801bf88f4ed5 +MD5 (nut-0.44.2.tar.gz) = e426128d0a203b6d3dd5f641c2b17fd0 diff --git a/sysutils/nut22/files/patch-aa b/sysutils/nut22/files/patch-aa index 16ed4293bf15..89b982062e3b 100644 --- a/sysutils/nut22/files/patch-aa +++ b/sysutils/nut22/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 diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist index 81e0ef91c233..b495263cd015 100644 --- a/sysutils/nut22/pkg-plist +++ b/sysutils/nut22/pkg-plist @@ -1,27 +1,32 @@ -sbin/apcsmart -sbin/belkin -sbin/bestfort -sbin/bestups -sbin/engetron -sbin/fentonups -sbin/genericups -sbin/ipt-anzen -sbin/mustekups -sbin/optiups -sbin/powercom -sbin/ups-trust425+625 -sbin/victronups -sbin/upsc -sbin/upscmd -sbin/upslog -sbin/upsmon -sbin/upsct -sbin/upsct2 -sbin/upsd +bin/upsc +bin/upscmd +bin/upsct +bin/upsct2 +bin/upslog etc/nut/hosts.conf.sample etc/nut/multimon.conf.sample etc/nut/upsd.conf.sample etc/nut/upsmon.conf.sample etc/nut/upsset.passwd.sample -etc/rc.d/upsd.sh.sample +etc/rc.d/nut.sh.sample +libexec/nut/apcsmart +libexec/nut/belkin +libexec/nut/bestfort +libexec/nut/bestuferrups +libexec/nut/bestups +libexec/nut/engetron +libexec/nut/fentonups +libexec/nut/genericups +libexec/nut/ipt-anzen +libexec/nut/mustekups +libexec/nut/newapc +libexec/nut/optiups +libexec/nut/powercom +libexec/nut/toshiba1500 +libexec/nut/ups-trust425+625 +libexec/nut/victronups +sbin/upsd +sbin/upsmon +sbin/upssched @dirrm etc/nut +@dirrm libexec/nut diff --git a/sysutils/nut22/pkg-plist.doc b/sysutils/nut22/pkg-plist.doc index 703131ed35fe..d1b1724ce29a 100644 --- a/sysutils/nut22/pkg-plist.doc +++ b/sysutils/nut22/pkg-plist.doc @@ -1,5 +1,7 @@ share/doc/nut/Changes.trust share/doc/nut/FAQ +share/doc/nut/QUICKSTART +share/doc/nut/README share/doc/nut/access.txt share/doc/nut/belkin.txt share/doc/nut/big-servers.txt @@ -8,6 +10,7 @@ share/doc/nut/configure.txt share/doc/nut/data-room.txt share/doc/nut/dummyups.txt share/doc/nut/generic-ups.txt +share/doc/nut/model-arguments.txt share/doc/nut/new-modules.txt share/doc/nut/pager.txt share/doc/nut/powercom.txt @@ -16,8 +19,7 @@ share/doc/nut/shutdown.txt share/doc/nut/tips.txt share/doc/nut/todo.txt share/doc/nut/ups-trust425+625.txt -share/doc/nut/README -share/doc/nut/QUICKSTART +share/doc/nut/upssched.txt share/doc/nut/cables/powerware.txt share/doc/nut/cables/victron.txt @dirrm share/doc/nut/cables