* Fix build problem on NetBSD current, terminfo case.

* Add comments to each patch file.

53 files changed, 371 insertions, 89 deletions

diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
index 8d9936003a1..bf8e809bb7a 100644
--- a/mail/ja-mh/distinfo
+++ b/mail/ja-mh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/12/25 13:55:12 taca Exp $
+$NetBSD: distinfo,v 1.12 2010/09/27 12:01:49 taca 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
@@ -15,47 +15,55 @@ Size (mh-6.8.4-JP-3.05-20031106.patch.gz) = 311 bytes
 SHA1 (mh-6.8.4-JP-3.05.tar.gz) = cb531f80be4326cd56d33d6fa9efba4d2d63d0ce
 RMD160 (mh-6.8.4-JP-3.05.tar.gz) = a092a9447370a09f770121baa2ae7eced130ff0f
 Size (mh-6.8.4-JP-3.05.tar.gz) = 1574689 bytes
-SHA1 (patch-aa) = 59b734fb27a8a5ccea529044bf5bd2f09965be85
-SHA1 (patch-ab) = d322f0400d065bc4152f681969ea858dfc2d87a9
-SHA1 (patch-ac) = ea10c3b0b230932a256fd9069b0aab34c7de92bb
-SHA1 (patch-ad) = 64d97e58ae75179f4be6222279aa6a470e37ac00
-SHA1 (patch-ae) = 7b39981a32d4a74bc7bd7c4b9a51300c73ff381a
-SHA1 (patch-af) = 3d477e8febb0af5605b8570bf03d77e1dbf64ab8
-SHA1 (patch-ag) = 863812f108d4d25b44c62996a50aafa8dbed2880
-SHA1 (patch-ah) = 6dcd2fffe854da65ecbf2ec4817d5f66ec7ca92e
-SHA1 (patch-ai) = 4f6e6ff7fa4b331d16edd27cff565eb022813443
-SHA1 (patch-aj) = 3fb227132f1556a864bd892fea30a2cdf99968e8
-SHA1 (patch-ak) = 97f021754702266996a05f8a665cd5dcc9168f60
-SHA1 (patch-al) = b91ccc3db1f1b889c9cd7d9c74b31a9c8f1b8993
-SHA1 (patch-am) = 5b94f3831692c3a23dd86b0a5cc4842712318ff2
-SHA1 (patch-ao) = 903d65929397ee283beb6aec93e08c32794dc709
-SHA1 (patch-ap) = 7c4069eb87ddca9d1d294b57681d51a393eab3f0
-SHA1 (patch-aq) = 7410ea8359575a89fb489403ab0ab76ff0c24a26
-SHA1 (patch-ar) = 7b3f65a4ff93c428dc4def0d4e3fe993bae7266b
-SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54
-SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb
-SHA1 (patch-au) = 53b2f70316c6d7b3c61d2d0ff09cfa0cc7486b20
-SHA1 (patch-av) = 14d79f16dcc7f5fe76caec499c9043fbc6874d06
-SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230
-SHA1 (patch-ax) = ec3ea364f6cec1f194971b1ba3e2d3090de01d9f
-SHA1 (patch-ay) = f62ad194e1bf70054ff833c094206f7754478a6f
-SHA1 (patch-az) = de12b9fc05d022a9850108541378f25249918182
-SHA1 (patch-ba) = 4e0880360e484f6b74c45870e97f6f89d3a87a76
-SHA1 (patch-bb) = a7ec0a5f4f96ca2e945dc1d133322852ec1d46dd
-SHA1 (patch-bc) = 44fc56c7bccca8c8d7c77a1a7eecfd2391228402
-SHA1 (patch-bd) = 448da6011564280649930b43fbf0d793030012b7
-SHA1 (patch-be) = a72a8a4e251a1329cc86d60b24cf7977c5f5482b
-SHA1 (patch-bf) = 6510f0ac0b88c1f08622948ba070f450cbcf02e1
-SHA1 (patch-bg) = 46a1d43ad4496ee2f4d031751f13ba48c4e492d4
-SHA1 (patch-bh) = f40cc4c0859f5e1bad7daabab99a33249561c061
-SHA1 (patch-bi) = c00381964adedd04613429c6adc9d9a91aac50b7
-SHA1 (patch-bj) = 609aaee6ceaf77b254f863e0b8a822b94f8bd481
-SHA1 (patch-bk) = 319b3b78cfad3a2a029c660e9159b5363b3cf6e6
-SHA1 (patch-bl) = bf78bc6ef3da67f8580465a0e0b4901835b816ad
-SHA1 (patch-bm) = 45b2c9250590d387754699f84fdcfb12b88bb29e
-SHA1 (patch-bn) = 8caa98f3e8e92198c9489d186620086408c51a5d
-SHA1 (patch-bo) = 76171ab1930424b3a4e5de3c69df2d8674c77b1c
-SHA1 (patch-bp) = 4e42fe6a4730644eb42908ffea1caad330d7ee77
-SHA1 (patch-bq) = 746b22913bd1f50430900929961e497d45c1169d
-SHA1 (patch-br) = fa583d9a18627a200ca2af0dce89893f1ad02cdb
-SHA1 (patch-bs) = 1e2371a0c0df470196d7673a78377329ab4cede6
+SHA1 (patch-aa) = f63670b588db1362907bd7dc3052712a60c0d02b
+SHA1 (patch-ab) = 23e5445cf1b25b20c53ffe126572f3f46bd7ec7f
+SHA1 (patch-ac) = 73180cf938280fcb1cd9c8d1f75de6b87ac70890
+SHA1 (patch-ad) = e4f644a9925b00ae1777a72b4937b44b037c2c02
+SHA1 (patch-ae) = 8a189fd695abafd76016f3b45b6591141c6415a6
+SHA1 (patch-af) = d3d4a278dc30dbb86c9545868f371d18a4e9ab81
+SHA1 (patch-ag) = 11b3586da9ea060cb0eb2abd4be66995c52b00dc
+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-aq) = f7147e5f5728bb60ad4741ac61b847323ff51b3c
+SHA1 (patch-ar) = 8193709d54a485b0e95c091be3748b6153e91f06
+SHA1 (patch-as) = a0d00cd93b69c8614982f3a8fbe047ade76a5515
+SHA1 (patch-at) = ada3b2deaadd94edf54748481f6dffb0fc09f28a
+SHA1 (patch-au) = 2cab2c4ff2b0fef56b20f8e1766539522142be8a
+SHA1 (patch-av) = 4006f326fa85d8710794382a5a0eb713f5392e70
+SHA1 (patch-aw) = cc78f180a54b5c72b5e90edde189b15fc4d209e4
+SHA1 (patch-ax) = 365ce5b623413cb55a4ee04ebaaa9f61e4ba0ff4
+SHA1 (patch-ay) = cbe7ddee99359a1497c1398602cc3e141493fb0d
+SHA1 (patch-az) = 66034ae3bb628cc74f1a9ff8e8c995a58941e9b3
+SHA1 (patch-ba) = 31ec33ea9ad1334e7b3d814121976a7c01fe820d
+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-bi) = 96324f2bbbc99913427ace1a8102256932e5f807
+SHA1 (patch-bj) = 46dd9576537c877328cfa7fb9f10fdba42ee53d0
+SHA1 (patch-bk) = 277f03f988d400f5fac89e8e2fb826feed3fd25a
+SHA1 (patch-bl) = 18e43de0280162e6c70f03803872812aa0647f1b
+SHA1 (patch-bm) = ba0045f5b04956d6392c833c4713a45997b47fad
+SHA1 (patch-bn) = f16a572626108561e12f112d559ea518262b3540
+SHA1 (patch-bo) = c1ed3f5ce677eea50d4bd52076bab75de4c49b5d
+SHA1 (patch-bp) = 952d27e9c68f4629ba84957492ecb1e0db563550
+SHA1 (patch-bq) = 17f8722b2509baad2e8362ac86a53181144c296d
+SHA1 (patch-br) = d58aef4d14429b8268a5b1652e686298615bb3ba
+SHA1 (patch-bs) = 6033c920fb4e7542d7ad5ed500b0397133ecee10
+SHA1 (patch-bt) = 79789097d2d0c4b7a469c40b77add954d77608b6
+SHA1 (patch-bu) = e31bcc3bec12ef681d1c813d6d01dafbcdf01df2
+SHA1 (patch-bv) = 013b6774331d2e87a14d6c79d9f941ab145f879a
+SHA1 (patch-bw) = d1755cd30038c3fb9c355944e317f0a2851b26ca
+SHA1 (patch-bx) = 03c71c7cf7b8b179aaf993763e27b120ccb3fee9
+SHA1 (patch-by) = e7a6795344983ccbcb593f0647479f97cbb48c46
+SHA1 (patch-bz) = 772d559a23eaacd70909fc44aab18e3ac4567c74
+SHA1 (patch-ca) = 80aff3342e835dd4969fd3600bd3e55bfb204bdb
diff --git a/mail/ja-mh/patches/patch-aa b/mail/ja-mh/patches/patch-aa
index d6fc4dc3bf0..83698242dcd 100644
--- a/mail/ja-mh/patches/patch-aa
+++ b/mail/ja-mh/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2005/03/15 14:05:52 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Proper integer size.
 
 --- h/md5.h.orig	1999-02-09 12:30:00.000000000 +0100
 +++ h/md5.h
