nut: 2.7.1 -> 2.7.4; corrected mandir

3 files changed, 69 insertions, 83 deletions

diff --git a/nut/.footprint b/nut/.footprint
index 851962687..3d587c893 100644
--- a/nut/.footprint
+++ b/nut/.footprint
@@ -13,7 +13,6 @@ drwxr-xr-x	root/root	etc/udev/rules.d/
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/udev/
 drwxr-xr-x	root/root	lib/udev/rules.d/
--rw-r--r--	root/root	lib/udev/rules.d/52-nut-usbups.rules
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/al175
@@ -21,7 +20,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/apcsmart-old
 -rwxr-xr-x	root/root	usr/bin/apcupsd-ups
 -rwxr-xr-x	root/root	usr/bin/bcmxcp
--rwxr-xr-x	root/root	usr/bin/bcmxcp_usb
 -rwxr-xr-x	root/root	usr/bin/belkin
 -rwxr-xr-x	root/root	usr/bin/belkinunv
 -rwxr-xr-x	root/root	usr/bin/bestfcom
@@ -29,7 +27,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/bestuferrups
 -rwxr-xr-x	root/root	usr/bin/bestups
 -rwxr-xr-x	root/root	usr/bin/blazer_ser
--rwxr-xr-x	root/root	usr/bin/blazer_usb
 -rwxr-xr-x	root/root	usr/bin/clone
 -rwxr-xr-x	root/root	usr/bin/clone-outlet
 -rwxr-xr-x	root/root	usr/bin/dummy-ups
@@ -54,23 +51,18 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/powercom
 -rwxr-xr-x	root/root	usr/bin/powerpanel
 -rwxr-xr-x	root/root	usr/bin/rhino
--rwxr-xr-x	root/root	usr/bin/richcomm_usb
 -rwxr-xr-x	root/root	usr/bin/riello_ser
--rwxr-xr-x	root/root	usr/bin/riello_usb
 -rwxr-xr-x	root/root	usr/bin/safenet
 -rwxr-xr-x	root/root	usr/bin/skel
 -rwxr-xr-x	root/root	usr/bin/solis
 -rwxr-xr-x	root/root	usr/bin/tripplite
--rwxr-xr-x	root/root	usr/bin/tripplite_usb
 -rwxr-xr-x	root/root	usr/bin/tripplitesu
 -rwxr-xr-x	root/root	usr/bin/upsc
 -rwxr-xr-x	root/root	usr/bin/upscmd
 -rwxr-xr-x	root/root	usr/bin/upscode2
--rwxr-xr-x	root/root	usr/bin/upsdrvctl
 -rwxr-xr-x	root/root	usr/bin/upslog
 -rwxr-xr-x	root/root	usr/bin/upsrw
 -rwxr-xr-x	root/root	usr/bin/upssched-cmd
--rwxr-xr-x	root/root	usr/bin/usbhid-ups
 -rwxr-xr-x	root/root	usr/bin/victronups
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libnutclient.a
@@ -85,80 +77,75 @@ lrwxrwxrwx	root/root	usr/lib/libnutscan.so.1 -> libnutscan.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libnutscan.so.1.0.0
 -rw-r--r--	root/root	usr/lib/libupsclient.a
 -rwxr-xr-x	root/root	usr/lib/libupsclient.la
