From 26182f399ba761e1309e078bd7d614e940ce3c59 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Fri, 6 May 2016 04:08:02 -0400 Subject: [PATCH] mutt-kz: play nicely with other mutts --- srcpkgs/mutt-kz/template | 61 ++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/srcpkgs/mutt-kz/template b/srcpkgs/mutt-kz/template index c45ba9b3ca..730a46c9fc 100644 --- a/srcpkgs/mutt-kz/template +++ b/srcpkgs/mutt-kz/template @@ -2,17 +2,17 @@ pkgname=mutt-kz reverts=20141129_6 version=1.6.0.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-notmuch --enable-pop --enable-imap --enable-smtp +configure_args="--enable-notmuch --enable-pop --sysconfdir=/etc/$pkgname --enable-hcache --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl - --enable-sidebar --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr - --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no" + --enable-sidebar --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --enable-smtp + --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no --enable-imap" hostmakedepends="automake perl pkg-config" makedepends="ncurses-devel libressl-devel libidn-devel gpgme-devel libnotmuch-devel gdbm-devel libsasl-devel" depends="notmuch mime-types" -conf_files="/etc/Muttrc" +conf_files="/etc/$pkgname/Muttrc" short_desc="Mutt (MUA) fork with notmuch support and another improvements" maintainer="Jan S. " license="GPL-3" @@ -20,16 +20,53 @@ homepage="https://github.com/karelzak/mutt-kz/" distfiles="https://github.com/karelzak/mutt-kz/archive/v${version}.tar.gz" checksum=7832ba066fb6d2681450e4c32b910dfb645ae7afd99dfa6b83c33ce1c5e58cea -provides="mutt-${version}_${revision}" -replaces="mutt>=0" +provides="mutt-0_1" +# Begin alternatives: +alternatives=" + mutt:mutt:/usr/bin/mutt-$pkgname + mutt:pgpewrap:/usr/bin/pgpewrap-$pkgname + mutt:flea:/usr/bin/flea-$pkgname + mutt:muttbug:/usr/bin/muttbug-$pkgname + mutt:smime_keys:/usr/bin/smime_keys-$pkgname + + mutt:pgpewrap.1:/usr/share/man/man1/pgpewrap-${pkgname}.1 + mutt:flea.1:/usr/share/man/man1/flea-${pkgname}.1 + mutt:mutt.1:/usr/share/man/man1/mutt-${pkgname}.1 + mutt:pgpring.1:/usr/share/man/man1/pgpring-${pkgname}.1 + mutt:muttbug.1:/usr/share/man/man1/muttbug-${pkgname}.1 + mutt:smime_keys.1:/usr/share/man/man1/smime_keys-${pkgname}.1 + + mutt:mbox.5:/usr/share/man/man5/mbox-${pkgname}.5 + mutt:muttrc.5:/usr/share/man/man5/muttrc-${pkgname}.5 + mutt:mmdf.5:/usr/share/man/man5/mmdf-${pkgname}.5 +" +# End alternatives pre_configure() { autoreconf -fi } + post_install() { - # provided by mime-types. - rm ${DESTDIR}/etc/mime.* - # move dist to examples dir. - vmkdir usr/share/examples/${pkgname} - mv ${DESTDIR}/etc/Muttrc.dist ${DESTDIR}/usr/share/examples/${pkgname} + # provided by mime-types + rm "${DESTDIR}"/etc/${pkgname}/mime.* + ln -s /etc/mime.types "${DESTDIR}/etc/${pkgname}/mime.types" + # move dist to examples dir + vsconf contrib/gpg.rc Muttrc.gpg.dist + mv "${DESTDIR}/etc/${pkgname}/Muttrc.dist" "${DESTDIR}/usr/share/examples/${pkgname}" + + # Allows alternatives to work + for manpage in "${DESTDIR}"/usr/share/man/man[15]/*; do + mv "$manpage" "${manpage%.*}-${pkgname}.${manpage##*.}" + done + for binary in "${DESTDIR}"/usr/bin/*; do + mv "$binary" "${binary}-${pkgname}" + done } + +# REMARKS: +# Conf file is in a --sysconfdir=/etc/$pkgname/Muttrc and then alternatives to +# /etc/Muttrc. In addition, a dependency on mime-types is broken by having +# /etc/dir/ because mutt probably expects the mime information in the same +# dir as sysconfdir. Thus a symlink is created to deal with this. +# /etc/Muttrc is not currently in alternatives to prevent inadvertently +# overwriting configuration.