diff --git a/mail/ja-mh/patches/patch-ab b/mail/ja-mh/patches/patch-ab
index f71f72011b3..5e820f238b2 100644
--- a/mail/ja-mh/patches/patch-ab
+++ b/mail/ja-mh/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add DragonFly support.
+* Don't declare errno.
 
 --- zotnet/mts/client.c.orig	2006-04-11 13:04:19.000000000 +0000
 +++ zotnet/mts/client.c
diff --git a/mail/ja-mh/patches/patch-ac b/mail/ja-mh/patches/patch-ac
index 5f6484c7fc0..93686e90192 100644
--- a/mail/ja-mh/patches/patch-ac
+++ b/mail/ja-mh/patches/patch-ac
@@ -1,4 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add Dragonfly sport.
+* Care for ELF shared library.
+* Check terminfo for NetBSD 6.0 and later.
 
 --- configure.orig	2001-06-14 16:41:51.000000000 +0000
 +++ configure
@@ -22,3 +26,24 @@ $NetBSD: patch-ac,v 1.3 2006/04/11 15:08:38 joerg Exp $
        echo __ELF__ | $CC -E - | grep -q __ELF__ || sharedlib=gnuelf
        slflags="-fpic"
        slibdir=$libdir
+@@ -3797,6 +3789,12 @@ then
+   fi
+ fi
+ 
++TERMINFO=
++if test -f /usr/share/misc/terminfo.db
++then
++  TERMINFO=TERMINFO
++fi
++
+ if test "$ac_cv_func_lockf" = yes -a x"$BSD44" = x
+ then
+   LOCKF=LOCKF
+@@ -4410,6 +4408,7 @@ s%@mailspool@%$mailspool%g
+ s%@mailgroup@%$mailgroup%g
+ s%@DBMPWD@%$DBMPWD%g
+ s%@SETMG@%$SETMG%g
++s%@TERMINFO@%$TERMINFO%g
+ s%@JAPAN@%$JAPAN%g
+ 
+ CEOF
diff --git a/mail/ja-mh/patches/patch-ad b/mail/ja-mh/patches/patch-ad
index 1da3b2fd07a..d7dddbf6ff7 100644
--- a/mail/ja-mh/patches/patch-ad
+++ b/mail/ja-mh/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add DragonFly support.
 
 --- sbr/discard.c.orig	2006-04-11 13:20:41.000000000 +0000
 +++ sbr/discard.c
