8 files changed, 411 insertions, 701 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 027b87a907e9..a33e44162e7c 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	groff
-PORTVERSION=	0.100
-PORTREVISION=	3
+PORTVERSION=	1.17
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,okazaki/&,} \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
-DISTNAME=	${PORTNAME}-1.15
-DISTFILES=	${DISTNAME}.tar.gz ${TMAC_DISTNAME}.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${TMAC_DISTNAME}.tar.gz
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	okazaki
-PATCHFILES=	${DISTNAME}-jgroff-${PORTVERSION}-pl1.diff.gz
+PATCH_SITE_SUBDIR=	okazaki/groff
+PATCHFILES=	${DISTNAME}-jgroff-0.0.1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@FreeBSD.org
 
-TMAC_DATE=	20010314
+TMAC_DATE=	20010614
 TMAC_DISTNAME=	tmac-${TMAC_DATE}
 
 USE_GMAKE=	yes
@@ -35,82 +33,75 @@ CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}"
 
-TMACBASE=	${WRKDIR}/${TMAC_DISTNAME}
-TMACDIR=	share/groff/tmac
+TMACBASE=	${WRKDIR}/tmac
+TMACDIR=	share/groff/${PORTVERSION}/tmac
+SITETMACDIR=	share/groff/site-tmac
 MDOCDIR=	${TMACDIR}/mdoc
-LOCALEDIR=	${MDOCDIR}/locale
 INFODIR=	${PREFIX}/info
 PORTDOCDIR=	share/doc/jgroff
+PLIST_SUB=	GROFF_VERSION=${PORTVERSION}
 
-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=		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.X tmac.a4 \
-		tmac.an tmac.an-old tmac.andoc tmac.arkup \
-		tmac.doc tmac.dvi tmac.html \
-		tmac.latin1 tmac.lbp tmac.m \
-		tmac.man tmac.mandoc tmac.markup tmac.mdoc \
-		tmac.me tmac.ms tmac.mse \
-		tmac.orig_me tmac.pspic tmac.s tmac.safer \
-		tmac.trace tmac.tty tmac.tty-char tmac.vgrind \
-		eqnrc troffrc troffrc-end
-MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms
-LOCALEFILES=	locale-list eucJP
+MAN1SRC=	eqn.1 indxbib.1 lookbib.1 neqn.1 nroff.1 pic.1 \
+		refer.1 soelim.1 tbl.1 troff.1 grn.1
+
+MAN1=		${MAN1SRC:S/^/g/g} \
+		addftinfo.1 afmtodit.1 grodvi.1 \
+		groff.1 grog.1 \
+		grohtml.1 grolbp.1 grolj4.1 grops.1 grotty.1 \
+		hpftodit.1 lkbib.1 pfbtops.1 tfmtodit.1
+MAN5=		groff_font.5 groff_out.5 groff_tmac.5
+MAN7=		groff.7 groff_char.7 groff_man.7 groff_mdoc.7 \
+		groff_me.7 groff_mm.7 groff_mmse.7 groff_ms.7 \
+		groff_mwww.7 mmroff.7 roff.7
+
+SITETMACFILES=	mdoc.local
+TMACFILES=	tmac.orig_me tmac.vgrind
+MDOCFILES=	eucJP
 
 DOCUMENTS=	ChangeLog.jp NEWS PROBLEMS README README.jp \
 		doc/meintro.me doc/meref.me doc/pic.ms
 
-TROFFRC_FILTER=	-e 's,^(.do ds troffrc!koi8-r tmac.tty)$$,$$1\n.do ds troffrc!nippon tmac.tty,;'
-EQNRC_FILTER=	-e 's,^(ifdef koi8-r ! define n %1% !)$$,$$1\nifdef nippon ! define n %1% !,;'
+.include <bsd.port.pre.mk>
 
-#for not writing "/usr/local" explicitly in the patch
-post-patch:
-	cd ${WRKSRC} \
-	&& ${PERL} -pi -e 's:^(postpro +):$$1${PREFIX}/bin/:g;' ${DESCFILES}
+.if ${OSVERSION} < 350001
+WITHOUT_INFO=	yes
+PLIST_SUB+=	INFO="@comment "
+.else
+PLIST_SUB+=	INFO=""
+.endif
 
-.include <bsd.port.pre.mk>
+TEXINFO_FILTER=	-e 's/\@acronym/\@var/g;' \
+		-e 's/ifnottex/ifinfo/g;' \
+		-e 's/ifnotinfo/iftex/g;' \
+		-e 's/\@option/\@samp/g;' \
+		-e 's/\@env/\@code/g;'
 
 post-build:
+.if !defined(WITHOUT_INFO)
 	cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo
+.endif
 
 post-install:
+.if !defined(WITHOUT_INFO)
 	@${MAKE} install-info
+.endif
 .if !defined(NOPORTDOCS)
 	@${MAKE} install-documents
 .endif
+.for FILE in ${SITETMACFILES}
+	${INSTALL_DATA} ${TMACBASE}/${FILE} ${PREFIX}/${SITETMACDIR}
+.endfor
 .for FILE in ${TMACFILES}
 	${INSTALL_DATA} ${TMACBASE}/${FILE} ${PREFIX}/${TMACDIR}
 .endfor
 .for FILE in ${MDOCFILES}
 	${INSTALL_DATA} ${TMACBASE}/mdoc/${FILE} ${PREFIX}/${MDOCDIR}
 .endfor
