From d9eecabe761b8331a416d65db8cbf546bcb9a274 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Mon, 4 Aug 2014 18:22:39 +0200
Subject: mutt-kz-git: enable gss

Also some cleaning up
---
 .SRCINFO |  4 ++--
 PKGBUILD | 79 ++++++++++++++++++++++++++++------------------------------------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 8049d25..87f53a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 4.2.1
-# Mon Jun  1 15:02:29 UTC 2015
+# Mon Jun  1 15:02:30 UTC 2015
 pkgbase = mutt-kz-git
 	pkgdesc = Small but powerful text-based mail client
-	pkgver = git
+	pkgver = 1.5.22.1.rc1.r32.g738df8f
 	pkgrel = 1
 	url = https://github.com/karelzak/mutt-kz
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 49aff3e..f41872a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,70 +1,61 @@
-# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
-# Contributor: neersighted <n@neersighted.com>
-# Contributor: boyska <piuttosto@logorroici.org>
-
 pkgname=mutt-kz-git
-pkgver=git
+pkgver=1.5.22.1.rc1.r32.g738df8f
 pkgrel=1
 
 pkgdesc='Small but powerful text-based mail client'
-arch=('i686' 'x86_64')
 url='https://github.com/karelzak/mutt-kz'
+arch=('i686' 'x86_64')
 license=('GPL')
 
+depends=('gdbm' 'gpgme' 'openssl>=0.9.8e' 'libsasl'
+         'mime-types' 'ncurses' 'notmuch' 'zlib')
+makedepends=('git' 'gnupg' 'libxslt')
+
+conflicts=('mutt')
+provides=('mutt')
+
 source=('git+https://github.com/karelzak/mutt-kz.git' 'xdg.patch'
         'trash.patch::https://www.cs.oberlin.edu/~kuperman/help/code/patch-1.5.20.bk.trash_folder-purge_message.1.txt')
 sha1sums=('SKIP'
           '8cbae5a7ade3812cbdcb8a8dfabb29b042b7296a'
           'b63fe4e7ea2a113819558862be1387364ec24213')
 
-depends=('gdbm' 'gpgme' 'openssl>=0.9.8e' 'libsasl' 'mime-types' 'ncurses' 'notmuch' 'zlib')
-makedepends=('git' 'gnupg' 'libxslt')
-
-conflicts=('mutt')
-provides=('mutt')
-
 pkgver() {
-  cd mutt-kz
-  git describe --always | sed 's/^v//;s/-/./g'
+	cd mutt-kz
+	git describe --long | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd mutt-kz
+	cd mutt-kz
 
-  # Apply patches.
-  patch -p1 < "$srcdir/trash.patch"
-  patch -p1 < "$srcdir/xdg.patch"
+	patch -p1 < "$srcdir/trash.patch"
+	patch -p1 < "$srcdir/xdg.patch"
 }
 
 build() {
-  cd mutt-kz
-
-  # Configure the build.
- ./prepare \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-debug \
-    --enable-gpgme \
-    --enable-hcache \
-    --enable-imap \
-    --enable-notmuch \
-    --enable-pgp \
-    --enable-pop \
-    --enable-smtp \
-    --with-idn \
-    --with-sasl \
-    --with-ssl=/usr
-
-  # Build it!
-  make
+	cd mutt-kz
+
+	./prepare \
+	    --prefix=/usr \
+	    --sysconfdir=/etc \
+	    --enable-debug \
+	    --enable-gpgme \
+	    --enable-hcache \
+	    --enable-imap \
+	    --enable-notmuch \
+	    --enable-pgp \
+	    --enable-pop \
+	    --enable-smtp \
+	    --with-idn \
+	    --with-sasl \
+	    --with-gss \
+	    --with-ssl=/usr
+	make
 }
 
 package() {
-  cd mutt-kz
-
-  # Install the program.
-  make DESTDIR="$pkgdir" install
+	cd mutt-kz
 
-  # Provided by the mime-types package.
-  rm "$pkgdir/etc/mime.types"
+	make DESTDIR="$pkgdir" install
+	rm "$pkgdir/etc/mime.types"
 }
-- 
cgit v1.2.3-70-g09d2