diff --git a/mail/ja-mh/patches/patch-ae b/mail/ja-mh/patches/patch-ae
index 3e03ed0c3e9..0ea8cc4e94a 100644
--- a/mail/ja-mh/patches/patch-ae
+++ b/mail/ja-mh/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- sbr/m_draft.c.orig	2006-04-11 13:13:52.000000000 +0000
 +++ sbr/m_draft.c
diff --git a/mail/ja-mh/patches/patch-af b/mail/ja-mh/patches/patch-af
index be9a84329eb..7288c585b97 100644
--- a/mail/ja-mh/patches/patch-af
+++ b/mail/ja-mh/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-af,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- sbr/m_getdefs.c.orig	2006-04-11 13:14:22.000000000 +0000
 +++ sbr/m_getdefs.c
diff --git a/mail/ja-mh/patches/patch-ag b/mail/ja-mh/patches/patch-ag
index 10fb8bd58c7..8bacbe3b01d 100644
--- a/mail/ja-mh/patches/patch-ag
+++ b/mail/ja-mh/patches/patch-ag
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ag,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add DragonFly support.
 
 --- sbr/m_getfld.c.orig	2001-06-13 14:21:02.000000000 +0000
 +++ sbr/m_getfld.c
diff --git a/mail/ja-mh/patches/patch-ah b/mail/ja-mh/patches/patch-ah
index 7607e50a976..65ec4c8cf19 100644
--- a/mail/ja-mh/patches/patch-ah
+++ b/mail/ja-mh/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ah,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno but include <errno.h>.
 
 --- sbr/makedir.c.orig	2006-04-11 13:36:24.000000000 +0000
 +++ sbr/makedir.c
diff --git a/mail/ja-mh/patches/patch-ai b/mail/ja-mh/patches/patch-ai
index 0457fb5095a..19ccd50a2f9 100644
--- a/mail/ja-mh/patches/patch-ai
+++ b/mail/ja-mh/patches/patch-ai
@@ -1,4 +1,7 @@
-$NetBSD: patch-ai,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ai,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare standard library functions but include proper header files.
+* Don't declare errno.
 
 --- sbr/ruserpass.c.orig	2006-04-11 13:37:37.000000000 +0000
 +++ sbr/ruserpass.c
diff --git a/mail/ja-mh/patches/patch-aj b/mail/ja-mh/patches/patch-aj
index 52f629e2e15..b4375789df2 100644
--- a/mail/ja-mh/patches/patch-aj
+++ b/mail/ja-mh/patches/patch-aj
@@ -1,4 +1,6 @@
-$NetBSD: patch-aj,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-aj,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno but include <errno.h>.
 
 --- sbr/advertise.c.orig	2006-04-11 13:42:29.000000000 +0000
 +++ sbr/advertise.c
diff --git a/mail/ja-mh/patches/patch-ak b/mail/ja-mh/patches/patch-ak
index 6b34eb473ec..525baab47ef 100644
--- a/mail/ja-mh/patches/patch-ak
+++ b/mail/ja-mh/patches/patch-ak
@@ -1,4 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ak,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/annosbr.c.orig	2006-04-11 13:45:01.000000000 +0000
 +++ uip/annosbr.c
diff --git a/mail/ja-mh/patches/patch-al b/mail/ja-mh/patches/patch-al
index 52d168d4900..3954dac6b26 100644
--- a/mail/ja-mh/patches/patch-al
+++ b/mail/ja-mh/patches/patch-al
@@ -1,4 +1,7 @@
-$NetBSD: patch-al,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-al,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add DragonFly support.
+* Don't declare errno.
 
 --- uip/vmh.c.orig	2006-04-11 14:16:00.000000000 +0000
 +++ uip/vmh.c
