Adopt, fix version numbering, cleanup packaging

1 files changed, 29 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 57236c8e14d9..73b57b4623cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,50 @@
-# Maintainer:  mrxx <mrxx at cyberhome dot at>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: mrxx <mrxx at cyberhome dot at>
 # Contributor: rmanne <rahul_manne@hotmail.com>
 
 pkgname=praat-git
-pkgver=r3401.f392d054
-pkgver() {
-    cd "${pkgname%-git}"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+pkgver=6.1.09.r104.g9db902f
 pkgrel=1
-pkgdesc="Doing Phonetics by computer (speech analysis)"
+pkgdesc='Doing Phonetics by computer (speech analysis)'
 arch=('x86_64' 'i686')
-url="http://www.fon.hum.uva.nl/praat/"
+url='http://www.praat.org/'
 license=('GPL')
-depends=('gtk2' 'alsa-lib' 'libpulse' 'jack')
-makedepends=('git' 'pkg-config' 'gtk2' 'alsa-lib')
+depends=('alsa-lib' 'gtk2' 'jack' 'libpulse' 'ttf-charis-sil' 'ttf-sil-doulos')
+makedepends=('git')
 optdepends=('ttf-sil-fonts')
-provides=('praat')
-conflicts=('praat' 'praat-bin')
-source=('praat::git+https://github.com/praat/praat.git' "praat.desktop" "praat.xpm" "praat.svg" "praat.1")
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("git+https://github.com/${pkgname%-git}/${pkgname%-git}.git"
+        "${pkgname%-git}.1"
+        "${pkgname%-git}.desktop"
+        "${pkgname%-git}.svg"
+        "${pkgname%-git}.xpm")
 sha256sums=('SKIP'
+            '21ee03cae45be634c57c167c2dfbdfd9d9b7feadb98e0124413d9426c199e81c'
             '94720aedc8e9c9e9d53b3230d79ccaae551b5bc5e6986528664311d55f3cce5a'
-            '07abf61475f22f83f0514a8fba1ec7bd3821d2b7f35b1215c1f3e1feb947d74b'
             'db6c7568f6e13b4ce7c37bd9fcf289832867f79ba7d7fc48c4f13f0045ad98f1'
-            '21ee03cae45be634c57c167c2dfbdfd9d9b7feadb98e0124413d9426c199e81c')
+            '07abf61475f22f83f0514a8fba1ec7bd3821d2b7f35b1215c1f3e1feb947d74b')
+
+pkgver() {
+    cd "${pkgname%-git}"
+    git describe --tags --abbrev=7 --match="v*" HEAD | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 prepare() {
-    cd "$srcdir/${pkgname%-git}"
+    cd "${pkgname%-git}"
     cp makefiles/makefile.defs.linux.alsa makefile.defs
 }
 
 build() {
-    cd "$srcdir/${pkgname%-git}"
+    cd "${pkgname%-git}"
     make
 }
 
 package() {
-pwd
-  mkdir -p -m 755 $pkgdir/usr/share/{applications,icons/hicolor/scalable/apps,man/man1,pixmaps}
-  install -Dm755  "$srcdir/${pkgname%-git}/praat" "$pkgdir/usr/bin/praat"
-  install -Dm644 "$srcdir/praat.desktop" "$pkgdir/usr/share/applications/"
-  install -Dm644 "$srcdir/praat.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
-  install -Dm644 "$srcdir/praat.xpm" "$pkgdir/usr/share/pixmaps/"
-  install -m644 "praat.1" "${pkgdir}/usr/share/man/man1/"
+    cd "${pkgname%-git}"
+    install -Dm755 -t "$pkgdir/usr/bin/praat" "${pkgname%-git}"
+    install -Dm644 -t "$pkgdir/usr/share/applications/" "../${pkgname%-git}.desktop"
+    install -Dm644 -t "$pkgdir/usr/share/icons/hicolor/scalable/apps/" "../${pkgname%-git}.svg"
+    install -Dm644 -t "$pkgdir/usr/share/pixmaps/" "../${pkgname%-git}.xpm"
+    install -Dm644 -t "${pkgdir}/usr/share/man/man1/" "../${pkgname%-git}.1"
 }