Update to jgroff-0.100 based on groff-1.15

PR:		18494
Submitted by:	maintainer

11 files changed, 532 insertions, 58 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index d3e1de3c7b7e..81788405d807 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -6,75 +6,108 @@
 #
 
 PORTNAME=	groff
-PORTVERSION=	0.99.1.1
+PORTVERSION=	0.100
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
-DISTNAME=	${PORTNAME}-1.11.1
+DISTNAME=	${PORTNAME}-1.15
 
-PATCH_SITES=	${MASTER_SITE_PORTS_JP} \
-		http://www.tg.rim.or.jp/~inagaki/
-PATCHFILES=	j${PORTNAME}-${PORTVERSION:R}.diff.gz \
-		j${PORTNAME}-${PORTVERSION:R}-${PORTVERSION}.diff.gz
+PATCH_SITES=	http://w3.mtci.ne.jp/~refactor/GNU/
+PATCHFILES=	${DISTNAME}-jgroff-${PORTVERSION}-pl1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@be.to
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 
-CONFIGURE_ARGS=	--program-prefix=g
+CONFIGURE_ARGS=	--program-prefix=g --enable-nippon
 CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_MAN="${INSTALL_MAN}"
+PLIST_SUB=	PORTDOCDIR="${PORTDOCDIR}"
 
-DESCS=		${WRKSRC}/devnippon/DESC.proto ${WRKSRC}/devps/DESC.in
+TMACBASE=	/usr/share/tmac
+TMACDIR=	share/groff/tmac
+MDOCDIR=	${TMACDIR}/mdoc
+LOCALEDIR=	${MDOCDIR}/locale
+INFODIR=	${PREFIX}/info
+PORTDOCDIR=	share/doc/jgroff
 
-MAN1=		groff.1 gtroff.1 gtbl.1 gpic.1 geqn.1 grops.1 grotty.1 \
-		grodvi.1 tfmtodit.1 grolj4.1 hpftodit.1 grefer.1 glookbib.1 \
-		gindxbib.1 lkbib.1 gsoelim.1 addftinfo.1 pfbtops.1 psbb.1 \
-		afmtodit.1 grog.1 gnroff.1
+DESCFILES=	devascii/DESC.proto devdvi-ascii/DESC.in \
+		devdvi/DESC.in devhtml/DESC devlatin1/DESC.proto \
+		devlj4/DESC.in devnippon/DESC.proto devps/DESC.in
+
+MAN1SRC=	eqn.1 indxbib.1 lookbib.1 nroff.1 pic.1 \
+		refer.1 soelim.1 tbl.1 troff.1
+
+MAN1=		${MAN1SRC:S/^/g/g} addftinfo.1 afmtodit.1 grodvi.1 \
+		groff.1 grog.1 grohtml.1 grolj4.1 grops.1 grotty.1 \
+		hpftodit.1 lkbib.1 pfbtops.1 psbb.1 tfmtodit.1
 MAN5=		groff_font.5 groff_out.5
-MAN7=		me.7 msafer.7 groff_char.7 groff_mm.7 groff_mmse.7 groff_ms.7
-MANCOMPRESSED= yes
+MAN7=		groff_char.7 groff_man.7 groff_mdoc.7 groff_mdoc.samples.7 \
+		groff_me.7 groff_mm.7 groff_mmse.7 groff_ms.7 groff_msafer.7 \
+
+TMACFILES=	tmac.an tmac.andoc tmac.groff_an tmac.orig_me tmac.vgrind \
+		eqnrc troffrc
+MDOCFILES=	doc-common doc-syms
+LOCALEFILES=	locale-list eucJP
+
+DOCUMENTS=	ChangeLog.jp NEWS PROBLEMS README README.jp \
+		doc/meintro.me doc/meref.me doc/pic.ms
 
