upgpkg: miniupnpd-git 2.2.2.r15.g6f848ae-1

2 files changed, 16 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69aa3b1ed07a..1cd95cf3c495 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = miniupnpd-git
 	pkgdesc = Lightweight UPnP IGD daemon (git)
-	pkgver = 2.1.r99.gf43949b
+	pkgver = 2.2.2.r15.g6f848ae
 	pkgrel = 1
 	url = http://miniupnp.free.fr
 	arch = i686
@@ -18,9 +18,8 @@ pkgbase = miniupnpd-git
 	conflicts = miniupnpd
 	backup = etc/miniupnpd/miniupnpd.conf
 	source = git+https://github.com/miniupnp/miniupnp.git
-	source = miniupnpd.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/miniupnpd.service?h=packages/miniupnpd
+	source = miniupnpd.service::https://raw.githubusercontent.com/archlinux/svntogit-community/packages/miniupnpd/trunk/miniupnpd.service
 	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = miniupnpd-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4098852edbcd..fc8a8525d3f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=miniupnpd-git
-pkgver=2.1.r99.gf43949b
+pkgver=2.2.2.r15.g6f848ae
 pkgrel=1
 pkgdesc="Lightweight UPnP IGD daemon (git)"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ provides=('miniupnpd')
 conflicts=('miniupnpd')
 backup=('etc/miniupnpd/miniupnpd.conf')
 source=("git+https://github.com/miniupnp/miniupnp.git"
-        "miniupnpd.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/miniupnpd.service?h=packages/miniupnpd")
+        "miniupnpd.service::https://raw.githubusercontent.com/archlinux/svntogit-community/packages/miniupnpd/trunk/miniupnpd.service")
 sha256sums=('SKIP'
             'SKIP')
 
@@ -27,22 +27,27 @@ pkgver() {
 build() {
   cd "miniupnp/miniupnpd"
 
-  CONFIG_OPTIONS="--ipv6 --leasefile" make -f Makefile.linux config.h
-  make -f "Makefile.linux"
+  ./configure \
+    --ipv6 \
+    --leasefile
+  make
 }
 
 package() {
   cd "miniupnp/miniupnpd"
 
-  make DESTDIR="$pkgdir" SBININSTALLDIR="/usr/bin" -f "Makefile.linux" install
+  make \
+    DESTDIR="$pkgdir" \
+    SBININSTALLDIR="/usr/bin" \
+    install
 
-  rm -r "$pkgdir/etc/init.d"
-
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/miniupnpd/LICENSE"
-  install -Dm644 "$srcdir/miniupnpd.service" "$pkgdir/usr/lib/systemd/system/miniupnpd.service"
+  install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/miniupnpd"
+  install -Dm644 "$srcdir/miniupnpd.service" -t "$pkgdir/usr/lib/systemd/system"
 
   sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
           s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "$pkgdir/etc/miniupnpd"/*.sh
   sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
              s/make genuuid/uuidgen/" "$pkgdir/etc/miniupnpd/miniupnpd.conf"
+
+  rm -r "$pkgdir/etc/init.d"
 }