changed build script, updating pkgbuild accordingly

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4859bc27d1f1..61a3354034f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
-pkgbase = tint3
+# Generated by mksrcinfo v8
+# Tue Aug 30 08:44:35 UTC 2016
+pkgbase = tint3-git
 	pkgdesc = An independant status bar for X11 (works best with bspwm)
-	pkgver = 300
+	pkgver = 304
 	pkgrel = 1
-	url = https://github.com/tmathmeyer/tint3
+	url = https://github.com/tmathmeyer/tint3-git
 	arch = x86_64
 	license = GPL
 	makedepends = git
@@ -13,9 +15,9 @@ pkgbase = tint3
 	depends = libxinerama
 	provides = tint3
 	conflicts = tint3
-	conflicts = tint3-git
-	source = https://github.com/tmathmeyer/tint3/archive/v300.zip
-	md5sums = c4a27f7d38305a332a7597fd4034207f
+	conflicts = tint3 tint3-cpp-git
+	source = git+https://github.com/tmathmeyer/tint3.git
+	md5sums = SKIP
 
-pkgname = tint3
+pkgname = tint3-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c3aeaa3f72bf..a75480348b84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Ted Meyer <tmathmeyer@gmail.com>
 
-pkgname=tint3
-pkgver=300
+_pkgname=tint3
+pkgname=$_pkgname-git
+pkgver=304
 pkgrel=1
 pkgdesc='An independant status bar for X11 (works best with bspwm)'
 arch=('x86_64')
@@ -10,15 +11,19 @@ license=('GPL')
 depends=('libxft' 'xcb-util-wm' 'libxinerama')
 makedepends=('git' 'libx11' 'xcb-util')
 optdepends=()
-provides=("${pkgname}")
-conflicts=("${pkgname}" "tint3-cpp-git")
-conflicts=("${pkgname}" "tint3-git")
-source=("https://github.com/tmathmeyer/tint3/archive/v300.zip")
-md5sums=('c4a27f7d38305a332a7597fd4034207f')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}" "tint3 tint3-cpp-git")
+source=("git+https://github.com/tmathmeyer/tint3.git")
+md5sums=('SKIP')
+
+pkgver() {
+    cd "$srcdir/$_pkgname"
+    git rev-list --count HEAD
+}
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver/src"
-    make
+    cd "$srcdir/$_pkgname"
+    make binary
 }
 
 package() {
@@ -26,6 +31,6 @@ package() {
     fontDir="$pkgdir/usr/share/fonts/TTF"
     install -dm755 "$installDir"
     install -dm755 "$fontDir"
-    install -m755 "$srcdir/$pkgname-$pkgver/fonts/sakamoto-11.bdf" "$fontDir/sakamoto-11.bdf"
-    install -m755 "$srcdir/$pkgname-$pkgver/src/build/tint3" "$installDir/tint3"
+    install -m755 "$srcdir/$_pkgname/fonts/sakamoto-11.bdf" "$fontDir/sakamoto-11.bdf"
+    install -m755 "$srcdir/$_pkgname/build/binary/tint3" "$installDir/tint3"
 }