diff --git a/mail/ja-mh/patches/patch-am b/mail/ja-mh/patches/patch-am
index 1bf0896cf83..e4c25a63993 100644
--- a/mail/ja-mh/patches/patch-am
+++ b/mail/ja-mh/patches/patch-am
@@ -1,4 +1,6 @@
-$NetBSD: patch-am,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-am,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno but include <errno.h>.
 
 --- conf/config/mts.c.orig	2006-04-11 13:46:53.000000000 +0000
 +++ conf/config/mts.c
diff --git a/mail/ja-mh/patches/patch-ao b/mail/ja-mh/patches/patch-ao
index 80b24e3f71c..27aada95314 100644
--- a/mail/ja-mh/patches/patch-ao
+++ b/mail/ja-mh/patches/patch-ao
@@ -1,4 +1,6 @@
-$NetBSD: patch-ao,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ao,v 1.4 2010/09/27 12:01:49 taca 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
diff --git a/mail/ja-mh/patches/patch-ap b/mail/ja-mh/patches/patch-ap
index 51856ba19fe..41e8aa57ee3 100644
--- a/mail/ja-mh/patches/patch-ap
+++ b/mail/ja-mh/patches/patch-ap
@@ -1,4 +1,6 @@
-$NetBSD: patch-ap,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ap,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add Dragonfly support.
 
 --- uip/folder.c.orig	2006-04-11 14:21:12.000000000 +0000
 +++ uip/folder.c
diff --git a/mail/ja-mh/patches/patch-aq b/mail/ja-mh/patches/patch-aq
index 659c851e431..79605b4b38c 100644
--- a/mail/ja-mh/patches/patch-aq
+++ b/mail/ja-mh/patches/patch-aq
@@ -1,4 +1,6 @@
-$NetBSD: patch-aq,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-aq,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/inc.c.orig	2006-04-11 14:22:52.000000000 +0000
 +++ uip/inc.c
diff --git a/mail/ja-mh/patches/patch-ar b/mail/ja-mh/patches/patch-ar
index 93fe4f4ddd7..49438d9189c 100644
--- a/mail/ja-mh/patches/patch-ar
+++ b/mail/ja-mh/patches/patch-ar
@@ -1,4 +1,6 @@
-$NetBSD: patch-ar,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ar,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Add Dragonfly support.
 
 --- uip/scansbr.c.orig	2006-04-11 14:23:48.000000000 +0000
 +++ uip/scansbr.c
diff --git a/mail/ja-mh/patches/patch-as b/mail/ja-mh/patches/patch-as
index 79a8f5ad893..dcd6779cbd7 100644
--- a/mail/ja-mh/patches/patch-as
+++ b/mail/ja-mh/patches/patch-as
@@ -1,4 +1,6 @@
-$NetBSD: patch-as,v 1.2 2004/11/29 05:09:43 taca Exp $
+$NetBSD: patch-as,v 1.3 2010/09/27 12:01:49 taca Exp $
+
+* Use stdarg(3) not varargs(3).
 
 --- sbr/concat.c.orig	1993-12-01 13:01:21.000000000 +0900
 +++ sbr/concat.c
diff --git a/mail/ja-mh/patches/patch-at b/mail/ja-mh/patches/patch-at
index b93fe80a1e2..86d268ce09d 100644
--- a/mail/ja-mh/patches/patch-at
+++ b/mail/ja-mh/patches/patch-at
@@ -1,4 +1,6 @@
-$NetBSD: patch-at,v 1.1 2004/11/21 18:52:36 kristerw Exp $
+$NetBSD: patch-at,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Proper prototype for variable argument function.
 
 --- h/mh.h.orig	Sun Nov 21 19:31:18 2004
 +++ h/mh.h	Sun Nov 21 19:33:05 2004
diff --git a/mail/ja-mh/patches/patch-au b/mail/ja-mh/patches/patch-au
index fe9836f10ff..5b4e516e8cf 100644
--- a/mail/ja-mh/patches/patch-au
+++ b/mail/ja-mh/patches/patch-au
@@ -1,4 +1,7 @@
-$NetBSD: patch-au,v 1.2 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-au,v 1.3 2010/09/27 12:01:49 taca Exp $
+
+* Proper linker options.
+* Nuke removing existing files.
 
 --- conf/makefiles/uip.orig	2001-05-30 14:57:47.000000000 +0000
 +++ conf/makefiles/uip
diff --git a/mail/ja-mh/patches/patch-av b/mail/ja-mh/patches/patch-av
index 128096f2407..b8660c0fd26 100644
--- a/mail/ja-mh/patches/patch-av
+++ b/mail/ja-mh/patches/patch-av
@@ -1,4 +1,7 @@
-$NetBSD: patch-av,v 1.3 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-av,v 1.4 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
+* Improve portability.
 
 --- uip/dropsbr.c.orig	1998-04-23 21:02:00.000000000 +0000
 +++ uip/dropsbr.c
