Update based on newest non-git PKGBUILD

1 files changed, 49 insertions, 35 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 44627e7d8415..c10bd26ac66a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,77 @@
-# Maintainer: Florian Bruhin <archlinux.org@the-compiler.org>
+# Maintainer: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
 # Contributor: Alex Reznichenko <sa5gap@yandex.ru>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Giuseppe Lucarelli <luk@rebelsoft.org>
+# Contributor: Dan Ziemba <zman0900@gmail.com>
 
 pkgname=network-ups-tools-git
-pkgver=v2.7.3.r2.g980aa03
+pkgver=v2.7.4.r55.gb0d8138
 pkgrel=1
 pkgdesc="NUT is a collection of programs for monitoring and administering UPS hardware"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://www.networkupstools.org/"
 license=('GPL2')
-depends=('openssl' 'libusb-compat')
+depends=('openssl' 'libusb-compat' 'libltdl' 'neon' 'net-snmp')
 provides=('network-ups-tools')
 conflicts=('network-ups-tools')
 makedepends=('asciidoc' 'git')
 backup=(etc/ups/{ups.conf,upsd.conf,upsd.users,upsmon.conf,upssched.conf})
 install=nut.install
-source=("git+https://github.com/networkupstools/nut.git"
-		'upsd.init')
+source=("git+https://github.com/networkupstools/nut.git")
 options=()
-md5sums=('SKIP'
-         '089ea4a56552253328d17603ff5670cc')
+md5sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/nut"
-    git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+  cd "$srcdir/nut"
+  git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-    find "$srcdir/nut" -name '*.py' -exec sed -i 's|^#!/usr/bin/env python|&2|' {} \;
+  find "$srcdir/nut" -name '*.py' -exec sed -i 's|^#!/usr/bin/env python|&2|' {} \;
 }
 
 build() {
-    cd "$srcdir/nut"
-    ./autogen.sh
-    ./configure \
-     	 --without-wrap \
-         --with-user=ups \
-         --with-group=nut \
-         --with-usb \
-         --prefix=/usr \
-         --with-udev-dir=/usr/lib/udev \
-         --with-systemdsystemunitdir=/usr/lib/systemd/system \
-         --datadir=/usr/share/ups \
-         --sbindir=/usr/bin \
-         --with-drvpath=/usr/bin \
-         --sysconfdir=/etc/ups
-
-    make
+  cd "$srcdir/nut"
+  ./autogen.sh
+  ./configure \
+    --without-wrap \
+    --with-user=ups \
+    --with-group=nut \
+    --disable-static \
+    --with-serial \
+    --with-usb \
+    --with-doc=html-single \
+    --without-avahi \
+    --with-snmp \
+    --with-neon \
+    --without-powerman \
+    --without-ipmi \
+    --without-freeipmi \
+    --with-libltdl \
+    --without-cgi \
+    --prefix=/usr \
+    --with-udev-dir=/usr/lib/udev \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --datadir=/usr/share/ups \
+    --sbindir=/usr/bin \
+    --with-drvpath=/usr/lib/network-ups-tools \
+    --sysconfdir=/etc/ups \
+    --with-openssl
+  make
 }
 
 package() {
-    cd "$srcdir/nut"
-    make DESTDIR="$pkgdir" install
+  cd "$srcdir/nut"
+  make DESTDIR="$pkgdir" install
+
+  install -D -m644 "conf/ups.conf.sample" "$pkgdir/etc/ups/ups.conf"
+  install -D -m640 "conf/upsd.conf.sample" "$pkgdir/etc/ups/upsd.conf"
+  install -D -m640 "conf/upsd.users.sample" "$pkgdir/etc/ups/upsd.users"
+  install -D -m640 "conf/upsmon.conf.sample" "$pkgdir/etc/ups/upsmon.conf"
+  install -D -m644 "conf/upssched.conf.sample" "$pkgdir/etc/ups/upssched.conf"
 
-    install -D -m755 "$srcdir/upsd.init" "$pkgdir/etc/rc.d/upsd"
-    install -D -m644 conf/ups.conf.sample "$pkgdir/etc/ups/ups.conf"
-    install -D -m640 conf/upsd.conf.sample "$pkgdir/etc/ups/upsd.conf"
-    install -D -m640 conf/upsd.users.sample "$pkgdir/etc/ups/upsd.users"
-    install -D -m640 conf/upsmon.conf.sample "$pkgdir/etc/ups/upsmon.conf"
-    install -D -m644 conf/upssched.conf.sample "$pkgdir/etc/ups/upssched.conf"
+  install -d -v -m755 "$pkgdir/usr/share/doc/network-ups-tools/images/cables"
+  install -v -m 644 docs/*.html "$pkgdir/usr/share/doc/network-ups-tools"
+  install -v -m 644 docs/images/*.png "$pkgdir/usr/share/doc/network-ups-tools/images"
+  install -v -m 644 docs/images/cables/*.{png,jpg} "$pkgdir/usr/share/doc/network-ups-tools/images/cables"
 }