From: Andrej Kacian Date: Fri, 24 Dec 2004 14:20:53 +0000 (+0000) Subject: Apply patch to fix reply annotation. Closes #69688. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10817616da8bcabc664c34a7fe0fbe047a9f79d4;p=gentoo.git Apply patch to fix reply annotation. Closes #69688. --- diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog index 3564109d92c5..cd29f6558537 100644 --- a/mail-client/nmh/ChangeLog +++ b/mail-client/nmh/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-client/nmh # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.12 2004/09/25 22:25:49 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.13 2004/12/24 14:20:53 ticho Exp $ + +*nmh-1.1-r1 (24 Dec 2004) + + 24 Dec 2004; Andrej Kacian + +files/nmh-1.1-annotate-fix.patch, +nmh-1.1-r1.ebuild: + Apply patch to fix reply annotation. Closes #69688, reported by Adam Jones + . 25 Sep 2004; Jason Wever nmh-1.1.ebuild: Stable on sparc. diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest index 0a228c7b41f4..93569545b516 100644 --- a/mail-client/nmh/Manifest +++ b/mail-client/nmh/Manifest @@ -1,12 +1,25 @@ -MD5 7299603620b09d98a96faf37e3b4b86b ChangeLog 2540 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 efa328cda307563547ee72f5a826e634 ChangeLog 2777 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 +MD5 e3d06a3947eaf2b7f8d7dee7b53f9bee nmh-1.1-r1.ebuild 1657 MD5 b29275af1d20061cef32eeb3d2d25aad nmh-1.1.ebuild 1525 MD5 61328c981af8cf348a2b188506eff58c nmh-1.0.4-r3.ebuild 1391 +MD5 637757c29641c06801989cb38c272984 files/nmh-1.1-install.patch 1077 MD5 06add1122d19eaf6dce391f099b76d3f files/digest-nmh-1.1 59 -MD5 339b171982f2e23bb6ea3bdd5eeca163 files/digest-nmh-1.0.4-r3 61 -MD5 59aed45aec804fa7284a6424a31a1ef3 files/nmh-1.0.4-configure-vitest.patch 356 MD5 20d9382ce8107879e07d57ae4b2b9727 files/nmh-1.0.4-m_getfld.patch 375 -MD5 70aa719a7d3c1d0ee4d481a8a603537a files/nmh-1.1-configure-vitest.patch 332 +MD5 06add1122d19eaf6dce391f099b76d3f files/digest-nmh-1.1-r1 59 +MD5 59aed45aec804fa7284a6424a31a1ef3 files/nmh-1.0.4-configure-vitest.patch 356 +MD5 339b171982f2e23bb6ea3bdd5eeca163 files/digest-nmh-1.0.4-r3 61 MD5 99d2bd65d462ef3d400834c4eb3ab41c files/nmh-1.1-inc-login.patch 552 -MD5 637757c29641c06801989cb38c272984 files/nmh-1.1-install.patch 1077 +MD5 70aa719a7d3c1d0ee4d481a8a603537a files/nmh-1.1-configure-vitest.patch 332 MD5 fa36a4dfabf2747ec6314bd0d81e71ef files/nmh-1.1-m_getfld.patch 571 +MD5 95d84e891e1f50445012106704041247 files/nmh-1.1-annotate-fix.patch 443 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBzCXOQlM6RnzZP+IRAkJWAJ49JQ1gNUNKo+Fs2pX3ByLaugUn1wCZAUox +4TrQUNRm3vfWkFeM2an25+U= +=N8dj +-----END PGP SIGNATURE----- diff --git a/mail-client/nmh/files/digest-nmh-1.1-r1 b/mail-client/nmh/files/digest-nmh-1.1-r1 new file mode 100644 index 000000000000..9f2970e9ee62 --- /dev/null +++ b/mail-client/nmh/files/digest-nmh-1.1-r1 @@ -0,0 +1 @@ +MD5 060647c9c60514a2a86f7f194c830096 nmh-1.1.tar.gz 808466 diff --git a/mail-client/nmh/files/nmh-1.1-annotate-fix.patch b/mail-client/nmh/files/nmh-1.1-annotate-fix.patch new file mode 100644 index 000000000000..a379c9345a08 --- /dev/null +++ b/mail-client/nmh/files/nmh-1.1-annotate-fix.patch @@ -0,0 +1,12 @@ +diff -bur nmh/uip/sendsbr.c nmh-fixed/uip/sendsbr.c +--- nmh/uip/sendsbr.c 2003-10-24 22:17:40.000000000 +0200 ++++ nmh-fixed/uip/sendsbr.c 2004-12-24 15:00:09.352367464 +0100 +@@ -1020,7 +1020,7 @@ + if (is_selected(mp, msgnum)) { + if (debugsw) + advise (NULL, "annotate message %d", msgnum); +- annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0); ++ annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0); + } + } + diff --git a/mail-client/nmh/nmh-1.1-r1.ebuild b/mail-client/nmh/nmh-1.1-r1.ebuild new file mode 100644 index 000000000000..b9f32299a4e4 --- /dev/null +++ b/mail-client/nmh/nmh-1.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.1-r1.ebuild,v 1.1 2004/12/24 14:20:53 ticho Exp $ + +inherit eutils +DESCRIPTION="New MH mail reader" +SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz" +HOMEPAGE="http://www.nongnu.org/nmh/" + +SLOT="0" +LICENSE="as-is" +KEYWORDS="~x86 ~sparc ~ppc" +IUSE="" + +DEPEND="virtual/libc + =sys-libs/db-1.85* + >=sys-libs/ncurses-5.2" + +S=${WORKDIR}/${PN} + +src_compile() { + + [ -z "${EDITOR}" ] && export EDITOR="prompter" + [ -z "${PAGER}" ] && export PAGER="/usr/bin/more" + + # Patches from bug #22173. + epatch ${FILESDIR}/${P}-inc-login.patch || die "epatch failed" + epatch ${FILESDIR}/${P}-install.patch || die "epatch failed" + # vi test access violation patch + epatch ${FILESDIR}/${P}-configure-vitest.patch || die "epatch failed" + # bug #57886 + epatch ${FILESDIR}/${P}-m_getfld.patch || die "epatch failed" + # bug #69688 + epatch ${FILESDIR}/${P}-annotate-fix.patch || die "epatch failed" + + # Redifining libdir to be bindir so the support binaries get installed + # correctly. Since no libraries are installed with nmh, this does not + # pose a problem at this time. + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-editor=${EDITOR} \ + --with-pager=${PAGER} \ + --enable-nmh-pop \ + --sysconfdir=/etc/nmh \ + --libdir=/usr/bin || die + make || die +} + +src_install() { + make prefix=${D}/usr \ + mandir=${D}/usr/share/man \ + libdir=${D}/usr/bin \ + etcdir=${D}/etc/nmh install || die + dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \ + MAIL.FILTERING Changelog* COPYRIGHT +}