From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] mutt: remove alternative
Date: Sun, 16 Jun 2019 14:50:26 +0200 [thread overview]
Message-ID: <20190616125026.hFxS9Loc403APc8C4QdVGi4PhLxghWwkJ2qJrDXSe80@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12476@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
There is an updated pull request by congdanhqx against master on the void-packages repository
https://github.com/congdanhqx/void-packages mutt
https://github.com/void-linux/void-packages/pull/12476
mutt: remove alternative
We used to have mutt alternative, provided by neomutt.
However, from commit edb9bbd0f3, ("neomutt: update to 20171013.",
2017-10-17) neomutt is no longger mutt.
Drop this alternative, so users can have better autocomplete,
let's say by: man 5 mutt<tab> and we can have simpler template.
Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
A patch file from https://github.com/void-linux/void-packages/pull/12476.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mutt-12476.patch --]
[-- Type: application/text/x-diff, Size: 3252 bytes --]
From 8ac10bc6d112eaa247eeb3b5baf529b4c756020f Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Sat, 15 Jun 2019 21:56:38 +0700
Subject: [PATCH] mutt: drop alternative
We used to have mutt alternative, provided by neomutt.
However, from commit edb9bbd0f3, ("neomutt: update to 20171013.",
2017-10-17) neomutt is no longger mutt.
Drop this alternative, so users can have better autocomplete,
let's say by: man 5 mutt<tab> and we can have simpler template.
Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
---
srcpkgs/mutt/template | 43 +------------------------------------------
1 file changed, 1 insertion(+), 42 deletions(-)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index eb0cc912254..0755903a24b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
# Template file for 'mutt'
pkgname=mutt
version=1.12.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -20,31 +20,6 @@ changelog="http://mutt.org/relnotes/1.12"
distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
checksum=ca12448784ed7b6c86d498921e18bc7b152d45494a452df56a7a0c8aaf13f98f
-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:flea:/usr/bin/flea-$pkgname
- mutt:muttbug:/usr/bin/muttbug-$pkgname
- mutt:mutt_pgpring:/usr/bin/mutt_pgpring-$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/mutt_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
@@ -57,20 +32,4 @@ post_install() {
# 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.
next prev parent reply other threads:[~2019-06-16 12:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-15 15:06 [PR PATCH] " voidlinux-github
2019-06-16 12:50 ` voidlinux-github [this message]
2019-06-16 12:50 ` [PR PATCH] [Updated] " voidlinux-github
2019-06-20 11:08 ` voidlinux-github
2019-06-20 11:08 ` voidlinux-github
2019-06-20 11:11 ` voidlinux-github
2019-06-25 6:58 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190616125026.hFxS9Loc403APc8C4QdVGi4PhLxghWwkJ2qJrDXSe80@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).