-lrwxrwxrwx	root/root	usr/lib/libupsclient.so -> libupsclient.so.3.0.1
-lrwxrwxrwx	root/root	usr/lib/libupsclient.so.3 -> libupsclient.so.3.0.1
--rwxr-xr-x	root/root	usr/lib/libupsclient.so.3.0.1
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/nut.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/ups.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/upsd.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/upsd.users.5.gz
--rw-r--r--	root/root	usr/man/man5/upsmon.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/upssched.conf.5.gz
-drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/al175.8.gz
--rw-r--r--	root/root	usr/man/man8/apcsmart-old.8.gz
--rw-r--r--	root/root	usr/man/man8/apcsmart.8.gz
--rw-r--r--	root/root	usr/man/man8/apcupsd-ups.8.gz
--rw-r--r--	root/root	usr/man/man8/bcmxcp.8.gz
--rw-r--r--	root/root	usr/man/man8/bcmxcp_usb.8.gz
--rw-r--r--	root/root	usr/man/man8/belkin.8.gz
--rw-r--r--	root/root	usr/man/man8/belkinunv.8.gz
--rw-r--r--	root/root	usr/man/man8/bestfcom.8.gz
--rw-r--r--	root/root	usr/man/man8/bestfortress.8.gz
--rw-r--r--	root/root	usr/man/man8/bestuferrups.8.gz
--rw-r--r--	root/root	usr/man/man8/bestups.8.gz
--rw-r--r--	root/root	usr/man/man8/blazer_ser.8.gz
--rw-r--r--	root/root	usr/man/man8/blazer_usb.8.gz
--rw-r--r--	root/root	usr/man/man8/clone.8.gz
--rw-r--r--	root/root	usr/man/man8/dummy-ups.8.gz
--rw-r--r--	root/root	usr/man/man8/etapro.8.gz
--rw-r--r--	root/root	usr/man/man8/everups.8.gz
--rw-r--r--	root/root	usr/man/man8/gamatronic.8.gz
--rw-r--r--	root/root	usr/man/man8/genericups.8.gz
--rw-r--r--	root/root	usr/man/man8/isbmex.8.gz
--rw-r--r--	root/root	usr/man/man8/ivtscd.8.gz
--rw-r--r--	root/root	usr/man/man8/liebert-esp2.8.gz
--rw-r--r--	root/root	usr/man/man8/liebert.8.gz
--rw-r--r--	root/root	usr/man/man8/masterguard.8.gz
--rw-r--r--	root/root	usr/man/man8/metasys.8.gz
--rw-r--r--	root/root	usr/man/man8/mge-shut.8.gz
--rw-r--r--	root/root	usr/man/man8/mge-utalk.8.gz
--rw-r--r--	root/root	usr/man/man8/microdowell.8.gz
--rw-r--r--	root/root	usr/man/man8/nut-recorder.8.gz
--rw-r--r--	root/root	usr/man/man8/nut-scanner.8.gz
--rw-r--r--	root/root	usr/man/man8/nutdrv_qx.8.gz
--rw-r--r--	root/root	usr/man/man8/nutupsdrv.8.gz
--rw-r--r--	root/root	usr/man/man8/oneac.8.gz
--rw-r--r--	root/root	usr/man/man8/optiups.8.gz
--rw-r--r--	root/root	usr/man/man8/powercom.8.gz
--rw-r--r--	root/root	usr/man/man8/powerpanel.8.gz
--rw-r--r--	root/root	usr/man/man8/rhino.8.gz
--rw-r--r--	root/root	usr/man/man8/richcomm_usb.8.gz
--rw-r--r--	root/root	usr/man/man8/riello_ser.8.gz
--rw-r--r--	root/root	usr/man/man8/riello_usb.8.gz
--rw-r--r--	root/root	usr/man/man8/safenet.8.gz
--rw-r--r--	root/root	usr/man/man8/solis.8.gz
--rw-r--r--	root/root	usr/man/man8/tripplite.8.gz
--rw-r--r--	root/root	usr/man/man8/tripplite_usb.8.gz
--rw-r--r--	root/root	usr/man/man8/tripplitesu.8.gz
--rw-r--r--	root/root	usr/man/man8/upsc.8.gz
--rw-r--r--	root/root	usr/man/man8/upscmd.8.gz
--rw-r--r--	root/root	usr/man/man8/upscode2.8.gz
--rw-r--r--	root/root	usr/man/man8/upsd.8.gz
--rw-r--r--	root/root	usr/man/man8/upsdrvctl.8.gz
--rw-r--r--	root/root	usr/man/man8/upslog.8.gz
--rw-r--r--	root/root	usr/man/man8/upsmon.8.gz
--rw-r--r--	root/root	usr/man/man8/upsrw.8.gz
--rw-r--r--	root/root	usr/man/man8/upssched.8.gz
--rw-r--r--	root/root	usr/man/man8/usbhid-ups.8.gz
--rw-r--r--	root/root	usr/man/man8/victronups.8.gz
+lrwxrwxrwx	root/root	usr/lib/libupsclient.so -> libupsclient.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libupsclient.so.4 -> libupsclient.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/libupsclient.so.4.0.0
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/upsd
+-rwxr-xr-x	root/root	usr/sbin/upsdrvctl
 -rwxr-xr-x	root/root	usr/sbin/upsmon
 -rwxr-xr-x	root/root	usr/sbin/upssched
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/nut.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/ups.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/upsd.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/upsd.users.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/upsmon.conf.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/upssched.conf.5.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/al175.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/apcsmart-old.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/apcsmart.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/apcupsd-ups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/bcmxcp.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/belkin.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/belkinunv.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/bestfcom.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/bestfortress.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/bestuferrups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/bestups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/blazer_ser.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/clone.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/dummy-ups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/etapro.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/everups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/gamatronic.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/genericups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/isbmex.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ivtscd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/liebert-esp2.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/liebert.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/masterguard.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/metasys.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mge-shut.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/mge-utalk.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/microdowell.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nut-recorder.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nut-scanner.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nutdrv_qx.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/nutupsdrv.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/oneac.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/optiups.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/powercom.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/powerpanel.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/rhino.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/riello_ser.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/safenet.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/solis.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tripplite.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/tripplitesu.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upsc.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upscmd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upscode2.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upsd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upsdrvctl.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upslog.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upsmon.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upsrw.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/upssched.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/victronups.8.gz
 drwxr-xr-x	root/root	usr/share/nut/
 -rw-r--r--	root/root	usr/share/nut/cmdvartab
 -rw-r--r--	root/root	usr/share/nut/driver.list
