From f2da46364f32770ad76127514f2c7e6ded1bc928 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Fri, 6 May 2016 04:08:02 -0400 Subject: [PATCH] mutt: play nicely with other mutts --- srcpkgs/mutt/template | 56 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 8a843221009..a4971b221ac 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -1,17 +1,17 @@ # Template file for 'mutt' pkgname=mutt version=1.6.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl - --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr + --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no" hostmakedepends="perl pkg-config libidn-devel" makedepends="ncurses-devel libressl-devel libidn-devel gpgme-devel gdbm-devel libsasl-devel" depends="mime-types" -conf_files="/etc/Muttrc" +conf_files="/etc/$pkgname/Muttrc" short_desc="The Mutt Mail Client" maintainer="Jan S. " license="GPL-2" @@ -19,14 +19,54 @@ homepage="http://www.mutt.org" distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz" checksum=98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 +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_build() { make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS -fPIC" CPPFLAGS= mutt_md5 make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS -fPIC" CPPFLAGS= -C doc } + post_install() { - rm ${DESTDIR}/etc/Muttrc.dist - rm ${DESTDIR}/etc/mime.types{,.dist} - rm ${DESTDIR}/usr/bin/{flea,muttbug} - rm ${DESTDIR}/usr/share/man/man1/{flea,muttbug}.1 - vinstall contrib/gpg.rc 644 etc Muttrc.gpg.dist + # 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.