From e9d5a25c94a340b0f4f492550bb6552ba103d17b Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Fri, 11 Jul 2014 07:33:42 +0200
Subject: lua, mutt: update packaging and versions

---
 mutt-nntp/PKGBUILD | 61 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

(limited to 'mutt-nntp')

diff --git a/mutt-nntp/PKGBUILD b/mutt-nntp/PKGBUILD
index eb7a870..bdc182c 100644
--- a/mutt-nntp/PKGBUILD
+++ b/mutt-nntp/PKGBUILD
@@ -15,7 +15,7 @@
 
 pkgname=mutt-nntp
 pkgver=1.5.23
-pkgrel=1
+pkgrel=2
 pkgdesc='Small but very powerful text-based mail client with NNTP patch'
 conflicts=("mutt")
 url='http://www.mutt.org/'
@@ -24,7 +24,9 @@ backup=('etc/Muttrc')
 arch=('i686' 'x86_64')
 optdepends=('smtp-forwarder: to send mail')
 depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
-source=("ftp://ftp.mutt.org/mutt/mutt-${pkgver}.tar.gz"
+# looks like "ftp://ftp.mutt.org/mutt/mutt-${pkgver}.tar.gz" is no longer
+# available, falling back on bitbucket download
+source=("https://bitbucket.org/mutt/mutt/downloads/mutt-${pkgver}.tar.gz"
         "http://mutt.org.ua/download/mutt-${pkgver}/patch-${pkgver}.rr.compressed.gz"
         "http://mutt.org.ua/download/mutt-${pkgver}/patch-${pkgver}.vvv.initials.gz"
         "http://mutt.org.ua/download/mutt-${pkgver}/patch-${pkgver}.vvv.nntp.gz"
@@ -44,44 +46,53 @@ sha512sums=('f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed
 
 install=install
 
-build() {
+prepare() {
     cd "${srcdir}/mutt-${pkgver}"
+    echo " * applying NNTP patches"
     patch -p1    < ../patch-${pkgver}.rr.compressed
     patch -p1    < ../patch-${pkgver}.vvv.nntp
     patch -p1    < ../patch-${pkgver}.vvv.nntp_ru
     patch -p1    < ../patch-${pkgver}.vvv.initials
     patch -p1    < ../patch-${pkgver}.vvv.quote
     patch -p1    < ../patch-${pkgver}.vvv.ru
+    echo " * invoking autotools"
     aclocal -I m4
     autoheader
     automake --add-missing --foreign
     autoconf
-    ./configure \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-compressed \
-            --enable-gpgme \
-            --enable-pop \
-            --enable-imap \
-            --enable-nntp \
-            --enable-smtp \
-            --enable-hcache \
-            --with-curses=/usr \
-            --with-regex \
-            --with-gss=/usr \
-            --with-ssl=/usr \
-            --with-sasl \
+    echo " * invoking configure"
+    ./configure                         \
+            --prefix=/usr               \
+            --sysconfdir=/etc           \
+            --enable-compressed         \
+            --enable-gpgme              \
+            --enable-pop                \
+            --enable-imap               \
+            --enable-nntp               \
+            --enable-smtp               \
+            --enable-hcache             \
+            --with-curses=/usr          \
+            --with-regex                \
+            --with-gss=/usr             \
+            --with-ssl=/usr             \
+            --with-sasl                 \
             --with-idn
+}
 
-        make
+build() {
+    cd "${srcdir}/mutt-${pkgver}"
+    echo " * building package ${pkgname} ${pkgver}"
+    make
 }
 
 package() {
-        cd "${srcdir}/mutt-${pkgver}"
-        make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/mutt-${pkgver}"
+    echo " * installing ${pkgname} ${pkgver}"
+    make DESTDIR="${pkgdir}" install
 
-        rm "${pkgdir}"/usr/bin/{flea,muttbug}
-        rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
-        rm "${pkgdir}"/etc/mime.types{,.dist}
-        install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
+    rm "${pkgdir}"/usr/bin/{flea,muttbug}
+    rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
+    rm "${pkgdir}"/etc/mime.types{,.dist}
+    install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
 }
+
-- 
cgit v1.2.3