lua, mutt: update packaging and versions

2 files changed, 55 insertions, 38 deletions

diff --git a/lua5.3/PKGBUILD b/lua5.3/PKGBUILD
index 6f44922..f2b39c0 100644
--- a/lua5.3/PKGBUILD
+++ b/lua5.3/PKGBUILD
@@ -4,24 +4,30 @@
 # Contributor: Sébastien Luttringer <seblu@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+#
+# Before trying this out make sure you read the changelog:
+#
+#     http://www.lua.org/work/doc/#changes
+#
 
 pkgname=lua53
-pkgver=5.3.0_work1
-pkgrel=2
+pkgver=5.3.0_work3
+pkgrel=1
 pkgdesc='Powerful light-weight programming language designed for extending applications, version 5.3 working draft'
 arch=('i686' 'x86_64')
 url='http://www.lua.org/'
 depends=('readline')
 license=('MIT')
 options=('!makeflags' '!emptydirs')
-source=('http://www.lua.org/work/lua-5.3.0-work1.tar.gz'
+source=('http://www.lua.org/work/lua-5.3.0-work3.tar.gz'
         'liblua.so.patch'
         'LICENSE'
         'lua.pc')
-md5sums=('d4053ee55741eab5ecd7061326577586'
-         '42ae5d526cc73695ee05ca8db6b19754'
-         '5d236d27128ef36bbc8f228faaf76f7f'
-         '3369fab35575e718eae71884674ba387')
+
+sha512sums=('28eaacc64d411ac8cd554baec7d613cdeff8af74fb6abeeacdc86831fedf4c244723160e6b3939206ea056e56b32ae802be2aac029b3dac53778cc30eaa93f78'
+            'bcb85d5863685473dcff1e615cfbadaede09440e4fcab1d32ea1cd6fca543e4e549084901cc5df72089ef145e213a763c26570637c539b7689b6e4e5cd129941'
+            '4f2dcdf727fa87cb1a89e8f9e678b6245b7af1722c74d4c04adc865745c80a0ce292fd5c18787fb3c00ec44bfa07a49ffed2fcb71008a84f4464933ab4bd3d38'
+            'c91d5e7b1468ec773a4863fd8f360e5379626668242b856605fab634d5aa003e247992f23a6f41b511481b5468bd644fcb18e66e6f1f2514688f5653f06d1186')
 
 build() {
   cd "lua-${pkgver/_/-}"
@@ -34,13 +40,13 @@ build() {
 
 package() {
   cd "lua-${pkgver/_/-}"
-  make \
-    TO_BIN="lua5.3 luac5.3" \
+  make                                                                    \
+    TO_BIN="lua5.3 luac5.3"                                               \
     TO_LIB="liblua5.3.a liblua5.3.so liblua5.3.so.5.3 liblua5.3.so.5.3.0" \
-    INSTALL_DATA="cp -d" \
-    INSTALL_TOP="$pkgdir/usr" \
-    INSTALL_INC="$pkgdir/usr/include/lua5.3" \
-    INSTALL_MAN="$pkgdir/usr/share/man/man1" \
+    INSTALL_DATA="cp -d"                                                  \
+    INSTALL_TOP="$pkgdir/usr"                                             \
+    INSTALL_INC="$pkgdir/usr/include/lua5.3"                              \
+    INSTALL_MAN="$pkgdir/usr/share/man/man1"                              \
     install
   install -Dm644 lua.pc "$pkgdir/usr/lib/pkgconfig/lua5.3.pc"
   install -d "$pkgdir/usr/share/doc/lua5.3"
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
 }
+