diff --git a/mail/ja-mh/patches/patch-aw b/mail/ja-mh/patches/patch-aw
index 3aaadb4e556..c0d4e00c106 100644
--- a/mail/ja-mh/patches/patch-aw
+++ b/mail/ja-mh/patches/patch-aw
@@ -1,4 +1,6 @@
-$NetBSD: patch-aw,v 1.1 2004/11/29 05:09:43 taca Exp $
+$NetBSD: patch-aw,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't ignore error.
 
 --- conf/makefiles/MH-Makefile.orig	1999-02-09 20:30:00.000000000 +0900
 +++ conf/makefiles/MH-Makefile
diff --git a/mail/ja-mh/patches/patch-ax b/mail/ja-mh/patches/patch-ax
index bdd27c214fd..31189a009be 100644
--- a/mail/ja-mh/patches/patch-ax
+++ b/mail/ja-mh/patches/patch-ax
@@ -1,4 +1,7 @@
-$NetBSD: patch-ax,v 1.2 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-ax,v 1.3 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
+* Fix confilct with getline(3).
 
 --- uip/popsbr.c.orig	2001-04-02 10:50:01.000000000 +0000
 +++ uip/popsbr.c
diff --git a/mail/ja-mh/patches/patch-ay b/mail/ja-mh/patches/patch-ay
index 1d8c1267128..1f929eda4cb 100644
--- a/mail/ja-mh/patches/patch-ay
+++ b/mail/ja-mh/patches/patch-ay
@@ -1,4 +1,6 @@
-$NetBSD: patch-ay,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ay,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/mhn.c.orig	2006-04-11 14:27:13.000000000 +0000
 +++ uip/mhn.c
diff --git a/mail/ja-mh/patches/patch-az b/mail/ja-mh/patches/patch-az
index cf28cb3dc95..58d94f62960 100644
--- a/mail/ja-mh/patches/patch-az
+++ b/mail/ja-mh/patches/patch-az
@@ -1,4 +1,6 @@
-$NetBSD: patch-az,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-az,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno but include <errno.h>.
 
 --- uip/ftpsbr.c.orig	2006-04-11 14:28:22.000000000 +0000
 +++ uip/ftpsbr.c
diff --git a/mail/ja-mh/patches/patch-ba b/mail/ja-mh/patches/patch-ba
index e7d5e738de5..9bf8e94481d 100644
--- a/mail/ja-mh/patches/patch-ba
+++ b/mail/ja-mh/patches/patch-ba
@@ -1,4 +1,6 @@
-$NetBSD: patch-ba,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ba,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/mshcmds.c.orig	2006-04-11 14:28:57.000000000 +0000
 +++ uip/mshcmds.c
diff --git a/mail/ja-mh/patches/patch-bb b/mail/ja-mh/patches/patch-bb
index 03b3b906e0a..95d910935d1 100644
--- a/mail/ja-mh/patches/patch-bb
+++ b/mail/ja-mh/patches/patch-bb
@@ -1,4 +1,6 @@
-$NetBSD: patch-bb,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-bb,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno but include <errno.h>.
 
 --- uip/vmhsbr.c.orig	2006-04-11 14:43:36.000000000 +0000
 +++ uip/vmhsbr.c
diff --git a/mail/ja-mh/patches/patch-bc b/mail/ja-mh/patches/patch-bc
index ab05eb970fc..10df670804d 100644
--- a/mail/ja-mh/patches/patch-bc
+++ b/mail/ja-mh/patches/patch-bc
@@ -1,4 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-bc,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/packf.c.orig	2006-04-11 14:44:10.000000000 +0000
 +++ uip/packf.c
diff --git a/mail/ja-mh/patches/patch-bd b/mail/ja-mh/patches/patch-bd
index 6efc193af3b..c958d90a3a4 100644
--- a/mail/ja-mh/patches/patch-bd
+++ b/mail/ja-mh/patches/patch-bd
@@ -1,4 +1,6 @@
-$NetBSD: patch-bd,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-bd,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/prompter.c.orig	2006-04-11 14:45:09.000000000 +0000
 +++ uip/prompter.c
diff --git a/mail/ja-mh/patches/patch-be b/mail/ja-mh/patches/patch-be
index 86e2f0b766a..e6612c124e2 100644
--- a/mail/ja-mh/patches/patch-be
+++ b/mail/ja-mh/patches/patch-be
@@ -1,4 +1,6 @@
-$NetBSD: patch-be,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-be,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/refile.c.orig	2006-04-11 14:45:44.000000000 +0000
 +++ uip/refile.c
diff --git a/mail/ja-mh/patches/patch-bf b/mail/ja-mh/patches/patch-bf
index 404c4568e4b..3f032906237 100644
--- a/mail/ja-mh/patches/patch-bf
+++ b/mail/ja-mh/patches/patch-bf
@@ -1,4 +1,6 @@
-$NetBSD: patch-bf,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-bf,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/scan.c.orig	2006-04-11 14:46:19.000000000 +0000
 +++ uip/scan.c
diff --git a/mail/ja-mh/patches/patch-bg b/mail/ja-mh/patches/patch-bg
index a2226b1c05a..b088dfa4c05 100644
--- a/mail/ja-mh/patches/patch-bg
+++ b/mail/ja-mh/patches/patch-bg
@@ -1,4 +1,6 @@
-$NetBSD: patch-bg,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-bg,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/send.c.orig	2006-04-11 14:47:09.000000000 +0000
 +++ uip/send.c
