diff options
| -rw-r--r-- | mail-client/nmh/ChangeLog | 11 | ||||
| -rw-r--r-- | mail-client/nmh/Manifest | 14 | ||||
| -rw-r--r-- | mail-client/nmh/files/digest-nmh-1.1 | 1 | ||||
| -rw-r--r-- | mail-client/nmh/files/nmh-1.1-configure-vitest.patch | 11 | ||||
| -rw-r--r-- | mail-client/nmh/files/nmh-1.1-inc-login.patch | 25 | ||||
| -rw-r--r-- | mail-client/nmh/files/nmh-1.1-install.patch | 30 | ||||
| -rw-r--r-- | mail-client/nmh/files/nmh-1.1-m_getfld.patch | 27 | ||||
| -rw-r--r-- | mail-client/nmh/nmh-1.1.ebuild | 54 |
8 files changed, 169 insertions, 4 deletions
diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog index ef0cdacea87c..d2a77f290cc7 100644 --- a/mail-client/nmh/ChangeLog +++ b/mail-client/nmh/ChangeLog @@ -1,6 +1,15 @@ # 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.8 2004/07/27 17:57:57 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.9 2004/07/31 02:41:24 langthang Exp $ + +*nmh-1.1 (30 Jul 2004) + + 30 Jul 2004; Tuan Van <langthang@gentoo.org> + +files/nmh-1.1-configure-vitest.patch, +files/nmh-1.1-inc-login.patch, + +files/nmh-1.1-install.patch, +files/nmh-1.1-m_getfld.patch, + +nmh-1.1.ebuild: + Version bump. Thanks to Jonathan Kraut, Claes Nästén, Aaron Peterson, + Sam Yates have contributed in bug #22173. 27 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> nmh-1.0.4-r3.ebuild: Stable on x86 & sparc wrt #57886 diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest index f6c4edce793e..cea1170a8895 100644 --- a/mail-client/nmh/Manifest +++ b/mail-client/nmh/Manifest @@ -1,8 +1,16 @@ +MD5 61328c981af8cf348a2b188506eff58c nmh-1.0.4-r3.ebuild 1391 +MD5 d33cc8b4025d7c1032ddbc30115a9fda .#ChangeLog.1.4 1676 +MD5 fd64c050f565de745a0ddaa0b667d292 .#Manifest.1.5 434 +MD5 b5226cfd0e6f8df4a2bac1c0a3f43133 nmh-1.0.4-r2.ebuild 1846 +MD5 f2f9bfda5aa449e2ff3d0becdc98e187 nmh-1.1.ebuild 1423 MD5 e330615df1ef153e863465f7fb393d46 ChangeLog 1936 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 -MD5 b5226cfd0e6f8df4a2bac1c0a3f43133 nmh-1.0.4-r2.ebuild 1846 -MD5 61328c981af8cf348a2b188506eff58c nmh-1.0.4-r3.ebuild 1391 +MD5 99d2bd65d462ef3d400834c4eb3ab41c files/nmh-1.1-inc-login.patch 552 MD5 339b171982f2e23bb6ea3bdd5eeca163 files/digest-nmh-1.0.4-r2 61 MD5 339b171982f2e23bb6ea3bdd5eeca163 files/digest-nmh-1.0.4-r3 61 -MD5 20d9382ce8107879e07d57ae4b2b9727 files/nmh-1.0.4-m_getfld.patch 375 MD5 59aed45aec804fa7284a6424a31a1ef3 files/nmh-1.0.4-configure-vitest.patch 356 +MD5 20d9382ce8107879e07d57ae4b2b9727 files/nmh-1.0.4-m_getfld.patch 375 +MD5 fa36a4dfabf2747ec6314bd0d81e71ef files/nmh-1.1-m_getfld.patch 571 +MD5 637757c29641c06801989cb38c272984 files/nmh-1.1-install.patch 1077 +MD5 06add1122d19eaf6dce391f099b76d3f files/digest-nmh-1.1 59 +MD5 70aa719a7d3c1d0ee4d481a8a603537a files/nmh-1.1-configure-vitest.patch 332 diff --git a/mail-client/nmh/files/digest-nmh-1.1 b/mail-client/nmh/files/digest-nmh-1.1 new file mode 100644 index 000000000000..9f2970e9ee62 --- /dev/null +++ b/mail-client/nmh/files/digest-nmh-1.1 @@ -0,0 +1 @@ +MD5 060647c9c60514a2a86f7f194c830096 nmh-1.1.tar.gz 808466 diff --git a/mail-client/nmh/files/nmh-1.1-configure-vitest.patch b/mail-client/nmh/files/nmh-1.1-configure-vitest.patch new file mode 100644 index 000000000000..874094ab1930 --- /dev/null +++ b/mail-client/nmh/files/nmh-1.1-configure-vitest.patch @@ -0,0 +1,11 @@ +--- configure.orig 2004-07-30 19:20:50.532346778 -0700 ++++ configure 2004-07-30 19:21:31.831339678 -0700 +@@ -3434,7 +3434,7 @@ + if test "${nmh_cv_attvibug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if echo 'r /nonexist-file ++ if echo 'r ./nonexist-file + q' | ex > /dev/null + then + nmh_cv_attvibug=no diff --git a/mail-client/nmh/files/nmh-1.1-inc-login.patch b/mail-client/nmh/files/nmh-1.1-inc-login.patch new file mode 100644 index 000000000000..d7c08908bfe0 --- /dev/null +++ b/mail-client/nmh/files/nmh-1.1-inc-login.patch @@ -0,0 +1,25 @@ +--- uip/inc.c.orig 2003-10-24 13:17:38.000000000 -0700 ++++ uip/inc.c 2004-07-30 19:33:26.699430580 -0700 +@@ -486,8 +486,7 @@ + * a POP server? + */ + if (inc_type == INC_POP) { +- if (user == NULL) +- user = getusername (); ++ + if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { + kpop = 1; + } +@@ -496,6 +495,12 @@ + else + ruserpass (host, &user, &pass); + ++ /* ++ * Do this _after_ ruserpass, otherwise the login field will be unusable ++ */ ++ if (user == NULL) ++ user = getusername (); ++ + /* + * initialize POP connection + */ diff --git a/mail-client/nmh/files/nmh-1.1-install.patch b/mail-client/nmh/files/nmh-1.1-install.patch new file mode 100644 index 000000000000..5109a5bda3cb --- /dev/null +++ b/mail-client/nmh/files/nmh-1.1-install.patch @@ -0,0 +1,30 @@ +diff -rc nmh.orig/uip/Makefile.in nmh/uip/Makefile.in +*** nmh.orig/uip/Makefile.in 2003-10-25 05:17:38.000000000 +0900 +--- nmh/uip/Makefile.in 2004-05-26 20:05:11.937450072 +0900 +*************** +*** 266,277 **** + rm -f $(bindir)/folders + rm -f $(bindir)/prev + rm -f $(bindir)/next +! rm -f $(libdir)/install-mh + $(LN) $(bindir)/flist $(bindir)/flists + $(LN) $(bindir)/folder $(bindir)/folders + $(LN) $(bindir)/show $(bindir)/prev + $(LN) $(bindir)/show $(bindir)/next +! $(LN) $(bindir)/install-mh $(libdir)/install-mh + + # install misc support binaries + install-misc: +--- 266,277 ---- + rm -f $(bindir)/folders + rm -f $(bindir)/prev + rm -f $(bindir)/next +! if [ "$(libdir)" != "$(bindir)" ]; then rm -f $(libdir)/install-mh; fi + $(LN) $(bindir)/flist $(bindir)/flists + $(LN) $(bindir)/folder $(bindir)/folders + $(LN) $(bindir)/show $(bindir)/prev + $(LN) $(bindir)/show $(bindir)/next +! if [ "$(libdir)" != "$(bindir)" ]; then $(LN) $(bindir)/install-mh $(libdir)/install-mh; fi + + # install misc support binaries + install-misc: diff --git a/mail-client/nmh/files/nmh-1.1-m_getfld.patch b/mail-client/nmh/files/nmh-1.1-m_getfld.patch new file mode 100644 index 000000000000..546274709b9b --- /dev/null +++ b/mail-client/nmh/files/nmh-1.1-m_getfld.patch @@ -0,0 +1,27 @@ +--- sbr/m_getfld.orig.c 2004-07-25 13:18:04.570397179 -0700 ++++ sbr/m_getfld.c 2004-07-25 13:25:36.471839770 -0700 +@@ -730,18 +730,18 @@ + register char *ep = pat + patln; + register char pc = *pat++; + +- for(;;) { +- while (pc != *str++) +- if (str > es) +- return 0; ++ for(;str <= es; str++) { ++ if (pc != *str) ++ continue; + if (str > es+1) + return 0; +- sp = str; pp = pat; ++ sp = str+1; pp = pat; + while (pp < ep && *sp++ == *pp) + pp++; + if (pp >= ep) +- return ((unsigned char *)--str); ++ return ((unsigned char *)str); + } ++ return 0; + } + + diff --git a/mail-client/nmh/nmh-1.1.ebuild b/mail-client/nmh/nmh-1.1.ebuild new file mode 100644 index 000000000000..6dc8862441f4 --- /dev/null +++ b/mail-client/nmh/nmh-1.1.ebuild @@ -0,0 +1,54 @@ +# 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.ebuild,v 1.1 2004/07/31 02:41:24 langthang Exp $ + +inherit eutils +DESCRIPTION="New MH mail reader" +SRC_URI="ftp://ftp.mhost.com/pub/nmh/${P}.tar.gz" +HOMEPAGE="http://www.mhost.com/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 + epatch ${FILESDIR}/${P}-install.patch + # vi test access violation patch + epatch ${FILESDIR}/${P}-configure-vitest.patch || die "patch failed." + # bug #57886 + epatch ${FILESDIR}/${P}-m_getfld.patch || die "patch 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 +} |