diff --git a/nut/.signature b/nut/.signature
index 31c75f5c5..802ed5379 100644
--- a/nut/.signature
+++ b/nut/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31WL4CC97nb8+p1UK6qInDj+jYLFiotbOgWwDlh0GqZ97f6PqDUwGZGbnqwSWxHAuk/IL8ZvOwt7H3HjycVR3A8=
-SHA256 (Pkgfile) = d98ce5d066fa24f4c032e30e13ead4cf50829b927a4775c16bc9af3ec44a147f
-SHA256 (.footprint) = 93058b0460b608df4016587fafa907a8b0207a85730411ab97d5cddb8851fa54
-SHA256 (nut-2.7.1.tar.gz) = 71a6d73ad6d910808126ba7f217ec1142a0c6709c63a22a099e7338960b2c798
+RWSagIOpLGJF32JNA4/RE0vUr/UvKt3Q84Dfs1/dtz10iaNyskwM6HSRzVysN7GN2eXcJEtxNJCttWSSHTM18bUn96AgWhWmGAE=
+SHA256 (Pkgfile) = f9b13836b7c580d75e7d7d81e154f16918dafca937d65eaeb76e30751214a143
+SHA256 (.footprint) = e28a068d51b3e83fb926a56d6bc6e859ccfb9f290780d838f089cbe5bf746aa5
+SHA256 (nut-2.7.4.tar.gz) = 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
 SHA256 (upsd) = 3aef2c1ea325ef9b7d799d244a4fd633ec378e963776bf643273c9d6ee83172a
diff --git a/nut/Pkgfile b/nut/Pkgfile
index 3d77c575b..444666cc0 100644
--- a/nut/Pkgfile
+++ b/nut/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libusb openssl tcp_wrappers
 
 name=nut
-version=2.7.1
+version=2.7.4
 release=1
 source=(http://www.networkupstools.org/source/${version%.*}/$name-$version.tar.gz
 	upsd)
@@ -17,7 +17,6 @@ build() {
 		--prefix=/usr \
 		--with-user=nut \
 		--with-group=nut \
-		--mandir=/usr/man \
 		--sysconfdir=/etc/$name \
 		--datadir=/usr/share/$name \
 		--localstatedir=/var/$name