Verbump to 2.2.10

Plus a bunch more formatting changes to align with the vanilla PKGBUILD. These
do make the diffs a bit more readable, though.

1 files changed, 40 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1da63df7ccc5..44a476dd5246 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,33 @@
 
 _pkgbase=mutt
 pkgname=${_pkgbase}-slang
-pkgver=2.2.9
+pkgver=2.2.10
 pkgrel=1
 pkgdesc="Small but very powerful text-based mail client - slang version"
 arch=(x86_64)
 url="http://www.mutt.org/"
 license=(GPL2)
-depends=(glibc libgpg-error mime-types slang sqlite zlib)
-makedepends=(docbook-xml docbook-xsl elinks gdbm gpgme krb5 libidn2 libsasl
-libxslt lynx openssl)
+depends=(
+  glibc
+  libgpg-error
+  mime-types
+  slang
+  sqlite
+  zlib
+)
+makedepends=(
+  docbook-xml
+  docbook-xsl
+  elinks
+  gdbm
+  gpgme
+  krb5
+  libidn2
+  libsasl
+  libxslt
+  lynx
+  openssl
+)
 provides=(mutt)
 conflicts=(mutt)
 optdepends=(
@@ -24,12 +42,12 @@ optdepends=(
   'python: for experimental mutt_oath2.py'
   'smtp-forwarder: to send mail'
 )
-backup=(etc/Muttrc)
-options=(debug)
+backup=(etc/${_pkgbase}/Muttrc)
+install=${_pkgbase}.install
 source=(https://bitbucket.org/${_pkgbase}/${_pkgbase}/downloads/${_pkgbase}-$pkgver.tar.gz{,.asc})
-sha512sums=('d4d308ba573ba6e43b6dd2c131d0dc345163bd375f19a9038c9eeaf271f9da88043951f6c74658ff1a9d7a8fdcce28809aba50ab3f5aa0d34b77cf4989bc054f'
+sha512sums=('6db0009163b31425dafe7b6e38374a623f1fd057daf57baaebe18be6d42e5a0ce7087a41bc5e2411f4fbe144497a43682c480754b51108952c7dd16b9294192f'
             'SKIP')
-b2sums=('86b0743102bb1b023b3ccb03740c24c6ec728765b3770afdb3faed2982789aaa38a7c306e5ee30ca05ced1baa7771657ab37e5ad53eaf59ec73e51990f699c74'
+b2sums=('d6892f49520b4fd73d7d0d04119b4f05828d76a4be4b55a8dbc585ef817d4455c9b9a93158d31e0699f011023de524355930d4acff3b9454982da0042c54db22'
         'SKIP')
 validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA') # Kevin J. McCarthy <kevin@8t8.us>
 
@@ -41,21 +59,22 @@ prepare() {
 build() {
   local configure_options=(
     --prefix=/usr
-    --sysconfdir=/etc
+    --sysconfdir=/etc/${_pkgbase}
+    --enable-autocrypt
+    --enable-compressed
     --enable-debug
     --enable-gpgme
-    --enable-pop
-    --enable-imap
-    --enable-smtp
     --enable-hcache
+    --enable-imap
+    --enable-pop
     --enable-sidebar
-    --enable-autocrypt
+    --enable-smtp
     --with-slang=/usr
     --with-gss=/usr
-    --with-ssl=/usr
-    --with-sqlite3
-    --with-sasl
     --with-idn2
+    --with-sasl
+    --with-sqlite3
+    --with-ssl=/usr
   )
 
   cd "${_pkgbase}-$pkgver"
@@ -74,8 +93,9 @@ package() {
   )
 
   make DESTDIR="$pkgdir" install -C ${_pkgbase}-$pkgver
-  install -vDm 644 ${_pkgbase}-$pkgver/contrib/gpg.rc "$pkgdir/etc/Muttrc.gpg.dist"
-
-  # /etc/mime.types is provided by mailcap
-  rm "$pkgdir/etc/mime.types"{,.dist}
+  # we backup /etc/mutt/Muttrc and don't need another copy
+  rm -v "$pkgdir/etc/${_pkgbase}/Muttrc.dist"
+  # a more comprehensive list of mime types is provided by mailcap in /etc/mime.types
+  rm -v "$pkgdir/etc/${_pkgbase}/mime.types"{,.dist}
+  ln -sv ../mime.types "$pkgdir/etc/${_pkgbase}/mime.types"
 }