-	${MKDIR} ${PREFIX}/${LOCALEDIR}
-.for FILE in ${LOCALEFILES}
-	${INSTALL_DATA} ${FILESDIR}/${FILE} ${PREFIX}/${LOCALEDIR}
-.endfor
-	${MKDIR} ${PREFIX}/${TMACDIR}/locale
-	${INSTALL_DATA} ${TMACBASE}/locale/hyphen.* ${PREFIX}/${TMACDIR}/locale
-.if defined(TROFFRC_FILTER) && !empty(TROFFRC_FILTER)
-	${PERL} -pi ${TROFFRC_FILTER} ${PREFIX}/${TMACDIR}/troffrc
-.endif
-.if defined(EQNRC_FILTER) && !empty(EQNRC_FILTER)
-	${PERL} -pi ${EQNRC_FILTER} ${PREFIX}/${TMACDIR}/eqnrc
-.endif
 
 install-documents:
 	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCUMENTS} ${PREFIX}/${PORTDOCDIR}
+	cd ${INSTALL_WRKSRC} \
+		&& ${INSTALL_DATA} ${DOCUMENTS} ${PREFIX}/${PORTDOCDIR}
 
 install-info:
 	${INSTALL_DATA} ${WRKSRC}/doc/groff ${INFODIR}
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index 0afee38da359..264d27534fc5 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -1,3 +1,3 @@
-MD5 (groff-1.15.tar.gz) = 0c87c54b39a71da4ad92a67f13b740a2
-MD5 (tmac-20010314.tar.gz) = c7adabe101aa1a053bcf09ba28ae38a9
-MD5 (groff-1.15-jgroff-0.100-pl1.diff.gz) = 6bfa9ec3a3dee8dca3a4f2cf930e8cd9
+MD5 (groff-1.17.tar.gz) = 1e14bb3aa113f1d7b48603bd9ee351a4
+MD5 (tmac-20010614.tar.gz) = 8d4241e3b04cb017ff7d470db613afb7
+MD5 (groff-1.17-jgroff-0.0.1.diff.gz) = 893c1f97f6e02a722cba31b4545e6447
diff --git a/japanese/groff/files/eucJP b/japanese/groff/files/eucJP
deleted file mode 100644
index 989dce4f31d0..000000000000
--- a/japanese/groff/files/eucJP
+++ /dev/null
@@ -1,233 +0,0 @@
-.\" -*- 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
deleted file mode 100644
index 18232ab9cb02..000000000000
--- a/japanese/groff/files/locale-list
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"
-.\" 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
-.\}
-.\"
-.\" Include in troff mode always (hack for non typewriter-like devices.)
-.\"
-.if t \{\
-.	sOl eucJP
-.\}
diff --git a/japanese/groff/files/patch-af b/japanese/groff/files/patch-af
deleted file mode 100644
index b3cfe227d5d1..000000000000
--- a/japanese/groff/files/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
index 2756581fba68..2c67d38dbac1 100644
--- a/japanese/groff/files/patch-ag
+++ b/japanese/groff/files/patch-ag
@@ -1,6 +1,6 @@
---- aclocal.m4.orig	Tue Dec 14 22:18:56 1999
-+++ aclocal.m4	Wed Apr 26 19:36:35 2000
-@@ -424,7 +424,11 @@
+--- aclocal.m4.orig	Thu Jun 14 16:55:42 2001
++++ aclocal.m4	Thu Jun 14 16:56:07 2001
+@@ -377,7 +377,11 @@
  	g=g
  else
  	AC_MSG_RESULT(no)
@@ -11,5 +11,5 @@
 +		g=
 +	fi
  fi
- AC_SUBST(g)
- ])dnl
+ AC_SUBST(g)])dnl
+ dnl
diff --git a/japanese/groff/files/patch-ah b/japanese/groff/files/patch-ah
index 84341742ed01..dd02e774561b 100644
--- a/japanese/groff/files/patch-ah
+++ b/japanese/groff/files/patch-ah
@@ -4,8 +4,8 @@
  fontdir=$(datasubdir)/font
  
  # fontpath says where to look for dev*/*.
--fontpath=.:$(fontdir):/usr/lib/font
-+fontpath=.:$(fontdir):/usr/share/groff_font
+-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/pkg-plist b/japanese/groff/pkg-plist
index 794dfd64147a..e1e9cb0dfece 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -1,6 +1,7 @@
 bin/addftinfo
 bin/afmtodit
 bin/geqn
+bin/ggrn
 bin/gindxbib
 bin/glookbib
 bin/gneqn
@@ -10,7 +11,7 @@ bin/grefer
 bin/grodvi
 bin/groff
 bin/grog
-bin/grohtml
+bin/grolbp
 bin/grolj4
 bin/grops
 bin/grotty
@@ -19,331 +20,335 @@ bin/gtbl
 bin/gtroff
 bin/hpftodit
 bin/lkbib
+bin/mmroff
 bin/pfbtops
-bin/psbb
+bin/post-grohtml
+bin/pre-grohtml
 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
