Date: Wednesday, February 16, 2011 @ 07:11:24
Author: bisson
Revision: 110098
use ncurses rather than slang, use libidn, remove unneeded patches, cleanup
PKGBUILD
Added:
mutt/trunk/install
(from rev 110052, mutt/trunk/mutt.install)
Modified:
mutt/trunk/PKGBUILD
Deleted:
mutt/trunk/mutt-unmailbox.patch
mutt/trunk/mutt.install
mutt/trunk/mutt_ssl.patch
----------------------+
PKGBUILD | 57 +++++++++++++++++++++++++++++--------------------
install | 12 ++++++++++
mutt-unmailbox.patch | 10 --------
mutt.install | 15 ------------
mutt_ssl.patch | 11 ---------
5 files changed, 46 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-02-16 12:02:11 UTC (rev 110097)
+++ PKGBUILD 2011-02-16 12:11:24 UTC (rev 110098)
@@ -1,33 +1,44 @@
# $Id$
# Maintainer: tobias [tobias [at] archlinux.org]
+
pkgname=mutt
pkgver=1.5.21
-pkgrel=1
-pkgdesc="A small but very powerful text-based mail client"
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc='Small but very powerful text-based mail client'
+url='http://www.mutt.org/'
+arch=('i686' 'x86_64')
license=('GPL')
-url="http://www.mutt.org/";
-depends=('slang' 'openssl' 'gdbm' 'mime-types' 'zlib' 'libsasl' 'gpgme')
-makedepends=('gnupg')
-install=${pkgname}.install
-source=(ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz)
-url="http://www.mutt.org/";
-md5sums=('a29db8f1d51e2f10c070bf88e8a553fd')
+depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types')
+source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz";)
+sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
+install=install
+
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gpgme \
+ --enable-pop \
+ --enable-imap \
+ --enable-smtp \
+ --enable-hcache \
+ --with-curses=/usr \
+ --with-regex \
+ --with-ssl=/usr \
+ --with-sasl \
+ --with-idn \
- ./configure --prefix=/usr --sysconfdir=/etc \
- --enable-pop --enable-imap --enable-smtp \
- --with-sasl --with-ssl=/usr --without-idn \
- --enable-hcache --enable-pgp --enable-inodesort \
- --enable-compressed --with-regex \
- --enable-gpgme --with-slang=/usr
- make || return 1
- make DESTDIR=${pkgdir} install
- rm -f ${pkgdir}/usr/bin/{flea,muttbug}
- rm -f ${pkgdir}/usr/share/man/man1/{flea,muttbug}.1
- rm -f ${pkgdir}/etc/mime.types*
- install -Dm644 contrib/gpg.rc ${pkgdir}/etc/Muttrc.gpg.dist
+ make
}
+package() {
+ cd "${srcdir}/${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
+}
Copied: mutt/trunk/install (from rev 110052, mutt/trunk/mutt.install)
===================================================================
--- install (rev 0)
+++ install 2011-02-16 12:11:24 UTC (rev 110098)
@@ -0,0 +1,12 @@
+post_install() {
+ cat <<EOF
+
+==> For GPG support, add the following to your muttrc:
+==> source /etc/Muttrc.gpg.dist
+
+EOF
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: mutt-unmailbox.patch
===================================================================
--- mutt-unmailbox.patch 2011-02-16 12:02:11 UTC (rev 110097)
+++ mutt-unmailbox.patch 2011-02-16 12:11:24 UTC (rev 110098)
@@ -1,10 +0,0 @@
---- a/buffy.c 2009-08-10 08:23:12.731846990 -0400
-+++ b/buffy.c 2009-08-10 08:23:50.541878087 -0400
-@@ -236,7 +236,6 @@
- {
- if(*tmp)
- {
-- FREE (&((*tmp)->path));
- tmp1=(*tmp)->next;
- FREE (tmp); /* __FREE_CHECKED__ */
- *tmp=tmp1;
Deleted: mutt.install
===================================================================
--- mutt.install 2011-02-16 12:02:11 UTC (rev 110097)
+++ mutt.install 2011-02-16 12:11:24 UTC (rev 110098)
@@ -1,15 +0,0 @@
-# arg 1: the new package version
-post_install() {
- cat << EOM
-
---> to support gpg, please use the following line in your ~/.muttrc
-
-source /etc/Muttrc.gpg.dist
-
-EOM
-}
-
-post_upgrade() {
- post_install $1
-}
-
Deleted: mutt_ssl.patch
===================================================================
--- mutt_ssl.patch 2011-02-16 12:02:11 UTC (rev 110097)
+++ mutt_ssl.patch 2011-02-16 12:11:24 UTC (rev 110098)
@@ -1,11 +0,0 @@
---- a/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200
-+++ b/mutt_ssl.c 2010-04-02 01:42:55.000000000 +0200
-@@ -652,7 +652,7 @@
- char *buf = NULL;
- int bufsize;
- /* needed to get the DNS subjectAltNames: */
-- STACK *subj_alt_names;
-+ STACK_OF(X509) *subj_alt_names;
- int subj_alt_names_count;
- GENERAL_NAME *subj_alt_name;
- /* did we find a name matching hostname? */