-post-extract:
-	@${RM} ${WRKSRC}/config.cache
-	@${RM} ${WRKSRC}/config.log
+.if exists(${TMACBASE}/locale/hyphen.us-ru)
+WITH_TMAC_LOCALE=	yes
+.else
+# There is no valid locale subdirectory.
+WITHOUT_TMAC_LOCALE=	yes
+PERL_ARGS= -e 's,^\@dirrm *share/groff/tmac/locale\n$$,,;'
+.if exists(${TMACBASE}/hyphen.us-ru)
+# hyphen.us-ru is in TMACBASE.
+PERL_ARGS+= -e 's,locale/(hyphen.us-ru)$$,$$1,;'
+.else
+# There is no hyphen.us-ru.
+PERL_ARGS+= -e 's,^.*hyphen.us-ru\n$$,,;'
+.endif
+.endif
 
 #for not writing "/usr/local" explicitly in the patch
 post-patch:
-	@for f in ${DESCS}; do \
-	  ${MV} -f $${f} $${f}.tmp; \
-	  ${SED} -e '$$d' $${f}.tmp > $${f}; \
-	  case $${f} in \
-	    */devnippon/*) \
-		${ECHO} "postpro ${PREFIX}/bin/grotty" >> $${f}; \
-		;; \
-	    */devps/*) \
-		${ECHO} "postpro ${PREFIX}/bin/grops" >> $${f}; \
-		;; \
-	  esac; \
-	done
+	cd ${WRKSRC} \
+	&& ${PERL} -pi -e 's:^(postpro +):$$1${PREFIX}/bin/:g;' ${DESCFILES}
 
 .include <bsd.port.pre.mk>
 
+post-build:
+	cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo
+
 post-install:
-	@${CP} -p /usr/share/tmac/tmac.an ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.andoc ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.groff_an ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.orig_me ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.vgrind ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/eqnrc ${PREFIX}/share/groff/tmac
-.if ${OSVERSION} >= 400000
-	@${CP} -p /usr/share/tmac/locale/hyphen.us-ru ${PREFIX}/share/groff/tmac
-.else
-	@${CP} -p /usr/share/tmac/hyphen.us-ru ${PREFIX}/share/groff/tmac
+	@${MAKE} install-info
+.if !defined(NOPORTDOCS)
+	@${MAKE} install-documents
+.endif
+	${CP} -p ${TMACFILES:S|^|${TMACBASE}/|g} ${PREFIX}/${TMACDIR}
+	${CP} -p ${MDOCFILES:S|^|${TMACBASE}/mdoc/|g} ${PREFIX}/${MDOCDIR}
+	${MKDIR} ${PREFIX}/${LOCALEDIR}
+	${INSTALL_DATA} ${LOCALEFILES:S|^|${FILESDIR}/|g} ${PREFIX}/${LOCALEDIR}
+.if defined(WITH_TMAC_LOCALE) && !defined(WITHOUT_TMAC_LOCALE)
+	${CP} -pr ${TMACBASE}/locale ${PREFIX}/${TMACDIR}
+.elif exists(${TMACBASE}/hyphen.us-ru)
+	${CP} -p ${TMACBASE}/hyphen.us-ru ${PREFIX}/${TMACDIR}
 .endif
-	@${CP} -p /usr/share/tmac/troffrc ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/mdoc/doc-common ${PREFIX}/share/groff/tmac/mdoc
-	@${CP} -p /usr/share/tmac/mdoc/doc-syms ${PREFIX}/share/groff/tmac/mdoc
-	@${PATCH} -d ${PREFIX}/share/groff/tmac < ${FILESDIR}/rc.diff
+.if defined(PERL_ARGS) && !empty(PERL_ARGS)
+	${PERL} -pi ${PERL_ARGS} ${TMPPLIST}
+.endif
+	${PATCH} -d ${PREFIX}/${TMACDIR} < ${FILESDIR}/rc.diff
+
+install-documents:
+	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCUMENTS} ${PREFIX}/${PORTDOCDIR}
+
+install-info:
+	${INSTALL_DATA} ${WRKSRC}/doc/groff ${INFODIR}
+	install-info ${INFODIR}/groff ${INFODIR}/dir
 
 .include <bsd.port.post.mk>
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index 6761c02e1604..7fc601f98e6c 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -1,3 +1,2 @@
-MD5 (groff-1.11.1.tar.gz) = d6769b8535b4e5d9bf9c0be3b6e3400e
-MD5 (jgroff-0.99.1.diff.gz) = fa727d542b344adc02d208e33d34e00a
-MD5 (jgroff-0.99.1-0.99.1.1.diff.gz) = 0351ce5a577b6da8470de8a25fa7354a
+MD5 (groff-1.15.tar.gz) = 0c87c54b39a71da4ad92a67f13b740a2
+MD5 (groff-1.15-jgroff-0.100-pl1.diff.gz) = 6bfa9ec3a3dee8dca3a4f2cf930e8cd9
diff --git a/japanese/groff/files/eucJP b/japanese/groff/files/eucJP
new file mode 100644
index 000000000000..989dce4f31d0
--- /dev/null
+++ b/japanese/groff/files/eucJP
@@ -0,0 +1,233 @@
+.\" -*- coding: japanese-iso-8bit-unix; -*-
+.\"
+.\" Copyright (C) 2000 FreeBSD JPMAN Project, <man-jp@jp.FreeBSD.org>
+.\" All rights reserved.
+.\" 
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 
+.\" THIS SOFTWARE IS PROVIDED BY THE FREEBSD JPMAN PROJECT AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
+.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+.\" THE POSSIBILITY OF SUCH DAMAGE.
+.\" 
+.\" $FreeBSD$
+.\"
+.\" This file is addition to groff package. It allows to translate Section
+.\" Headers (.Sh) and correctly display man page header and footer. It
+.\" also contains translated version of .Dt macros (.DtL).
+.\" Current translation: Japanese (ja_JP.eucJP)
+.\"
+.\"
+.\" Localized (japanese) .Sh macro version for troff
+.\" Original code derived from mdoc/doc-ditroff
+.\"
+.if t \{\
+.	rm Sh
+.	de Sh
+.	nr nS 0
+.	nr sE 0
+.	nr iS 0
+'	ad
+.	ie "\\$1"NAME" \{\
+.       	hK
+'       	in 0
+.	\}
+.	el \{\
+.		ie "\\$1"名称" \{\
+.			hK
+'			in 0
+.		\}
+.		el \{\
+.       		nr nS 0
+.       		nr nA 0
+.       		nr nF 0
+.       		nr nT 0
+.       		nr nY 0
+.       		nr oT 0
+.       		if "\\$1"SYNOPSIS" \{\
+.				na
+.				nr nS 1
+.			\}
+.       		if "\\$1"DESCRIPTION" \{\
+.				nr fY 0
+.				nr fZ 0
+.				nr fB 0
+.				nr Fb 0
+.				ds Fb
+.			\}
+.       		if "\\$1"SEE" \{\
+.               		nr nA 1
+.               		na
+.       		\}
+.       		if "\\$1"FILES" .nr nF 1
+.       		if "\\$1"STANDARDS" .nr nT 1
+.       		if "\\$1"AUTHORS" .nr nY 1
+.			if "\\$1"SEE" .nr sE 1
+.\"
+.\" japanese chapter names
+.\"
+.       		if "\\$1"書式" \{\
+.				na
+.				nr nS 1
+.			\}
+.       		if "\\$1"解説" \{\
+.				nr fY 0
+.				nr fZ 0
+.				nr fB 0
+.				nr Fb 0
+.				ds Fb
+.			\}
+.       		if "\\$1"関連項目" \{\
+.               		nr nA 1
+.               		na
+.       		\}
+.       		if "\\$1"関連ファイル" .nr nF 1
+.       		if "\\$1"規格" .nr nT 1
+.       		if "\\$1"作者" .nr nY 1
+.			if "\\$1"関連項目" .nr sE 1
+.       		in 0
+.       		nr aN 0
+.		\}
+.	\}
+.	pL
+'	sp
+.	ns
+.	ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.	if !\\n(cR .ne 3
+'	fi
+\&\\*(sH\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
+\&\fP\s0\&
+.	in \\n(.iu+\\n(Tiu
+.	ns
+..
+.	\}
+.\"
+.\" Localized .Sh macro version for nroff
+.\" Original code derived from mdoc/doc-nroff
+.\"
+.if n \{\
+.	rm Sh
+.	de Sh
+.	nr nS 0
+.	nr sE 0
+.	nr iS 0
+.	ie "\\$1"NAME" \{\
+.       	hK
+'       	in 0
+.	\}
+.	el \{\
+.		ie "\\$1"名称" \{\
+.			hK
+'			in 0
+.		\}
+.		el \{\
+.       		nr nS 0
+.       		nr nA 0
+.       		nr nF 0
+.       		nr nT 0
+.       		nr nY 0
+.       		nr aN 0
+.       		nr oT 0
+.       		if "\\$1"SEE" .nr nA 1
+.       		if "\\$1"FILES" .nr nF 1
+.       		if "\\$1"STANDARDS" .nr nT 1
+.       		if "\\$1"SYNOPSIS" .nr nS 1
+.       		if "\\$1"DESCRIPTION" \{\
+.               		rr fB
+.               		rr Fb
+.               		ds Fb
+.               		nr fY 0
+.               		nr fZ 0
+.       		\}
+.			if "\\$1"AUTHORS" .nr nY 1
+.\"
+.\" japanese chapters names
+.\"
+.       		if "\\$1"関連項目" .nr nA 1
+.       		if "\\$1"関連ファイル" .nr nF 1
+.       		if "\\$1"規格" .nr nT 1
+.       		if "\\$1"書式" .nr nS 1
+.       		if "\\$1"解説" \{\
+.               		rr fB
+.               		rr Fb
+.               		ds Fb
+.               		nr fY 0
+.               		nr fZ 0
+.			\}
+.			if "\\$1"作者" .nr nY 1
+.       		in 0
+.		\}
+.	\}
+.	pL
+'	sp
+.	ns
+.	ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.	if !\\n(cR .ne 3
+'	fi
+\&\\*(sH\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
+\&\fP\s0\&
+.	in \\n(.iu+\\n(Tiu
+.	if "\\$1"SEE" .nr sE 1
+.	if "\\$1"関連項目" .nr sE 1
+.	ns
+..
+.\}
+.\"
+.\" .Dt macro replacement for localized manpages (.DtL)
+.\" Original code derived from mdoc/doc-common
+.\"
+.de DtL
+.ds dT UNTITLED
+.ds vT LOCAL
+.ds cH Null
+.if !"\\$1"" .ds dT \\$1
+.if !"\\$2"" \{\
+.	ds cH \\$2
+.		if \\$2>=1 .if \\$2<=9 \{\
+.			ds vT FreeBSD Reference Manual
+.			if "\\$2"1" .ds vT FreeBSD General Commands Manual
+.			if "\\$2"2" .ds vT FreeBSD System Calls Manual
+.			if "\\$2"3" .ds vT FreeBSD Library Functions Manual
+.			if "\\$2"4" .ds vT FreeBSD Kernel Interfaces Manual
+.			if "\\$2"5" .ds vT FreeBSD File Formats Manual
+.			if "\\$2"6" .ds vT FreeBSD Games Manual
+.			if "\\$2"7" .ds vT FreeBSD Miscellaneous Information Manual
+.			if "\\$2"8" .ds vT FreeBSD System Manager's Manual
+.			if "\\$2"9" .ds vT FreeBSD Kernel Developer's Manual
+.			nr sN \\$2
+.		\}
+.		if "\\$2"unass"  .ds vT DRAFT
+.		if "\\$2"draft"  .ds vT DRAFT
+.		if "\\$2"paper"  .ds vT UNTITLED
+.\}
+.if !"\\$3"" \{\
+.	if "\\$3"USD"   .ds vT FreeBSD User's Supplementary Documents
+.	if "\\$3"PS1"   .ds vT FreeBSD Programmers's Supplementary Documents
+.	if "\\$3"AMD"   .ds vT FreeBSD Ancestral Manual Documents
+.	if "\\$3"SMM"   .ds vT FreeBSD System Manager's Manual
+.	if "\\$3"URM"   .ds vT FreeBSD Reference Manual
+.	if "\\$3"PRM"   .ds vT FreeBSD Programmers's Manual
+.	if "\\$3"IND"   .ds vT FreeBSD Manual Master Index
+.	if "\\$3"LOCAL" .ds vT FreeBSD Local Manual
+.	if "\\$3"tahoe" .as vT \ (Tahoe Architecture)
+.	if "\\$3"vax" .as vT \ (VAX Architecture)
+.	if "\\$3"hp300" .as vT \ (HP300 Architecture)
+.	if "\\$3"i386" .as vT \ (i386 Architecture)
+.	if "\\$3"Alpha" .as vT \ (Alpha Architecture)
+.	if "\\*(vT"LOCAL" .ds vT \\$3
+.\}
+..
diff --git a/japanese/groff/files/locale-list b/japanese/groff/files/locale-list
new file mode 100644
index 000000000000..0beba8a5ae35
--- /dev/null
+++ b/japanese/groff/files/locale-list
@@ -0,0 +1,32 @@
+.\"
+.\" Copyright (C) 1999, 2000 Alexey Zelkin <phantom@cris.net>,
+.\" Simferopol, Crimea, Urkaine. All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 
+.\" THIS SOFTWARE IS PROVIDED BY THE ALEXEY ZELKIN AND CONTRIBUTORS ``AS IS''
+.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\" 
+.\" %FreeBSD: src/contrib/groff/tmac/locale/locale-list,v 1.2 2000/05/04 18:21:11 phantom Exp %
+.\"
+.\" Include [tg]roff japanese translated if [tg]roff invoked with -Tnippon.
+.\"
+.if "\*[.T]"nippon" \{\
+.	sOl eucJP
+.\}
diff --git a/japanese/groff/files/patch-af b/japanese/groff/files/patch-af
new file mode 100644
index 000000000000..b3cfe227d5d1
--- /dev/null
+++ b/japanese/groff/files/patch-af
@@ -0,0 +1,19 @@
+--- indxbib/indxbib.cc.~2~	Wed Mar  8 00:23:35 2000
++++ indxbib/indxbib.cc	Wed Mar  8 00:31:02 2000
+@@ -222,10 +222,16 @@
+   else {
+     temp_index_file = strsave(TEMP_INDEX_TEMPLATE);
+   }
++#ifndef HAVE_MKSTEMP
+   if (!mktemp(temp_index_file) || !temp_index_file[0])
+     fatal("cannot create file name for temporary file");
++#endif
+   catch_fatal_signals();
++#ifdef HAVE_MKSTEMP
++  int fd = mkstemp(temp_index_file);
++#else
+   int fd = creat(temp_index_file, S_IRUSR|S_IRGRP|S_IROTH);
++#endif
+   if (fd < 0)
+     fatal("can't create temporary index file: %1", strerror(errno));
+   indxfp = fdopen(fd, "w");
diff --git a/japanese/groff/files/patch-ag b/japanese/groff/files/patch-ag
new file mode 100644
index 000000000000..2756581fba68
--- /dev/null
+++ b/japanese/groff/files/patch-ag
@@ -0,0 +1,15 @@
+--- aclocal.m4.orig	Tue Dec 14 22:18:56 1999
++++ aclocal.m4	Wed Apr 26 19:36:35 2000
+@@ -424,7 +424,11 @@
+ 	g=g
+ else
+ 	AC_MSG_RESULT(no)
+-	g=
++	if test "x$program_prefix" != xNONE; then
++		g="$program_prefix"
++	else
++		g=
++	fi
+ fi
+ AC_SUBST(g)
+ ])dnl
diff --git a/japanese/groff/files/patch-ah b/japanese/groff/files/patch-ah
new file mode 100644
index 000000000000..84341742ed01
--- /dev/null
+++ b/japanese/groff/files/patch-ah
@@ -0,0 +1,11 @@
+--- Makefile.in.~1~	Mon May  1 10:10:40 2000
++++ Makefile.in	Mon May  1 10:15:10 2000
+@@ -81,7 +81,7 @@
+ fontdir=$(datasubdir)/font
+ 
+ # fontpath says where to look for dev*/*.
+-fontpath=.:$(fontdir):/usr/lib/font
++fontpath=.:$(fontdir):/usr/share/groff_font
+ 
+ # tmacdir says where to install macros.
+ tmacdir=$(datasubdir)/tmac
diff --git a/japanese/groff/files/patch-ai b/japanese/groff/files/patch-ai
new file mode 100644
index 000000000000..5a8639baa2e6
--- /dev/null
+++ b/japanese/groff/files/patch-ai
@@ -0,0 +1,48 @@
+--- tmac.orig/tmac.doc	Fri May 21 13:50:47 1999
++++ tmac/tmac.doc	Thu Sep 23 07:36:16 1999
+@@ -30,6 +30,7 @@
+ .\" SUCH DAMAGE.
+ .\"
+ .\"     @(#)doc	5.8 (Berkeley) 8/5/91
++.\" %FreeBSD: src/contrib/groff/tmac/tmac.doc,v 1.4 1999/09/22 22:36:16 phantom Exp %
+ .\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be
+ .\" installed as mdoc/doc-* rather than tmac.doc-* (the filename
+ .\" `tmac.doc-common' would be too long); when using groff, the doc-* files
+@@ -49,6 +50,9 @@
+ .de sO
+ .mso mdoc/\\$1
+ ..
++.de sOl
++.sO locale/\\$1
++..
+ .if t \{\
+ .       sO doc-ditroff
+ .\}
+@@ -57,6 +61,7 @@
+ .\}
+ .sO doc-common
+ .sO doc-syms
++.sOl locale-list
+ .\" NS Db macro - start/stop DEBUG MODE
+ .\" NS Db register DEBUG MODE
+ .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
+@@ -1536,7 +1541,7 @@
+ .	if "\\$1"-literal" \&\\*(lI\c
+ .	if "\\$1"-symbolic" \&\\*(sY\c
+ .\}
+-.el .tm Usage .Bf [Em | emphasis | Li | literal | Sy | symbolic] (#\\n(.c)
++.el .tm Usage .Bf [Em | -emphasis | Li | -literal | Sy | -symbolic] (#\\n(.c)
+ ..
+ .de Ef
+ .ds mN Ef
+@@ -3417,7 +3422,9 @@
+ .\" .	nr fV \\n(.$-1
+ .	if "\\$1"-std" \{\
+ .	nr cH \\*(cH
+-.	if (\\n(cH<2):(\\n(cH>3) .tm Usage: .Rv -std sections 2 and 3 only
++.\" This macro also allowed for 7 section because mdoc.samples.7 will show
++.\" actual information (not hardcoded)
++.	if !((\\n(cH=2):(\\n(cH=3):(\\n(cH=7)) .tm Usage: .Rv -std sections 2 and 3 only
+ .		br
+ \&The
+ .Fn \\$2
diff --git a/japanese/groff/files/rc.diff b/japanese/groff/files/rc.diff
index 1bb111dacb8a..788fc3ef8ff9 100644
--- a/japanese/groff/files/rc.diff
+++ b/japanese/groff/files/rc.diff
@@ -1,6 +1,6 @@
---- tmac/eqnrc.orig	Tue Mar 25 23:40:57 1997
-+++ tmac/eqnrc	Fri May  2 23:37:04 1997
-@@ -51,6 +51,7 @@
+--- tmac/eqnrc.orig	Thu Mar 16 10:18:38 2000
++++ tmac/eqnrc	Fri Apr 28 20:59:24 2000
+@@ -53,6 +53,7 @@
  ifdef ascii ! define n %1% !
  ifdef latin1 ! define n %1% !
  ifdef koi8-r ! define n %1% !
@@ -8,13 +8,13 @@
  ifdef n !
  set nroff 1
  !
---- tmac/troffrc.orig	Tue Mar 25 23:40:57 1997
-+++ tmac/troffrc	Fri May  2 23:37:43 1997
-@@ -13,6 +13,7 @@
+--- tmac/troffrc.orig	Thu Mar 16 10:18:38 2000
++++ tmac/troffrc	Fri Apr 28 20:59:24 2000
+@@ -14,6 +14,7 @@
  .do ds troffrc!ascii tmac.tty
  .do ds troffrc!latin1 tmac.tty
  .do ds troffrc!koi8-r tmac.tty
 +.do ds troffrc!nippon tmac.tty
  .do ds troffrc!lj4 tmac.lj4
+ .do ds troffrc!html tmac.html
  .do if d troffrc!\*[.T] \
- .	do mso \*[troffrc!\*[.T]]
diff --git a/japanese/groff/pkg-descr b/japanese/groff/pkg-descr
index f26a42fabf5d..b7ea11bd4055 100644
--- a/japanese/groff/pkg-descr
+++ b/japanese/groff/pkg-descr
@@ -1,2 +1,19 @@
-Jgroff is based on GNU groff formating system. It is enhanced to
-handle japanese EUC coding documents.
+Jgroff is based on GNU groff formating system.  It is enhanced to
+handle Japanese EUC coded documents.
+
+Following devices are added by jgroff:
+
+    nippon     For typewriter-like devices using the Japanese-EUC
+               coded character set.
+    dvi-ascii  For pTeX DVI format.
+
+and following devices are enhanced to handle Japanese-EUC:
+
+    dvi        For TeX DVI format.
+    ps         For PostScript printers and previewers.
+    X75        For a 75 dpi X11 previewer.
+    X100       For a 100 dpi X11 previewer.
+    X75-12     For a 75 dpi X11 previewer optimized for 12 point texts.
+    X100-12    For a 100 dpi X11 previewer optimized for 12 point texts.
+
+Preview on X11 devices require japanese/gxditview is installed.
diff --git a/japanese/groff/pkg-plist b/japanese/groff/pkg-plist
index 64d63317f2d3..ff4e0d96249b 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -10,6 +10,7 @@ bin/grefer
 bin/grodvi
 bin/groff
 bin/grog
+bin/grohtml
 bin/grolj4
 bin/grops
 bin/grotty
@@ -21,6 +22,9 @@ bin/lkbib
 bin/pfbtops
 bin/psbb
 bin/tfmtodit
+@unexec install-info --delete %D/info/groff %D/info/dir
+info/groff
+@exec install-info %D/info/groff %D/info/dir
 share/groff/eign
 share/groff/font/devascii/B
 share/groff/font/devascii/BI
@@ -54,6 +58,51 @@ share/groff/font/devdvi/R
 share/groff/font/devdvi/S
 share/groff/font/devdvi/SA
 share/groff/font/devdvi/SB
+share/groff/font/devdvi-ascii/generate/CompileFonts
+share/groff/font/devdvi-ascii/generate/Makefile
+share/groff/font/devdvi-ascii/generate/msam.map
+share/groff/font/devdvi-ascii/generate/msbm.map
+share/groff/font/devdvi-ascii/generate/texb.map
+share/groff/font/devdvi-ascii/generate/texex.map
+share/groff/font/devdvi-ascii/generate/texi.map
+share/groff/font/devdvi-ascii/generate/texmi.map
+share/groff/font/devdvi-ascii/generate/texr.map
+share/groff/font/devdvi-ascii/generate/texsy.map
+share/groff/font/devdvi-ascii/generate/textt.map
+share/groff/font/devdvi-ascii/B
+share/groff/font/devdvi-ascii/BI
+share/groff/font/devdvi-ascii/CW
+share/groff/font/devdvi-ascii/DESC
+share/groff/font/devdvi-ascii/EX
+share/groff/font/devdvi-ascii/G
+share/groff/font/devdvi-ascii/H
+share/groff/font/devdvi-ascii/HB
+share/groff/font/devdvi-ascii/HI
+share/groff/font/devdvi-ascii/I
+share/groff/font/devdvi-ascii/M
+share/groff/font/devdvi-ascii/MI
+share/groff/font/devdvi-ascii/R
+share/groff/font/devdvi-ascii/S
+share/groff/font/devdvi-ascii/SA
+share/groff/font/devdvi-ascii/SB
+share/groff/font/devhtml/CB
+share/groff/font/devhtml/CBI
+share/groff/font/devhtml/CI
+share/groff/font/devhtml/CR
+share/groff/font/devhtml/DESC
+share/groff/font/devhtml/HB
+share/groff/font/devhtml/HBI
+share/groff/font/devhtml/HI
+share/groff/font/devhtml/HR
+share/groff/font/devhtml/NB
+share/groff/font/devhtml/NBI
+share/groff/font/devhtml/NI
+share/groff/font/devhtml/NR
+share/groff/font/devhtml/S
+share/groff/font/devhtml/TB
+share/groff/font/devhtml/TBI
+share/groff/font/devhtml/TI
+share/groff/font/devhtml/TR
 share/groff/font/devlatin1/B
 share/groff/font/devlatin1/BI
 share/groff/font/devlatin1/DESC
@@ -240,10 +289,13 @@ share/groff/font/devX75/TB
 share/groff/font/devX75/TBI
 share/groff/font/devX75/TI
 share/groff/font/devX75/TR
+share/groff/tmac/locale/hyphen.us-ru
 share/groff/tmac/mdoc/doc-common
 share/groff/tmac/mdoc/doc-ditroff
 share/groff/tmac/mdoc/doc-nroff
 share/groff/tmac/mdoc/doc-syms
+share/groff/tmac/mdoc/locale/eucJP
+share/groff/tmac/mdoc/locale/locale-list
 share/groff/tmac/mm/0.MT
 share/groff/tmac/mm/4.MT
 share/groff/tmac/mm/5.MT
@@ -254,17 +306,18 @@ share/groff/tmac/mm/se_ms.cov
 share/groff/tmac/eqnrc
 share/groff/tmac/eqnrc.orig
 share/groff/tmac/hyphen.us
-share/groff/tmac/hyphen.us-ru
 share/groff/tmac/man.local
 share/groff/tmac/tmac.X
 share/groff/tmac/tmac.Xps
 share/groff/tmac/tmac.an
 share/groff/tmac/tmac.andoc
+share/groff/tmac/tmac.arkup
 share/groff/tmac/tmac.doc
 share/groff/tmac/tmac.doc.old
 share/groff/tmac/tmac.dvi
 share/groff/tmac/tmac.e
 share/groff/tmac/tmac.groff_an
+share/groff/tmac/tmac.html
 share/groff/tmac/tmac.latin1
 share/groff/tmac/tmac.lj4
 share/groff/tmac/tmac.m
@@ -283,9 +336,21 @@ share/groff/tmac/tmac.tty-char
 share/groff/tmac/tmac.vgrind
 share/groff/tmac/troffrc
 share/groff/tmac/troffrc.orig
+%%PORTDOCDIR%%/ChangeLog.jp
+%%PORTDOCDIR%%/NEWS
+%%PORTDOCDIR%%/PROBLEMS
+%%PORTDOCDIR%%/README
+%%PORTDOCDIR%%/README.jp
+%%PORTDOCDIR%%/meintro.me
+%%PORTDOCDIR%%/meref.me
+%%PORTDOCDIR%%/pic.ms
+@dirrm %%PORTDOCDIR%%
 @dirrm share/groff/font/devascii
 @dirrm share/groff/font/devdvi/generate
 @dirrm share/groff/font/devdvi
+@dirrm share/groff/font/devdvi-ascii/generate
+@dirrm share/groff/font/devdvi-ascii
+@dirrm share/groff/font/devhtml
 @dirrm share/groff/font/devlatin1
 @dirrm share/groff/font/devlj4/generate
 @dirrm share/groff/font/devlj4
@@ -297,6 +362,8 @@ share/groff/tmac/troffrc.orig
 @dirrm share/groff/font/devX75-12
 @dirrm share/groff/font/devX75
 @dirrm share/groff/font
+@dirrm share/groff/tmac/locale
+@dirrm share/groff/tmac/mdoc/locale
 @dirrm share/groff/tmac/mdoc
 @dirrm share/groff/tmac/mm
 @dirrm share/groff/tmac