update; add build(); fix dependencies

2 files changed, 29 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb2d8667b678..a93136a2cb7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = freelan-git
-	pkgdesc = A peer-to-peer, secure, easy-to-setup, multi-platform, open-source, highly-configurable VPN software.
-	pkgver = r3731.d248bb5
+	pkgdesc = Peer-to-peer, secure, easy-to-setup, multi-platform, highly-configurable VPN software
+	pkgver = r3862.1cf517bf
 	pkgrel = 1
 	url = https://github.com/freelan-developers/freelan
 	arch = any
 	license = GPL
 	makedepends = git
+	makedepends = scons
 	depends = boost
 	depends = curl
+	depends = miniupnpc
 	depends = openssl
-	depends = scons
 	depends = python
-	source = freelan-git::git+https://github.com/freelan-developers/freelan.git
-	sha512sums = SKIP
+	source = git+https://github.com/freelan-developers/freelan.git
+	sha256sums = SKIP
 
 pkgname = freelan-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7ce8df6c97a0..1fee4b2d6739 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,33 @@
-# Maintainer: SplitFire (split7fire at yandex.ru)
+# Maintainer: Stephan Springer <buzo+arch@Lini.de>
+# Contributor: SplitFire (split7fire at yandex.ru)
 
-pkgname=freelan-git
-pkgver=r3731.d248bb5
+_pkgname=freelan
+pkgname="$_pkgname"-git
+pkgver=r3862.1cf517bf
 pkgrel=1
-pkgdesc="A peer-to-peer, secure, easy-to-setup, multi-platform, open-source, highly-configurable VPN software."
+pkgdesc="Peer-to-peer, secure, easy-to-setup, multi-platform, highly-configurable VPN software"
 arch=('any')
 url="https://github.com/freelan-developers/freelan"
 license=('GPL')
-depends=('boost' 'curl' 'openssl' 'scons' 'python')
-makedepends=('git')
-source=($pkgname::git+'https://github.com/freelan-developers/freelan.git')
-# Because the sources are not static, skip Git checksum:
-sha512sums=('SKIP')
+depends=('boost' 'curl' 'miniupnpc' 'openssl' 'python')
+makedepends=('git' 'scons')
+source=(git+https://github.com/freelan-developers/"$_pkgname".git)
+sha256sums=(SKIP)
+
 pkgver() {
-  cd "$srcdir/$pkgname"
-  # Use the tag of the last commit
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$_pkgname"
+    printf "r%s.%s" \
+           "$(git rev-list --count HEAD)" \
+           "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "$srcdir/$_pkgname"
+    scons -j6 apps --mode=release prefix="$pkgdir" bin_prefix="$pkgdir"/usr
+    # scons samples  # build fails currently
 }
 
 package() {
-  cd "$srcdir/$pkgname"
-    scons install prefix=$pkgdir/ bin_prefix=$pkgdir/usr
+    cd "$srcdir/$_pkgname"
+    scons install --mode=release prefix="$pkgdir" bin_prefix="$pkgdir"/usr
 }