]> Pileus Git - ~andy/sunrise/commitdiff
mail-client/nmh: New Ebuild for bug 336057 to resurrect mail-client/nmh thanks to...
authorSeth Robertson (SethRobertson) <in-gentoo@baka.org>
Thu, 9 Sep 2010 01:14:51 +0000 (01:14 +0000)
committerSeth Robertson (SethRobertson) <in-gentoo@baka.org>
Thu, 9 Sep 2010 01:14:51 +0000 (01:14 +0000)
svn path=/sunrise/; revision=11297

mail-client/nmh/ChangeLog [new file with mode: 0644]
mail-client/nmh/Manifest [new file with mode: 0644]
mail-client/nmh/files/nmh-1.3-db5.patch [new file with mode: 0644]
mail-client/nmh/files/nmh-1.3-inc-login.patch [new file with mode: 0644]
mail-client/nmh/files/nmh-1.3-install.patch [new file with mode: 0644]
mail-client/nmh/files/nmh-1.3-m_getfld.patch [new file with mode: 0644]
mail-client/nmh/files/nmh-1.3-parallelmake.patch [new file with mode: 0644]
mail-client/nmh/metadata.xml [new file with mode: 0644]
mail-client/nmh/nmh-1.3-r2.ebuild [new file with mode: 0644]

diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog
new file mode 100644 (file)
index 0000000..f937156
--- /dev/null
@@ -0,0 +1,11 @@
+# ChangeLog for mail-client/nmh
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  09 Sep 2010; Seth Robertson (SethRobertson) <in-gentoo@baka.org>
+  +nmh-1.3-r2.ebuild, +files/nmh-1.3-db5.patch,
+  +files/nmh-1.3-inc-login.patch, +files/nmh-1.3-install.patch,
+  +files/nmh-1.3-m_getfld.patch, +files/nmh-1.3-parallelmake.patch,
+  +metadata.xml:
+  New Ebuild for bug 336057 to resurrect mail-client/nmh thanks to Tommy
+
diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
new file mode 100644 (file)
index 0000000..ff159a6
--- /dev/null
@@ -0,0 +1,9 @@
+AUX nmh-1.3-db5.patch 568 RMD160 4ecedcf484147ba74c296bf8675419948b45c586 SHA1 e7706a77ea8d065e48147929aca71a02e1939663 SHA256 b139def59d1c5371bec1a3b5067698bbb7c320771f66a703c7b8c9eb2f1bdf78
+AUX nmh-1.3-inc-login.patch 602 RMD160 22cd9b4062810b1d30e7d451f3c54b8ad065ce53 SHA1 ddd7152870068b57926a35695b836cc782874d87 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf58fc2d194094897ff16f9dd2
+AUX nmh-1.3-install.patch 482 RMD160 db11b277c4c6e8ec124c94935405a035573eff76 SHA1 30e5f89d457fcc6a8075511e2e221e7f7313682c SHA256 b5f5ba018b71ee02ebc0618df1d1eb47a74214e7ff210975040a4f51619b0cfa
+AUX nmh-1.3-m_getfld.patch 624 RMD160 0723829e7a2138529f3e10df270c69e6f5ff6e80 SHA1 b84f27e4c7a84ce6260b0a8c857aff8997d6983d SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5
+AUX nmh-1.3-parallelmake.patch 3121 RMD160 d743b48cb2c5bf7d5da9b2141ef0c0fd17221d54 SHA1 16943bc94e83c290ae9e7b7d2b3078a96c840a1a SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c
+DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
+EBUILD nmh-1.3-r2.ebuild 1706 RMD160 8ec02cc8f44ec60b8069a939bf7745cddfc6dff9 SHA1 2262fa16bfceca645ea4559ae5a2c1ec93cd2ed0 SHA256 732b2bc1027ab87804d0fbfd84d8680524811d7889dd55f264b329e11954c07a
+MISC ChangeLog 454 RMD160 d2bbba8099f6cb9a8598061652acb4ebc432a702 SHA1 0c495e1fcef9326938b4604f0521e874026a7e20 SHA256 a0f65467df56fcc01a207dc4d4ebde80901973d12f81242be18b75cc990a0106
+MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/mail-client/nmh/files/nmh-1.3-db5.patch b/mail-client/nmh/files/nmh-1.3-db5.patch
new file mode 100644 (file)
index 0000000..473e2b6
--- /dev/null
@@ -0,0 +1,17 @@
+diff --git a/uip/slocal.c b/uip/slocal.c
+index 9697d84..d38a020 100644
+--- a/uip/slocal.c
++++ b/uip/slocal.c
+@@ -46,6 +46,12 @@
+ extern int  initgroups(char*, int);
+ #endif
++/* This define is needed for Berkeley db v5 and above to
++ * make the header file expose the 'historical' ndbm APIs.
++ * We define it unconditionally because this is simple and
++ * harmless.
++ */
++#define HAVE_DBM
+ /* This define is needed for Berkeley db v2 and above to
+  * make the header file expose the 'historical' ndbm APIs.
+  * We define it unconditionally because this is simple and
diff --git a/mail-client/nmh/files/nmh-1.3-inc-login.patch b/mail-client/nmh/files/nmh-1.3-inc-login.patch
new file mode 100644 (file)
index 0000000..631a03f
--- /dev/null
@@ -0,0 +1,27 @@
+diff --git a/uip/inc.c b/uip/inc.c
+index cf12ab8..b8384cd 100644
+--- a/uip/inc.c
++++ b/uip/inc.c
+@@ -496,8 +496,7 @@ main (int argc, char **argv)
+      * a POP server?
+      */
+     if (inc_type == INC_POP) {
+-      if (user == NULL)
+-          user = getusername ();
++
+       if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
+           kpop = 1;
+       }
+@@ -506,6 +505,12 @@ main (int argc, char **argv)
+       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.3-install.patch b/mail-client/nmh/files/nmh-1.3-install.patch
new file mode 100644 (file)
index 0000000..25dc321
--- /dev/null
@@ -0,0 +1,12 @@
+diff --git a/uip/Makefile.in b/uip/Makefile.in
+index b3c6717..5ed34f8 100644
+--- a/uip/Makefile.in
++++ b/uip/Makefile.in
+@@ -267,7 +267,6 @@ install-lcmds:
+       rm -f $(DESTDIR)$(bindir)/folders
+       rm -f $(DESTDIR)$(bindir)/prev
+       rm -f $(DESTDIR)$(bindir)/next
+-      rm -f $(DESTDIR)$(libdir)/install-mh
+       $(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
+       $(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+       $(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
diff --git a/mail-client/nmh/files/nmh-1.3-m_getfld.patch b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
new file mode 100644 (file)
index 0000000..6e0104c
--- /dev/null
@@ -0,0 +1,29 @@
+diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
+index caf9519..13c2c3d 100644
+--- a/sbr/m_getfld.c
++++ b/sbr/m_getfld.c
+@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, char *str)
+       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/files/nmh-1.3-parallelmake.patch b/mail-client/nmh/files/nmh-1.3-parallelmake.patch
new file mode 100644 (file)
index 0000000..1ac2415
--- /dev/null
@@ -0,0 +1,99 @@
+diff --git a/etc/Makefile.in b/etc/Makefile.in
+index f1412b1..9af408d 100644
+--- a/etc/Makefile.in
++++ b/etc/Makefile.in
+@@ -86,13 +86,13 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
+ install: install-bin-files install-etc-files
+ install-bin-files:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++      mkdir -p $(DESTDIR)$(bindir)
+       for script in $(GENERATED_BIN_FILES); do \
+         $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
+       done
+ install-etc-files:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
++      mkdir -p $(DESTDIR)$(etcdir)
+       INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+       for file in $(STATIC_FILES); do \
+         INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
+diff --git a/man/Makefile.in b/man/Makefile.in
+index 2ac26f3..7c613bf 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -130,14 +130,14 @@ install: install-man1 install-man5 install-man8
+ # install the man pages in man1
+ install-man1:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext1)
++      mkdir -p $(DESTDIR)$(mandir)/man$(manext1)
+       for file in $(MAN1); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext1) ; \
+       done
+ # install the man pages in man5
+ install-man5:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext5)
++      mkdir -p $(DESTDIR)$(mandir)/man$(manext5)
+       for file in $(MAN5); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext5) ; \
+       done
+@@ -148,7 +148,7 @@ install-man5:
+ # install the man pages in man8
+ install-man8:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext8)
++      mkdir -p $(DESTDIR)$(mandir)/man$(manext8)
+       for file in $(MAN8); do \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man$(manext8) ; \
+       done
+diff --git a/mts/Makefile.in b/mts/Makefile.in
+index f739e30..f606fef 100644
+--- a/mts/Makefile.in
++++ b/mts/Makefile.in
+@@ -43,7 +43,7 @@ SUBDIRS = smtp
+ all: all-recursive libmts.a
+-all-recursive:
++all-recursive $(OBJS):
+       for subdir in $(SUBDIRS); do \
+         (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
+       done
+diff --git a/uip/Makefile.in b/uip/Makefile.in
+index 5ed34f8..c9239b1 100644
+--- a/uip/Makefile.in
++++ b/uip/Makefile.in
+@@ -256,13 +256,13 @@ install: install-cmds install-misc install-lcmds install-scmds
+ # install commands
+ install-cmds:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++      mkdir -p $(DESTDIR)$(bindir)
+       for cmd in $(CMDS); do \
+         $(INSTALL_PROGRAM) $$cmd $(DESTDIR)$(bindir)/$$cmd; \
+       done
+ # install links
+-install-lcmds:
++install-lcmds: install-cmds
+       rm -f $(DESTDIR)$(bindir)/flists
+       rm -f $(DESTDIR)$(bindir)/folders
+       rm -f $(DESTDIR)$(bindir)/prev
+@@ -274,13 +274,13 @@ install-lcmds:
+ # install misc support binaries
+ install-misc:
+-      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++      mkdir -p $(DESTDIR)$(libdir)
+       for misc in $(MISC); do \
+         $(INSTALL_PROGRAM) $$misc $(DESTDIR)$(libdir)/$$misc; \
+       done
+ # install commands with special installation needs (thus no $(SCMDS) use here)
+-install-scmds:
++install-scmds: install-cmds
+       if test x$(SETGID_MAIL) != x; then \
+         $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \
+       else \
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
new file mode 100644 (file)
index 0000000..e6233b5
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+</pkgmetadata>
diff --git a/mail-client/nmh/nmh-1.3-r2.ebuild b/mail-client/nmh/nmh-1.3-r2.ebuild
new file mode 100644 (file)
index 0000000..2beef3d
--- /dev/null
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="New MH mail reader"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="|| ( sys-libs/gdbm =sys-libs/db-1.85* )
+       >=sys-libs/ncurses-5.2
+       net-libs/liblockfile
+       app-editors/gentoo-editor
+       !!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
+RDEPEND="${DEPEND}"
+
+
+src_prepare() {
+       # Patches from bug #22173.
+       epatch "${FILESDIR}"/${P}-inc-login.patch
+       epatch "${FILESDIR}"/${P}-install.patch
+       # bug #57886
+       epatch "${FILESDIR}"/${P}-m_getfld.patch
+       # bug #319937
+       epatch "${FILESDIR}"/${P}-db5.patch
+       # Allow parallel compiles/installs
+       epatch "${FILESDIR}"/${P}-parallelmake.patch
+}
+
+src_configure() {
+       [ -z "${EDITOR}" ] && export EDITOR="prompter"
+       [ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
+
+       # Redefining 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.
+
+       # strip options from ${PAGER} (quoting not good enough) (Bug #262150)
+       PAGER=${PAGER%% *}
+
+       # use gentoo-editor to avoid implicit dependencies (Bug #294762)
+
+       econf \
+               --prefix=/usr \
+               --mandir=/usr/share/man \
+               --with-editor=/usr/libexec/gentoo-editor \
+               --with-pager="${PAGER}" \
+               --enable-nmh-pop \
+               --sysconfdir=/etc/nmh \
+               --libdir=/usr/bin
+}
+
+src_install() {
+       emake prefix="${D}"/usr \
+               mandir="${D}"/usr/share/man \
+               libdir="${D}"/usr/bin \
+               etcdir="${D}"/etc/nmh install || die
+       dodoc ChangeLog DATE MACHINES README || die
+}