Fix return types.

26 files changed, 1302 insertions, 36 deletions

diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
index ae1b262eb98..843635f9fbe 100644
--- a/mail/ja-mh/distinfo
+++ b/mail/ja-mh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2013/02/26 11:07:26 joerg Exp $
+$NetBSD: distinfo,v 1.16 2013/03/28 21:31:25 joerg 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
@@ -26,10 +26,10 @@ SHA1 (patch-ah) = 80dd1b71e1a03c259a7887222d52c6b4c12cd5a7
 SHA1 (patch-ai) = 8db66e521183caacd483ad658501bcf47bc0a6bc
 SHA1 (patch-aj) = c61b8efa24e5ff991e23df7446df7752c20fc00b
 SHA1 (patch-ak) = e59aa64dda2aea2f7baf849e7ce7d89829f2e836
-SHA1 (patch-al) = 8d36cf4a1b5f46d78cf183cd51ea99926b54290d
-SHA1 (patch-am) = 463f28b6c0f83c02cc16c9b75079ee8b56e438fd
-SHA1 (patch-ao) = 0661bba6d997406d66c1da1acb3631cfce37791e
-SHA1 (patch-ap) = b8b46ef327a70b15d278ae17e93eff1f83cfe551
+SHA1 (patch-al) = 7c5f3996a5b54fdcf83ba5cfd464133cf0f7405f
+SHA1 (patch-am) = c40a05aa4af321059768b17efcb982373e733dd0
+SHA1 (patch-ao) = fab777f3405e2564d9a5748eb5a54dc8f9cd36e8
+SHA1 (patch-ap) = 73b6bfa830d8d7b93f860a887d5684f2ab5ca5a9
 SHA1 (patch-aq) = f7147e5f5728bb60ad4741ac61b847323ff51b3c
 SHA1 (patch-ar) = 8193709d54a485b0e95c091be3748b6153e91f06
 SHA1 (patch-as) = a0d00cd93b69c8614982f3a8fbe047ade76a5515
@@ -38,16 +38,16 @@ SHA1 (patch-au) = 2cab2c4ff2b0fef56b20f8e1766539522142be8a
 SHA1 (patch-av) = 4006f326fa85d8710794382a5a0eb713f5392e70
 SHA1 (patch-aw) = cc78f180a54b5c72b5e90edde189b15fc4d209e4
 SHA1 (patch-ax) = 365ce5b623413cb55a4ee04ebaaa9f61e4ba0ff4
-SHA1 (patch-ay) = cbe7ddee99359a1497c1398602cc3e141493fb0d
+SHA1 (patch-ay) = 3444fa3404fe77753df2d8180b9a6b62be2b2815
 SHA1 (patch-az) = 66034ae3bb628cc74f1a9ff8e8c995a58941e9b3
-SHA1 (patch-ba) = 31ec33ea9ad1334e7b3d814121976a7c01fe820d
+SHA1 (patch-ba) = 42523907f1d7c0453aa367d154df90b448b9d340
 SHA1 (patch-bb) = 72fb6d45c51d3f45ccc50b9c05de0c69e7b41b4a
 SHA1 (patch-bc) = d2fd30fc7ad11fddf5f2166561b59477c2461560
 SHA1 (patch-bd) = 2943eccc657738c1a573c8013023bd113b79155a
 SHA1 (patch-be) = 839d0b8259931cc6c66256615fd6297433980976
 SHA1 (patch-bf) = 86345158e2f57ebc0e72f42922aa3ca0c2d27453
 SHA1 (patch-bg) = 77de246c988d71b8414b874410b688e2ad594417
-SHA1 (patch-bh) = e56b978d5a1ff1a10438f57a39b9f49b7ee45758
+SHA1 (patch-bh) = cf79fcd105eba84ab431b2f292f4a69a9d28fda3
 SHA1 (patch-bi) = 96324f2bbbc99913427ace1a8102256932e5f807
 SHA1 (patch-bj) = 46dd9576537c877328cfa7fb9f10fdba42ee53d0
 SHA1 (patch-bk) = 277f03f988d400f5fac89e8e2fb826feed3fd25a
@@ -69,3 +69,21 @@ SHA1 (patch-bz) = 772d559a23eaacd70909fc44aab18e3ac4567c74
 SHA1 (patch-ca) = 80aff3342e835dd4969fd3600bd3e55bfb204bdb
 SHA1 (patch-cb) = 7dac74aeffa477456b1a43a377da3d7df60ee0e3
 SHA1 (patch-cc) = 726417f991275244ded1074a4e973be813c39af1
+SHA1 (patch-sbr_path.c) = eef3aec53e350485f2d7d96f8dbef2c78912d701
+SHA1 (patch-uip_ali.c) = 17452beeb7c18bb58619d9f28533d754fdf0ea50
+SHA1 (patch-uip_aliasbr.c) = 0c3a3db3ae46d838d1b91bc06e985d118bf3b202
+SHA1 (patch-uip_burst.c) = dcf64514d32be344bc040636223909a444f01265
+SHA1 (patch-uip_conflict.c) = 11963796144d57d1bc32210e125908df7592dfc0
+SHA1 (patch-uip_forw.c) = 0a5fbfcd615e63be9656e00925ab2ea42b7ab85e
+SHA1 (patch-uip_mhlsbr.c) = b18046acc36325902f92aa0e9c681e100de0b111
+SHA1 (patch-uip_msh.c) = 0cb9e352e9a3c4be88367f68bce0926d3e2cfbb1
+SHA1 (patch-uip_post.c) = 964a2ab0c3d0c3ccbb9647effff7ca9da56d62cf
+SHA1 (patch-uip_rcvtty.c) = c4b434a7cf249d36125035a3585497b73c4d80a0
+SHA1 (patch-uip_replsbr.c) = b02e73b19b913ee2beaa0af3e97f765b7b35f280
+SHA1 (patch-uip_sendsbr.c) = 37ca2f779286a538182502d5bc187f4da99cb250
+SHA1 (patch-uip_slocal.c) = 263b3ca94f2cdcab870a2bbc0a40744d9837c490
+SHA1 (patch-uip_spost.c) = 5203cf5ec3f5a0650e8cc4250c3cabc39e29ed58
+SHA1 (patch-uip_trmsbr.c) = a898fd7796a298c4fba683199cb306da0129bec9
+SHA1 (patch-uip_whatnowsbr.c) = df9a8d170f8e6953c5058e5e4edd25a5f6b1365f
+SHA1 (patch-zotnet_mts_mts.h) = f389ba8bb3b7cceb213055da7103cd672d2f3c4b
+SHA1 (patch-zotnet_tws_dtimep.c-lexed) = 3b855d0aceacde5d448b98eb2f42b3b7eb5b3e1f
diff --git a/mail/ja-mh/patches/patch-al b/mail/ja-mh/patches/patch-al
index 3954dac6b26..9904baafa86 100644
--- a/mail/ja-mh/patches/patch-al
+++ b/mail/ja-mh/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-al,v 1.5 2013/03/28 21:31:25 joerg Exp $
 
 * Add DragonFly support.
 * Don't declare errno.
 
---- uip/vmh.c.orig	2006-04-11 14:16:00.000000000 +0000
+--- uip/vmh.c.orig	2013-03-28 18:02:16.000000000 +0000
 +++ uip/vmh.c
 @@ -113,13 +113,20 @@ void     __cputchar __P((int));
  #define	SMALLMOVE	1
@@ -51,7 +51,18 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
  extern int  sys_nerr;
  extern char *sys_errlist[];