diff --git a/mail/ja-mh/patches/patch-bh b/mail/ja-mh/patches/patch-bh
index 764ae8b2b90..b192b17d82f 100644
--- a/mail/ja-mh/patches/patch-bh
+++ b/mail/ja-mh/patches/patch-bh
@@ -1,4 +1,6 @@
-$NetBSD: patch-bh,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-bh,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/bbc.c.orig	2006-04-11 14:50:44.000000000 +0000
 +++ uip/bbc.c
diff --git a/mail/ja-mh/patches/patch-bi b/mail/ja-mh/patches/patch-bi
index c2254ce160e..d379b877f89 100644
--- a/mail/ja-mh/patches/patch-bi
+++ b/mail/ja-mh/patches/patch-bi
@@ -1,4 +1,6 @@
-$NetBSD: patch-bi,v 1.1 2006/04/11 15:08:39 joerg Exp $
+$NetBSD: patch-bi,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Don't declare errno.
 
 --- uip/rcvstore.c.orig	2006-04-11 14:51:32.000000000 +0000
 +++ uip/rcvstore.c
diff --git a/mail/ja-mh/patches/patch-bj b/mail/ja-mh/patches/patch-bj
index f041b522f02..5c7111a14e9 100644
--- a/mail/ja-mh/patches/patch-bj
+++ b/mail/ja-mh/patches/patch-bj
@@ -1,4 +1,6 @@
-$NetBSD: patch-bj,v 1.1 2006/07/21 16:43:57 minskim Exp $
+$NetBSD: patch-bj,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Make it build on Linux by conditionally removing conflicting declarations.
 
 --- h/strings.h.orig	2001-04-02 10:35:24.000000000 +0000
 +++ h/strings.h
diff --git a/mail/ja-mh/patches/patch-bk b/mail/ja-mh/patches/patch-bk
index 8326f578767..4b1dcb20a56 100644
--- a/mail/ja-mh/patches/patch-bk
+++ b/mail/ja-mh/patches/patch-bk
@@ -1,4 +1,6 @@
-$NetBSD: patch-bk,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bk,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Nuke removing existing files.
 
 --- conf/makefiles/doc.orig	1999-02-09 11:30:00.000000000 +0000
 +++ conf/makefiles/doc
diff --git a/mail/ja-mh/patches/patch-bl b/mail/ja-mh/patches/patch-bl
index d4c2b01937e..9f84694b2f4 100644
--- a/mail/ja-mh/patches/patch-bl
+++ b/mail/ja-mh/patches/patch-bl
@@ -1,4 +1,6 @@
-$NetBSD: patch-bl,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bl,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Nuke removing existing files.
 
 --- conf/makefiles/support/bboards.orig	2001-06-11 01:25:43.000000000 +0000
 +++ conf/makefiles/support/bboards
diff --git a/mail/ja-mh/patches/patch-bm b/mail/ja-mh/patches/patch-bm
index 6206473e398..e90db20f319 100644
--- a/mail/ja-mh/patches/patch-bm
+++ b/mail/ja-mh/patches/patch-bm
@@ -1,4 +1,6 @@
-$NetBSD: patch-bm,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bm,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Nuke removing existing files.
 
 --- conf/makefiles/support/general.orig	1998-04-23 21:02:00.000000000 +0000
 +++ conf/makefiles/support/general
diff --git a/mail/ja-mh/patches/patch-bn b/mail/ja-mh/patches/patch-bn
index 333788db96b..6b84a1f94ff 100644
--- a/mail/ja-mh/patches/patch-bn
+++ b/mail/ja-mh/patches/patch-bn
@@ -1,4 +1,6 @@
-$NetBSD: patch-bn,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bn,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Nuke removing existing files.
 
 --- conf/makefiles/support/pop.orig	2001-06-11 01:25:56.000000000 +0000
 +++ conf/makefiles/support/pop
diff --git a/mail/ja-mh/patches/patch-bo b/mail/ja-mh/patches/patch-bo
index 048f177ea96..9cd3d6aa106 100644
--- a/mail/ja-mh/patches/patch-bo
+++ b/mail/ja-mh/patches/patch-bo
@@ -1,4 +1,6 @@
-$NetBSD: patch-bo,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bo,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Nuke removing existing files.
 
 --- conf/makefiles/zotnet/mf.orig	2001-06-11 01:26:24.000000000 +0000
 +++ conf/makefiles/zotnet/mf
diff --git a/mail/ja-mh/patches/patch-bp b/mail/ja-mh/patches/patch-bp
index c378c3a2dee..fa4f58d6c51 100644
--- a/mail/ja-mh/patches/patch-bp
+++ b/mail/ja-mh/patches/patch-bp
@@ -1,4 +1,6 @@
-$NetBSD: patch-bp,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bp,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Nuke removing existing files.
 
 --- conf/makefiles/zotnet/mts.orig	2001-06-11 01:26:35.000000000 +0000
 +++ conf/makefiles/zotnet/mts
diff --git a/mail/ja-mh/patches/patch-bq b/mail/ja-mh/patches/patch-bq
index c54263b4ae2..1581a23f074 100644
--- a/mail/ja-mh/patches/patch-bq
+++ b/mail/ja-mh/patches/patch-bq
@@ -1,4 +1,6 @@
-$NetBSD: patch-bq,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bq,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Use standard strdup(3).
 
 --- conf/mhconfig.c.orig	2001-05-29 15:04:36.000000000 +0000
 +++ conf/mhconfig.c
