Creation and execution of mhconfig moved to do-configure target in Makefile

instead of doing it in scripts/configure.

Move ``make clean'' that should done before the build process to pre-build
instead of doing it in scripts/configure.

Define RUN_DEPENDS on jless so that the command show can display Japanese
message correctly.

Generate mh configuration for FreeBSD from template instead of doing that
by patches.
(This allows the port to respect ${PREFIX}.)

Submitted by:	sanpei@yy.cs.keio.ac.jp
Integrated recent changes made to ports/mail/mh.
Integrated widely used patches that are distributed with mew:
  - Patch to make the folder command faster.
  - Patch to suppress X-Authentication-Warning.
Added configuration options to include full pop support.
(Closing PR #2209.)
CVS: ----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS: ' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: 	Makefile patches/patch-ab patches/patch-ac patches/patch-ad
CVS: 	pkg/DESCR pkg/PLIST
CVS: Added Files:
CVS: 	files/FreeBSD.in patches/patch-ag patches/patch-ah
CVS: Removed Files:
CVS: 	patches/patch-aa scripts/configure
CVS: ----------------------------------------------------------------------

3 files changed, 30 insertions, 3 deletions

diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 5d3e7270e61c..36df64883916 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 March 1995
 # Whom:			Akito FUJITA <fujita@zoo.ncl.omron.co.jp>
 #
-# $Id: Makefile,v 1.5 1996/11/11 10:12:24 max Exp $
+# $Id: Makefile,v 1.6 1996/11/18 14:01:51 asami Exp $
 #
 
 DISTNAME=	mh-6.8.3
@@ -14,14 +14,25 @@ DISTFILES=	mh-6.8.3-JP.2c.tar.gz
 
 MAINTAINER=	asami@FreeBSD.ORG
 
+RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
+
 MAN1=		ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 \
 		mark.1 mh-chart.1 mh.1 mhl.1 mhook.1 mhmail.1 mhn.1 \
 		mhparam.1 mhpath.1 msgchk.1 msh.1 next.1 packf.1 pick.1 \
 		prev.1 prompter.1 rcvstore.1 refile.1 repl.1 rmf.1 rmm.1 \
-		scan.1 send.1 show.1 slocal.1 sortm.1 vmh.1 whatnow.1 whom.1
+		scan.1 send.1 show.1 slocal.1 sortm.1 vmh.1 whatnow.1 whom.1 \
+		popi.1
 MAN5=		mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 \
 		mh-tailor.5
-MAN8=		ap.8 conflict.8 dp.8 install-mh.8 post.8 fmtdump.8
+MAN8=		ap.8 conflict.8 dp.8 install-mh.8 post.8 fmtdump.8 popauth.8
+
+do-configure:
+	@sed s%@PREFIX@%${PREFIX}%g ${FILESDIR}/FreeBSD.in \
+	  > ${WRKSRC}/conf/FreeBSD
+	@(cd ${WRKSRC}/conf; make; ./mhconfig FreeBSD)
+
+pre-build:
+	@(cd ${WRKSRC} ; make clean)
 
 post-install:
 	ldconfig -m ${PREFIX}/lib
diff --git a/japanese/mh/pkg-descr b/japanese/mh/pkg-descr
index ec73a9e84d2d..4b7ba5ac842b 100644
--- a/japanese/mh/pkg-descr
+++ b/japanese/mh/pkg-descr
@@ -2,3 +2,11 @@ This is the MH mail user agent (reader/sender) version 6.8.3 with
 Japanese patches, a command line based mail reader that is powerful
 and extensible.  MH is an excellent choice for people who receive and
 process a LOT of mail.
+
+  This port has integrated some useful patches:
+
+	o speed-up the folder command patch distributed with mew
+				(Message interface to Emacs Window)
+
+	o Patch to smail to suppress X-Authentication-Warning, also 
+	  distributed with mew.
diff --git a/japanese/mh/pkg-plist b/japanese/mh/pkg-plist
index c1e537c36d72..122638f7425c 100644
--- a/japanese/mh/pkg-plist
+++ b/japanese/mh/pkg-plist
@@ -18,6 +18,8 @@ bin/next
 bin/prev
 bin/packf
 bin/pick
+bin/popauth
+bin/popi
 bin/prompter
 bin/refile
 bin/repl
@@ -34,6 +36,9 @@ lib/mh/ap
 lib/mh/conflict
 lib/mh/dp
 lib/mh/packmbox
+lib/mh/popaka
+lib/mh/popwrd
+lib/mh/spop
 lib/mh/viamail
 lib/mh/mhl
 lib/mh/install-mh
@@ -67,6 +72,7 @@ lib/mh/scan.time
 lib/mh/scan.timely
 lib/mh/mhn_defaults
 lib/mh/tmac.h
+libexec/popd
 man/man1/ali.1.gz
 man/man1/anno.1.gz
 man/man1/burst.1.gz
@@ -89,6 +95,7 @@ man/man1/msh.1.gz
 man/man1/next.1.gz
 man/man1/packf.1.gz
 man/man1/pick.1.gz
+man/man1/popi.1.gz
 man/man1/prev.1.gz
 man/man1/prompter.1.gz
 man/man1/rcvstore.1.gz
@@ -116,3 +123,4 @@ man/man8/dp.8.gz
 man/man8/install-mh.8.gz
 man/man8/post.8.gz
 man/man8/fmtdump.8.gz
+man/man8/popauth.8.gz