-@@ -348,7 +363,11 @@ static  vmh () {
+@@ -248,7 +263,9 @@ extern char *sys_errlist[];
+ static void	adorn ();
+ 
+ static	vmh(), lreset(), linsert(), ladvance(), lretreat(), lgo();
+-static	TTYon(), TTYoff(), foreground();
++static	foreground();
++static void TTYon (void);
++static void TTYoff (void);
+ static int	PEERinit(), pINI(), pLOOP(), pTTY(), pWIN(), WINinit();
+ static int	WINgetstr(), WINless(), WINputc(), TTYinit(), pWINaux();
+ /*  */
+@@ -348,7 +365,11 @@ static  vmh () {
  	wclrtoeol (Command);
  	wrefresh (Command);
  
@@ -64,7 +75,7 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  	    case NOTOK: 
  		break;
  
-@@ -808,6 +827,9 @@ static int  WINinit (nprog) {
+@@ -808,6 +829,9 @@ static int  WINinit (nprog) {
      sideground ();
  
  #ifndef	TERMINFO
@@ -74,7 +85,7 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
      if (CM == NULL)
  #else	/* TERMINFO */
      if (cursor_address == NULL)	/* assume mtr wanted "cm", not "CM" */
-@@ -822,6 +844,15 @@ static int  WINinit (nprog) {
+@@ -822,6 +846,15 @@ static int  WINinit (nprog) {
  #ifndef	TERMINFO
      if (tgetflag ("xt") || tgetnum ("sg") > 0)
  	SO = SE = US = UE = NULL;
@@ -90,7 +101,7 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  #else	/* TERMINFO */
  /*
   * If termcap mapped directly to terminfo, we'd use the following:
-@@ -862,21 +893,36 @@ static int  WINinit (nprog) {
+@@ -862,21 +895,36 @@ static int  WINinit (nprog) {
  
  /*  */
  
@@ -131,7 +142,7 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  	    case '\f':
  		wrefresh (curscr);
  		break;
-@@ -1382,7 +1428,7 @@ WINDOW *w;
+@@ -1382,7 +1430,7 @@ WINDOW *w;
  	    lp -> l_buf[i] = w -> lines[getcury(w)] -> line[i].ch;
  #else
  	    wmove(w, getcury(w), i);
@@ -140,7 +151,7 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  #endif
  	}
  	lp -> l_buf[getmaxx(w)] = '\0';
-@@ -1413,8 +1459,12 @@ WINDOW *w;
+@@ -1413,8 +1461,12 @@ WINDOW *w;
      }
  #endif /* __NCURSES_H */
      for (cp = lp -> l_buf + strlen (lp -> l_buf) - 1; cp >= lp -> l_buf; cp--)
@@ -154,7 +165,23 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  	else
  	    break;
  
-@@ -1579,7 +1629,9 @@ static	TTYoff () {
+@@ -1539,7 +1591,7 @@ static int  TTYinit (nprog) {
+ 
+ /*  */
+ 
+-static	TTYon () {
++static void TTYon (void) {
+     if (tty_ready == DONE)
+ 	return;
+ 
+@@ -1573,13 +1625,15 @@ static	TTYon () {
+ 
+ /*  */
+ 
+-static	TTYoff () {
++static void TTYoff (void) {
+     if (tty_ready == NOTOK)
+ 	return;
  
      INTR = intrc;
  #ifndef	SYS5
@@ -164,7 +191,7 @@ $NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
  #else	/* SYS5 */
  #if defined(TCGETATTR) && !defined(TCSETA) && defined(TCSANOW)
      (void) tcsetattr (fileno (stdin), TCSANOW, &sg);
-@@ -1591,6 +1643,9 @@ static	TTYoff () {
+@@ -1591,6 +1645,9 @@ static	TTYoff () {
      leaveok (curscr, TRUE);
      mvcur (0, COLS - 1, LINES - 1, 0);
      endwin ();
diff --git a/mail/ja-mh/patches/patch-am b/mail/ja-mh/patches/patch-am
index e4c25a63993..6e888598fb4 100644
--- a/mail/ja-mh/patches/patch-am
+++ b/mail/ja-mh/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.4 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-am,v 1.5 2013/03/28 21:31:25 joerg Exp $
 
 * Don't declare errno but include <errno.h>.
 
@@ -15,3 +15,13 @@ $NetBSD: patch-am,v 1.4 2010/09/27 12:01:49 taca Exp $
  
  static char   *tailor_value ();
  
+@@ -256,8 +253,7 @@ static  struct bind {
+ 
+ /* ARGSUSED */
+ 
+-mts_init (name)
+-char    *name;
++void mts_init (char *name)
+ {
+     register char  *bp,
+                    *cp;
diff --git a/mail/ja-mh/patches/patch-ao b/mail/ja-mh/patches/patch-ao
index 27aada95314..dc064f86fa3 100644
--- a/mail/ja-mh/patches/patch-ao
+++ b/mail/ja-mh/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-ao,v 1.5 2013/03/28 21:31:25 joerg Exp $
 
 * Don't declare errno but include <errno.h>.
 
---- zotnet/mts/lock.c.orig	2006-04-11 13:49:57.000000000 +0000
+--- zotnet/mts/lock.c.orig	2001-04-03 07:22:46.000000000 +0000
 +++ zotnet/mts/lock.c
 @@ -77,10 +77,7 @@ static char ident[] = "@(#)$Id: lock.c,v
  #define	FLOCK		/* LOCKF will override this, if defined */
@@ -15,3 +15,34 @@ $NetBSD: patch-ao,v 1.4 2010/09/27 12:01:49 taca Exp $
  
  #ifdef	LOCKONLY
  #ifndef	MMDFONLY
+@@ -103,7 +100,13 @@ char *lockname_from_fd();
+ #endif /* MAILLOCK */
+ 
+ static int	b_lkopen(), lockit(), f_lkopen();
+-static		lockname(), timerON(), timerOFF();
++static		lockname(), timerOFF();
++
++#ifdef LIBLOCKFILE
++static void timerON (char  *lock, int fd, int ltype);
++#else
++static void timerON (char *lock, int fd);
++#endif
+ 
+ time_t	time ();
+ char   *mktemp ();
+@@ -620,13 +623,10 @@ int	sig;
+ /*  */
+ 
+ #ifdef LIBLOCKFILE
+-static timerON (lock, fd, ltype)
+-int 	ltype;
++static void timerON (char  *lock, int fd, int ltype)
+ #else
+-static timerON (lock, fd)
++static void timerON (char *lock, int fd)
+ #endif
+-char   *lock;
+-int	fd;
+ {
+     register struct lock   *lp;
+ 
diff --git a/mail/ja-mh/patches/patch-ap b/mail/ja-mh/patches/patch-ap
index 41e8aa57ee3..20c320578c9 100644
--- a/mail/ja-mh/patches/patch-ap
+++ b/mail/ja-mh/patches/patch-ap
@@ -1,10 +1,21 @@
-$NetBSD: patch-ap,v 1.4 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-ap,v 1.5 2013/03/28 21:31:25 joerg Exp $
 
 * Add Dragonfly support.
 
---- uip/folder.c.orig	2006-04-11 14:21:12.000000000 +0000
+--- uip/folder.c.orig	2001-04-02 10:35:24.000000000 +0000
 +++ uip/folder.c
-@@ -74,8 +74,6 @@ static struct swit switches[] = {
+@@ -11,7 +11,9 @@ static char ident[] = "@(#)$Id: folder.c
+ #include	<locale.h>
+ #endif
+ 
+-static		dodir(), addir(), addfold(), dother();
++static void addfold (char *fold);
++static void addir (char *name);
++static		dodir(), dother();
+ static int	pfold(), sfold(), compare();
+ /*  */
+ 
+@@ -74,8 +76,6 @@ static struct swit switches[] = {
  
  /*  */
  
@@ -13,7 +24,17 @@ $NetBSD: patch-ap,v 1.4 2010/09/27 12:01:49 taca Exp $
  static int  fshort = 0;
  static int  fcreat = 0;
  static int  fpack = 0;
-@@ -572,7 +570,7 @@ register char   *name;
+@@ -542,8 +542,7 @@ register struct msgs   *mp;
+ 
+ /*  */
+ 
+-static	addir (name)
+-register char   *name;
++static void addir (char *name)
+ {
+     register char  *base,
+                    *cp;
+@@ -572,7 +571,7 @@ register char   *name;
      }
      while (dp = readdir (dd))
  	if (strcmp (dp -> d_name, ".") && strcmp (dp -> d_name, "..")) {
@@ -22,3 +43,13 @@ $NetBSD: patch-ap,v 1.4 2010/09/27 12:01:49 taca Exp $
  	    if (cp + dp -> d_reclen + 2 >= name + BUFSIZ)
  #else /* SYS5DIR && !hpux && !__CYGWIN32__ */
  	    if (cp + strlen (dp -> d_name) + 2 >= name + BUFSIZ)
+@@ -589,8 +588,7 @@ register char   *name;
+ 
+ /*  */
+ 
+-static	addfold (fold)
+-register char   *fold;
++static void addfold (char *fold)
+ {
+     register int    i,
+                     j;
diff --git a/mail/ja-mh/patches/patch-ay b/mail/ja-mh/patches/patch-ay
index 1f929eda4cb..4ffb9c3a28b 100644
--- a/mail/ja-mh/patches/patch-ay
+++ b/mail/ja-mh/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.2 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-ay,v 1.3 2013/03/28 21:31:25 joerg Exp $
 
 * Don't declare errno.
 
---- uip/mhn.c.orig	2006-04-11 14:27:13.000000000 +0000
+--- uip/mhn.c.orig	2001-08-30 02:57:33.000000000 +0000
 +++ uip/mhn.c
 @@ -219,7 +219,6 @@ static	char   *errs = NULL;
  static	char   *tmp;
@@ -12,3 +12,83 @@ $NetBSD: patch-ay,v 1.2 2010/09/27 12:01:49 taca Exp $
  #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
  extern	int	sys_nerr;
  extern	char   *sys_errlist[];
+@@ -342,7 +341,7 @@ typedef struct Content {
+ 
+ static CT	get_content ();
+ static int	list_content (), show_content (), store_content ();
+-static int	cache_content ();
++static void cache_content (CT ct);
+ static int	user_content (), compose_content (), output_content ();
+ static void	free_content (), flush_errors (), set_id ();
+ 
+@@ -3190,8 +3189,7 @@ static struct k2v	Charset[] = {
+     NULL,	    CHARSET_UNKNOWN		/* this one must be last! */
+ };
+ 
+-static int  free_text (ct)
+-register CT	ct;
++static void free_text (CT ct)
+ {
+     register struct text *t = (struct text *) ct -> c_ctparams;
+ 
+@@ -3678,8 +3676,7 @@ char   *unused;
+ }
+ 
+ 
+-static int  free_multi (ct)
+-register CT	ct;
++static void free_multi (CT ct)
+ {
+     register struct multipart *m = (struct multipart *) ct -> c_ctparams;
+     register struct part   *part,
+@@ -4095,8 +4092,7 @@ losing: ;
+ }
+ 
+ 
+-static int  free_partial (ct)
+-register CT	ct;
++static void free_partial (CT ct)
+ {
+     register struct partial *p = (struct partial *) ct -> c_ctparams;
+ 
+@@ -4301,8 +4297,7 @@ register CT	ct;
+ }
+ 
+ 
+-static int  free_external (ct)
+-register CT	ct;
++static void free_external (CT ct)
+ {
+     register struct exbody *e = (struct exbody *) ct -> c_ctparams;
+ 
+@@ -4699,8 +4694,7 @@ register CT	ct;
+ }
+ 
+ 
+-static int  close_encoding (ct)
+-register CT	ct;
++static void close_encoding (CT ct)
+ {
+     register struct cefile *ce = (struct cefile *) ct -> c_ceparams;
+ 
+@@ -4750,9 +4744,7 @@ estimate: ;
+ }
+ 
+ 
+-static int  free_encoding (ct, toplevel)
+-register CT	ct;
+-int	toplevel;
++static void free_encoding (CT ct, int toplevel)
+ {
+     register struct cefile *ce = (struct cefile *) ct -> c_ceparams;
+ 
+@@ -6152,8 +6144,7 @@ char   *mapfile,
+ 
+ /*  */
+ 
+-static int  cache_content (ct)
+-register CT    ct;
++static void cache_content (CT ct)
+ {
+     int	    cachetype;
+     char   *file,
diff --git a/mail/ja-mh/patches/patch-ba b/mail/ja-mh/patches/patch-ba
index 9bf8e94481d..5c2a6c5ed0a 100644
--- a/mail/ja-mh/patches/patch-ba
+++ b/mail/ja-mh/patches/patch-ba
@@ -1,12 +1,15 @@
-$NetBSD: patch-ba,v 1.2 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-ba,v 1.3 2013/03/28 21:31:25 joerg Exp $
 
 * Don't declare errno.
 
---- uip/mshcmds.c.orig	2006-04-11 14:28:57.000000000 +0000
+--- uip/mshcmds.c.orig	2001-04-02 16:40:58.000000000 +0000
 +++ uip/mshcmds.c
-@@ -29,9 +29,6 @@ static char ident[] = "@(#)$Id: mshcmds.
+@@ -28,10 +28,9 @@ static char ident[] = "@(#)$Id: mshcmds.
+ #endif	/* MIME */
  
  /*  */
++void readids (int id);
++void display_info (int scansw);
  
 -extern int errno;
 -
@@ -14,7 +17,192 @@ $NetBSD: patch-ba,v 1.2 2010/09/27 12:01:49 taca Exp $
  static char delim3[] = "-------";/* from burst.c */
  
  
-@@ -3529,7 +3526,6 @@ char   *proc,
+@@ -47,7 +46,9 @@ static int     nontext();
+ #endif
+ 
+ 
+-static burst(), forw(), rmm(), show(), ask(), copy_message(), copy_digest();
++static burst(), show(), ask(), copy_message(), copy_digest();
++static void rmm(void);
++static void forw (char *proc, char *filter, int vecp, char **vec, int mime);
+ static int	process();
+ 				/* SORTM */
+ static int	msgsort (), subsort();
+@@ -66,9 +67,7 @@ extern	char	response[];
+ 
+ /*  */
+ 
+-forkcmd (args, pgm)
+-char  **args,
+-       *pgm;
++void forkcmd (char **args, char *pgm)
+ {
+     int     child_id;
+     char   *vec[MAXARGS];
+@@ -143,8 +142,7 @@ static struct swit distswit[] = {
+ 
+ /*  */
+ 
+-distcmd (args)
+-char  **args;
++void distcmd (char **args)
+ {
+     int     vecp = 1;
+     char   *cp,
+@@ -249,8 +247,7 @@ static struct swit explswit[] = {
+ 
+ /*  */
+ 
+-explcmd (args)
+-char  **args;
++void explcmd (char **args)
+ {
+     int     inplace = 0,
+             quietsw = 0,
+@@ -498,8 +495,7 @@ static struct swit fileswit[] = {
+ 
+ /*  */
+ 
+-filecmd (args)
+-char  **args;
++void filecmd (char **args)
+ {
+     int	    linksw = 0,
+ 	    msgp = 0,
+@@ -675,8 +671,7 @@ static struct swit foldswit[] = {
+ 
+ /*  */
+ 
+-foldcmd (args)
+-char  **args;
++void foldcmd (char **args)
+ {
+     int     fastsw = 0,
+             headersw = 0,
+@@ -906,8 +901,7 @@ static struct swit forwswit[] = {
+ 
+ /*  */
+ 
+-forwcmd (args)
+-char  **args;
++void forwcmd (char **args)
+ {
+     int	    msgp = 0,
+             vecp = 1,
+@@ -1028,12 +1022,7 @@ char  **args;
+ 
+ /*  */
+ 
+-static	forw (proc, filter, vecp, vec, mime)
+-int     vecp,
+-    	mime;
+-char   *proc,
+-       *filter,
+-      **vec;
++static void forw (char *proc, char *filter, int vecp, char **vec, int mime)
+ {
+     int     i,
+             child_id,
+@@ -1364,8 +1353,7 @@ static struct swit markswit[] = {
+ 
+ /*  */
+ 
+-markcmd (args)
+-char  **args;
++void markcmd (char **args)
+ {
+     int     addsw = 0,
+             deletesw = 0,
+@@ -1617,8 +1605,7 @@ static struct swit mhnswit[] = {
+ 
+ /*  */
+ 
+-mhncmd (args)
+-char  **args;
++void mhncmd (char **args)
+ {
+     int     msgp = 0,
+ 	    vecp = 1,
+@@ -1733,8 +1720,7 @@ static struct swit packswit[] = {
+ 
+ /*  */
+ 
+-packcmd (args)
+-char  **args;
++void packcmd (char **args)
+ {
+     int     msgp = 0,
+             md,
+@@ -1923,8 +1909,7 @@ static struct swit pickswit[] = {
+ 
+ /*  */
+ 
+-pickcmd (args)
+-char  **args;
++void pickcmd (char **args)
+ {
+     int     zerosw = 1,
+             msgp = 0,
+@@ -2126,8 +2111,7 @@ static struct swit replswit[] = {
+ 
+ /*  */
+ 
+-replcmd (args)
+-char  **args;
++void replcmd (char **args)
+ {
+     int     vecp = 1;
+     char   *cp,
+@@ -2227,8 +2211,7 @@ static struct swit rmmswit[] = {
+ 
+ /*  */
+ 
+-rmmcmd (args)
+-char  **args;
++void rmmcmd (char **args)
+ {
+     int	    msgp = 0,
+             msgnum;
+@@ -2275,7 +2258,7 @@ struct msgs	*opntrashf ();
+ struct msgs	*trash ();
+ #endif /* MH_PLUS */
+ 
+-static  rmm () {
++static void rmm (void) {
+     register int    msgnum,
+                     vecp;
+     register char  *cp;
+@@ -2503,8 +2486,7 @@ static struct swit scanswit[] = {
+ 
+ /*  */
+ 
+-scancmd (args)
+-char  **args;
++void scancmd (char **args)
+ {
+ #define	equiv(a,b)	(a ? b && !strcmp (a, b) : !b)
+ 
+@@ -2765,8 +2747,7 @@ static struct swit showswit[] = {
+ 
+ /*  */
+ 
+-showcmd (args)
+-char  **args;
++void showcmd (char **args)
+ {
+     int	    headersw = 1,
+             nshow = 0,
+@@ -3236,8 +3217,7 @@ static struct swit sortswit[] = {
+ 
+ /*  */
+ 
+-sortcmd (args)
+-char  **args;
++void sortcmd (char **args)
+ {
+     int     msgp = 0,
+             msgnum;
+@@ -3529,7 +3509,6 @@ char   *proc,
      (void) strcpy (tmpfil, m_scratch ("", invo_name));
      if ((out = fopen (tmpfil, "w")) == NULL) {
  	int     olderr;
diff --git a/mail/ja-mh/patches/patch-bh b/mail/ja-mh/patches/patch-bh
index b192b17d82f..c57748221df 100644
--- a/mail/ja-mh/patches/patch-bh
+++ b/mail/ja-mh/patches/patch-bh
@@ -1,15 +1,96 @@
-$NetBSD: patch-bh,v 1.2 2010/09/27 12:01:49 taca Exp $
+$NetBSD: patch-bh,v 1.3 2013/03/28 21:31:26 joerg Exp $
 
 * Don't declare errno.
 
---- uip/bbc.c.orig	2006-04-11 14:50:44.000000000 +0000
+--- uip/bbc.c.orig	1998-12-01 17:05:00.000000000 +0000
 +++ uip/bbc.c
-@@ -112,8 +112,6 @@ struct bbcount {
+@@ -112,7 +112,14 @@ struct bbcount {
  
  /*  */
  
 -extern int  errno;
--
++void rcinit (char *rc);
++
++static void rcput (FILE *bbrc, struct bbcount *p);
++static void pgmread (int pd, int child_id, struct bboard *bb);
++static void add_bb (char *s, int hush);
++static void default_bboards (void);
++static void bbread (struct bboard *bb, int vecp, char *vec[]);
++static void rcend (void);
+ 
  static int  changed = 0;
  static int  oops = 0;
- static int  quitting = 0;
+@@ -566,10 +573,7 @@ char   *s;
+ 
+ /*  */
+ 
+-bbread (bb, vecp, vec)
+-register struct bboard  *bb;
+-int	vecp;
+-char   *vec[];
++static void bbread (struct bboard *bb, int vecp, char *vec[])
+ {
+     int     child_id,
+             pd[2];
+@@ -661,10 +665,7 @@ char   *vec[];
+ 
+ /*  */
+ 
+-pgmread (pd, child_id, bb)
+-int     pd,
+-        child_id;
+-register struct bboard  *bb;
++static void pgmread (int pd, int child_id, struct bboard *bb)
+ {
+     int     i,
+             j,
+@@ -746,8 +747,7 @@ int	i;
+ 
+ /*  */
+ 
+-rcinit (rc)
+-register char  *rc;
++void rcinit (char *rc)
+ {
+     int     state;
+     register char  *cp;
+@@ -797,7 +797,7 @@ register char  *rc;
+ 
+ /*  */
+ 
+-rcend () {
++static void rcend (void) {
+     TYPESIG (*hstat) (), (*istat) (), (*qstat) (), (*tstat) ();
+     register FILE *bbrc;
+ 
+@@ -826,9 +826,7 @@ rcend () {
+ }
+ 
+ 
+-rcput (bbrc, p)
+-register FILE *bbrc;
+-register struct bbcount *p;
++static void rcput (FILE *bbrc, struct bbcount *p)
+ {
+     if (p == NULL)
+ 	return;
+@@ -931,7 +929,7 @@ register char   *w;
+ 
+ /*  */
+ 
+-default_bboards () {
++static void default_bboards (void) {
+     register char  *cp,
+                   **ap;
+ #ifdef	UCL
+@@ -987,9 +985,7 @@ default_bboards () {
+ 
+ /*  */
+ 
+-add_bb (s, hush)
+-register char   *s;
+-int     hush;
++static void add_bb (char *s, int hush)
+ {
+     register struct bboard  *bb;
+     static struct bboard   *tail = NULL;
diff --git a/mail/ja-mh/patches/patch-sbr_path.c b/mail/ja-mh/patches/patch-sbr_path.c
new file mode 100644
index 00000000000..2c50356969d
--- /dev/null
+++ b/mail/ja-mh/patches/patch-sbr_path.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-sbr_path.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- sbr/path.c.orig	2013-03-28 18:10:53.000000000 +0000
++++ sbr/path.c
+@@ -17,7 +17,7 @@ static char ident[] = "@(#)$Id: path.c,v
+ static char *pwds;
+ 
+ static char   *expath ();
+-static	compath();
++static void compath (char *f);
+ 
+ 
+ char   *path (name, flag)
+@@ -98,8 +98,7 @@ register int     flag;
+ 
+ /*  */
+ 
+-static  compath (f)
+-register char  *f;
++static void compath (char *f)
+ {
+     register char  *cp,
+                    *dp;
diff --git a/mail/ja-mh/patches/patch-uip_ali.c b/mail/ja-mh/patches/patch-uip_ali.c
new file mode 100644
index 00000000000..e6ef4105adc
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_ali.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-uip_ali.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/ali.c.orig	2013-03-28 18:03:52.000000000 +0000
++++ uip/ali.c
+@@ -47,6 +47,8 @@ static struct swit switches[] = {
+ 
+ static	int     pos = 1;
+ 
++static void print_aka (char *p, int list, int margin);
++
+ extern struct aka  *akahead;
+ 
+ /*  */
+@@ -180,10 +182,7 @@ char   *argv[];
+ 
+ /*  */
+ 
+-print_aka (p, list, margin)
+-register char  *p;
+-int     list,
+-        margin;
++static void print_aka (char *p, int list, int margin)
+ {
+     register char   c;
+ #ifdef JAPAN
diff --git a/mail/ja-mh/patches/patch-uip_aliasbr.c b/mail/ja-mh/patches/patch-uip_aliasbr.c
new file mode 100644
index 00000000000..ea6da9a22af
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_aliasbr.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-uip_aliasbr.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/aliasbr.c.orig	2013-03-28 18:04:32.000000000 +0000
++++ uip/aliasbr.c
+@@ -26,7 +26,7 @@ static char   *scanp (), *getp (), *seek
+ static struct aka *akalloc ();
+ static struct home *hmalloc ();
+ 
+-static		add_aka();
++static void add_aka (struct aka *ak, char *pp);
+ static int	aleq(), addfile(), addgroup(), addmember(), addall();
+ 
+ #ifndef	__STDC__
+@@ -474,9 +474,7 @@ register char   *addrs;
+ 
+ /*  */
+ 
+-static	add_aka (ak, pp)
+-register struct aka *ak;
+-register char   *pp;
++static void add_aka (struct aka *ak, char *pp)
+ {
+     register struct adr *ad,
+ 			*ld;
diff --git a/mail/ja-mh/patches/patch-uip_burst.c b/mail/ja-mh/patches/patch-uip_burst.c
new file mode 100644
index 00000000000..1ed686857e9
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_burst.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-uip_burst.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/burst.c.orig	2013-03-28 18:11:40.000000000 +0000
++++ uip/burst.c
+@@ -11,7 +11,7 @@ static char ident[] = "@(#)$Id: burst.c,
+ #include	<locale.h>
+ #endif
+ 
+-static	cpybrst(), burst();
++static	cpybrst();
+ /*  */
+ 
+ static struct swit switches[] = {
+@@ -50,6 +50,8 @@ struct smsg {
+ 
+ /*  */
+ 
++static void burst (struct smsg *smsgs, int msgnum, int inplace, int quietsw, int verbosw);
++
+ /* ARGSUSED */
+ 
+ main (argc, argv)
+@@ -185,12 +187,7 @@ char  **argv;
+ 
+ /*  */
+ 
+-static  burst (smsgs, msgnum, inplace, quietsw, verbosw)
+-register struct smsg *smsgs;
+-int     msgnum,
+-        inplace,
+-        quietsw,
+-        verbosw;
++static void burst (struct smsg *smsgs, int msgnum, int inplace, int quietsw, int verbosw)
+ {
+     int     i,
+             j,
diff --git a/mail/ja-mh/patches/patch-uip_conflict.c b/mail/ja-mh/patches/patch-uip_conflict.c
new file mode 100644
index 00000000000..a9a1e5de24a
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_conflict.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-uip_conflict.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/conflict.c.orig	2013-03-28 18:42:59.000000000 +0000
++++ uip/conflict.c
+@@ -23,6 +23,10 @@ static char ident[] = "@(#)$Id: conflict
+ #define	NDIRS	100
+ #define	NGRPS	100
+ 
++void setup (void);
++
++static void mdrop(char *drop);
++
+ /*  */
+ 
+ static struct swit switches[] = {
+@@ -299,8 +303,7 @@ maildrops () 
+ }
+ 
+ 
+-mdrop(drop)
+-register char *drop;
++static void mdrop(char *drop)
+ {
+     register int    hit = 0;
+ #ifdef SYS5DIR
+@@ -346,7 +349,7 @@ register char   *s;
+ 
+ /*  */
+ 
+-setup () {
++void setup (void) {
+     int     fd,
+             pd[2];
+ 
diff --git a/mail/ja-mh/patches/patch-uip_forw.c b/mail/ja-mh/patches/patch-uip_forw.c
new file mode 100644
index 00000000000..94ef8839ab9
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_forw.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-uip_forw.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/forw.c.orig	2013-03-28 18:15:26.000000000 +0000
++++ uip/forw.c
+@@ -22,7 +22,8 @@ static char ident[] = "@(#)$Id: forw.c,v
+ #define	IFORMAT	"digest-issue-%s"
+ #define	VFORMAT	"digest-volume-%s"
+ 
+-static	mhl_draft(), copy_draft(), build_form();
++static	mhl_draft(), build_form();
++static void copy_draft (int out, char *digest, char *file, int volume, int issue, int mime);
+ /*  */
+ 
+ static struct swit switches[] = {
+@@ -558,13 +559,7 @@ register char   *digest,
+ 
+ /*  */
+ 
+-static	copy_draft (out, digest, file, volume, issue, mime)
+-int     out,
+-        volume,
+-        issue,
+-	mime;
+-register char   *digest,
+-		*file;
++static void copy_draft (int out, char *digest, char *file, int volume, int issue, int mime)
+ {
+     int     fd,i,
+             msgcnt,
diff --git a/mail/ja-mh/patches/patch-uip_mhlsbr.c b/mail/ja-mh/patches/patch-uip_mhlsbr.c
new file mode 100644
index 00000000000..12c5ca4904f
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_mhlsbr.c
@@ -0,0 +1,109 @@
+$NetBSD: patch-uip_mhlsbr.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/mhlsbr.c.orig	2001-04-04 16:05:16.000000000 +0000
++++ uip/mhlsbr.c
+@@ -57,6 +57,8 @@ static char ident[] = "@(#)$Id: mhlsbr.c
+ 
+ #define	QUOTE	'\\'
+ 
++static void m_pclose (void);
++
+ /*  */
+ 
+ static struct swit mhlswitches[] = {
+@@ -292,8 +294,13 @@ static TYPESIG	intrser (), pipeser (), q
+ static char   *mcomp_add (), *oneline (), *parse ();
+ static struct mcomp *add_queue ();
+ 
+-static	mhl_format(), evalvar(), process(), mhlfile(), free_queue(), putcomp();
+-static	putstr(), putch(), face_format(), m_popen();
++static	mhl_format(), evalvar(), free_queue();
++static void process (char *folder, char *fname, int ofilen, int ofilec);
++static void mhlfile (FILE *fp, char *mname, int ofilen, int ofilec);
++static  void putcomp (struct mcomp *c1, struct mcomp *c2, int flag);
++static	putstr(), m_popen();
++static void face_format (struct mcomp *c1);
++static void putch(char ch);
+ static int	ptoi(), ptos(), doface();
+ 
+ void	clear_screen ();
+@@ -784,11 +791,7 @@ static char *parse () {
+ 
+ /*  */
+ 
+-static  process (folder, fname, ofilen, ofilec)
+-char   *folder,
+-       *fname;
+-int	ofilen,
+-	ofilec;
++static void process (char *folder, char *fname, int ofilen, int ofilec)
+ {
+     char  *cp;
+     FILE  *fp;
+@@ -832,11 +835,7 @@ int	ofilen,
+ 
+ /*  */
+ 
+-static mhlfile (fp, mname, ofilen, ofilec)
+-register FILE   *fp;
+-register char   *mname;
+-int	ofilen,
+-	ofilec;
++static void mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
+ {
+     int     state;
+     register struct mcomp  *c1,
+@@ -1089,9 +1088,7 @@ struct pqpair {
+ };
+ 
+ 
+-static mcomp_format (c1, c2)
+-register struct mcomp *c1,
+-		      *c2;
++static void mcomp_format (struct mcomp *c1, struct mcomp *c2)
+ {
+     int     dat[5];
+     register char  *ap,
+@@ -1256,10 +1253,7 @@ register struct mcomp **head,
+ 
+ /*  */
+ 
+-static  putcomp (c1, c2, flag)
+-register struct mcomp *c1,
+-		      *c2;
+-int     flag;
++static void putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
+ {
+     int     count,
+             cchdr;
+@@ -1478,9 +1472,8 @@ putstr_sbr(string)
+ 
+ /*  */
+ 
+-static
+-putch(ch)
+-     char ch;
++static void
++putch(char ch)
+ {
+     char buf[BUFSIZ];
+ 
+@@ -1686,8 +1679,7 @@ int     i;
+ 
+ /*  */
+ 
+-static	face_format (c1)
+-register struct mcomp *c1;
++static void face_format (struct mcomp *c1)
+ {
+     register char  *cp;
+     register struct mailname   *mp;
+@@ -2018,7 +2010,7 @@ char *name;
+ }
+ 
+ 
+-m_pclose () {
++static void m_pclose (void) {
+     if (m_pid == NOTOK)
+ 	return;
+ 
diff --git a/mail/ja-mh/patches/patch-uip_msh.c b/mail/ja-mh/patches/patch-uip_msh.c
new file mode 100644
index 00000000000..65494d8f3d7
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_msh.c
@@ -0,0 +1,113 @@
+$NetBSD: patch-uip_msh.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/msh.c.orig	2013-03-28 18:19:47.000000000 +0000
++++ uip/msh.c
+@@ -181,6 +181,23 @@ jmp_buf sigenv;			/* the environment poi
+ 
+ static TYPESIG	intrser (), pipeser (), quitser ();
+ 
++void readids (int id);
++void display_info (int scansw);
++void filecmd (char **args);
++void foldcmd (char **args);
++void explcmd (char **args);
++void forwcmd (char **args);
++void markcmd (char **args);
++void mhncmd (char **args);
++void packcmd (char **args);
++void distcmd (char **args);
++void pickcmd (char **args);
++void replcmd (char **args);
++void showcmd (char **args);
++void scancmd (char **args);
++void rmmcmd (char **args);
++void sortcmd (char **args);
++void forkcmd (char **args, char *pgm);
+ 
+ #ifndef	__STDC__
+ #ifdef	SYS5
+@@ -189,10 +206,14 @@ struct passwd  *getpwnam ();
+ #endif
+ 
+ static int	read_map(), read_file(), check_folder(), getargs(), parse();
+-static int	getcmds(), init_io(), initaux_io(), finaux_io(), peerwait();
++static int	getcmds(), init_io(), initaux_io(), peerwait();
++static void finaux_io (struct Cmd *cmdp);
+ static int	pINI(), pQRY(), pQRY1(), pQRY2(), pCMD(), pFIN();
+ static int	ttyR(), ttyNaux(), winN(), winR(), winX();
+-static		msh(), m_gMsgs(), scanrange(), scanstring(), quit();
++static		scanrange(), scanstring();
++static void msh (int scansw);
++static void m_gMsgs (int n);
++static void quit(void);
+ static		fin_io(), m_init();
+ #if defined(BPOP) || defined(NNTP)
+ static int	read_pop();
+@@ -461,8 +482,7 @@ static struct swit mshcmds[] = {
+ 
+ /*  */
+ 
+-static  msh (scansw)
+-int     scansw;
++static void msh (int scansw)
+ {
+     int     i;
+     register char  *cp,
+@@ -924,8 +944,7 @@ register char  *s;
+ 
+ /*  */
+ 
+-static m_gMsgs (n)
+-int	n;
++static void m_gMsgs (int n)
+ {
+     int	    nmsgs;
+ 
+@@ -1184,8 +1203,7 @@ char   *arg;
+ 
+ /*  */
+ 
+-readids (id)
+-int     id;
++void readids (int id)
+ {
+     register int    cur,
+                     flags,
+@@ -1284,8 +1302,7 @@ int     msgnum;
+ 
+ /*  */
+ 
+-display_info (scansw)
+-int     scansw;
++void display_info (int scansw)
+ {
+     int     flags,
+             sd;
+@@ -1332,7 +1349,7 @@ int     scansw;
+ 
+ /*  */
+ 
+-static	write_ids () {
++static void write_ids (void) {
+     int     i = 0,
+ 	    flags,
+             msgnum;
+@@ -1358,7 +1375,7 @@ static	write_ids () {
+ 
+ /*  */
+ 
+-static  quit () {
++static void quit (void) {
+     int     i,
+             md,
+             msgnum;
+@@ -1945,8 +1962,7 @@ int	vio;
+ }
+ 
+ 
+-static int  finaux_io (cmdp)
+-register struct Cmd *cmdp;
++static void finaux_io (struct Cmd *cmdp)
+ {
+     switch (cmdp -> direction) {
+ 	case STDIO: 
diff --git a/mail/ja-mh/patches/patch-uip_post.c b/mail/ja-mh/patches/patch-uip_post.c
new file mode 100644
index 00000000000..49b675319df
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_post.c
@@ -0,0 +1,159 @@
+$NetBSD: patch-uip_post.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/post.c.orig	2013-03-28 18:44:13.000000000 +0000
++++ uip/post.c
+@@ -365,10 +365,24 @@ static	char   *record = NULLCP;
+ off_t	lseek ();
+ time_t	time ();
+ 
+-static	putfmt(), start_headers(), finish_headers(), putgrp(), pl();
++#ifndef	MHMTS
++static void do_addresses (int bccque, int talk);
++#else	/* MHMTS */
++static void do_addresses (char *file, int fd, int ud, int bccque, int talk);
++#endif	/* MHMTS */
++
++static	start_headers(), finish_headers(), pl();
++static void putfmt (char *name, char *str, FILE *out);
++static void putgrp (char *name, char *group, FILE *out, unsigned int flags);
+ static	anno(), make_bcc_file(), verify_all_addresses();
+-static	chkadr(), do_addresses(), do_text(), do_an_address(), sigon();
+-static 	sigoff(), p_refile(), fcc(), die(), insert_fcc(), p_record ();
++static	chkadr(), do_text();
++static void do_an_address (struct mailname *lp, int talk, int tma);
++static void sigon (void);
++static 	fcc(), die();
++static void insert_fcc (struct headers *hdr, char *pp);
++static void sigoff (void );
++static void p_refile (char *file);
++static void p_record (void);
+ static int	get_header(), putadr(), insert(), annoaux();
+ #ifdef TMA
+ static	postplain();
+@@ -844,10 +858,7 @@ daemon: ;
+ 
+ /*    DRAFT GENERATION */
+ 
+-static putfmt (name, str, out)
+-register char   *name,
+-		*str;
+-register FILE *out;
++static void putfmt (char *name, char *str, FILE *out)
+ {
+     int     count,
+             grp,
+@@ -1264,11 +1275,7 @@ unsigned int    flags;
+ 
+ /*  */
+ 
+-static putgrp (name, group, out, flags)
+-register char   *name,
+-		*group;
+-register FILE *out;
+-unsigned int    flags;
++static void putgrp (char *name, char *group, FILE *out, unsigned int flags)
+ {
+     int     len;
+     char   *cp;
+@@ -1418,9 +1425,7 @@ register struct mailname *mp;
+ 
+ /*  */
+ 
+-static  insert_fcc (hdr, pp)
+-register struct	headers *hdr;
+-register char   *pp;
++static void insert_fcc (struct headers *hdr, char *pp)
+ {
+     register char   *cp;
+ 
+@@ -1952,15 +1957,10 @@ int	talk;
+ /*  */
+ 
+ #ifndef	MHMTS
+-static do_addresses (bccque, talk)
++static void do_addresses (int bccque, int talk)
+ #else	/* MHMTS */
+-static do_addresses (file, fd, ud, bccque, talk)
+-register char   *file;
+-int	fd,
+-	ud;
++static void do_addresses (char *file, int fd, int ud, int bccque, int talk)
+ #endif	/* MHMTS */
+-int	bccque,
+-	talk;
+ {
+     int     retval;
+ #ifndef	BERK
+@@ -2122,10 +2122,7 @@ int     fd;
+ /* ARGSUSED */
+ #endif	/* TMA */
+ 
+-static do_an_address (lp, talk, tma)
+-register struct mailname *lp;
+-int     talk,
+-	tma;
++static void do_an_address (struct mailname *lp, int talk, int tma)
+ {
+     int     len,
+             retval;
+@@ -2260,10 +2257,7 @@ int     talk,
+ #ifdef	MHMTS
+ /* ARGSUSED */
+ 
+-static do_an_address (lp, talk, tma)
+-register struct mailname *lp;
+-int     talk,
+-	tma;
++static void do_an_address (struct mailname *lp, int talk, int tma)
+ {
+     register char  *mbox;
+     char    addr[BUFSIZ];
+@@ -2353,10 +2347,7 @@ int     talk,
+ /* ARGSUSED */
+ #endif	/* TMA */
+ 
+-static do_an_address (lp, talk, tma)
+-register struct mailname *lp;
+-int     talk,
+-	tma;
++static void do_an_address (struct mailname *lp, int talk, int tma)
+ {
+     int     retval;
+     register char  *mbox,
+@@ -2463,7 +2454,7 @@ int     i;
+ #endif	/* not MHMTS */
+ 
+ 
+-static  sigon () {
++static void sigon (void) {
+     if (debug)
+ 	return;
+ 
+@@ -2481,7 +2472,7 @@ static  sigon () {
+ }
+ 
+ 
+-static sigoff () {
++static void sigoff (void ) {
+     if (debug)
+ 	return;
+ 
+@@ -2493,8 +2484,7 @@ static sigoff () {
+ 
+ /*    FCC INTERACTION */
+ 
+-static  p_refile (file)
+-register char   *file;
++static void p_refile (char *file)
+ {
+     register int     i;
+ 
+@@ -2560,7 +2550,7 @@ register char   *file,
+ 
+ /*    RECORD RECIPIENTS */
+ 
+-static	p_record ()
++static void p_record (void)
+ {
+     int	    i,
+ 	    child_id,
diff --git a/mail/ja-mh/patches/patch-uip_rcvtty.c b/mail/ja-mh/patches/patch-uip_rcvtty.c
new file mode 100644
index 00000000000..de6b11191ac
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_rcvtty.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-uip_rcvtty.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/rcvtty.c.orig	2013-03-28 18:54:40.000000000 +0000
++++ uip/rcvtty.c
+@@ -79,7 +79,7 @@ off_t	lseek ();
+ char   *getusr ();
+ 
+ static int	message_fd(), header_fd();
+-static		alert();
++static  void alert (char *tty, int md);
+ 
+ static int bell = 1;
+ static int newline = 1;
+@@ -329,9 +329,7 @@ static int  header_fd () {
+ /*  */
+ 
+ #ifndef	TTYD
+-static  alert (tty, md)
+-char   *tty;
+-int     md;
++static  void alert (char *tty, int md)
+ {
+     int     i,
+             td;
+@@ -395,9 +393,7 @@ int     md;
+ 
+ /*  */
+ 
+-static  alert (user, md)
+-register char   *user;
+-int     md;
++static void  alert (char *user, int md)
+ {
+     int     i,
+             td;
diff --git a/mail/ja-mh/patches/patch-uip_replsbr.c b/mail/ja-mh/patches/patch-uip_replsbr.c
new file mode 100644
index 00000000000..1da92de2f3f
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_replsbr.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-uip_replsbr.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/replsbr.c.orig	2013-03-28 18:37:39.000000000 +0000
++++ uip/replsbr.c
+@@ -68,7 +68,8 @@ static char *addrcomps[] = {
+     NULL
+ };
+ 
+-static	insert(), replfilter();
++static	insert();
++static void replfilter (FILE *in, FILE *out);
+ /*  */
+ 
+ /* ARGSUSED */
+@@ -438,9 +439,7 @@ register struct mailname *np;
+ 
+ /*  */
+ 
+-static	replfilter (in, out)
+-register FILE *in,
+-	      *out;
++static void replfilter (FILE *in, FILE *out)
+ {
+     int	    pid;
+     char   *mhl;
diff --git a/mail/ja-mh/patches/patch-uip_sendsbr.c b/mail/ja-mh/patches/patch-uip_sendsbr.c
new file mode 100644
index 00000000000..ffdf2911420
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_sendsbr.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-uip_sendsbr.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/sendsbr.c.orig	2013-03-28 18:13:35.000000000 +0000
++++ uip/sendsbr.c
+@@ -13,7 +13,9 @@ static char ident[] = "@(#)$Id: sendsbr.
+ #include <unistd.h>
+ #endif
+ 
+-static		alert(), anno(), annoaux();
++static		alert();
++static void annoaux(int);
++static void anno (int fd, struct stat *st);
+ static int	tmp_fd();
+ static int	sendaux();
+ #ifdef	MIME
+@@ -494,9 +496,7 @@ static int  tmp_fd () {
+ 
+ /*  */
+ 
+-static anno (fd, st)
+-int	fd;
+-register struct stat *st;
++static void anno (int fd, struct stat *st)
+ {
+     int     child_id;
+     TYPESIG (*hstat) (), (*istat) (), (*qstat) (), (*tstat) ();
+@@ -548,8 +548,7 @@ register struct stat *st;
+ 
+ /*  */
+ 
+-static	annoaux (fd)
+-int	fd;
++static void annoaux (int fd)
+ {
+     int	    fd2,
+ 	    fd3,
diff --git a/mail/ja-mh/patches/patch-uip_slocal.c b/mail/ja-mh/patches/patch-uip_slocal.c
new file mode 100644
index 00000000000..c9abbf6287a
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_slocal.c
@@ -0,0 +1,36 @@
+$NetBSD: patch-uip_slocal.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/slocal.c.orig	2013-03-28 18:56:29.000000000 +0000
++++ uip/slocal.c
+@@ -211,7 +211,9 @@ struct passwd *getpwnam ();
+ #endif
+ static int	localmail(), usr_delivery(), split(), parse(), logged_in();
+ static int	timely(), usr_file(), usr_pipe(), copyfile();
+-static expand(), glob(), copyinfo();
++static expand();
++static void glob (int fd);
++static void copyinfo (FILE *fp, char *from);
+ 
+ /*  */
+ 
+@@ -893,8 +895,7 @@ int	fd;
+ 
+ /*  */
+ 
+-static	glob (fd)
+-register int  fd;
++static void glob (int fd)
+ {
+     char buffer[BUFSIZ];
+     struct stat st;
+@@ -1238,9 +1239,7 @@ int     i;
+ 
+ /*  */
+ 
+-static	copyinfo (fp, from)
+-register FILE   *fp;
+-char	*from;
++static void copyinfo (FILE *fp, char *from)
+ {
+     int     i;
+     register char  *cp;
diff --git a/mail/ja-mh/patches/patch-uip_spost.c b/mail/ja-mh/patches/patch-uip_spost.c
new file mode 100644
index 00000000000..8c59a756f37
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_spost.c
@@ -0,0 +1,52 @@
+$NetBSD: patch-uip_spost.c,v 1.1 2013/03/28 21:31:26 joerg Exp $
+
+--- uip/spost.c.orig	2001-04-04 16:05:17.000000000 +0000
++++ uip/spost.c
+@@ -212,9 +212,11 @@ static char *fccfold[FCCS];	/* foldernam
+ static struct headers  *hdrtab;	/* table for the message we're doing */
+ static FILE *out;		/* output (temp) file */
+ 
+-static	putfmt(), start_headers(), finish_headers(), putadr(),
+-	insert_fcc();
+-static	file(), fcc();
++static void putfmt (char *name, char *str, FILE *out);
++static	start_headers(), finish_headers(), putadr();
++static void insert_fcc (struct headers *hdr, char *pp);
++static	fcc();
++static void file (char *path);
+ static int	get_header(), putone();
+ /*    MAIN */
+ 
+@@ -529,10 +531,7 @@ char   *argv[];
+ 
+ /*    DRAFT GENERATION */
+ 
+-static putfmt (name, str, out)
+-char   *name,
+-       *str;
+-FILE * out;
++static void putfmt (char *name, char *str, FILE *out)
+ {
+     int     count,
+             grp,
+@@ -835,9 +834,7 @@ int indent;
+ 
+ /*  */
+ 
+-static  insert_fcc (hdr, pp)
+-struct	headers *hdr;
+-char   *pp;
++static void insert_fcc (struct headers *hdr, char *pp)
+ {
+     char   *cp;
+ 
+@@ -921,8 +918,7 @@ static  make_bcc_file () {
+ 
+ /*    FCC INTERACTION */
+ 
+-static  file (path)
+-char   *path;
++static void file (char *path)
+ {
+     int     i;
+ 
diff --git a/mail/ja-mh/patches/patch-uip_trmsbr.c b/mail/ja-mh/patches/patch-uip_trmsbr.c
new file mode 100644
index 00000000000..d9cc11c6fb1
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_trmsbr.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-uip_trmsbr.c,v 1.1 2013/03/28 21:31:27 joerg Exp $
+
+--- uip/trmsbr.c.orig	2013-03-28 18:16:11.000000000 +0000
++++ uip/trmsbr.c
+@@ -57,7 +57,7 @@ static char termcap[TXTSIZ];
+ 
+ /*  */
+ 
+-static  read_termcap () {
++static void read_termcap (void) {
+     register char  *bp,
+                    *term;
+     char   *cp,
diff --git a/mail/ja-mh/patches/patch-uip_whatnowsbr.c b/mail/ja-mh/patches/patch-uip_whatnowsbr.c
new file mode 100644
index 00000000000..82e2055f411
--- /dev/null
+++ b/mail/ja-mh/patches/patch-uip_whatnowsbr.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-uip_whatnowsbr.c,v 1.1 2013/03/28 21:31:27 joerg Exp $
+
+--- uip/whatnowsbr.c.orig	2013-03-28 18:12:50.000000000 +0000
++++ uip/whatnowsbr.c
+@@ -18,7 +18,8 @@ static char ident[] = "@(#)$Id: whatnows
+ #define	MIMEminc(a)	0
+ #endif
+ 
+-static int	editfile(), copyf(), sendfile(), sendit(), whomfile();
++static int	editfile(), copyf(), sendfile(), whomfile();
++static void sendit (char *sp, char **arg, char *file, int pushed);
+ #ifdef	MIME
+ static int	mhnfile();
+ #endif
+@@ -690,11 +691,7 @@ extern char *distfile;
+ 
+ /*  */
+ 
+-static  sendit (sp, arg, file, pushed)
+-register char  *sp,
+-	      **arg,
+-               *file;
+-int     pushed;
++static void sendit (char *sp, char **arg, char *file, int pushed)
+ {
+ #ifndef	lint
+     int	    distsw = 0;
diff --git a/mail/ja-mh/patches/patch-zotnet_mts_mts.h b/mail/ja-mh/patches/patch-zotnet_mts_mts.h
new file mode 100644
index 00000000000..4bb54f7c7cb
--- /dev/null
+++ b/mail/ja-mh/patches/patch-zotnet_mts_mts.h
@@ -0,0 +1,10 @@
+$NetBSD: patch-zotnet_mts_mts.h,v 1.1 2013/03/28 21:31:27 joerg Exp $
+
+--- zotnet/mts/mts.h.orig	2013-03-28 18:05:39.000000000 +0000
++++ zotnet/mts/mts.h
+@@ -109,3 +109,5 @@ extern char *maildelivery;
+ 
+ extern int Everyone;
+ extern char *NoShell;
++
++void mts_init (char *name);
diff --git a/mail/ja-mh/patches/patch-zotnet_tws_dtimep.c-lexed b/mail/ja-mh/patches/patch-zotnet_tws_dtimep.c-lexed
new file mode 100644
index 00000000000..15db238434b
--- /dev/null
+++ b/mail/ja-mh/patches/patch-zotnet_tws_dtimep.c-lexed
@@ -0,0 +1,14 @@
+$NetBSD: patch-zotnet_tws_dtimep.c-lexed,v 1.1 2013/03/28 21:31:27 joerg Exp $
+
+--- zotnet/tws/dtimep.c-lexed.orig	2013-03-28 18:10:08.000000000 +0000
++++ zotnet/tws/dtimep.c-lexed
+@@ -115,8 +115,7 @@ static	int day_map[] = {
+ #endif	/* BSD42 */
+ #endif
+ 
+-static	zonehack (tw)
+-register struct tws *tw;
++static void zonehack (struct tws *tw)
+ {
+     register struct tm *tm;
+