-share/groff/font/devascii/DESC
-share/groff/font/devascii/I
-share/groff/font/devascii/R
-share/groff/font/devdvi/generate/CompileFonts
-share/groff/font/devdvi/generate/Makefile
-share/groff/font/devdvi/generate/msam.map
-share/groff/font/devdvi/generate/msbm.map
-share/groff/font/devdvi/generate/texb.map
-share/groff/font/devdvi/generate/texex.map
-share/groff/font/devdvi/generate/texi.map
-share/groff/font/devdvi/generate/texmi.map
-share/groff/font/devdvi/generate/texr.map
-share/groff/font/devdvi/generate/texsy.map
-share/groff/font/devdvi/generate/textt.map
-share/groff/font/devdvi/B
-share/groff/font/devdvi/BI
-share/groff/font/devdvi/CW
-share/groff/font/devdvi/DESC
-share/groff/font/devdvi/EX
-share/groff/font/devdvi/G
-share/groff/font/devdvi/H
-share/groff/font/devdvi/HB
-share/groff/font/devdvi/HI
-share/groff/font/devdvi/I
-share/groff/font/devdvi/M
-share/groff/font/devdvi/MI
-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
-share/groff/font/devlatin1/I
-share/groff/font/devlatin1/R
-share/groff/font/devlj4/generate/Makefile
-share/groff/font/devlj4/generate/special.map
-share/groff/font/devlj4/generate/text.map
-share/groff/font/devlj4/ALBB
-share/groff/font/devlj4/ALBR
-share/groff/font/devlj4/AOB
-share/groff/font/devlj4/AOI
-share/groff/font/devlj4/AOR
-share/groff/font/devlj4/CB
-share/groff/font/devlj4/CBI
-share/groff/font/devlj4/CI
-share/groff/font/devlj4/CLARENDON
-share/groff/font/devlj4/CORONET
-share/groff/font/devlj4/CR
-share/groff/font/devlj4/DESC
-share/groff/font/devlj4/GB
-share/groff/font/devlj4/GBI
-share/groff/font/devlj4/GI
-share/groff/font/devlj4/GR
-share/groff/font/devlj4/LGB
-share/groff/font/devlj4/LGI
-share/groff/font/devlj4/LGR
-share/groff/font/devlj4/MARIGOLD
-share/groff/font/devlj4/OB
-share/groff/font/devlj4/OBI
-share/groff/font/devlj4/OI
-share/groff/font/devlj4/OR
-share/groff/font/devlj4/S
-share/groff/font/devlj4/TB
-share/groff/font/devlj4/TBI
-share/groff/font/devlj4/TI
-share/groff/font/devlj4/TR
-share/groff/font/devlj4/UB
-share/groff/font/devlj4/UBI
-share/groff/font/devlj4/UCB
-share/groff/font/devlj4/UCBI
-share/groff/font/devlj4/UCI
-share/groff/font/devlj4/UCR
-share/groff/font/devlj4/UI
-share/groff/font/devlj4/UR
-share/groff/font/devnippon/B
-share/groff/font/devnippon/BI
-share/groff/font/devnippon/DESC
-share/groff/font/devnippon/G
-share/groff/font/devnippon/I
-share/groff/font/devnippon/M
-share/groff/font/devnippon/R
-share/groff/font/devps/generate/Makefile
-share/groff/font/devps/generate/afmname
-share/groff/font/devps/generate/dingbatsmap
-share/groff/font/devps/generate/dingbatsrmap
-share/groff/font/devps/generate/lgreekmap
-share/groff/font/devps/generate/symbol.sed
-share/groff/font/devps/generate/symbolchars
-share/groff/font/devps/generate/symbolsl.afm
-share/groff/font/devps/generate/textmap
-share/groff/font/devps/AB
-share/groff/font/devps/ABI
-share/groff/font/devps/AI
-share/groff/font/devps/AR
-share/groff/font/devps/BMB
-share/groff/font/devps/BMBI
-share/groff/font/devps/BMI
-share/groff/font/devps/BMR
-share/groff/font/devps/CB
-share/groff/font/devps/CBI
-share/groff/font/devps/CI
-share/groff/font/devps/CR
-share/groff/font/devps/DESC
-share/groff/font/devps/G
-share/groff/font/devps/HB
-share/groff/font/devps/HBI
-share/groff/font/devps/HI
-share/groff/font/devps/HNB
-share/groff/font/devps/HNBI
-share/groff/font/devps/HNI
-share/groff/font/devps/HNR
-share/groff/font/devps/HR
-share/groff/font/devps/M
-share/groff/font/devps/NB
-share/groff/font/devps/NBI
-share/groff/font/devps/NI
-share/groff/font/devps/NR
-share/groff/font/devps/PB
-share/groff/font/devps/PBI
-share/groff/font/devps/PI
-share/groff/font/devps/PR
-share/groff/font/devps/S
-share/groff/font/devps/SS
-share/groff/font/devps/TB
-share/groff/font/devps/TBI
-share/groff/font/devps/TI
-share/groff/font/devps/TR
-share/groff/font/devps/ZCMI
-share/groff/font/devps/ZD
-share/groff/font/devps/ZDR
-share/groff/font/devps/download
-share/groff/font/devps/prologue
-share/groff/font/devps/symbolsl.pfa
-share/groff/font/devps/text.enc
-share/groff/font/devps/zapfdr.pfa
-share/groff/font/devX100-12/CB
-share/groff/font/devX100-12/CBI
-share/groff/font/devX100-12/CI
-share/groff/font/devX100-12/CR
-share/groff/font/devX100-12/DESC
-share/groff/font/devX100-12/G
-share/groff/font/devX100-12/HB
-share/groff/font/devX100-12/HBI
-share/groff/font/devX100-12/HI
-share/groff/font/devX100-12/HR
-share/groff/font/devX100-12/M
-share/groff/font/devX100-12/NB
-share/groff/font/devX100-12/NBI
-share/groff/font/devX100-12/NI
-share/groff/font/devX100-12/NR
-share/groff/font/devX100-12/S
-share/groff/font/devX100-12/TB
-share/groff/font/devX100-12/TBI
-share/groff/font/devX100-12/TI
-share/groff/font/devX100-12/TR
-share/groff/font/devX100/CB
-share/groff/font/devX100/CBI
-share/groff/font/devX100/CI
-share/groff/font/devX100/CR
-share/groff/font/devX100/DESC
-share/groff/font/devX100/G
-share/groff/font/devX100/HB
-share/groff/font/devX100/HBI
-share/groff/font/devX100/HI
-share/groff/font/devX100/HR
-share/groff/font/devX100/M
-share/groff/font/devX100/NB
-share/groff/font/devX100/NBI
-share/groff/font/devX100/NI
-share/groff/font/devX100/NR
-share/groff/font/devX100/S
-share/groff/font/devX100/TB
-share/groff/font/devX100/TBI
-share/groff/font/devX100/TI
-share/groff/font/devX100/TR
-share/groff/font/devX75-12/CB
-share/groff/font/devX75-12/CBI
-share/groff/font/devX75-12/CI
-share/groff/font/devX75-12/CR
-share/groff/font/devX75-12/DESC
-share/groff/font/devX75-12/G
-share/groff/font/devX75-12/HB
-share/groff/font/devX75-12/HBI
-share/groff/font/devX75-12/HI
-share/groff/font/devX75-12/HR
-share/groff/font/devX75-12/M
-share/groff/font/devX75-12/NB
-share/groff/font/devX75-12/NBI
-share/groff/font/devX75-12/NI
-share/groff/font/devX75-12/NR
-share/groff/font/devX75-12/S
-share/groff/font/devX75-12/TB
-share/groff/font/devX75-12/TBI
-share/groff/font/devX75-12/TI
-share/groff/font/devX75-12/TR
-share/groff/font/devX75/CB
-share/groff/font/devX75/CBI
-share/groff/font/devX75/CI
-share/groff/font/devX75/CR
-share/groff/font/devX75/DESC
-share/groff/font/devX75/G
-share/groff/font/devX75/HB
-share/groff/font/devX75/HBI
-share/groff/font/devX75/HI
-share/groff/font/devX75/HR
-share/groff/font/devX75/M
-share/groff/font/devX75/NB
-share/groff/font/devX75/NBI
-share/groff/font/devX75/NI
-share/groff/font/devX75/NR
-share/groff/font/devX75/S
-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
-share/groff/tmac/mm/locale
-share/groff/tmac/mm/ms.cov
-share/groff/tmac/mm/se_locale
-share/groff/tmac/mm/se_ms.cov
-share/groff/tmac/eqnrc
-share/groff/tmac/hyphen.us
-share/groff/tmac/man.local
-share/groff/tmac/tmac.X
-share/groff/tmac/tmac.Xps
-share/groff/tmac/tmac.a4
-share/groff/tmac/tmac.an
-share/groff/tmac/tmac.an-old
-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.html
-share/groff/tmac/tmac.latin1
-share/groff/tmac/tmac.lbp
-share/groff/tmac/tmac.lj4
-share/groff/tmac/tmac.m
-share/groff/tmac/tmac.man
-share/groff/tmac/tmac.mandoc
-share/groff/tmac/tmac.markup
-share/groff/tmac/tmac.mdoc
-share/groff/tmac/tmac.me
-share/groff/tmac/tmac.ms
-share/groff/tmac/tmac.mse
-share/groff/tmac/tmac.orig_me
-share/groff/tmac/tmac.pic
-share/groff/tmac/tmac.ps
-share/groff/tmac/tmac.psatk
-share/groff/tmac/tmac.psnew
-share/groff/tmac/tmac.psold
-share/groff/tmac/tmac.pspic
-share/groff/tmac/tmac.s
-share/groff/tmac/tmac.safer
-share/groff/tmac/tmac.trace
-share/groff/tmac/tmac.tty
-share/groff/tmac/tmac.tty-char
-share/groff/tmac/tmac.vgrind
-share/groff/tmac/troffrc
-share/groff/tmac/troffrc-end
+%%INFO%%@unexec install-info --delete %D/info/groff %D/info/dir
+%%INFO%%info/groff
+%%INFO%%@exec install-info %D/info/groff %D/info/dir
+share/groff/%%GROFF_VERSION%%/eign
+share/groff/%%GROFF_VERSION%%/font/devX100-12/CB
+share/groff/%%GROFF_VERSION%%/font/devX100-12/CBI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/CI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/CR
+share/groff/%%GROFF_VERSION%%/font/devX100-12/DESC
+share/groff/%%GROFF_VERSION%%/font/devX100-12/G
+share/groff/%%GROFF_VERSION%%/font/devX100-12/HB
+share/groff/%%GROFF_VERSION%%/font/devX100-12/HBI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/HI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/HR
+share/groff/%%GROFF_VERSION%%/font/devX100-12/M
+share/groff/%%GROFF_VERSION%%/font/devX100-12/NB
+share/groff/%%GROFF_VERSION%%/font/devX100-12/NBI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/NI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/NR
+share/groff/%%GROFF_VERSION%%/font/devX100-12/S
+share/groff/%%GROFF_VERSION%%/font/devX100-12/TB
+share/groff/%%GROFF_VERSION%%/font/devX100-12/TBI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/TI
+share/groff/%%GROFF_VERSION%%/font/devX100-12/TR
+share/groff/%%GROFF_VERSION%%/font/devX100/CB
+share/groff/%%GROFF_VERSION%%/font/devX100/CBI
+share/groff/%%GROFF_VERSION%%/font/devX100/CI
+share/groff/%%GROFF_VERSION%%/font/devX100/CR
+share/groff/%%GROFF_VERSION%%/font/devX100/DESC
+share/groff/%%GROFF_VERSION%%/font/devX100/G
+share/groff/%%GROFF_VERSION%%/font/devX100/HB
+share/groff/%%GROFF_VERSION%%/font/devX100/HBI
+share/groff/%%GROFF_VERSION%%/font/devX100/HI
+share/groff/%%GROFF_VERSION%%/font/devX100/HR
+share/groff/%%GROFF_VERSION%%/font/devX100/M
+share/groff/%%GROFF_VERSION%%/font/devX100/NB
+share/groff/%%GROFF_VERSION%%/font/devX100/NBI
+share/groff/%%GROFF_VERSION%%/font/devX100/NI
+share/groff/%%GROFF_VERSION%%/font/devX100/NR
+share/groff/%%GROFF_VERSION%%/font/devX100/S
+share/groff/%%GROFF_VERSION%%/font/devX100/TB
+share/groff/%%GROFF_VERSION%%/font/devX100/TBI
+share/groff/%%GROFF_VERSION%%/font/devX100/TI
+share/groff/%%GROFF_VERSION%%/font/devX100/TR
+share/groff/%%GROFF_VERSION%%/font/devX75-12/CB
+share/groff/%%GROFF_VERSION%%/font/devX75-12/CBI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/CI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/CR
+share/groff/%%GROFF_VERSION%%/font/devX75-12/DESC
+share/groff/%%GROFF_VERSION%%/font/devX75-12/G
+share/groff/%%GROFF_VERSION%%/font/devX75-12/HB
+share/groff/%%GROFF_VERSION%%/font/devX75-12/HBI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/HI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/HR
+share/groff/%%GROFF_VERSION%%/font/devX75-12/M
+share/groff/%%GROFF_VERSION%%/font/devX75-12/NB
+share/groff/%%GROFF_VERSION%%/font/devX75-12/NBI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/NI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/NR
+share/groff/%%GROFF_VERSION%%/font/devX75-12/S
+share/groff/%%GROFF_VERSION%%/font/devX75-12/TB
+share/groff/%%GROFF_VERSION%%/font/devX75-12/TBI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/TI
+share/groff/%%GROFF_VERSION%%/font/devX75-12/TR
+share/groff/%%GROFF_VERSION%%/font/devX75/CB
+share/groff/%%GROFF_VERSION%%/font/devX75/CBI
+share/groff/%%GROFF_VERSION%%/font/devX75/CI
+share/groff/%%GROFF_VERSION%%/font/devX75/CR
+share/groff/%%GROFF_VERSION%%/font/devX75/DESC
+share/groff/%%GROFF_VERSION%%/font/devX75/G
+share/groff/%%GROFF_VERSION%%/font/devX75/HB
+share/groff/%%GROFF_VERSION%%/font/devX75/HBI
+share/groff/%%GROFF_VERSION%%/font/devX75/HI
+share/groff/%%GROFF_VERSION%%/font/devX75/HR
+share/groff/%%GROFF_VERSION%%/font/devX75/M
+share/groff/%%GROFF_VERSION%%/font/devX75/NB
+share/groff/%%GROFF_VERSION%%/font/devX75/NBI
+share/groff/%%GROFF_VERSION%%/font/devX75/NI
+share/groff/%%GROFF_VERSION%%/font/devX75/NR
+share/groff/%%GROFF_VERSION%%/font/devX75/S
+share/groff/%%GROFF_VERSION%%/font/devX75/TB
+share/groff/%%GROFF_VERSION%%/font/devX75/TBI
+share/groff/%%GROFF_VERSION%%/font/devX75/TI
+share/groff/%%GROFF_VERSION%%/font/devX75/TR
+share/groff/%%GROFF_VERSION%%/font/devascii/B
+share/groff/%%GROFF_VERSION%%/font/devascii/BI
+share/groff/%%GROFF_VERSION%%/font/devascii/DESC
+share/groff/%%GROFF_VERSION%%/font/devascii/I
+share/groff/%%GROFF_VERSION%%/font/devascii/R
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/B
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/BI
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/CW
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/CWI
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/DESC
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/EX
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/G
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/H
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/HB
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/HI
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/I
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/M
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/MI
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/R
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/S
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/SA
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/SB
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/CompileFonts
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/Makefile
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/msam.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/msbm.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/texb.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/texex.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/texi.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/texmi.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/texr.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/texsy.map
+share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate/textt.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/B
+share/groff/%%GROFF_VERSION%%/font/devdvi/BI
+share/groff/%%GROFF_VERSION%%/font/devdvi/CW
+share/groff/%%GROFF_VERSION%%/font/devdvi/CWI
+share/groff/%%GROFF_VERSION%%/font/devdvi/DESC
+share/groff/%%GROFF_VERSION%%/font/devdvi/EX
+share/groff/%%GROFF_VERSION%%/font/devdvi/G
+share/groff/%%GROFF_VERSION%%/font/devdvi/H
+share/groff/%%GROFF_VERSION%%/font/devdvi/HB
+share/groff/%%GROFF_VERSION%%/font/devdvi/HI
+share/groff/%%GROFF_VERSION%%/font/devdvi/I
+share/groff/%%GROFF_VERSION%%/font/devdvi/M
+share/groff/%%GROFF_VERSION%%/font/devdvi/MI
+share/groff/%%GROFF_VERSION%%/font/devdvi/R
+share/groff/%%GROFF_VERSION%%/font/devdvi/S
+share/groff/%%GROFF_VERSION%%/font/devdvi/SA
+share/groff/%%GROFF_VERSION%%/font/devdvi/SB
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/CompileFonts
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/Makefile
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/msam.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/msbm.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/texb.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/texex.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/texi.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/texmi.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/texr.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/texsy.map
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/textt.map
+share/groff/%%GROFF_VERSION%%/font/devhtml/B
+share/groff/%%GROFF_VERSION%%/font/devhtml/BI
+share/groff/%%GROFF_VERSION%%/font/devhtml/CR
+share/groff/%%GROFF_VERSION%%/font/devhtml/DESC
+share/groff/%%GROFF_VERSION%%/font/devhtml/I
+share/groff/%%GROFF_VERSION%%/font/devhtml/R
+share/groff/%%GROFF_VERSION%%/font/devhtml/S
+share/groff/%%GROFF_VERSION%%/font/devlatin1/B
+share/groff/%%GROFF_VERSION%%/font/devlatin1/BI
+share/groff/%%GROFF_VERSION%%/font/devlatin1/DESC
+share/groff/%%GROFF_VERSION%%/font/devlatin1/I
+share/groff/%%GROFF_VERSION%%/font/devlatin1/R
+share/groff/%%GROFF_VERSION%%/font/devlbp/DESC
+share/groff/%%GROFF_VERSION%%/font/devlbp/HB
+share/groff/%%GROFF_VERSION%%/font/devlbp/HBI
+share/groff/%%GROFF_VERSION%%/font/devlbp/HI
+share/groff/%%GROFF_VERSION%%/font/devlbp/HR
+share/groff/%%GROFF_VERSION%%/font/devlbp/TB
+share/groff/%%GROFF_VERSION%%/font/devlbp/TBI
+share/groff/%%GROFF_VERSION%%/font/devlbp/TI
+share/groff/%%GROFF_VERSION%%/font/devlbp/TR
+share/groff/%%GROFF_VERSION%%/font/devlj4/ALBB
+share/groff/%%GROFF_VERSION%%/font/devlj4/ALBR
+share/groff/%%GROFF_VERSION%%/font/devlj4/AOB
+share/groff/%%GROFF_VERSION%%/font/devlj4/AOI
+share/groff/%%GROFF_VERSION%%/font/devlj4/AOR
+share/groff/%%GROFF_VERSION%%/font/devlj4/CB
+share/groff/%%GROFF_VERSION%%/font/devlj4/CBI
+share/groff/%%GROFF_VERSION%%/font/devlj4/CI
+share/groff/%%GROFF_VERSION%%/font/devlj4/CLARENDON
+share/groff/%%GROFF_VERSION%%/font/devlj4/CORONET
+share/groff/%%GROFF_VERSION%%/font/devlj4/CR
+share/groff/%%GROFF_VERSION%%/font/devlj4/DESC
+share/groff/%%GROFF_VERSION%%/font/devlj4/GB
+share/groff/%%GROFF_VERSION%%/font/devlj4/GBI
+share/groff/%%GROFF_VERSION%%/font/devlj4/GI
+share/groff/%%GROFF_VERSION%%/font/devlj4/GR
+share/groff/%%GROFF_VERSION%%/font/devlj4/LGB
+share/groff/%%GROFF_VERSION%%/font/devlj4/LGI
+share/groff/%%GROFF_VERSION%%/font/devlj4/LGR
+share/groff/%%GROFF_VERSION%%/font/devlj4/MARIGOLD
+share/groff/%%GROFF_VERSION%%/font/devlj4/OB
+share/groff/%%GROFF_VERSION%%/font/devlj4/OBI
+share/groff/%%GROFF_VERSION%%/font/devlj4/OI
+share/groff/%%GROFF_VERSION%%/font/devlj4/OR
+share/groff/%%GROFF_VERSION%%/font/devlj4/S
+share/groff/%%GROFF_VERSION%%/font/devlj4/TB
+share/groff/%%GROFF_VERSION%%/font/devlj4/TBI
+share/groff/%%GROFF_VERSION%%/font/devlj4/TI
+share/groff/%%GROFF_VERSION%%/font/devlj4/TR
+share/groff/%%GROFF_VERSION%%/font/devlj4/UB
+share/groff/%%GROFF_VERSION%%/font/devlj4/UBI
+share/groff/%%GROFF_VERSION%%/font/devlj4/UCB
+share/groff/%%GROFF_VERSION%%/font/devlj4/UCBI
+share/groff/%%GROFF_VERSION%%/font/devlj4/UCI
+share/groff/%%GROFF_VERSION%%/font/devlj4/UCR
+share/groff/%%GROFF_VERSION%%/font/devlj4/UI
+share/groff/%%GROFF_VERSION%%/font/devlj4/UR
+share/groff/%%GROFF_VERSION%%/font/devlj4/generate/Makefile
+share/groff/%%GROFF_VERSION%%/font/devlj4/generate/special.map
+share/groff/%%GROFF_VERSION%%/font/devlj4/generate/text.map
+share/groff/%%GROFF_VERSION%%/font/devnippon/B
+share/groff/%%GROFF_VERSION%%/font/devnippon/BI
+share/groff/%%GROFF_VERSION%%/font/devnippon/DESC
+share/groff/%%GROFF_VERSION%%/font/devnippon/G
+share/groff/%%GROFF_VERSION%%/font/devnippon/I
+share/groff/%%GROFF_VERSION%%/font/devnippon/M
+share/groff/%%GROFF_VERSION%%/font/devnippon/R
+share/groff/%%GROFF_VERSION%%/font/devps/AB
+share/groff/%%GROFF_VERSION%%/font/devps/ABI
+share/groff/%%GROFF_VERSION%%/font/devps/AI
+share/groff/%%GROFF_VERSION%%/font/devps/AR
+share/groff/%%GROFF_VERSION%%/font/devps/BMB
+share/groff/%%GROFF_VERSION%%/font/devps/BMBI
+share/groff/%%GROFF_VERSION%%/font/devps/BMI
+share/groff/%%GROFF_VERSION%%/font/devps/BMR
+share/groff/%%GROFF_VERSION%%/font/devps/CB
+share/groff/%%GROFF_VERSION%%/font/devps/CBI
+share/groff/%%GROFF_VERSION%%/font/devps/CI
+share/groff/%%GROFF_VERSION%%/font/devps/CR
+share/groff/%%GROFF_VERSION%%/font/devps/DESC
+share/groff/%%GROFF_VERSION%%/font/devps/G
+share/groff/%%GROFF_VERSION%%/font/devps/HB
+share/groff/%%GROFF_VERSION%%/font/devps/HBI
+share/groff/%%GROFF_VERSION%%/font/devps/HI
+share/groff/%%GROFF_VERSION%%/font/devps/HNB
+share/groff/%%GROFF_VERSION%%/font/devps/HNBI
+share/groff/%%GROFF_VERSION%%/font/devps/HNI
+share/groff/%%GROFF_VERSION%%/font/devps/HNR
+share/groff/%%GROFF_VERSION%%/font/devps/HR
+share/groff/%%GROFF_VERSION%%/font/devps/M
+share/groff/%%GROFF_VERSION%%/font/devps/NB
+share/groff/%%GROFF_VERSION%%/font/devps/NBI
+share/groff/%%GROFF_VERSION%%/font/devps/NI
+share/groff/%%GROFF_VERSION%%/font/devps/NR
+share/groff/%%GROFF_VERSION%%/font/devps/PB
+share/groff/%%GROFF_VERSION%%/font/devps/PBI
+share/groff/%%GROFF_VERSION%%/font/devps/PI
+share/groff/%%GROFF_VERSION%%/font/devps/PR
+share/groff/%%GROFF_VERSION%%/font/devps/S
+share/groff/%%GROFF_VERSION%%/font/devps/SS
+share/groff/%%GROFF_VERSION%%/font/devps/TB
+share/groff/%%GROFF_VERSION%%/font/devps/TBI
+share/groff/%%GROFF_VERSION%%/font/devps/TI
+share/groff/%%GROFF_VERSION%%/font/devps/TR
+share/groff/%%GROFF_VERSION%%/font/devps/ZCMI
+share/groff/%%GROFF_VERSION%%/font/devps/ZD
+share/groff/%%GROFF_VERSION%%/font/devps/ZDR
+share/groff/%%GROFF_VERSION%%/font/devps/download
+share/groff/%%GROFF_VERSION%%/font/devps/generate/Makefile
+share/groff/%%GROFF_VERSION%%/font/devps/generate/afmname
+share/groff/%%GROFF_VERSION%%/font/devps/generate/dingbats.map
+share/groff/%%GROFF_VERSION%%/font/devps/generate/dingbats.rmap
+share/groff/%%GROFF_VERSION%%/font/devps/generate/lgreekmap
+share/groff/%%GROFF_VERSION%%/font/devps/generate/symbol.sed
+share/groff/%%GROFF_VERSION%%/font/devps/generate/symbolchars
+share/groff/%%GROFF_VERSION%%/font/devps/generate/symbolsl.afm
+share/groff/%%GROFF_VERSION%%/font/devps/generate/textmap
+share/groff/%%GROFF_VERSION%%/font/devps/prologue
+share/groff/%%GROFF_VERSION%%/font/devps/symbolsl.pfa
+share/groff/%%GROFF_VERSION%%/font/devps/text.enc
+share/groff/%%GROFF_VERSION%%/font/devps/zapfdr.pfa
+share/groff/%%GROFF_VERSION%%/font/devutf8/B
+share/groff/%%GROFF_VERSION%%/font/devutf8/BI
+share/groff/%%GROFF_VERSION%%/font/devutf8/DESC
+share/groff/%%GROFF_VERSION%%/font/devutf8/I
+share/groff/%%GROFF_VERSION%%/font/devutf8/R
+share/groff/%%GROFF_VERSION%%/tmac/X.tmac
+share/groff/%%GROFF_VERSION%%/tmac/Xps.tmac
+share/groff/%%GROFF_VERSION%%/tmac/a4.tmac
+share/groff/%%GROFF_VERSION%%/tmac/an-old.tmac
+share/groff/%%GROFF_VERSION%%/tmac/an.tmac
+share/groff/%%GROFF_VERSION%%/tmac/andoc.tmac
+share/groff/%%GROFF_VERSION%%/tmac/doc-old.tmac
+share/groff/%%GROFF_VERSION%%/tmac/doc.tmac
+share/groff/%%GROFF_VERSION%%/tmac/dvi.tmac
+share/groff/%%GROFF_VERSION%%/tmac/e.tmac
+share/groff/%%GROFF_VERSION%%/tmac/eqnrc
+share/groff/%%GROFF_VERSION%%/tmac/html.tmac
+share/groff/%%GROFF_VERSION%%/tmac/hyphen.us
+share/groff/%%GROFF_VERSION%%/tmac/latin1.tmac
+share/groff/%%GROFF_VERSION%%/tmac/lj4.tmac
+share/groff/%%GROFF_VERSION%%/tmac/m.tmac
+share/groff/%%GROFF_VERSION%%/tmac/man.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mandoc.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mdoc.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/doc-common
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/doc-ditroff
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/doc-nroff
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/doc-syms
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/eucJP
+share/groff/%%GROFF_VERSION%%/tmac/me.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mm/0.MT
+share/groff/%%GROFF_VERSION%%/tmac/mm/4.MT
+share/groff/%%GROFF_VERSION%%/tmac/mm/5.MT
+share/groff/%%GROFF_VERSION%%/tmac/mm/locale
+share/groff/%%GROFF_VERSION%%/tmac/mm/ms.cov
+share/groff/%%GROFF_VERSION%%/tmac/mm/se_locale
+share/groff/%%GROFF_VERSION%%/tmac/mm/se_ms.cov
+share/groff/%%GROFF_VERSION%%/tmac/ms.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mse.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mwww.tmac
+share/groff/%%GROFF_VERSION%%/tmac/pic.tmac
+share/groff/%%GROFF_VERSION%%/tmac/ps.tmac
+share/groff/%%GROFF_VERSION%%/tmac/psatk.tmac
+share/groff/%%GROFF_VERSION%%/tmac/psold.tmac
+share/groff/%%GROFF_VERSION%%/tmac/pspic.tmac
+share/groff/%%GROFF_VERSION%%/tmac/s.tmac
+share/groff/%%GROFF_VERSION%%/tmac/safer.tmac
+share/groff/%%GROFF_VERSION%%/tmac/tmac.orig_me
+share/groff/%%GROFF_VERSION%%/tmac/tmac.vgrind
+share/groff/%%GROFF_VERSION%%/tmac/trace.tmac
+share/groff/%%GROFF_VERSION%%/tmac/troffrc
+share/groff/%%GROFF_VERSION%%/tmac/troffrc-end
+share/groff/%%GROFF_VERSION%%/tmac/tty-char.tmac
+share/groff/%%GROFF_VERSION%%/tmac/tty.tmac
+share/groff/%%GROFF_VERSION%%/tmac/www.tmac
+share/groff/site-tmac/man.local
+share/groff/site-tmac/mdoc.local
 %%PORTDOCS%%share/doc/jgroff/ChangeLog.jp
 %%PORTDOCS%%share/doc/jgroff/NEWS
 %%PORTDOCS%%share/doc/jgroff/PROBLEMS
