mail/ja-mh: Eliminated more "extern int errno" to fix DragonFly

4 files changed, 61 insertions, 8 deletions

diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
index bf8e809bb7a..03f2b9183f2 100644
--- a/mail/ja-mh/distinfo
+++ b/mail/ja-mh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2010/09/27 12:01:49 taca Exp $
+$NetBSD: distinfo,v 1.13 2011/12/17 12:50:57 marino Exp $
 
 SHA1 (mh-6.8.4-JP-3.05-20030114.patch.gz) = 6d4e6535465e5ffd5b9b5eef8d96cfcb1f947470
 RMD160 (mh-6.8.4-JP-3.05-20030114.patch.gz) = f22d6f37bcd79bddf893c0f42d714fc01647dfe1
@@ -58,7 +58,7 @@ SHA1 (patch-bo) = c1ed3f5ce677eea50d4bd52076bab75de4c49b5d
 SHA1 (patch-bp) = 952d27e9c68f4629ba84957492ecb1e0db563550
 SHA1 (patch-bq) = 17f8722b2509baad2e8362ac86a53181144c296d
 SHA1 (patch-br) = d58aef4d14429b8268a5b1652e686298615bb3ba
-SHA1 (patch-bs) = 6033c920fb4e7542d7ad5ed500b0397133ecee10
+SHA1 (patch-bs) = 46ae5e2354a9b95b1d57aff91961f704d81fa3a3
 SHA1 (patch-bt) = 79789097d2d0c4b7a469c40b77add954d77608b6
 SHA1 (patch-bu) = e31bcc3bec12ef681d1c813d6d01dafbcdf01df2
 SHA1 (patch-bv) = 013b6774331d2e87a14d6c79d9f941ab145f879a
@@ -67,3 +67,5 @@ SHA1 (patch-bx) = 03c71c7cf7b8b179aaf993763e27b120ccb3fee9
 SHA1 (patch-by) = e7a6795344983ccbcb593f0647479f97cbb48c46
 SHA1 (patch-bz) = 772d559a23eaacd70909fc44aab18e3ac4567c74
 SHA1 (patch-ca) = 80aff3342e835dd4969fd3600bd3e55bfb204bdb
+SHA1 (patch-cb) = 7dac74aeffa477456b1a43a377da3d7df60ee0e3
+SHA1 (patch-cc) = 726417f991275244ded1074a4e973be813c39af1
diff --git a/mail/ja-mh/patches/patch-bs b/mail/ja-mh/patches/patch-bs
index ba19ee30575..76057b57366 100644
--- a/mail/ja-mh/patches/patch-bs
+++ b/mail/ja-mh/patches/patch-bs
@@ -1,10 +1,28 @@
-$NetBSD: patch-bs,v 1.2 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-bs,v 1.3 2011/12/17 12:50:57 marino Exp $
 
 * Fix confilct with getline(3).
 
 --- uip/pshsbr.c.orig	2001-04-02 10:50:24.000000000 +0000
 +++ uip/pshsbr.c
-@@ -63,7 +63,7 @@ int	command(), multiline();
+@@ -27,17 +27,11 @@ static char ident[] = "@(#)$Id: popsbr.c
+ #define	TRM	"."
+ #define	TRMLEN	(sizeof TRM - 1)
+ 
+-#ifdef __CYGWIN32__
+ #include <errno.h>
+-#endif
+-extern int  errno;
+ #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
+ extern int  sys_nerr;
+ extern char *sys_errlist[];
+ #endif
+-#ifdef __NetBSD__ /* XXX */
+-#include <errno.h>
+-#endif
+ 
+ static int  poprint = 0;
+ static int  pophack = 0;
+@@ -63,7 +57,7 @@ int	command(), multiline();
  static	int	command(), multiline();
  #endif
  
@@ -13,7 +31,7 @@ $NetBSD: patch-bs,v 1.2 2010/09/27 12:01:49 taca Exp $
  static putline();
  
  #ifdef NNTP
-@@ -176,7 +176,7 @@ int	snoop;
+@@ -176,7 +170,7 @@ int	snoop;
  
      (void) signal (SIGPIPE, SIG_IGN);
  
@@ -22,7 +40,7 @@ $NetBSD: patch-bs,v 1.2 2010/09/27 12:01:49 taca Exp $
  	case OK: 
  	    if (poprint)
  		fprintf (stderr, "<--- %s\n", response);
-@@ -619,7 +619,7 @@ char   *fmt,
+@@ -619,7 +613,7 @@ char   *fmt,
      if (putline (buffer, output) == NOTOK)
  	return NOTOK;
  
@@ -31,7 +49,7 @@ $NetBSD: patch-bs,v 1.2 2010/09/27 12:01:49 taca Exp $
  	case OK: 
  	    if (poprint)
  		fprintf (stderr, "<--- %s\n", response);
-@@ -645,7 +645,7 @@ static int  multiline () {
+@@ -645,7 +639,7 @@ static int  multiline () {
  #endif
      char    buffer[BUFSIZ + TRMLEN];
  
@@ -40,7 +58,7 @@ $NetBSD: patch-bs,v 1.2 2010/09/27 12:01:49 taca Exp $
  	return NOTOK;
  #ifdef	DEBUG
      if (poprint)
-@@ -665,7 +665,7 @@ static int  multiline () {
+@@ -665,7 +659,7 @@ static int  multiline () {
  
  /*  */
  
diff --git a/mail/ja-mh/patches/patch-cb b/mail/ja-mh/patches/patch-cb
new file mode 100644
index 00000000000..e91e554d52f
--- /dev/null
+++ b/mail/ja-mh/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2011/12/17 12:50:57 marino Exp $
+
+--- support/pop/popwrd.c.orig	1999-02-09 11:30:00.000000000 +0000
++++ support/pop/popwrd.c
+@@ -24,8 +24,6 @@ struct passwd *getpwnam();
+ static char  temp[] = "ptmp";
+ static char  home[BUFSIZ];
+ 
+-extern int errno;
+-
+ char   *crypt (), *getpass (), *tail ();
+ time_t	time ();
+ 
diff --git a/mail/ja-mh/patches/patch-cc b/mail/ja-mh/patches/patch-cc
new file mode 100644
index 00000000000..4bb8cd8ea89
--- /dev/null
+++ b/mail/ja-mh/patches/patch-cc
@@ -0,0 +1,20 @@
+$NetBSD: patch-cc,v 1.1 2011/12/17 12:50:57 marino Exp $
+
+--- miscellany/less-177/os.c.orig	2011-12-17 08:02:11.467641000 +0000
++++ miscellany/less-177/os.c
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <setjmp.h>
++#include <errno.h>
+ #include "less.h"
+ 
+ /*
+@@ -98,7 +99,6 @@ get_time()
+ 
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+-extern int errno;
+ 
+ 	public char *
+ errno_message(filename)