Maintainous of mail/ja-mh package.

* Fix build problem on NetBSD current; getline() conflicts.
* Add DESTDIR support.

And some more clean up.  No functional change.

13 files changed, 2253 insertions, 12 deletions

diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile
index 380704cd4f9..2992ca10e67 100644
--- a/mail/ja-mh/Makefile
+++ b/mail/ja-mh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/11/10 05:06:45 taca Exp $
+# $NetBSD: Makefile,v 1.12 2009/12/25 13:55:12 taca Exp $
 
 DISTNAME=	mh-6.8.4-JP-3.05
 PKGNAME=	ja-mh6-3.05
@@ -20,6 +20,8 @@ DEPENDS+=	ja-less>=332:../../misc/ja-less
 
 CONFLICTS=	nmh-[0-9]* ja-mh-*_JP_*
 
+PKG_DESTDIR_SUPPORT=	destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_JOBS_SAFE=	NO
@@ -34,6 +36,6 @@ CONFIGURE_ARGS+=	--enable-rpop
 INSTALLATION_DIRS=	bin lib
 
 post-install:
-	${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
+	${LN} -sf libmh.so.3.2 ${DESTDIR}${PREFIX}/lib/libmh.so.3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ja-mh/distinfo b/mail/ja-mh/distinfo
index 3f6c2fd1fd9..8d9936003a1 100644
--- a/mail/ja-mh/distinfo
+++ b/mail/ja-mh/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.10 2006/07/21 16:43:56 minskim Exp $
+$NetBSD: distinfo,v 1.11 2009/12/25 13:55:12 taca Exp $
 
-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 (mh-6.8.4-JP-3.05-20030114.patch.gz) = 6d4e6535465e5ffd5b9b5eef8d96cfcb1f947470
 RMD160 (mh-6.8.4-JP-3.05-20030114.patch.gz) = f22d6f37bcd79bddf893c0f42d714fc01647dfe1
 Size (mh-6.8.4-JP-3.05-20030114.patch.gz) = 313 bytes
@@ -15,6 +12,9 @@ Size (mh-6.8.4-JP-3.05-20031023.patch.gz) = 307 bytes
 SHA1 (mh-6.8.4-JP-3.05-20031106.patch.gz) = daaf41afb5e83143dceb5ae6444e26f1f9ca5bf8
 RMD160 (mh-6.8.4-JP-3.05-20031106.patch.gz) = b0585c5c5aebdafa619e129917f0b7d7db987b02
 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
@@ -34,10 +34,10 @@ SHA1 (patch-aq) = 7410ea8359575a89fb489403ab0ab76ff0c24a26
 SHA1 (patch-ar) = 7b3f65a4ff93c428dc4def0d4e3fe993bae7266b
 SHA1 (patch-as) = 786c7bf7988806023d9fd5a2ced5a9d31550ff54
 SHA1 (patch-at) = 5594d3beac4e911cfa3ff277d4ae034a6dccdccb
-SHA1 (patch-au) = 3788f6ca9362a97323cc6bf0f942f2ba949e1c46
+SHA1 (patch-au) = 53b2f70316c6d7b3c61d2d0ff09cfa0cc7486b20
 SHA1 (patch-av) = 14d79f16dcc7f5fe76caec499c9043fbc6874d06
 SHA1 (patch-aw) = 8cfee271b0549e6886e29ae74e4e547dccc20230
-SHA1 (patch-ax) = d0b559c1d9f72c413ca8764ddf0794a086c19307
+SHA1 (patch-ax) = ec3ea364f6cec1f194971b1ba3e2d3090de01d9f
 SHA1 (patch-ay) = f62ad194e1bf70054ff833c094206f7754478a6f
 SHA1 (patch-az) = de12b9fc05d022a9850108541378f25249918182
 SHA1 (patch-ba) = 4e0880360e484f6b74c45870e97f6f89d3a87a76
@@ -50,3 +50,12 @@ 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
diff --git a/mail/ja-mh/patches/patch-au b/mail/ja-mh/patches/patch-au
index 0a9d44fa361..fe9836f10ff 100644
--- a/mail/ja-mh/patches/patch-au
+++ b/mail/ja-mh/patches/patch-au
@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.1 2004/11/29 05:09:43 taca Exp $
+$NetBSD: patch-au,v 1.2 2009/12/25 13:55:12 taca Exp $
 
---- conf/makefiles/uip.orig	2001-05-30 23:57:47.000000000 +0900
+--- conf/makefiles/uip.orig	2001-05-30 14:57:47.000000000 +0000
 +++ conf/makefiles/uip
 @@ -140,7 +140,7 @@ LD	=	LD_LIBRARY_PATH=../sbr @(MHCOMPILER
  LD	=	LD_LIBRARY_PATH=../sbr @(MHCOMPILER)
@@ -22,3 +22,483 @@ $NetBSD: patch-au,v 1.1 2004/11/29 05:09:43 taca Exp $
  		@(SLDFLAG) -lmh$(SLIBVER) ../mts/libmts.a  ../zotnet/libzot.a
  LDLIBS	=	$(LDLIBES) ../config/version.o $(LDOPTLIB)
  LDLIBS_POST =	$(LDLIBES) ../config/version.o $(LDOPTLIB_POST)
+@@ -305,7 +309,6 @@ lint:		$(LCMDS) $(LMISC)
+ inst-ali:	$(BINDIR)/ali
+ 
+ $(BINDIR)/ali:	xali
+-		-$(REMOVE) $@ zali
+ 		$(CP) xali $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -322,7 +325,6 @@ l-ali:;		$(LINT) $(LFLAGS) ali.c aliasbr
+ inst-anno:	$(BINDIR)/anno
+ 
+ $(BINDIR)/anno:	xanno
+-		-$(REMOVE) $@ zanno
+ 		$(CP) xanno $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -339,7 +341,6 @@ l-anno:;	$(LINT) $(LFLAGS) anno.c annosb
+ inst-ap:	$(ETCDIR)/ap
+ 
+ $(ETCDIR)/ap:	xap
+-		-$(REMOVE) $@ zap
+ 		$(CP) xap $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -356,8 +357,6 @@ l-ap:;		$(LINT) $(LFLAGS) ap.c trmsbr.c 
+ inst-bbc:	$(BINDIR)/bbc
+ 
+ $(BINDIR)/bbc:	xbbc
+-		-$(REMOVE) $@ zbbc
+-		-chmod u-s zbbc
+ 		$(CP) xbbc $@
+ 		-@chmod $(PGMPROT) $@
+ @BEGIN: BPOP
+@@ -387,8 +386,6 @@ pshsbr.o:	pshsbr.c
+ inst-bbl:	$(BINDIR)/bbl
+ 
+ $(BINDIR)/bbl:	xbbl
+-		-$(REMOVE) $@ zbbl
+-		-chmod u-s zbbl
+ 		$(CP) xbbl $@
+ 		-chmod $(PGMPROT) $@
+ 		-$(CHOWN) $(BBUID) $@ && chmod u+s $@
+@@ -406,7 +403,6 @@ l-bbl:;		$(LINT) $(LFLAGS) bbl.c $(LLIBS
+ inst-burst:	$(BINDIR)/burst
+ 
+ $(BINDIR)/burst:	xburst
+-		-$(REMOVE) $@ zburst
+ 		$(CP) xburst $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -423,7 +419,6 @@ l-burst:;	$(LINT) $(LFLAGS) burst.c $(LL
+ inst-cipher:	$(BINDIR)/cipher
+ 
+ $(BINDIR)/cipher:	xcipher
+-		-$(REMOVE) $@ zcipher
+ 		$(CP) xcipher $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -440,7 +435,6 @@ l-cipher:;	$(LINT) $(LFLAGS) cipher.c $(
+ inst-comp:	$(BINDIR)/comp
+ 
+ $(BINDIR)/comp:	xcomp
+-		-$(REMOVE) $@ zcomp
+ 		$(CP) xcomp $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $(BINDIR)/comp
+@@ -460,7 +454,6 @@ l-comp:;	$(LINT) $(LFLAGS) comp.c whatno
+ inst-conflict:	$(ETCDIR)/conflict
+ 
+ $(ETCDIR)/conflict:	xconflict
+-		-$(REMOVE) $@ zconflict
+ 		$(CP) xconflict $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -477,7 +470,6 @@ l-conflict:;	$(LINT) $(LFLAGS) conflict.
+ inst-decipher:	$(BINDIR)/decipher
+ 
+ $(BINDIR)/decipher:	xdecipher
+-		-$(REMOVE) $@ zdecipher
+ 		$(CP) xdecipher $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -494,7 +486,6 @@ l-decipher:;	$(LINT) $(LFLAGS) decipher.
+ inst-dist:	$(BINDIR)/dist
+ 
+ $(BINDIR)/dist:	xdist
+-		-$(REMOVE) $@ zdist
+ 		$(CP) xdist $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -514,7 +505,6 @@ l-dist:;	$(LINT) $(LFLAGS) dist.c whatno
+ inst-dp:	$(ETCDIR)/dp
+ 
+ $(ETCDIR)/dp:	xdp
+-		-$(REMOVE) $@ zdp
+ 		$(CP) xdp $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $(ETCDIR)/dp
+@@ -531,7 +521,6 @@ l-dp:;		$(LINT) $(LFLAGS) dp.c trmsbr.c 
+ inst-fmtdump:	$(ETCDIR)/fmtdump
+ 
+ $(ETCDIR)/fmtdump:	xfmtdump
+-		-$(REMOVE) $@ zfmtdump
+ 		cp xfmtdump $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -549,7 +538,6 @@ inst-folders:	inst-folder
+ inst-folder:	$(BINDIR)/folder
+ 
+ $(BINDIR)/folder:	xfolder
+-		-$(REMOVE) $@ zfolder
+ 		$(CP) xfolder $@
+ 		-@chmod $(PGMPROT) $@
+ 		rm -f $(BINDIR)/folders
+@@ -569,7 +557,6 @@ l-folder:;	$(LINT) $(LFLAGS) folder.c $(
+ inst-forw:	$(BINDIR)/forw
+ 
+ $(BINDIR)/forw:	xforw
+-		-$(REMOVE) $@ zforw
+ 		$(CP) xforw $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -589,9 +576,6 @@ l-forw:;	$(LINT) $(LFLAGS) forw.c whatno
+ inst-inc:	$(BINDIR)/inc
+ 
+ $(BINDIR)/inc:	xinc
+-		-$(REMOVE) $@ zinc
+-		-chmod u-s zinc
+-		-chmod g-s zinc
+ 		$(CP) xinc $@
+ 		-@chmod $(PGMPROT) $@
+ @BEGIN: MAILGROUP
+@@ -620,7 +604,6 @@ l-inc:;		$(LINT) $(LFLAGS) inc.c scansbr
+ inst-install-mh:	$(ETCDIR)/install-mh
+ 
+ $(ETCDIR)/install-mh:	xinstall-mh
+-		-$(REMOVE) $@ zinstall-mh
+ 		$(CP) xinstall-mh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -637,7 +620,6 @@ l-install-mh:;	$(LINT) $(LFLAGS) install
+ inst-kdsc:	$(ETCDIR)/kdsc
+ 
+ $(ETCDIR)/kdsc:	xkdsc
+-		-$(REMOVE) $@ zkdsc
+ 		$(CP) xkdsc $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -654,7 +636,6 @@ l-kdsc:;	$(LINT) $(LFLAGS) kdsc.c $(KDSL
+ inst-mark:	$(BINDIR)/mark
+ 
+ $(BINDIR)/mark:	xmark
+-		-$(REMOVE) $@ zmark
+ 		$(CP) xmark $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -671,7 +652,6 @@ l-mark:;	$(LINT) $(LFLAGS) mark.c $(LLIB
+ inst-mhl:	$(ETCDIR)/mhl
+ 
+ $(ETCDIR)/mhl:	xmhl
+-		-$(REMOVE) $@ zmhl
+ 		$(CP) xmhl $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -691,7 +671,6 @@ l-mhl:;		$(LINT) $(LFLAGS) mhl.c \
+ inst-mhmail:	$(BINDIR)/mhmail
+ 
+ $(BINDIR)/mhmail:	xmhmail
+-		-$(REMOVE) $@ zmhmail
+ 		$(CP) xmhmail $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -708,7 +687,6 @@ l-mhmail:;	$(LINT) $(LFLAGS) mhmail.c $(
+ inst-mhn:	$(BINDIR)/mhn
+ 
+ $(BINDIR)/mhn:	xmhn
+-		-$(REMOVE) $@ zmhn
+ 		cp xmhn $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -726,8 +704,7 @@ l-mhn:;		$(LINT) $(LFLAGS) mhn.c ftpsbr.
+ inst-mhparam:	$(BINDIR)/mhparam
+ 
+ $(BINDIR)/mhparam:	xmhparam
+-		-$(REMOVE) $@ zmhparam
+-		cp xmhparam $@
++		$(CP) xmhparam $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -743,7 +720,6 @@ l-mhparam:;	$(LINT) $(LFLAGS) mhparam.c 
+ inst-mhpath:	$(BINDIR)/mhpath
+ 
+ $(BINDIR)/mhpath:	xmhpath
+-		-$(REMOVE) $@ zmhpath
+ 		$(CP) xmhpath $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -760,8 +736,6 @@ l-mhpath:;	$(LINT) $(LFLAGS) mhpath.c $(
+ inst-msgchk:	$(BINDIR)/msgchk
+ 
+ $(BINDIR)/msgchk:	xmsgchk
+-		-$(REMOVE) $@ zmsgchk
+-		-chmod u-s zmsgchk
+ 		$(CP) xmsgchk $@
+ 		-@chmod $(PGMPROT) $@
+ @BEGIN: RPOP
+@@ -783,7 +757,6 @@ l-msgchk:;	$(LINT) $(LFLAGS) msgchk.c $(
+ inst-msh:	$(BINDIR)/msh
+ 
+ $(BINDIR)/msh:	xmsh
+-		-$(REMOVE) $@ zmsh
+ 		$(CP) xmsh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -810,7 +783,6 @@ l-msh:;		$(LINT) $(LFLAGS) msh.c mshcmds
+ inst-packf:	$(BINDIR)/packf
+ 
+ $(BINDIR)/packf:	xpackf
+-		-$(REMOVE) $@ zpackf
+ 		$(CP) xpackf $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -828,7 +800,6 @@ l-packf:;	$(LINT) $(LFLAGS) packf.c drop
+ inst-pgped:	$(BINDIR)/pgped
+ 
+ $(BINDIR)/pgped:	xpgped
+-		-$(REMOVE) $@ zpgped
+ 		$(CP) xpgped $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -845,7 +816,6 @@ l-pgped:;	$(LINT) $(LFLAGS) pgped.c alia
+ inst-pgpshow:	$(BINDIR)/pgpshow
+ 
+ $(BINDIR)/pgpshow:	xpgpshow
+-		-$(REMOVE) $@ zpgpshow
+ 		$(CP) xpgpshow $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -863,7 +833,6 @@ l-pgpshow:;	$(LINT) $(LFLAGS) pgpshow.c 
+ inst-pick:	$(BINDIR)/pick
+ 
+ $(BINDIR)/pick:	xpick
+-		-$(REMOVE) $@ zpick
+ 		$(CP) xpick $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -880,8 +849,7 @@ l-pick:;	$(LINT) $(LFLAGS) pick.c picksb
+ inst-popi:	$(BINDIR)/popi
+ 
+ $(BINDIR)/popi:	xpopi
+-		-$(REMOVE) $@ zpopi
+-		cp xpopi $@
++		$(CP) xpopi $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -898,8 +866,6 @@ l-popi:;	$(LINT) $(LFLAGS) popi.c $(POPL
+ inst-post:	$(ETCDIR)/post
+ 
+ $(ETCDIR)/post:	xpost
+-		-$(REMOVE) $@ zpost
+-		-chmod u-s zpost
+ 		$(CP) xpost $@
+ 		-@chmod $(PGMPROT) $@
+ @BEGIN: MHMTS
+@@ -923,7 +889,6 @@ l-post:;	$(LINT) $(LFLAGS) post.c \
+ inst-prompter:	$(BINDIR)/prompter
+ 
+ $(BINDIR)/prompter:	xprompter
+-		-$(REMOVE) $@ zprompter
+ 		$(CP) xprompter $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -940,7 +905,6 @@ l-prompter:;	$(LINT) $(LFLAGS) prompter.
+ inst-rcvdist:	$(ETCDIR)/rcvdist
+ 
+ $(ETCDIR)/rcvdist:	xrcvdist
+-		-$(REMOVE) $@ zrcvdist
+ 		$(CP) xrcvdist $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -957,7 +921,6 @@ l-rcvdist:;	$(LINT) $(LFLAGS) rcvdist.c 
+ inst-rcvpack:	$(ETCDIR)/rcvpack
+ 
+ $(ETCDIR)/rcvpack:	xrcvpack
+-		-$(REMOVE) $@ zrcvpack
+ 		$(CP) xrcvpack $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -974,7 +937,6 @@ l-rcvpack:;	$(LINT) $(LFLAGS) rcvpack.c 
+ inst-rcvstore:	$(ETCDIR)/rcvstore
+ 
+ $(ETCDIR)/rcvstore:	xrcvstore
+-		-$(REMOVE) $@ zrcvstore
+ 		$(CP) xrcvstore $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -991,8 +953,6 @@ l-rcvstore:;	$(LINT) $(LFLAGS) rcvstore.
+ inst-rcvtty:	$(ETCDIR)/rcvtty
+ 
+ $(ETCDIR)/rcvtty:	xrcvtty
+-		-$(REMOVE) $@ zrcvtty
+-		-chmod g-s zrcvtty
+ 		$(CP) xrcvtty $@
+ 		-@chmod $(PGMPROT) $@
+ @BEGIN: BSD43
+@@ -1025,7 +985,6 @@ l-rcvtty:;	$(LINT) $(LFLAGS) rcvtty.c sc
+ inst-refile:	$(BINDIR)/refile
+ 
+ $(BINDIR)/refile:	xrefile
+-		-$(REMOVE) $@ zrefile
+ 		$(CP) xrefile $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1042,7 +1001,6 @@ l-refile:;	$(LINT) $(LFLAGS) refile.c $(
+ inst-repl:	$(BINDIR)/repl
+ 
+ $(BINDIR)/repl:	xrepl
+-		-$(REMOVE) $@ zrepl
+ 		$(CP) xrepl $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1062,8 +1020,6 @@ l-repl:;	$(LINT) $(LFLAGS) repl.c replsb
+ inst-rmail:	/bin/rmail
+ 
+ /bin/rmail:	xrmail
+-		-$(REMOVE) $@ zrmail
+-		-chmod u-s zrmail
+ 		$(CP) xrmail $@
+ 		-@chmod $(PGMPROT) $@
+ 		-$(CHOWN) root $@
+@@ -1082,7 +1038,6 @@ l-rmail:;	$(LINT) $(LFLAGS) rmail.c $(LL
+ inst-rmf:	$(BINDIR)/rmf
+ 
+ $(BINDIR)/rmf:	xrmf
+-		-$(REMOVE) $@ zrmf
+ 		$(CP) xrmf $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1099,7 +1054,6 @@ l-rmf:;		$(LINT) $(LFLAGS) rmf.c $(LLIBS
+ inst-rmm:	$(BINDIR)/rmm
+ 
+ $(BINDIR)/rmm:	xrmm
+-		-$(REMOVE) $@ zrmm
+ 		$(CP) xrmm $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1116,7 +1070,6 @@ l-rmm:;		$(LINT) $(LFLAGS) rmm.c $(LLIBS
+ inst-scan:	$(BINDIR)/scan
+ 
+ $(BINDIR)/scan:	xscan
+-		-$(REMOVE) $@ zscan
+ 		$(CP) xscan $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1136,7 +1089,6 @@ l-scan:;	$(LINT) $(LFLAGS) scan.c \
+ inst-send:	$(BINDIR)/send
+ 
+ $(BINDIR)/send:	xsend
+-		-$(REMOVE) $@ zsend
+ 		$(CP) xsend $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1158,7 +1110,6 @@ inst-prev:	inst-show
+ inst-show:	$(BINDIR)/show
+ 
+ $(BINDIR)/show:	xshow
+-		-$(REMOVE) $@ zshow
+ 		$(CP) xshow $@
+ 		-@chmod $(PGMPROT) $@
+ 		rm -f $(BINDIR)/next
+@@ -1184,8 +1135,6 @@ l-show:;	$(LINT) $(LFLAGS) show.c \
+ inst-sbboards:	$(SBBOARDS)
+ 
+ $(SBBOARDS):	xsbboards
+-		-$(REMOVE) $@ zsbboards
+-		-chmod u-s zsbboards
+ 		$(CP) xsbboards $@
+ 		-chmod $(PGMPROT) $@
+ @BEGIN: SENDMTS
+@@ -1205,7 +1154,6 @@ l-sbboards:;	$(LINT) $(LFLAGS) sbboards.
+ inst-slocal:	$(ETCDIR)/slocal
+ 
+ $(ETCDIR)/slocal:	xslocal
+-		-$(REMOVE) $@ zslocal
+ 		$(CP) xslocal $@
+ 		-chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1222,7 +1170,6 @@ l-slocal:;	$(LINT) $(LFLAGS) slocal.c al
+ inst-sortm:	$(BINDIR)/sortm
+ 
+ $(BINDIR)/sortm:	xsortm
+-		-$(REMOVE) $@ zsortm
+ 		$(CP) xsortm $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1239,8 +1186,6 @@ l-sortm:;	$(LINT) $(LFLAGS) sortm.c $(LL
+ inst-spop:	$(ETCDIR)/spop
+ 
+ $(ETCDIR)/spop:	xspop
+-		-$(REMOVE) $@ zspop
+-		-chmod u-s zspop
+ 		$(CP) xspop $@
+ 		-chmod $(PGMPROT) $@
+ 		-$(CHOWN) $(POPUID) $@ && chmod u+s $@
+@@ -1262,7 +1207,6 @@ l-spop:;	$(LINT) $(LFLAGS) -DSPOP spop.c
+ inst-spost:	$(ETCDIR)/spost
+ 
+ $(ETCDIR)/spost:	xspost
+-		-$(REMOVE) $@ zspost
+ 		$(CP) xspost $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1281,8 +1225,7 @@ l-spost:;	$(LINT) $(LFLAGS) spost.c alia
+ inst-sendmail:	$(ETCDIR)/sendmail
+ 
+ $(ETCDIR)/sendmail:	xsendmail
+-		-$(REMOVE) $@ zsendmail
+-		cp xsendmail $@
++		$(CP) xsendmail $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo "Don't forget to: ln -s @(MHSENDMAILPATH) $@"
+@@ -1299,7 +1242,6 @@ l-sendmail:;		$(LINT) $(LFLAGS) sendmail
+ inst-tma:	$(BINDIR)/tma
+ 
+ $(BINDIR)/tma:	xtma
+-		-$(REMOVE) $@ ztma
+ 		$(CP) xtma $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1316,7 +1258,6 @@ l-tma:;		$(LINT) $(LFLAGS) tma.c $(TMALL
+ inst-umhook:	$(BINDIR)/umhook
+ 
+ $(BINDIR)/umhook:	xumhook
+-		-$(REMOVE) $@ zumhook
+ 		$(CP) xumhook $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1333,7 +1274,6 @@ l-umhook:;	$(LINT) $(LFLAGS) umhook.c $(
+ inst-vmh:	$(BINDIR)/vmh
+ 
+ $(BINDIR)/vmh:	xvmh
+-		-$(REMOVE) $@ zvmh
+ 		$(CP) xvmh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1354,7 +1294,6 @@ xvmhtest:	vmhtest.o vmhsbr.o $(LIBES)
+ inst-whatnow:	$(BINDIR)/whatnow
+ 
+ $(BINDIR)/whatnow:	xwhatnow
+-		-$(REMOVE) $@ zwhatnow
+ 		$(CP) xwhatnow $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1374,7 +1313,6 @@ l-whatnow:;	$(LINT) $(LFLAGS) whatnow.c 
+ inst-whom:	$(BINDIR)/whom
+ 
+ $(BINDIR)/whom:	xwhom
+-		-$(REMOVE) $@ zwhom
+ 		$(CP) xwhom $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1391,7 +1329,6 @@ l-whom:;	$(LINT) $(LFLAGS) whom.c distsb
+ inst-wmh:	$(BINDIR)/wmh
+ 
+ $(BINDIR)/wmh:	xwmh
+-		-$(REMOVE) $@ zwmh
+ 		$(CP) xwmh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -1438,7 +1375,6 @@ unclean:;	-rm -f z* _* :* core *.core ed
+ #	inst-pickle:	$(BINDIR)/pickle
+ #	
+ #	$(BINDIR)/pickle:	xpickle
+-#			-$(REMOVE) $@ zpickle
+ #			cp xpickle $@
+ #			-@chmod $(PGMPROT) $@
+ #			-@ls -l $@
diff --git a/mail/ja-mh/patches/patch-ax b/mail/ja-mh/patches/patch-ax
index 7348d42ca69..bdd27c214fd 100644
--- a/mail/ja-mh/patches/patch-ax
+++ b/mail/ja-mh/patches/patch-ax
@@ -1,6 +1,6 @@
-$NetBSD: patch-ax,v 1.1 2006/04/11 15:08:38 joerg Exp $
+$NetBSD: patch-ax,v 1.2 2009/12/25 13:55:12 taca Exp $
 
---- uip/popsbr.c.orig	2006-04-11 14:26:31.000000000 +0000
+--- uip/popsbr.c.orig	2001-04-02 10:50:01.000000000 +0000
 +++ uip/popsbr.c
 @@ -27,10 +27,7 @@ static char ident[] = "@(#)$Id: popsbr.c
  #define	TRM	"."
@@ -13,3 +13,48 @@ $NetBSD: patch-ax,v 1.1 2006/04/11 15:08:38 joerg Exp $
  #if !defined(BSD44) && !defined(__GNU_LIBRARY__)
  extern int  sys_nerr;
  extern char *sys_errlist[];
+@@ -63,7 +60,7 @@ int	command(), multiline();
+ static	int	command(), multiline();
+ #endif
+ 
+-static int	getline();
++static int	_getline();
+ static putline();
+ 
+ #ifdef NNTP
+@@ -176,7 +173,7 @@ int	snoop;
+ 
+     (void) signal (SIGPIPE, SIG_IGN);
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (_getline (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -619,7 +616,7 @@ char   *fmt,
+     if (putline (buffer, output) == NOTOK)
+ 	return NOTOK;
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (_getline (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -645,7 +642,7 @@ static int  multiline () {
+ #endif
+     char    buffer[BUFSIZ + TRMLEN];
+ 
+-    if (getline (buffer, sizeof buffer, input) != OK)
++    if (_getline (buffer, sizeof buffer, input) != OK)
+ 	return NOTOK;
+ #ifdef	DEBUG
+     if (poprint)
+@@ -665,7 +662,7 @@ static int  multiline () {
+ 
+ /*  */
+ 
+-static int  getline (s, n, iop)
++static int  _getline (s, n, iop)
+ char   *s;
+ int     n;
+ FILE * iop;
diff --git a/mail/ja-mh/patches/patch-bk b/mail/ja-mh/patches/patch-bk
new file mode 100644
index 00000000000..8326f578767
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bk
@@ -0,0 +1,1142 @@
+$NetBSD: patch-bk,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/makefiles/doc.orig	1999-02-09 11:30:00.000000000 +0000
++++ conf/makefiles/doc
+@@ -36,6 +36,7 @@ inst-options2=	inst-cipher inst-decipher
+ Toptions2=	cipher.man decipher.man tma.man
+ @END: TMA
+ REMOVE	=	@(MHREMOVE)
++CP      =       @(CP)
+ MANPROT	=	0644
+ 
+ MAN1	=	ali.$(EXT1) anno.$(EXT1) burst.$(EXT1) comp.$(EXT1) \
+@@ -301,8 +302,7 @@ $(JMANDIR)/$(DIR1) $(JMANDIR)/$(DIR5) $(
+ inst-tmac:	$(ETCDIR)/tmac.h
+ 
+ $(ETCDIR)/tmac.h:	tmac.h
+-		-$(REMOVE) $@ ztmac.h
+-		cp tmac.h $@
++		$(CP) tmac.h $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -311,8 +311,7 @@ $(ETCDIR)/tmac.h:	tmac.h
+ inst-ali:	$(MANDIR)/$(DIR1)/ali.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/ali.$(EXT1):	ali.man
+-		-$(REMOVE) $@ zali.man
+-		cp ali.man $@
++		$(CP) ali.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -320,8 +319,7 @@ $(MANDIR)/$(DIR1)/ali.$(EXT1):	ali.man
+ inst-anno:	$(MANDIR)/$(DIR1)/anno.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/anno.$(EXT1):	anno.man
+-		-$(REMOVE) $@ zanno.man
+-		cp anno.man $@
++		$(CP) anno.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -329,8 +327,7 @@ $(MANDIR)/$(DIR1)/anno.$(EXT1):	anno.man
+ inst-ap:	$(MANDIR)/$(DIR8)/ap.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/ap.$(EXT8):	ap.man
+-		-$(REMOVE) $@ zap.man
+-		cp ap.man $@
++		$(CP) ap.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -338,8 +335,7 @@ $(MANDIR)/$(DIR8)/ap.$(EXT8):	ap.man
+ inst-bbc:	$(MANDIR)/$(DIR1)/bbc.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/bbc.$(EXT1):	bbc.man
+-		-$(REMOVE) $@ zbbc.man
+-		cp bbc.man $@
++		$(CP) bbc.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -347,8 +343,7 @@ $(MANDIR)/$(DIR1)/bbc.$(EXT1):	bbc.man
+ inst-bbl:	$(MANDIR)/$(DIR1)/bbl.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/bbl.$(EXT1):	bbl.man
+-		-$(REMOVE) $@ zbbl.man
+-		cp bbl.man $@
++		$(CP) bbl.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -356,8 +351,7 @@ $(MANDIR)/$(DIR1)/bbl.$(EXT1):	bbl.man
+ inst-bbleader:	$(MANDIR)/$(DIR1)/bbleader.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/bbleader.$(EXT1):	bbleader.man
+-		-$(REMOVE) $@ zbbleader.man
+-		cp bbleader.man $@
++		$(CP) bbleader.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -365,8 +359,7 @@ $(MANDIR)/$(DIR1)/bbleader.$(EXT1):	bble
+ inst-bboards:	$(MANDIR)/$(DIR1)/bboards.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/bboards.$(EXT1):	bboards.man
+-		-$(REMOVE) $@ zbboards.man
+-		cp bboards.man $@
++		$(CP) bboards.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -374,8 +367,7 @@ $(MANDIR)/$(DIR1)/bboards.$(EXT1):	bboar
+ inst-burst:	$(MANDIR)/$(DIR1)/burst.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/burst.$(EXT1):	burst.man
+-		-$(REMOVE) $@ zburst.man
+-		cp burst.man $@
++		$(CP) burst.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -383,8 +375,7 @@ $(MANDIR)/$(DIR1)/burst.$(EXT1):	burst.m
+ inst-cipher:	$(MANDIR)/$(DIR1)/cipher.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/cipher.$(EXT1):	cipher.man
+-		-$(REMOVE) $@ zcipher.man
+-		cp cipher.man $@
++		$(CP) cipher.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -392,8 +383,7 @@ $(MANDIR)/$(DIR1)/cipher.$(EXT1):	cipher
+ inst-comp:	$(MANDIR)/$(DIR1)/comp.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/comp.$(EXT1):	comp.man
+-		-$(REMOVE) $@ zcomp.man
+-		cp comp.man $@
++		$(CP) comp.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -401,8 +391,7 @@ $(MANDIR)/$(DIR1)/comp.$(EXT1):	comp.man
+ inst-conflict:	$(MANDIR)/$(DIR8)/conflict.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/conflict.$(EXT8):	conflict.man
+-		-$(REMOVE) $@ zconflict.man
+-		cp conflict.man $@
++		$(CP) conflict.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -410,8 +399,7 @@ $(MANDIR)/$(DIR8)/conflict.$(EXT8):	conf
+ inst-decipher:	$(MANDIR)/$(DIR1)/decipher.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/decipher.$(EXT1):	decipher.man
+-		-$(REMOVE) $@ zdecipher.man
+-		cp decipher.man $@
++		$(CP) decipher.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -419,8 +407,7 @@ $(MANDIR)/$(DIR1)/decipher.$(EXT1):	deci
+ inst-dist:	$(MANDIR)/$(DIR1)/dist.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/dist.$(EXT1):	dist.man
+-		-$(REMOVE) $@ zdist.man
+-		cp dist.man $@
++		$(CP) dist.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -428,8 +415,7 @@ $(MANDIR)/$(DIR1)/dist.$(EXT1):	dist.man
+ inst-dp:	$(MANDIR)/$(DIR8)/dp.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/dp.$(EXT8):	dp.man
+-		-$(REMOVE) $@ zdp.man
+-		cp dp.man $@
++		$(CP) dp.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -437,8 +423,7 @@ $(MANDIR)/$(DIR8)/dp.$(EXT8):	dp.man
+ inst-folder:	$(MANDIR)/$(DIR1)/folder.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/folder.$(EXT1):	folder.man
+-		-$(REMOVE) $@ zfolder.man
+-		cp folder.man $@
++		$(CP) folder.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -446,8 +431,7 @@ $(MANDIR)/$(DIR1)/folder.$(EXT1):	folder
+ inst-fmtdump:	$(MANDIR)/$(DIR8)/fmtdump.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/fmtdump.$(EXT8):	fmtdump.man
+-		-$(REMOVE) $@ zfmtdump.man
+-		cp fmtdump.man $@
++		$(CP) fmtdump.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -455,8 +439,7 @@ $(MANDIR)/$(DIR8)/fmtdump.$(EXT8):	fmtdu
+ inst-forw:	$(MANDIR)/$(DIR1)/forw.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/forw.$(EXT1):	forw.man
+-		-$(REMOVE) $@ zforw.man
+-		cp forw.man $@
++		$(CP) forw.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -464,8 +447,7 @@ $(MANDIR)/$(DIR1)/forw.$(EXT1):	forw.man
+ inst-inc:	$(MANDIR)/$(DIR1)/inc.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/inc.$(EXT1):	inc.man
+-		-$(REMOVE) $@ zinc.man
+-		cp inc.man $@
++		$(CP) inc.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -473,8 +455,7 @@ $(MANDIR)/$(DIR1)/inc.$(EXT1):	inc.man
+ inst-install-mh: $(MANDIR)/$(DIR8)/install-mh.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/install-mh.$(EXT8): install-mh.man
+-		-$(REMOVE) $@ zinstall-mh.man
+-		cp install-mh.man $@
++		$(CP) install-mh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -482,8 +463,7 @@ $(MANDIR)/$(DIR8)/install-mh.$(EXT8): in
+ inst-mark:	$(MANDIR)/$(DIR1)/mark.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mark.$(EXT1):	mark.man
+-		-$(REMOVE) $@ zmark.man
+-		cp mark.man $@
++		$(CP) mark.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -491,8 +471,7 @@ $(MANDIR)/$(DIR1)/mark.$(EXT1):	mark.man
+ inst-mh-alias:	$(MANDIR)/$(DIR5)/mh-alias.$(EXT5)
+ 
+ $(MANDIR)/$(DIR5)/mh-alias.$(EXT5):	mh-alias.man
+-		-$(REMOVE) $@ zmh-alias.man
+-		cp mh-alias.man $@
++		$(CP) mh-alias.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -500,8 +479,7 @@ $(MANDIR)/$(DIR5)/mh-alias.$(EXT5):	mh-a
+ inst-mh-format:	$(MANDIR)/$(DIR5)/mh-format.$(EXT5)
+ 
+ $(MANDIR)/$(DIR5)/mh-format.$(EXT5):	mh-format.man
+-		-$(REMOVE) $@ zmh-format.man
+-		cp mh-format.man $@
++		$(CP) mh-format.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -509,8 +487,7 @@ $(MANDIR)/$(DIR5)/mh-format.$(EXT5):	mh-
+ inst-mh-chart:	$(MANDIR)/$(DIR1)/mh-chart.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mh-chart.$(EXT1):	mh-chart.man
+-		-$(REMOVE) $@ zmh-chart.man
+-		cp mh-chart.man $@
++		$(CP) mh-chart.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -518,8 +495,7 @@ $(MANDIR)/$(DIR1)/mh-chart.$(EXT1):	mh-c
+ inst-mh-mail:	$(MANDIR)/$(DIR5)/mh-mail.$(EXT5)
+ 
+ $(MANDIR)/$(DIR5)/mh-mail.$(EXT5):	mh-mail.man
+-		-$(REMOVE) $@ zmh-mail.man
+-		cp mh-mail.man $@
++		$(CP) mh-mail.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -527,8 +503,7 @@ $(MANDIR)/$(DIR5)/mh-mail.$(EXT5):	mh-ma
+ inst-mh-tailor:	$(MANDIR)/$(DIR5)/mh-tailor.$(EXT5)
+ 
+ $(MANDIR)/$(DIR5)/mh-tailor.$(EXT5):	mh-tailor.man
+-		-$(REMOVE) $@ zmh-tailor.man
+-		cp mh-tailor.man $@
++		$(CP) mh-tailor.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -536,8 +511,7 @@ $(MANDIR)/$(DIR5)/mh-tailor.$(EXT5):	mh-
+ inst-mh-profile:	$(MANDIR)/$(DIR5)/mh-profile.$(EXT5)
+ 
+ $(MANDIR)/$(DIR5)/mh-profile.$(EXT5):	mh-profile.man
+-		-$(REMOVE) $@ zmh-profile.man
+-		cp mh-profile.man $@
++		$(CP) mh-profile.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -545,8 +519,7 @@ $(MANDIR)/$(DIR5)/mh-profile.$(EXT5):	mh
+ inst-mh-sequence:	$(MANDIR)/$(DIR5)/mh-sequence.$(EXT5)
+ 
+ $(MANDIR)/$(DIR5)/mh-sequence.$(EXT5):	mh-sequence.man
+-		-$(REMOVE) $@ zmh-sequence.man
+-		cp mh-sequence.man $@
++		$(CP) mh-sequence.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -554,8 +527,7 @@ $(MANDIR)/$(DIR5)/mh-sequence.$(EXT5):	m
+ inst-mhook:	$(MANDIR)/$(DIR1)/mhook.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mhook.$(EXT1):	mhook.man
+-		-$(REMOVE) $@ zmhook.man
+-		cp mhook.man $@
++		$(CP) mhook.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -563,8 +535,7 @@ $(MANDIR)/$(DIR1)/mhook.$(EXT1):	mhook.m
+ inst-mh:	$(MANDIR)/$(DIR1)/mh.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mh.$(EXT1):	mh.man
+-		-$(REMOVE) $@ zmh.man
+-		cp mh.man $@
++		$(CP) mh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -572,8 +543,7 @@ $(MANDIR)/$(DIR1)/mh.$(EXT1):	mh.man
+ inst-mhl:	$(MANDIR)/$(DIR1)/mhl.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mhl.$(EXT1):	mhl.man
+-		-$(REMOVE) $@ zmhl.man
+-		cp mhl.man $@
++		$(CP) mhl.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -581,8 +551,7 @@ $(MANDIR)/$(DIR1)/mhl.$(EXT1):	mhl.man
+ inst-mhmail:	$(MANDIR)/$(DIR1)/mhmail.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mhmail.$(EXT1):	mhmail.man
+-		-$(REMOVE) $@ zmhmail.man
+-		cp mhmail.man $@
++		$(CP) mhmail.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -590,8 +559,7 @@ $(MANDIR)/$(DIR1)/mhmail.$(EXT1):	mhmail
+ inst-mhn:	$(MANDIR)/$(DIR1)/mhn.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mhn.$(EXT1):	mhn.man
+-		-$(REMOVE) $@ zmhn.man
+-		cp mhn.man $@
++		$(CP) mhn.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -599,8 +567,7 @@ $(MANDIR)/$(DIR1)/mhn.$(EXT1):	mhn.man
+ inst-mhparam:	$(MANDIR)/$(DIR1)/mhparam.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mhparam.$(EXT1):	mhparam.man
+-		-$(REMOVE) $@ zmhparam.man
+-		cp mhparam.man $@
++		$(CP) mhparam.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -608,8 +575,7 @@ $(MANDIR)/$(DIR1)/mhparam.$(EXT1):	mhpar
+ inst-mhpath:	$(MANDIR)/$(DIR1)/mhpath.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/mhpath.$(EXT1):	mhpath.man
+-		-$(REMOVE) $@ zmhpath.man
+-		cp mhpath.man $@
++		$(CP) mhpath.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -617,8 +583,7 @@ $(MANDIR)/$(DIR1)/mhpath.$(EXT1):	mhpath
+ inst-msgchk:	$(MANDIR)/$(DIR1)/msgchk.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/msgchk.$(EXT1):	msgchk.man
+-		-$(REMOVE) $@ zmsgchk.man
+-		cp msgchk.man $@
++		$(CP) msgchk.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -626,8 +591,7 @@ $(MANDIR)/$(DIR1)/msgchk.$(EXT1):	msgchk
+ inst-msh:	$(MANDIR)/$(DIR1)/msh.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/msh.$(EXT1):	msh.man
+-		-$(REMOVE) $@ zmsh.man
+-		cp msh.man $@
++		$(CP) msh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -635,8 +599,7 @@ $(MANDIR)/$(DIR1)/msh.$(EXT1):	msh.man
+ inst-next:	$(MANDIR)/$(DIR1)/next.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/next.$(EXT1):	next.man
+-		-$(REMOVE) $@ znext.man
+-		cp next.man $@
++		$(CP) next.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -644,8 +607,7 @@ $(MANDIR)/$(DIR1)/next.$(EXT1):	next.man
+ inst-packf:	$(MANDIR)/$(DIR1)/packf.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/packf.$(EXT1):	packf.man
+-		-$(REMOVE) $@ zpackf.man
+-		cp packf.man $@
++		$(CP) packf.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -653,8 +615,7 @@ $(MANDIR)/$(DIR1)/packf.$(EXT1):	packf.m
+ inst-pgped:	$(MANDIR)/$(DIR1)/pgped.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/pgped.$(EXT1):	pgped.man
+-		-$(REMOVE) $@ zpgped.man
+-		cp pgped.man $@
++		$(CP) pgped.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -662,8 +623,7 @@ $(MANDIR)/$(DIR1)/pgped.$(EXT1):	pgped.m
+ inst-popauth:	$(MANDIR)/$(DIR8)/popauth.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/popauth.$(EXT8):	popauth.man
+-		-$(REMOVE) $@ zpopauth.man
+-		cp popauth.man $@
++		$(CP) popauth.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -671,8 +631,7 @@ $(MANDIR)/$(DIR8)/popauth.$(EXT8):	popau
+ inst-popd:	$(MANDIR)/$(DIR8)/popd.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/popd.$(EXT8):	popd.man
+-		-$(REMOVE) $@ zpopd.man
+-		cp popd.man $@
++		$(CP) popd.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -680,8 +639,7 @@ $(MANDIR)/$(DIR8)/popd.$(EXT8):	popd.man
+ inst-popi:	$(MANDIR)/$(DIR1)/popi.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/popi.$(EXT1):	popi.man
+-		-$(REMOVE) $@ zpopi.man
+-		cp popi.man $@
++		$(CP) popi.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -689,8 +647,7 @@ $(MANDIR)/$(DIR1)/popi.$(EXT1):	popi.man
+ inst-pick:	$(MANDIR)/$(DIR1)/pick.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/pick.$(EXT1):	pick.man
+-		-$(REMOVE) $@ zpick.man
+-		cp pick.man $@
++		$(CP) pick.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -698,8 +655,7 @@ $(MANDIR)/$(DIR1)/pick.$(EXT1):	pick.man
+ inst-post:	$(MANDIR)/$(DIR8)/post.$(EXT8)
+ 
+ $(MANDIR)/$(DIR8)/post.$(EXT8):	post.man
+-		-$(REMOVE) $@ zpost.man
+-		cp post.man $@
++		$(CP) post.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -707,8 +663,7 @@ $(MANDIR)/$(DIR8)/post.$(EXT8):	post.man
+ inst-prev:	$(MANDIR)/$(DIR1)/prev.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/prev.$(EXT1):	prev.man
+-		-$(REMOVE) $@ zprev.man
+-		cp prev.man $@
++		$(CP) prev.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -716,8 +671,7 @@ $(MANDIR)/$(DIR1)/prev.$(EXT1):	prev.man
+ inst-prompter:	$(MANDIR)/$(DIR1)/prompter.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/prompter.$(EXT1):	prompter.man
+-		-$(REMOVE) $@ zprompter.man
+-		cp prompter.man $@
++		$(CP) prompter.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -725,8 +679,7 @@ $(MANDIR)/$(DIR1)/prompter.$(EXT1):	prom
+ inst-rcvstore:	$(MANDIR)/$(DIR1)/rcvstore.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/rcvstore.$(EXT1):	rcvstore.man
+-		-$(REMOVE) $@ zrcvstore.man
+-		cp rcvstore.man $@
++		$(CP) rcvstore.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -734,8 +687,7 @@ $(MANDIR)/$(DIR1)/rcvstore.$(EXT1):	rcvs
+ inst-refile:	$(MANDIR)/$(DIR1)/refile.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/refile.$(EXT1):	refile.man
+-		-$(REMOVE) $@ zrefile.man
+-		cp refile.man $@
++		$(CP) refile.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -743,8 +695,7 @@ $(MANDIR)/$(DIR1)/refile.$(EXT1):	refile
+ inst-repl:	$(MANDIR)/$(DIR1)/repl.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/repl.$(EXT1):	repl.man
+-		-$(REMOVE) $@ zrepl.man
+-		cp repl.man $@
++		$(CP) repl.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -752,8 +703,7 @@ $(MANDIR)/$(DIR1)/repl.$(EXT1):	repl.man
+ inst-rmm:	$(MANDIR)/$(DIR1)/rmm.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/rmm.$(EXT1):	rmm.man
+-		-$(REMOVE) $@ zrmm.man
+-		cp rmm.man $@
++		$(CP) rmm.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -761,8 +711,7 @@ $(MANDIR)/$(DIR1)/rmm.$(EXT1):	rmm.man
+ inst-rmf:	$(MANDIR)/$(DIR1)/rmf.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/rmf.$(EXT1):	rmf.man
+-		-$(REMOVE) $@ zrmf.man
+-		cp rmf.man $@
++		$(CP) rmf.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -770,8 +719,7 @@ $(MANDIR)/$(DIR1)/rmf.$(EXT1):	rmf.man
+ inst-scan:	$(MANDIR)/$(DIR1)/scan.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/scan.$(EXT1):	scan.man
+-		-$(REMOVE) $@ zscan.man
+-		cp scan.man $@
++		$(CP) scan.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -779,8 +727,7 @@ $(MANDIR)/$(DIR1)/scan.$(EXT1):	scan.man
+ inst-send:	$(MANDIR)/$(DIR1)/send.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/send.$(EXT1):	send.man
+-		-$(REMOVE) $@ zsend.man
+-		cp send.man $@
++		$(CP) send.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -788,8 +735,7 @@ $(MANDIR)/$(DIR1)/send.$(EXT1):	send.man
+ inst-show:	$(MANDIR)/$(DIR1)/show.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/show.$(EXT1):	show.man
+-		-$(REMOVE) $@ zshow.man
+-		cp show.man $@
++		$(CP) show.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -797,8 +743,7 @@ $(MANDIR)/$(DIR1)/show.$(EXT1):	show.man
+ inst-slocal:	$(MANDIR)/$(DIR1)/slocal.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/slocal.$(EXT1):	slocal.man
+-		-$(REMOVE) $@ zslocal.man
+-		cp slocal.man $@
++		$(CP) slocal.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -806,8 +751,7 @@ $(MANDIR)/$(DIR1)/slocal.$(EXT1):	slocal
+ inst-sortm:	$(MANDIR)/$(DIR1)/sortm.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/sortm.$(EXT1):	sortm.man
+-		-$(REMOVE) $@ zsortm.man
+-		cp sortm.man $@
++		$(CP) sortm.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -815,8 +759,7 @@ $(MANDIR)/$(DIR1)/sortm.$(EXT1):	sortm.m
+ inst-tma:	$(MANDIR)/$(DIR1)/tma.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/tma.$(EXT1):	tma.man
+-		-$(REMOVE) $@ ztma.man
+-		cp tma.man $@
++		$(CP) tma.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -824,8 +767,7 @@ $(MANDIR)/$(DIR1)/tma.$(EXT1):	tma.man
+ inst-vmh:	$(MANDIR)/$(DIR1)/vmh.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/vmh.$(EXT1):	vmh.man
+-		-$(REMOVE) $@ zvmh.man
+-		cp vmh.man $@
++		$(CP) vmh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -833,8 +775,7 @@ $(MANDIR)/$(DIR1)/vmh.$(EXT1):	vmh.man
+ inst-whatnow:	$(MANDIR)/$(DIR1)/whatnow.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/whatnow.$(EXT1):	whatnow.man
+-		-$(REMOVE) $@ zwhatnow.man
+-		cp whatnow.man $@
++		$(CP) whatnow.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -842,8 +783,7 @@ $(MANDIR)/$(DIR1)/whatnow.$(EXT1):	whatn
+ inst-whom:	$(MANDIR)/$(DIR1)/whom.$(EXT1)
+ 
+ $(MANDIR)/$(DIR1)/whom.$(EXT1):	whom.man
+-		-$(REMOVE) $@ zwhom.man
+-		cp whom.man $@
++		$(CP) whom.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -852,8 +792,7 @@ $(MANDIR)/$(DIR1)/whom.$(EXT1):	whom.man
+ inst-ja-ali:	$(JMANDIR)/$(DIR1)/ali.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/ali.$(EXT1):	ja-ali.man
+-		-$(REMOVE) $@ zja-ali.man
+-		cp ja-ali.man $@
++		$(CP) ja-ali.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -861,8 +800,7 @@ $(JMANDIR)/$(DIR1)/ali.$(EXT1):	ja-ali.m
+ inst-ja-anno:	$(JMANDIR)/$(DIR1)/anno.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/anno.$(EXT1):	ja-anno.man
+-		-$(REMOVE) $@ zja-anno.man
+-		cp ja-anno.man $@
++		$(CP) ja-anno.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -870,8 +808,7 @@ $(JMANDIR)/$(DIR1)/anno.$(EXT1):	ja-anno
+ inst-ja-ap:	$(JMANDIR)/$(DIR8)/ap.$(EXT8)
+ 
+ $(JMANDIR)/$(DIR8)/ap.$(EXT8):	ja-ap.man
+-		-$(REMOVE) $@ zja-ap.man
+-		cp ja-ap.man $@
++		$(CP) ja-ap.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -879,8 +816,7 @@ $(JMANDIR)/$(DIR8)/ap.$(EXT8):	ja-ap.man
+ inst-ja-bbc:	$(JMANDIR)/$(DIR1)/bbc.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/bbc.$(EXT1):	ja-bbc.man
+-		-$(REMOVE) $@ zja-bbc.man
+-		cp ja-bbc.man $@
++		$(CP) ja-bbc.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -888,8 +824,7 @@ $(JMANDIR)/$(DIR1)/bbc.$(EXT1):	ja-bbc.m
+ inst-ja-burst:	$(JMANDIR)/$(DIR1)/burst.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/burst.$(EXT1):	ja-burst.man
+-		-$(REMOVE) $@ zja-burst.man
+-		cp ja-burst.man $@
++		$(CP) ja-burst.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -897,8 +832,7 @@ $(JMANDIR)/$(DIR1)/burst.$(EXT1):	ja-bur
+ inst-ja-comp:	$(JMANDIR)/$(DIR1)/comp.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/comp.$(EXT1):	ja-comp.man
+-		-$(REMOVE) $@ zja-comp.man
+-		cp ja-comp.man $@
++		$(CP) ja-comp.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -906,8 +840,7 @@ $(JMANDIR)/$(DIR1)/comp.$(EXT1):	ja-comp
+ inst-ja-conflict:	$(JMANDIR)/$(DIR8)/conflict.$(EXT8)
+ 
+ $(JMANDIR)/$(DIR8)/conflict.$(EXT8):	ja-conflict.man
+-		-$(REMOVE) $@ zja-conflict.man
+-		cp ja-conflict.man $@
++		$(CP) ja-conflict.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -915,8 +848,7 @@ $(JMANDIR)/$(DIR8)/conflict.$(EXT8):	ja-
+ inst-ja-dist:	$(JMANDIR)/$(DIR1)/dist.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/dist.$(EXT1):	ja-dist.man
+-		-$(REMOVE) $@ zja-dist.man
+-		cp ja-dist.man $@
++		$(CP) ja-dist.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -924,8 +856,7 @@ $(JMANDIR)/$(DIR1)/dist.$(EXT1):	ja-dist
+ inst-ja-dp:	$(JMANDIR)/$(DIR8)/dp.$(EXT8)
+ 
+ $(JMANDIR)/$(DIR8)/dp.$(EXT8):	ja-dp.man
+-		-$(REMOVE) $@ zja-dp.man
+-		cp ja-dp.man $@
++		$(CP) ja-dp.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -933,8 +864,7 @@ $(JMANDIR)/$(DIR8)/dp.$(EXT8):	ja-dp.man
+ inst-ja-fmtdump:	$(JMANDIR)/$(DIR8)/fmtdump.$(EXT8)
+ 
+ $(JMANDIR)/$(DIR8)/fmtdump.$(EXT8):	ja-fmtdump.man
+-		-$(REMOVE) $@ zja-fmtdump.man
+-		cp ja-fmtdump.man $@
++		$(CP) ja-fmtdump.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -942,8 +872,7 @@ $(JMANDIR)/$(DIR8)/fmtdump.$(EXT8):	ja-f
+ inst-ja-folder:	$(JMANDIR)/$(DIR1)/folder.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/folder.$(EXT1):	ja-folder.man
+-		-$(REMOVE) $@ zja-folder.man
+-		cp ja-folder.man $@
++		$(CP) ja-folder.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -951,8 +880,7 @@ $(JMANDIR)/$(DIR1)/folder.$(EXT1):	ja-fo
+ inst-ja-forw:	$(JMANDIR)/$(DIR1)/forw.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/forw.$(EXT1):	ja-forw.man
+-		-$(REMOVE) $@ zja-forw.man
+-		cp ja-forw.man $@
++		$(CP) ja-forw.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -960,8 +888,7 @@ $(JMANDIR)/$(DIR1)/forw.$(EXT1):	ja-forw
+ inst-ja-inc:	$(JMANDIR)/$(DIR1)/inc.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/inc.$(EXT1):	ja-inc.man
+-		-$(REMOVE) $@ zja-inc.man
+-		cp ja-inc.man $@
++		$(CP) ja-inc.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -969,8 +896,7 @@ $(JMANDIR)/$(DIR1)/inc.$(EXT1):	ja-inc.m
+ inst-ja-install-mh:	$(JMANDIR)/$(DIR8)/install-mh.$(EXT8)
+ 
+ $(JMANDIR)/$(DIR8)/install-mh.$(EXT8):	ja-install-mh.man
+-		-$(REMOVE) $@ zja-install-mh.man
+-		cp ja-install-mh.man $@
++		$(CP) ja-install-mh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -978,8 +904,7 @@ $(JMANDIR)/$(DIR8)/install-mh.$(EXT8):	j
+ inst-ja-mark:	$(JMANDIR)/$(DIR1)/mark.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mark.$(EXT1):	ja-mark.man
+-		-$(REMOVE) $@ zja-mark.man
+-		cp ja-mark.man $@
++		$(CP) ja-mark.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -987,8 +912,7 @@ $(JMANDIR)/$(DIR1)/mark.$(EXT1):	ja-mark
+ inst-ja-mh-alias:	$(JMANDIR)/$(DIR5)/mh-alias.$(EXT5)
+ 
+ $(JMANDIR)/$(DIR5)/mh-alias.$(EXT5):	ja-mh-alias.man
+-		-$(REMOVE) $@ zja-mh-alias.man
+-		cp ja-mh-alias.man $@
++		$(CP) ja-mh-alias.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -996,8 +920,7 @@ $(JMANDIR)/$(DIR5)/mh-alias.$(EXT5):	ja-
+ inst-ja-mh-chart:	$(JMANDIR)/$(DIR1)/mh-chart.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mh-chart.$(EXT1):	ja-mh-chart.man
+-		-$(REMOVE) $@ zja-mh-chart.man
+-		cp ja-mh-chart.man $@
++		$(CP) ja-mh-chart.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1005,8 +928,7 @@ $(JMANDIR)/$(DIR1)/mh-chart.$(EXT1):	ja-
+ inst-ja-mh-format:	$(JMANDIR)/$(DIR5)/mh-format.$(EXT5)
+ 
+ $(JMANDIR)/$(DIR5)/mh-format.$(EXT5):	ja-mh-format.man
+-		-$(REMOVE) $@ zja-mh-format.man
+-		cp ja-mh-format.man $@
++		$(CP) ja-mh-format.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1014,8 +936,7 @@ $(JMANDIR)/$(DIR5)/mh-format.$(EXT5):	ja
+ inst-ja-mh-mail:	$(JMANDIR)/$(DIR5)/mh-mail.$(EXT5)
+ 
+ $(JMANDIR)/$(DIR5)/mh-mail.$(EXT5):	ja-mh-mail.man
+-		-$(REMOVE) $@ zja-mh-mail.man
+-		cp ja-mh-mail.man $@
++		$(CP) ja-mh-mail.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1023,8 +944,7 @@ $(JMANDIR)/$(DIR5)/mh-mail.$(EXT5):	ja-m
+ inst-ja-mh-profile:	$(JMANDIR)/$(DIR5)/mh-profile.$(EXT5)
+ 
+ $(JMANDIR)/$(DIR5)/mh-profile.$(EXT5):	ja-mh-profile.man
+-		-$(REMOVE) $@ zja-mh-profile.man
+-		cp ja-mh-profile.man $@
++		$(CP) ja-mh-profile.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1032,8 +952,7 @@ $(JMANDIR)/$(DIR5)/mh-profile.$(EXT5):	j
+ inst-ja-mh-sequence:	$(JMANDIR)/$(DIR5)/mh-sequence.$(EXT5)
+ 
+ $(JMANDIR)/$(DIR5)/mh-sequence.$(EXT5):	ja-mh-sequence.man
+-		-$(REMOVE) $@ zja-mh-sequence.man
+-		cp ja-mh-sequence.man $@
++		$(CP) ja-mh-sequence.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1041,8 +960,7 @@ $(JMANDIR)/$(DIR5)/mh-sequence.$(EXT5):	
+ inst-ja-mh-tailor:	$(JMANDIR)/$(DIR5)/mh-tailor.$(EXT5)
+ 
+ $(JMANDIR)/$(DIR5)/mh-tailor.$(EXT5):	ja-mh-tailor.man
+-		-$(REMOVE) $@ zja-mh-tailor.man
+-		cp ja-mh-tailor.man $@
++		$(CP) ja-mh-tailor.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1050,8 +968,7 @@ $(JMANDIR)/$(DIR5)/mh-tailor.$(EXT5):	ja
+ inst-ja-mh:	$(JMANDIR)/$(DIR1)/mh.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mh.$(EXT1):	ja-mh.man
+-		-$(REMOVE) $@ zja-mh.man
+-		cp ja-mh.man $@
++		$(CP) ja-mh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1059,8 +976,7 @@ $(JMANDIR)/$(DIR1)/mh.$(EXT1):	ja-mh.man
+ inst-ja-mhl:	$(JMANDIR)/$(DIR1)/mhl.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mhl.$(EXT1):	ja-mhl.man
+-		-$(REMOVE) $@ zja-mhl.man
+-		cp ja-mhl.man $@
++		$(CP) ja-mhl.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1068,8 +984,7 @@ $(JMANDIR)/$(DIR1)/mhl.$(EXT1):	ja-mhl.m
+ inst-ja-mhmail:	$(JMANDIR)/$(DIR1)/mhmail.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mhmail.$(EXT1):	ja-mhmail.man
+-		-$(REMOVE) $@ zja-mhmail.man
+-		cp ja-mhmail.man $@
++		$(CP) ja-mhmail.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1077,8 +992,7 @@ $(JMANDIR)/$(DIR1)/mhmail.$(EXT1):	ja-mh
+ inst-ja-mhn:	$(JMANDIR)/$(DIR1)/mhn.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mhn.$(EXT1):	ja-mhn.man
+-		-$(REMOVE) $@ zja-mhn.man
+-		cp ja-mhn.man $@
++		$(CP) ja-mhn.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1086,8 +1000,7 @@ $(JMANDIR)/$(DIR1)/mhn.$(EXT1):	ja-mhn.m
+ inst-ja-mhook:	$(JMANDIR)/$(DIR1)/mhook.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mhook.$(EXT1):	ja-mhook.man
+-		-$(REMOVE) $@ zja-mhook.man
+-		cp ja-mhook.man $@
++		$(CP) ja-mhook.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1095,8 +1008,7 @@ $(JMANDIR)/$(DIR1)/mhook.$(EXT1):	ja-mho
+ inst-ja-mhparam:	$(JMANDIR)/$(DIR1)/mhparam.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mhparam.$(EXT1):	ja-mhparam.man
+-		-$(REMOVE) $@ zja-mhparam.man
+-		cp ja-mhparam.man $@
++		$(CP) ja-mhparam.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1104,8 +1016,7 @@ $(JMANDIR)/$(DIR1)/mhparam.$(EXT1):	ja-m
+ inst-ja-mhpath:	$(JMANDIR)/$(DIR1)/mhpath.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/mhpath.$(EXT1):	ja-mhpath.man
+-		-$(REMOVE) $@ zja-mhpath.man
+-		cp ja-mhpath.man $@
++		$(CP) ja-mhpath.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1113,8 +1024,7 @@ $(JMANDIR)/$(DIR1)/mhpath.$(EXT1):	ja-mh
+ inst-ja-msgchk:	$(JMANDIR)/$(DIR1)/msgchk.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/msgchk.$(EXT1):	ja-msgchk.man
+-		-$(REMOVE) $@ zja-msgchk.man
+-		cp ja-msgchk.man $@
++		$(CP) ja-msgchk.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1122,8 +1032,7 @@ $(JMANDIR)/$(DIR1)/msgchk.$(EXT1):	ja-ms
+ inst-ja-msh:	$(JMANDIR)/$(DIR1)/msh.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/msh.$(EXT1):	ja-msh.man
+-		-$(REMOVE) $@ zja-msh.man
+-		cp ja-msh.man $@
++		$(CP) ja-msh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1131,8 +1040,7 @@ $(JMANDIR)/$(DIR1)/msh.$(EXT1):	ja-msh.m
+ inst-ja-next:	$(JMANDIR)/$(DIR1)/next.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/next.$(EXT1):	ja-next.man
+-		-$(REMOVE) $@ zja-next.man
+-		cp ja-next.man $@
++		$(CP) ja-next.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1140,8 +1048,7 @@ $(JMANDIR)/$(DIR1)/next.$(EXT1):	ja-next
+ inst-ja-packf:	$(JMANDIR)/$(DIR1)/packf.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/packf.$(EXT1):	ja-packf.man
+-		-$(REMOVE) $@ zja-packf.man
+-		cp ja-packf.man $@
++		$(CP) ja-packf.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1149,8 +1056,7 @@ $(JMANDIR)/$(DIR1)/packf.$(EXT1):	ja-pac
+ inst-ja-pgped:	$(JMANDIR)/$(DIR1)/pgped.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/pgped.$(EXT1):	ja-pgped.man
+-		-$(REMOVE) $@ zja-pgped.man
+-		cp ja-pgped.man $@
++		$(CP) ja-pgped.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1158,8 +1064,7 @@ $(JMANDIR)/$(DIR1)/pgped.$(EXT1):	ja-pgp
+ inst-ja-pick:	$(JMANDIR)/$(DIR1)/pick.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/pick.$(EXT1):	ja-pick.man
+-		-$(REMOVE) $@ zja-pick.man
+-		cp ja-pick.man $@
++		$(CP) ja-pick.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1167,8 +1072,7 @@ $(JMANDIR)/$(DIR1)/pick.$(EXT1):	ja-pick
+ inst-ja-post:	$(JMANDIR)/$(DIR8)/post.$(EXT8)
+ 
+ $(JMANDIR)/$(DIR8)/post.$(EXT8):	ja-post.man
+-		-$(REMOVE) $@ zja-post.man
+-		cp ja-post.man $@
++		$(CP) ja-post.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1176,8 +1080,7 @@ $(JMANDIR)/$(DIR8)/post.$(EXT8):	ja-post
+ inst-ja-prev:	$(JMANDIR)/$(DIR1)/prev.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/prev.$(EXT1):	ja-prev.man
+-		-$(REMOVE) $@ zja-prev.man
+-		cp ja-prev.man $@
++		$(CP) ja-prev.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1185,8 +1088,7 @@ $(JMANDIR)/$(DIR1)/prev.$(EXT1):	ja-prev
+ inst-ja-prompter:	$(JMANDIR)/$(DIR1)/prompter.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/prompter.$(EXT1):	ja-prompter.man
+-		-$(REMOVE) $@ zja-prompter.man
+-		cp ja-prompter.man $@
++		$(CP) ja-prompter.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1194,8 +1096,7 @@ $(JMANDIR)/$(DIR1)/prompter.$(EXT1):	ja-
+ inst-ja-rcvstore:	$(JMANDIR)/$(DIR1)/rcvstore.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/rcvstore.$(EXT1):	ja-rcvstore.man
+-		-$(REMOVE) $@ zja-rcvstore.man
+-		cp ja-rcvstore.man $@
++		$(CP) ja-rcvstore.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1203,8 +1104,7 @@ $(JMANDIR)/$(DIR1)/rcvstore.$(EXT1):	ja-
+ inst-ja-refile:	$(JMANDIR)/$(DIR1)/refile.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/refile.$(EXT1):	ja-refile.man
+-		-$(REMOVE) $@ zja-refile.man
+-		cp ja-refile.man $@
++		$(CP) ja-refile.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1212,8 +1112,7 @@ $(JMANDIR)/$(DIR1)/refile.$(EXT1):	ja-re
+ inst-ja-repl:	$(JMANDIR)/$(DIR1)/repl.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/repl.$(EXT1):	ja-repl.man
+-		-$(REMOVE) $@ zja-repl.man
+-		cp ja-repl.man $@
++		$(CP) ja-repl.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1221,8 +1120,7 @@ $(JMANDIR)/$(DIR1)/repl.$(EXT1):	ja-repl
+ inst-ja-rmf:	$(JMANDIR)/$(DIR1)/rmf.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/rmf.$(EXT1):	ja-rmf.man
+-		-$(REMOVE) $@ zja-rmf.man
+-		cp ja-rmf.man $@
++		$(CP) ja-rmf.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1230,8 +1128,7 @@ $(JMANDIR)/$(DIR1)/rmf.$(EXT1):	ja-rmf.m
+ inst-ja-rmm:	$(JMANDIR)/$(DIR1)/rmm.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/rmm.$(EXT1):	ja-rmm.man
+-		-$(REMOVE) $@ zja-rmm.man
+-		cp ja-rmm.man $@
++		$(CP) ja-rmm.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1239,8 +1136,7 @@ $(JMANDIR)/$(DIR1)/rmm.$(EXT1):	ja-rmm.m
+ inst-ja-scan:	$(JMANDIR)/$(DIR1)/scan.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/scan.$(EXT1):	ja-scan.man
+-		-$(REMOVE) $@ zja-scan.man
+-		cp ja-scan.man $@
++		$(CP) ja-scan.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1248,8 +1144,7 @@ $(JMANDIR)/$(DIR1)/scan.$(EXT1):	ja-scan
+ inst-ja-send:	$(JMANDIR)/$(DIR1)/send.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/send.$(EXT1):	ja-send.man
+-		-$(REMOVE) $@ zja-send.man
+-		cp ja-send.man $@
++		$(CP) ja-send.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1257,8 +1152,7 @@ $(JMANDIR)/$(DIR1)/send.$(EXT1):	ja-send
+ inst-ja-show:	$(JMANDIR)/$(DIR1)/show.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/show.$(EXT1):	ja-show.man
+-		-$(REMOVE) $@ zja-show.man
+-		cp ja-show.man $@
++		$(CP) ja-show.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1266,8 +1160,7 @@ $(JMANDIR)/$(DIR1)/show.$(EXT1):	ja-show
+ inst-ja-slocal:	$(JMANDIR)/$(DIR1)/slocal.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/slocal.$(EXT1):	ja-slocal.man
+-		-$(REMOVE) $@ zja-slocal.man
+-		cp ja-slocal.man $@
++		$(CP) ja-slocal.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1275,8 +1168,7 @@ $(JMANDIR)/$(DIR1)/slocal.$(EXT1):	ja-sl
+ inst-ja-sortm:	$(JMANDIR)/$(DIR1)/sortm.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/sortm.$(EXT1):	ja-sortm.man
+-		-$(REMOVE) $@ zja-sortm.man
+-		cp ja-sortm.man $@
++		$(CP) ja-sortm.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1284,8 +1176,7 @@ $(JMANDIR)/$(DIR1)/sortm.$(EXT1):	ja-sor
+ inst-ja-vmh:	$(JMANDIR)/$(DIR1)/vmh.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/vmh.$(EXT1):	ja-vmh.man
+-		-$(REMOVE) $@ zja-vmh.man
+-		cp ja-vmh.man $@
++		$(CP) ja-vmh.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1293,8 +1184,7 @@ $(JMANDIR)/$(DIR1)/vmh.$(EXT1):	ja-vmh.m
+ inst-ja-whatnow:	$(JMANDIR)/$(DIR1)/whatnow.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/whatnow.$(EXT1):	ja-whatnow.man
+-		-$(REMOVE) $@ zja-whatnow.man
+-		cp ja-whatnow.man $@
++		$(CP) ja-whatnow.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1302,8 +1192,7 @@ $(JMANDIR)/$(DIR1)/whatnow.$(EXT1):	ja-w
+ inst-ja-whom:	$(JMANDIR)/$(DIR1)/whom.$(EXT1)
+ 
+ $(JMANDIR)/$(DIR1)/whom.$(EXT1):	ja-whom.man
+-		-$(REMOVE) $@ zja-whom.man
+-		cp ja-whom.man $@
++		$(CP) ja-whom.man $@
+ 		-@chmod $(MANPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -1505,8 +1394,7 @@ depend:;
+ #	inst-pickle:	$(MANDIR)/$(DIR[n])/pickle.$(EXT[n])
+ #	
+ #	$(MANDIR)/$(DIR[n])/pickle.$(EXT[n]):	pickle.man
+-#			-$(REMOVE) $@ zpickle.man
+-#			cp pickle.man $@
++#			$(CP) pickle.man $@
+ #			-@chmod $(MANPROT) $@
+ #			-@ls -l $@
+ #			-@echo ""
diff --git a/mail/ja-mh/patches/patch-bl b/mail/ja-mh/patches/patch-bl
new file mode 100644
index 00000000000..d4c2b01937e
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bl
@@ -0,0 +1,111 @@
+$NetBSD: patch-bl,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/makefiles/support/bboards.orig	2001-06-11 01:25:43.000000000 +0000
++++ conf/makefiles/support/bboards
+@@ -15,6 +15,7 @@ BBDIR	=	@(BBHOME)
+ BBETC	=	$(BBDIR)/etc
+ CHOWN	=	@(MHCHOWNPATH)
+ REMOVE	=	@(MHREMOVE)
++CP      =       @(CP)
+ BBUID	=	bboards
+ @BEGIN: BBSERVER
+ ALL	=	bbaka bbexp bbtar
+@@ -118,8 +119,7 @@ inst-bboards:	$(BBDIR)/BBoards
+ 
+ $(BBDIR)/BBoards: BBoards
+ 		-@if [ ! -f $@ ]; then \
+-		    $(REMOVE) $@ zBBoards; \
+-		    cp BBoards $@; \
++		    $(CP) BBoards $@; \
+ 		else \
+ 		    echo "Will not overwrite existing $@"; \
+ 		fi
+@@ -135,8 +135,7 @@ $(BBDIR)/BBoards: BBoards
+ inst-bbaka:	$(BBETC)/bbaka
+ 
+ $(BBETC)/bbaka: xbbaka
+-		-$(REMOVE) $@ zbbaka
+-		cp xbbaka $@
++		$(CP) xbbaka $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -156,8 +155,7 @@ l-bbaka:;	$(LINT) $(LFLAGS) bbaka.c $(LL
+ inst-bbexp:	$(BBETC)/bbexp
+ 
+ $(BBETC)/bbexp: xbbexp
+-		-$(REMOVE) $@ zbbexp
+-		cp xbbexp $@
++		$(CP) xbbexp $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -177,8 +175,7 @@ l-bbexp:;	$(LINT) $(LFLAGS) bbexp.c ../.
+ inst-bbtar:	$(BBETC)/bbtar
+ 
+ $(BBETC)/bbtar: xbbtar
+-		-$(REMOVE) $@ zbbtar
+-		cp xbbtar $@
++		$(CP) xbbtar $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -198,8 +195,7 @@ l-bbtar:;	$(LINT) $(LFLAGS) bbtar.c $(LL
+ inst-daily:	$(BBETC)/bboards.daily
+ 
+ $(BBETC)/bboards.daily: bboards.daily
+-		-$(REMOVE) $@ zbboards.daily
+-		cp bboards.daily $@
++		$(CP) bboards.daily $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@chmod +x $@
+ 		-@ls -l $@
+@@ -213,8 +209,7 @@ $(BBETC)/bboards.daily: bboards.daily
+ inst-weekly:	$(BBETC)/bboards.weekly
+ 
+ $(BBETC)/bboards.weekly: bboards.weekly
+-		-$(REMOVE) $@ zbboards.weekly
+-		cp bboards.weekly $@
++		$(CP) bboards.weekly $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@chmod +x $@
+ 		-@ls -l $@
+@@ -228,8 +223,7 @@ $(BBETC)/bboards.weekly: bboards.weekly
+ inst-makebboards:	$(BBETC)/Makefile
+ 
+ $(BBETC)/Makefile: MakeBBoards
+-		-$(REMOVE) $@ zMakeBBoards
+-		cp MakeBBoards $@
++		$(CP) MakeBBoards $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -242,8 +236,7 @@ $(BBETC)/Makefile: MakeBBoards
+ inst-cshell:	$(BBDIR)/.cshrc
+ 
+ $(BBDIR)/.cshrc: cshrc
+-		-$(REMOVE) $@ z.cshrc
+-		cp cshrc $@
++		$(CP) cshrc $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -256,8 +249,7 @@ $(BBDIR)/.cshrc: cshrc
+ inst-profile:	$(BBDIR)/.mh_profile
+ 
+ $(BBDIR)/.mh_profile: mh_profile
+-		-$(REMOVE) $@ z.mh_profile
+-		cp mh_profile $@
++		$(CP) mh_profile $@
+ 		-$(CHOWN) $(BBUID) $@
+ 		-@ls -l $@
+ 		-@touch $(BBETC)/context
+@@ -296,7 +288,7 @@ depend:
+ 		echo '/^# DO NOT DELETE THIS LINE/+2,$$d' > eddep
+ 		echo '$$r makedep' >> eddep
+ 		echo 'w' >> eddep
+-		cp Makefile _Makefile
++		$(CP) Makefile _Makefile
+ 		ed - Makefile < eddep
+ 		rm eddep makedep
+ 		echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
diff --git a/mail/ja-mh/patches/patch-bm b/mail/ja-mh/patches/patch-bm
new file mode 100644
index 00000000000..6206473e398
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bm
@@ -0,0 +1,203 @@
+$NetBSD: patch-bm,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/makefiles/support/general.orig	1998-04-23 21:02:00.000000000 +0000
++++ conf/makefiles/support/general
+@@ -74,7 +74,6 @@ inst-aliases:	$(ETCDIR)/MailAliases
+ 
+ $(ETCDIR)/MailAliases:	MailAliases
+ 		-@if [ ! -f $@ ]; then \
+-		    $(REMOVE) $@ zMailAliases; \
+ 		    $(CP) MailAliases $@; \
+ 		else \
+ 		    echo "Will not overwrite existing $@"; \
+@@ -87,7 +86,6 @@ $(ETCDIR)/MailAliases:	MailAliases
+ inst-components:	$(ETCDIR)/components
+ 
+ $(ETCDIR)/components:	components
+-		-$(REMOVE) $@ zcomponents
+ 		$(CP) components $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -97,7 +95,6 @@ $(ETCDIR)/components:	components
+ inst-digestcomps:	$(ETCDIR)/digestcomps
+ 
+ $(ETCDIR)/digestcomps:	digestcomps
+-		-$(REMOVE) $@ zdigestcomps
+ 		$(CP) digestcomps $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -107,7 +104,6 @@ $(ETCDIR)/digestcomps:	digestcomps
+ inst-distcomps:	$(ETCDIR)/distcomps
+ 
+ $(ETCDIR)/distcomps:	distcomps
+-		-$(REMOVE) $@ zdistcomps
+ 		$(CP) distcomps $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -117,7 +113,6 @@ $(ETCDIR)/distcomps:	distcomps
+ inst-forwcomps:	$(ETCDIR)/forwcomps
+ 
+ $(ETCDIR)/forwcomps:	forwcomps
+-		-$(REMOVE) $@ zforwcomps
+ 		$(CP) forwcomps $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -127,7 +122,6 @@ $(ETCDIR)/forwcomps:	forwcomps
+ inst-rcvdistcomps:	$(ETCDIR)/rcvdistcomps
+ 
+ $(ETCDIR)/rcvdistcomps:	rcvdistcomps
+-		-$(REMOVE) $@ zrcvdistcomps
+ 		$(CP) rcvdistcomps $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -137,7 +131,6 @@ $(ETCDIR)/rcvdistcomps:	rcvdistcomps
+ inst-replcomps:	$(ETCDIR)/replcomps
+ 
+ $(ETCDIR)/replcomps:	replcomps
+-		-$(REMOVE) $@ zreplcomps
+ 		$(CP) replcomps $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -147,7 +140,6 @@ $(ETCDIR)/replcomps:	replcomps
+ inst-digest:	$(ETCDIR)/mhl.digest
+ 
+ $(ETCDIR)/mhl.digest:	mhl.digest
+-		-$(REMOVE) $@ zmhl.digest
+ 		$(CP) mhl.digest $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -162,7 +154,6 @@ MHL_FORMAT= mhl.format.hdecode
+ @END: MIME_HEADERS
+ 
+ $(ETCDIR)/mhl.format:	$(MHL_FORMAT)
+-		-$(REMOVE) $@ zmhl.format
+ 		$(CP) $(MHL_FORMAT) $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -172,7 +163,6 @@ $(ETCDIR)/mhl.format:	$(MHL_FORMAT)
+ inst-forward:	$(ETCDIR)/mhl.forward
+ 
+ $(ETCDIR)/mhl.forward:	mhl.forward
+-		-$(REMOVE) $@ zmhl.forward
+ 		$(CP) mhl.forward $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -182,7 +172,6 @@ $(ETCDIR)/mhl.forward:	mhl.forward
+ inst-body:	$(ETCDIR)/mhl.body
+ 
+ $(ETCDIR)/mhl.body:	mhl.body
+-		-$(REMOVE) $@ zmhl.body
+ 		$(CP) mhl.body $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -197,8 +186,7 @@ MHL_HEADERS= mhl.headers.hdecode
+ @END: MIME_HEADERS
+ 
+ $(ETCDIR)/mhl.headers:	$(MHL_HEADERS)
+-		-$(REMOVE) $@ zmhl.headers
+-		cp $(MHL_HEADERS) $@
++		$(CP) $(MHL_HEADERS) $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -207,7 +195,6 @@ $(ETCDIR)/mhl.headers:	$(MHL_HEADERS)
+ inst-default:	$(ETCDIR)/scan.default
+ 
+ $(ETCDIR)/scan.default:	scan.default
+-		-$(REMOVE) $@ zscan.default
+ 		$(CP) scan.default $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -216,7 +203,6 @@ $(ETCDIR)/scan.default:	scan.default
+ inst-mailx:	$(ETCDIR)/scan.mailx
+ 
+ $(ETCDIR)/scan.mailx:	scan.mailx
+-		-$(REMOVE) $@ zscan.mailx
+ 		$(CP) scan.mailx $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -226,7 +212,6 @@ $(ETCDIR)/scan.mailx:	scan.mailx
+ inst-size:	$(ETCDIR)/scan.size
+ 
+ $(ETCDIR)/scan.size:	scan.size
+-		-$(REMOVE) $@ zscan.size
+ 		$(CP) scan.size $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -236,7 +221,6 @@ $(ETCDIR)/scan.size:	scan.size
+ inst-time:	$(ETCDIR)/scan.time
+ 
+ $(ETCDIR)/scan.time:	scan.time
+-		-$(REMOVE) $@ zscan.time
+ 		$(CP) scan.time $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -246,7 +230,6 @@ $(ETCDIR)/scan.time:	scan.time
+ inst-timely:	$(ETCDIR)/scan.timely
+ 
+ $(ETCDIR)/scan.timely:	scan.timely
+-		-$(REMOVE) $@ zscan.timely
+ 		$(CP) scan.timely $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+@@ -256,8 +239,7 @@ $(ETCDIR)/scan.timely:	scan.timely
+ inst-packmbox:	$(ETCDIR)/packmbox
+ 
+ $(ETCDIR)/packmbox:	packmbox.sh
+-		-$(REMOVE) $@ zpackmbox.sh
+-		cp packmbox.sh $@
++		$(CP) packmbox.sh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -267,7 +249,6 @@ inst-bboards:	$(ETCDIR)/BBoardAliases
+ 
+ $(ETCDIR)/BBoardAliases:	BBoardAliases
+ 		-@if [ ! -f $@ ]; then \
+-		    $(REMOVE) $@ zBBoardAliases; \
+ 		    $(CP) BBoardAliases $@; \
+ 		else \
+ 		    echo "Will not overwrite existing $@"; \
+@@ -281,8 +262,7 @@ $(ETCDIR)/BBoardAliases:	BBoardAliases
+ inst-viamail:	$(ETCDIR)/viamail
+ 
+ $(ETCDIR)/viamail:	viamail.sh
+-		-$(REMOVE) $@ zviamail.sh
+-		cp viamail.sh $@
++		$(CP) viamail.sh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+@@ -291,7 +271,6 @@ $(ETCDIR)/viamail:	viamail.sh
+ inst-mhndefs:	$(ETCDIR)/mhn_defaults
+ 
+ $(ETCDIR)/mhn_defaults:	true
+-		-$(REMOVE) $@ zmhn_defaults
+ 		-@echo "Will merge mhn_defaults into existing $@"
+ 		-@./bootmhn.sh $(ETCDIR)
+ 		-@chmod $(FILPROT) $@
+@@ -302,22 +281,19 @@ $(ETCDIR)/mhn_defaults:	true
+ inst-pgpmime:	$(ETCDIR)/pgped.tcl $(BINDIR)/pgped $(BINDIR)/pgpshow
+ 
+ $(ETCDIR)/pgped.tcl:	pgped.tcl
+-		-$(REMOVE) $@ zpgped.tcl
+-		cp pgped.tcl $@
++		$(CP) pgped.tcl $@
+ 		-@chmod $(FILPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+ 
+ $(BINDIR)/pgped:	pgped.sh
+-		-$(REMOVE) $@ zpgped.sh
+ 		sed -e 's%@LIB%$(ETCDIR)%' < pgped.sh > $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
+ 
+ $(BINDIR)/pgpshow:	pgpshow.sh
+-		-$(REMOVE) $@ zpgpshow.sh
+-		cp pgpshow.sh $@
++		$(CP) pgpshow.sh $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+ 		-@echo ""
diff --git a/mail/ja-mh/patches/patch-bn b/mail/ja-mh/patches/patch-bn
new file mode 100644
index 00000000000..333788db96b
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bn
@@ -0,0 +1,46 @@
+$NetBSD: patch-bn,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/makefiles/support/pop.orig	2001-06-11 01:25:56.000000000 +0000
++++ conf/makefiles/support/pop
+@@ -122,7 +122,6 @@ uninstall:;	-cd $(ETCDIR); rm -f popd
+ inst-popd:	$(ETCDIR)/popd
+ 
+ $(ETCDIR)/popd:	xpopd
+-		-$(REMOVE) $@ zpopd
+ 		-rm -f $@
+ 		$(CP) xpopd $@
+ 		-chmod 700 $@
+@@ -159,7 +158,6 @@ l-popd:;	$(LINT) $(LFLAGS) popd.c popser
+ inst-popaka:	$(LIBDIR)/popaka
+ 
+ $(LIBDIR)/popaka:	xpopaka
+-		-$(REMOVE) $@ zpopaka
+ 		$(CP) xpopaka $@
+ 		-@chmod $(PGMPROT) $@
+ 		-@ls -l $@
+@@ -180,8 +178,6 @@ l-popaka:;	$(LINT) $(LFLAGS) popaka.c $(
+ inst-popauth:	$(BINDIR)/popauth
+ 
+ $(BINDIR)/popauth:	xpopauth
+-		-$(REMOVE) $@ zpopauth
+-		-chmod u-s zpopauth
+ 		$(CP) xpopauth $@
+ 		-@chmod $(PGMPROT) $@
+ 		-$(CHOWN) $(POPUID) $@ && chmod u+s $@
+@@ -203,8 +199,6 @@ l-popauth:;	$(LINT) $(LFLAGS) popauth.c 
+ inst-popwrd:	$(LIBDIR)/popwrd
+ 
+ $(LIBDIR)/popwrd:	xpopwrd
+-		-$(REMOVE) $@ zpopwrd
+-		-chmod u-s zpopwrd
+ 		$(CP) xpopwrd $@
+ 		-chmod $(PGMPROT) $@
+ 		-$(CHOWN) $(POPUID) $@ && chmod u+s $@
+@@ -226,7 +220,6 @@ l-popwrd:;	$(LINT) $(LFLAGS) popwrd.c $(
+ inst-smtpd:	$(ETCDIR)/smtpd
+ 
+ $(ETCDIR)/smtpd:	xsmtpd
+-		-$(REMOVE) $@ zsmtpd
+ 		$(CP) xsmtpd $@
+ 		-chmod 700 $@
+ 		-@ls -l $@
diff --git a/mail/ja-mh/patches/patch-bo b/mail/ja-mh/patches/patch-bo
new file mode 100644
index 00000000000..048f177ea96
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bo
@@ -0,0 +1,53 @@
+$NetBSD: patch-bo,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/makefiles/zotnet/mf.orig	2001-06-11 01:26:24.000000000 +0000
++++ conf/makefiles/zotnet/mf
+@@ -20,6 +20,8 @@ OFILES	=	uumm.o mmuu.o
+ @END: MHMTS
+ REMOVE	=	@(MHREMOVE)
+ 
++CP      =       @(CP)
++
+ CC      =	@(MHCOMPILER)
+ CPP     =	@(MHCPP)
+ @BEGIN: OPTIM
+@@ -71,8 +73,7 @@ uninstall:;
+ inst-uminc:	$(ETCDIR)/uminc
+ 
+ $(ETCDIR)/uminc:	xuminc
+-		-$(REMOVE) $(ETCDIR)/uminc zuminc
+-		cp xuminc $@
++		$(CP) xuminc $@
+ 		-@ls -l $@
+ 		-@echo ""
+ 
+@@ -89,8 +90,7 @@ xuminc:		uminc.o uumm.o mf.o $(TWSLIB) $
+ inst-umsift:	$(ETCDIR)/umsift
+ 
+ $(ETCDIR)/umsift:	xumsift
+-		-$(REMOVE) $(ETCDIR)/umsift zumsift
+-		cp xumsift $@
++		$(CP) xumsift $@
+ 		-@ls -l $@
+ 		-@echo ""
+ 
+@@ -114,8 +114,7 @@ uumm:		uumm.o
+ inst-muinc:	$(ETCDIR)/muinc
+ 
+ $(ETCDIR)/muinc:	xmuinc
+-		-$(REMOVE) $(ETCDIR)/muinc zmuinc
+-		cp xmuinc $@
++		$(CP) xmuinc $@
+ 		-@ls -l $@
+ 		-@echo ""
+ 
+@@ -132,8 +131,7 @@ xmuinc:		muinc.o mmuu.o mf.o $(TWSLIB) $
+ inst-musift:	$(ETCDIR)/musift
+ 
+ $(ETCDIR)/musift:	xmusift
+-		-$(REMOVE) $(ETCDIR)/musift zmusift
+-		cp xmusift $@
++		$(CP) xmusift $@
+ 		-@ls -l $@
+ 		-@echo ""
+ 
diff --git a/mail/ja-mh/patches/patch-bp b/mail/ja-mh/patches/patch-bp
new file mode 100644
index 00000000000..c378c3a2dee
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bp
@@ -0,0 +1,23 @@
+$NetBSD: patch-bp,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/makefiles/zotnet/mts.orig	2001-06-11 01:26:35.000000000 +0000
++++ conf/makefiles/zotnet/mts
+@@ -14,6 +14,8 @@ LDOPTLIB=	@(LDOPTLIB)
+ CHOWN	=	@(MHCHOWNPATH)
+ REMOVE	=	@(MHREMOVE)
+ 
++CP      =       @(CP)
++
+ CC      =	@(MHCOMPILER)
+ CPP     =	@(MHCPP)
+ @BEGIN: OPTIM
+@@ -94,8 +96,7 @@ inst-mtstailor:	$(ETCDIR)/mtstailor
+ 
+ $(ETCDIR)/mtstailor:	mtstailor
+ 		-@if [ ! -f $@ ]; then \
+-		    $(REMOVE) $@ zmtstailor; \
+-		    cp mtstailor $@; \
++		    $(CP) mtstailor $@; \
+ 		else \
+ 		    echo "Will not overwrite existing $@"; \
+ 		fi
diff --git a/mail/ja-mh/patches/patch-bq b/mail/ja-mh/patches/patch-bq
new file mode 100644
index 00000000000..c54263b4ae2
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bq
@@ -0,0 +1,47 @@
+$NetBSD: patch-bq,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- conf/mhconfig.c.orig	2001-05-29 15:04:36.000000000 +0000
++++ conf/mhconfig.c
+@@ -6,6 +6,8 @@ static char ident[] = "@(#)$Id: mhconfig
+ 
+ #include <ctype.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #ifdef	hpux
+ #define	SYS5
+ #endif
+@@ -16,7 +18,6 @@ static char ident[] = "@(#)$Id: mhconfig
+ 
+ static void insopt(), mkopts();
+ 
+-extern	char *strcpy(), *malloc(), *index(), *rindex();
+ #ifdef	notdef
+ extern	char *sprintf();	/* rely on stdio.h to declare this */
+ #endif
+@@ -268,7 +269,7 @@ static struct pair {
+ static do_sed(), do_sedfile(), do_files(), do_doc(), do_make();
+ static shell(), arginit(), add_option(), trim();
+ 
+-static char   *stradd (), *strdup (), *tail ();
++static char   *stradd (), *tail ();
+ 
+ /*  */
+ 
+@@ -1002,7 +1003,7 @@ char   *s1,
+     return p;
+ }
+ 
+-
++#if 0
+ static char *strdup (s)
+ char   *s;
+ {
+@@ -1014,6 +1015,7 @@ char   *s;
+     (void) strcpy (p, s);
+     return p;
+ }
++#endif
+ 
+ /*  */
+ 
diff --git a/mail/ja-mh/patches/patch-br b/mail/ja-mh/patches/patch-br
new file mode 100644
index 00000000000..7ca748773ef
--- /dev/null
+++ b/mail/ja-mh/patches/patch-br
@@ -0,0 +1,31 @@
+$NetBSD: patch-br,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- support/pop/popser.c.orig	1999-02-09 11:30:00.000000000 +0000
++++ support/pop/popser.c
+@@ -259,7 +259,7 @@ static		p_cmatch(), p_isdate(), p_ishead
+ extern	int	mbx_read ();
+ 
+ static int	setup(), setupaux(), read_map(), read_file(), pmbx_size();
+-static int	quitaux(), quitfile(), respond(), getline();
++static int	quitaux(), quitfile(), respond(), _getline();
+ static	m_gMsgs(), multiline(), multiend(), putline();
+ /*  */
+ 
+@@ -410,7 +410,7 @@ char   *rhost;
+     (void) respond (OK, "%s ready %s", server, timestamp);
+ 
+     for (mystate = auth1; mystate != halt && mystate != error;)
+-	switch (getline (buffer, sizeof buffer, input)) {
++	switch (_getline (buffer, sizeof buffer, input)) {
+ 	    case OK: 
+ 		if ((v = getvector (buffer, vec)) == NULL)
+ 		    continue;
+@@ -1850,7 +1850,7 @@ static  multiend () {
+ 
+ /*  */
+ 
+-static int  getline (s, n, iop)
++static int  _getline (s, n, iop)
+ register char  *s;
+ register int	n;
+ register FILE  *iop;
diff --git a/mail/ja-mh/patches/patch-bs b/mail/ja-mh/patches/patch-bs
new file mode 100644
index 00000000000..a0874bc05ab
--- /dev/null
+++ b/mail/ja-mh/patches/patch-bs
@@ -0,0 +1,49 @@
+$NetBSD: patch-bs,v 1.1 2009/12/25 13:55:12 taca Exp $
+
+--- uip/pshsbr.c.orig	2001-04-02 10:50:24.000000000 +0000
++++ uip/pshsbr.c
+@@ -63,7 +63,7 @@ int	command(), multiline();
+ static	int	command(), multiline();
+ #endif
+ 
+-static int	getline();
++static int	_getline();
+ static putline();
+ 
+ #ifdef NNTP
+@@ -176,7 +176,7 @@ int	snoop;
+ 
+     (void) signal (SIGPIPE, SIG_IGN);
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (_getline (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -619,7 +619,7 @@ char   *fmt,
+     if (putline (buffer, output) == NOTOK)
+ 	return NOTOK;
+ 
+-    switch (getline (response, sizeof response, input)) {
++    switch (_getline (response, sizeof response, input)) {
+ 	case OK: 
+ 	    if (poprint)
+ 		fprintf (stderr, "<--- %s\n", response);
+@@ -645,7 +645,7 @@ static int  multiline () {
+ #endif
+     char    buffer[BUFSIZ + TRMLEN];
+ 
+-    if (getline (buffer, sizeof buffer, input) != OK)
++    if (_getline (buffer, sizeof buffer, input) != OK)
+ 	return NOTOK;
+ #ifdef	DEBUG
+     if (poprint)
+@@ -665,7 +665,7 @@ static int  multiline () {
+ 
+ /*  */
+ 
+-static int  getline (s, n, iop)
++static int  _getline (s, n, iop)
+ char   *s;
+ int     n;
+ FILE * iop;