@@ -353,26 +358,30 @@ share/groff/tmac/troffrc-end
 %%PORTDOCS%%share/doc/jgroff/meref.me
 %%PORTDOCS%%share/doc/jgroff/pic.ms
 %%PORTDOCS%%@dirrm share/doc/jgroff
-@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
-@dirrm share/groff/font/devnippon
-@dirrm share/groff/font/devps/generate
-@dirrm share/groff/font/devps
-@dirrm share/groff/font/devX100-12
-@dirrm share/groff/font/devX100
-@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
+@dirrm lib/groff/site-tmac
+@dirrm lib/groff
+@dirrm share/groff/%%GROFF_VERSION%%/font/devX100
+@dirrm share/groff/%%GROFF_VERSION%%/font/devX100-12
+@dirrm share/groff/%%GROFF_VERSION%%/font/devX75
+@dirrm share/groff/%%GROFF_VERSION%%/font/devX75-12
+@dirrm share/groff/%%GROFF_VERSION%%/font/devascii
+@dirrm share/groff/%%GROFF_VERSION%%/font/devdvi/generate
+@dirrm share/groff/%%GROFF_VERSION%%/font/devdvi
+@dirrm share/groff/%%GROFF_VERSION%%/font/devdvi-ascii/generate
+@dirrm share/groff/%%GROFF_VERSION%%/font/devdvi-ascii
+@dirrm share/groff/%%GROFF_VERSION%%/font/devhtml
+@dirrm share/groff/%%GROFF_VERSION%%/font/devlatin1
+@dirrm share/groff/%%GROFF_VERSION%%/font/devlbp
+@dirrm share/groff/%%GROFF_VERSION%%/font/devlj4/generate
+@dirrm share/groff/%%GROFF_VERSION%%/font/devlj4
+@dirrm share/groff/%%GROFF_VERSION%%/font/devnippon
+@dirrm share/groff/%%GROFF_VERSION%%/font/devps/generate
+@dirrm share/groff/%%GROFF_VERSION%%/font/devps
+@dirrm share/groff/%%GROFF_VERSION%%/font/devutf8
+@dirrm share/groff/%%GROFF_VERSION%%/font
+@dirrm share/groff/%%GROFF_VERSION%%/tmac/mdoc
+@dirrm share/groff/%%GROFF_VERSION%%/tmac/mm
+@dirrm share/groff/%%GROFF_VERSION%%/tmac
+@dirrm share/groff/%%GROFF_VERSION%%
+@dirrm share/groff/site-tmac
 @dirrm share/groff