4 files changed, 73 insertions, 70 deletions

diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index f151c914a65f..7a5864d9c978 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -1,38 +1,47 @@
 # New ports collection makefile for:	mh (Japanese)
-# Version required:	6.8.3-JP.2c
+# Version required:	6.8.4
 # Date created:		28 March 1995
 # Whom:			Akito FUJITA <fujita@zoo.ncl.omron.co.jp>
 #
-# $Id: Makefile,v 1.9 1997/09/14 21:34:54 max Exp $
+# $Id: Makefile,v 1.10 1997/12/25 22:29:39 asami Exp $
 #
 
 DISTNAME=	mh-6.8.3
-PKGNAME=	ja-mh-6.8.3
-MASTER_SITES=	ftp://omrongw.wg.omron.co.jp/pub/net/mail/
-CATEGORIES=	japanese mail
-DISTFILES=	mh-6.8.3-JP.2c.tar.gz
+PKGNAME=	ja-mh-6.8.4
+CATEGORIES=	japanese
+MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/mh/tar/
+EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.ORG
+PATCH_SITES=	ftp://ftp.ics.uci.edu/pub/mh/updates/ \
+		ftp://jaz.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
+PATCHFILES=	MH.6.8.4.Z \
+		mh-6.8.4-JP-3.00.patch.gz
 
+MAINTAINER=	sanpei@yy.cs.keio.ac.jp
+
+BUILD_DEPENDS=	jless:${PORTSDIR}/japanese/less
 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 \
-		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 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)
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-batchmode \
+		--enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
+
+MAN1=	ali.1 anno.1 bbc.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1 \
+	mh-chart.1 mh.1 mhl.1 mhmail.1 mhn.1 mhook.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
+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 fmtdump.8 install-mh.8 popauth.8 post.8
+
+do-patch:
+	@${GZCAT} ${_DISTDIR}/MH.6.8.4.Z | \
+		${PATCH} -d ${WRKSRC} --forward --quiet -p0
+	@${GZCAT} ${_DISTDIR}/mh-6.8.4-JP-3.00.patch.gz | \
+		${PATCH} -d ${WRKSRC} --forward --quiet -p1
+
+pre-configure:
+	@chmod +x ${WRKSRC}/configure
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/japanese/mh/distinfo b/japanese/mh/distinfo
index 5b81e5120d7d..cd4129bfa143 100644
--- a/japanese/mh/distinfo
+++ b/japanese/mh/distinfo
@@ -1 +1,3 @@
-MD5 (mh-6.8.3-JP.2c.tar.gz) = 4234b0c9f4f99a2b68d1d928858da078
+MD5 (mh-6.8.3.tar.Z) = 70bd6efcdeb3ba9d8a0484098e15b830
+MD5 (MH.6.8.4.Z) = a4a68d15743d43ce60d2fa4b8dfda63c
+MD5 (mh-6.8.4-JP-3.00.patch.gz) = cf8b6c3e63169176919d149503aa5495
diff --git a/japanese/mh/pkg-descr b/japanese/mh/pkg-descr
index 4b7ba5ac842b..93fd4d0f3fad 100644
--- a/japanese/mh/pkg-descr
+++ b/japanese/mh/pkg-descr
@@ -1,12 +1,3 @@
-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.
+This is the MH mail user agent (reader/sender) 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.
diff --git a/japanese/mh/pkg-plist b/japanese/mh/pkg-plist
index 98ffab2a7a91..10a9bb88b52b 100644
--- a/japanese/mh/pkg-plist
+++ b/japanese/mh/pkg-plist
@@ -1,5 +1,6 @@
 bin/ali
 bin/anno
+bin/bbc
 bin/burst
 bin/comp
 bin/dist
@@ -10,16 +11,17 @@ bin/inc
 bin/mark
 bin/mhmail
 bin/mhn
+bin/mhparam
 bin/mhpath
 bin/msgchk
 bin/msh
-bin/show
 bin/next
-bin/prev
 bin/packf
+bin/pgped
+bin/pgpshow
 bin/pick
 bin/popauth
-bin/popi
+bin/prev
 bin/prompter
 bin/refile
 bin/repl
@@ -27,55 +29,55 @@ bin/rmf
 bin/rmm
 bin/scan
 bin/send
+bin/show
 bin/sortm
 bin/vmh
 bin/whatnow
 bin/whom
-bin/mhparam
+lib/mh/MailAliases
 lib/mh/ap
+lib/mh/components
 lib/mh/conflict
+lib/mh/digestcomps
+lib/mh/distcomps
 lib/mh/dp
+lib/mh/fmtdump
+lib/mh/forwcomps
+lib/mh/install-mh
+lib/mh/mhl
+lib/mh/mhl.body
+lib/mh/mhl.digest
+lib/mh/mhl.format
+lib/mh/mhl.forward
+lib/mh/mhl.headers
+lib/mh/mhn_defaults
+lib/mh/mtstailor
 lib/mh/packmbox
 lib/mh/popaka
 lib/mh/popwrd
-lib/mh/spop
-lib/mh/viamail
-lib/mh/mhl
-lib/mh/install-mh
 lib/mh/post
 lib/mh/rcvdist
+lib/mh/rcvdistcomps
 lib/mh/rcvpack
 lib/mh/rcvstore
-lib/mh/fmtdump
-lib/mh/spost
-lib/mh/slocal
 lib/mh/rcvtty
-lib/libmh.so.3.2
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
-lib/mh/mtstailor
-lib/mh/MailAliases
-lib/mh/components
-lib/mh/digestcomps
-lib/mh/distcomps
-lib/mh/forwcomps
-lib/mh/rcvdistcomps
 lib/mh/replcomps
-lib/mh/mhl.digest
-lib/mh/mhl.format
-lib/mh/mhl.forward
-lib/mh/mhl.body
-lib/mh/mhl.headers
-lib/mh/scan.mailx
 lib/mh/scan.default
+lib/mh/scan.mailx
 lib/mh/scan.size
 lib/mh/scan.time
 lib/mh/scan.timely
-lib/mh/mhn_defaults
+lib/mh/slocal
+lib/mh/spop
+lib/mh/spost
 lib/mh/tmac.h
-libexec/popd
+lib/mh/viamail
+lib/libmh.so.3.2
+@exec ldconfig -m %B
+sbin/popd
 man/man1/ali.1.gz
 man/man1/anno.1.gz
+man/man1/bbc.1.gz
 man/man1/burst.1.gz
 man/man1/comp.1.gz
 man/man1/dist.1.gz
@@ -86,9 +88,9 @@ man/man1/mark.1.gz
 man/man1/mh-chart.1.gz
 man/man1/mh.1.gz
 man/man1/mhl.1.gz
-man/man1/mhook.1.gz
 man/man1/mhmail.1.gz
 man/man1/mhn.1.gz
+man/man1/mhook.1.gz
 man/man1/mhparam.1.gz
 man/man1/mhpath.1.gz
 man/man1/msgchk.1.gz
@@ -96,7 +98,6 @@ 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
@@ -121,7 +122,7 @@ man/man5/mh-tailor.5.gz
 man/man8/ap.8.gz
 man/man8/conflict.8.gz
 man/man8/dp.8.gz
-man/man8/install-mh.8.gz
-man/man8/post.8.gz
 man/man8/fmtdump.8.gz
+man/man8/install-mh.8.gz
 man/man8/popauth.8.gz
+man/man8/post.8.gz