diff --git a/mail/ja-mh/patches/patch-br b/mail/ja-mh/patches/patch-br
index 7ca748773ef..72d60aae1a4 100644
--- a/mail/ja-mh/patches/patch-br
+++ b/mail/ja-mh/patches/patch-br
@@ -1,4 +1,6 @@
-$NetBSD: patch-br,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-br,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Fix confilct with getline(3).
 
 --- support/pop/popser.c.orig	1999-02-09 11:30:00.000000000 +0000
 +++ support/pop/popser.c
diff --git a/mail/ja-mh/patches/patch-bs b/mail/ja-mh/patches/patch-bs
index a0874bc05ab..ba19ee30575 100644
--- a/mail/ja-mh/patches/patch-bs
+++ b/mail/ja-mh/patches/patch-bs
@@ -1,4 +1,6 @@
-$NetBSD: patch-bs,v 1.1 2009/12/25 13:55:12 taca Exp $
+$NetBSD: patch-bs,v 1.2 2010/09/27 12:01:49 taca Exp $
+
+* Fix confilct with getline(3).
 
 --- uip/pshsbr.c.orig	2001-04-02 10:50:24.000000000 +0000
 +++ uip/pshsbr.c
diff --git a/mail/ja-mh/patches/patch-bt b/mail/ja-mh/patches/patch-bt
new file mode 100644
index 00000000000..7b12ebba0f6
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bt
@@ -0,0 +1,16 @@
+$NetBSD: patch-bt,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* set TERMINFO as options.
+
+--- conf/MH.in.orig	2001-06-13 14:28:26.000000000 +0000
++++ conf/MH.in
+@@ -41,7 +41,8 @@ options	@CONTENT_LENGTH@ @DBMPWD@ @FCNTL
+ options	@LIBLOCKFILE@ @LOCKF@ @MAILLOCK@ @NCURSES@ @NDIR@ @NFS@ @NOIOCTLH@
+ options	@NORUSERPASS@ @NTOHLSWAP@ @POSIX@ @READLINE@ @RENAME@ @SETEUID@ @SETMG@
+ options	@SETREUID@ @SHADOW@ @SIGEMT@ @SOCKETS@ @SOLARIS@ @SUN40@ @SYS5@
+-options	@SYS5DIR@ @SVR4@ @TZNAME@ @UNISTD@ @V7@ @VSPRINTF@ @WAITINT@ @ZONEINFO@
++options	@SYS5DIR@ @SVR4@ @TERMINFO@ @TZNAME@ @UNISTD@ @V7@ @VSPRINTF@
++options @WAITINT@ @ZONEINFO@
+ 
+ # POP support
+ pop	@pop@
diff --git a/mail/ja-mh/patches/patch-bu b/mail/ja-mh/patches/patch-bu
new file mode 100644
index 00000000000..2969829c11b
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bu
@@ -0,0 +1,15 @@
+$NetBSD: patch-bu,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Change m_tmpfil to avoid to use mktemp(3).
+
+--- sbr/llib-lmh.orig	1993-12-01 04:01:23.000000000 +0000
++++ sbr/llib-lmh
+@@ -93,7 +93,7 @@ void	m_setcur(m,i) struct msgs *m; { m_s
+ void	m_setseq(m) struct msgs *m; { m_setseq(m); }
+ void	m_setvis(m,s) struct msgs *m; { m_setvis(m,s); }
+ void	m_sync(m) struct msgs *m; { m_sync(m); }
+-char   *m_tmpfil(t) char *t; { return m_tmpfil (t); }
++char   *m_tmpfil(t, int) char *t; int *fd; { return m_tmpfil (t, fd); }
+ void	m_unknown(f) FILE *f; { m_unknown(f); }
+ void	m_update() { m_update(); }
+ int     m_whatnow(e,n,u,f,a,d,m,t,i,c) struct msgs *m; char *e,*f,*a,*t,*c;
diff --git a/mail/ja-mh/patches/patch-bv b/mail/ja-mh/patches/patch-bv
new file mode 100644
index 00000000000..54045cb412f
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bv
@@ -0,0 +1,26 @@
+$NetBSD: patch-bv,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Change m_tmpfil to avoid to use mktemp(3).
+
+--- sbr/m_tmpfil.c.orig	1993-12-01 04:01:25.000000000 +0000
++++ sbr/m_tmpfil.c
+@@ -2,15 +2,17 @@
+ 
+ #include "../h/mh.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ 
+-char   *m_tmpfil (template)
++char   *m_tmpfil (template, fd)
+ register char  *template;
++int *fd;
+ {
+     static char tmpfil[BUFSIZ];
+ 
+     (void) sprintf (tmpfil, "/tmp/%sXXXXXX", template);
+-    (void) unlink (mktemp (tmpfil));
++    *fd = mkstemp(tmpfil);
+ 
+     return tmpfil;
+ }
diff --git a/mail/ja-mh/patches/patch-bw b/mail/ja-mh/patches/patch-bw
new file mode 100644
index 00000000000..9504113c1c1
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bw
@@ -0,0 +1,14 @@
+$NetBSD: patch-bw,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Include a proper header file.
+
+--- sbr/m_update.c.orig	1998-04-23 21:02:00.000000000 +0000
++++ sbr/m_update.c
+@@ -5,6 +5,7 @@ static char ident[] = "@(#)$Id: m_update
+ 
+ #include "../h/mh.h"
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #ifndef	sigmask
+ #define	sigmask(s)	(1 << ((s) - 1))
diff --git a/mail/ja-mh/patches/patch-bx b/mail/ja-mh/patches/patch-bx
new file mode 100644
index 00000000000..36da4ce66d6
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bx
@@ -0,0 +1,13 @@
+$NetBSD: patch-bx,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Include a proper header file.
+
+--- sbr/printsw.c.orig	1993-12-01 04:01:26.000000000 +0000
++++ sbr/printsw.c
+@@ -1,5 +1,6 @@
+ /* printsw.c - print switches */
+ 
++#include <stdio.h>
+ #include "../h/mh.h"
+ 
+ 
diff --git a/mail/ja-mh/patches/patch-by b/mail/ja-mh/patches/patch-by
new file mode 100644
index 00000000000..a4799de4d81
--- /dev/null
+++ b/mail/ja-mh/patches/patch-by
@@ -0,0 +1,20 @@
+$NetBSD: patch-by,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Use getcwd for BSD44.
+
+--- sbr/pwd.c.orig	2001-04-02 10:46:53.000000000 +0000
++++ sbr/pwd.c
+@@ -36,8 +36,13 @@ char   *pwd () {
+ 	admonish (NULL, "unable to determine working directory");
+ #endif	/* SYS5DIR */
+ #else	/* BSD42 */
++#ifndef	BSD44
+     if (getwd (curwd) == 0) {
+ 	admonish (NULLCP, "unable to determine working directory: %s", curwd);
++#else
++    if (getcwd (curwd, MAXPATHLEN) == NULL) {
++	admonish (NULL, "unable to determine working directory");
++#endif
+ #endif	/* BSD42 */
+ 	if (mypath == NULL
+ 		|| *mypath == 0
diff --git a/mail/ja-mh/patches/patch-bz b/mail/ja-mh/patches/patch-bz
new file mode 100644
index 00000000000..0afc8408d0d
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bz
@@ -0,0 +1,39 @@
+$NetBSD: patch-bz,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Change m_tmpfil to avoid to use mktemp(3).
+
+--- uip/distsbr.c.orig	1993-12-01 04:01:35.000000000 +0000
++++ uip/distsbr.c
+@@ -150,15 +150,10 @@ register char   *msgnam;
+ 
+     if ((ifp = fopen (msgnam, "r")) == NULL)
+ 	adios (msgnam, "unable to open message");
+-
+-    (void) strcpy (tmpfil, m_tmpfil ("dist"));
+-    if ((hdrfd = creat (tmpfil, 0600)) == NOTOK)
+-	adios (tmpfil, "unable to create temporary file");
+-    (void) close (hdrfd);
+-    if ((hdrfd = open (tmpfil, 2)) == NOTOK)
+-	adios (tmpfil, "unable to re-open temporary file");
++    
++    (void) strcpy (tmpfil, m_tmpfil("dist", &hdrfd));
+     if ((out = dup (hdrfd)) == NOTOK
+-	    || (ofp = fdopen (out, "w")) == NULL)
++	   || (ofp = fdopen (out, "w")) == NULL)
+ 	adios (NULLCP, "no file descriptors -- you lose big");
+     (void) unlink (tmpfil);
+ 
+@@ -186,12 +181,7 @@ register char   *msgnam;
+ 	    case BODYEOF: 
+ 		(void) fclose (ofp);
+ 
+-		(void) strcpy (tmpfil, m_tmpfil ("dist"));
+-		if ((txtfd = creat (tmpfil, 0600)) == NOTOK)
+-		    adios (tmpfil, "unable to create temporary file");
+-		(void) close (txtfd);
+-		if ((txtfd = open (tmpfil, 2)) == NOTOK)
+-		    adios (tmpfil, "unable to re-open temporary file");
++		(void) strcpy (tmpfil, m_tmpfil("dist", &txtfd));
+ 		if ((out = dup (txtfd)) == NOTOK
+ 			|| (ofp = fdopen (out, "w")) == NULL)
+ 		    adios (NULLCP, "no file descriptors -- you lose big");
diff --git a/mail/ja-mh/patches/patch-ca b/mail/ja-mh/patches/patch-ca
new file mode 100644
index 00000000000..764ff6f7826
--- /dev/null
+++ b/mail/ja-mh/patches/patch-ca
@@ -0,0 +1,14 @@
+$NetBSD: patch-ca,v 1.1 2010/09/27 12:01:49 taca Exp $
+
+* Include a proper header file.
+
+--- zotnet/tws/date.c.orig	1993-12-01 04:01:43.000000000 +0000
++++ zotnet/tws/date.c
+@@ -1,6 +1,7 @@
+ /* date.c */
+ 
+ #include "tws.h"
++#include <stdlib.h>
+ #include <stdio.h>
+ 
+