Upgrade to 1.18.1.

Update tmac suite to 20030303 of RELENG_4.

10 files changed, 255 insertions, 127 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 4fc7987..15dde2e 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -6,97 +6,94 @@
 #
 
 PORTNAME=	groff
-PORTVERSION=	1.17.2
-PORTREVISION=	5
+PORTVERSION=	1.18.1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,okazaki/&,} \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${TMAC_DISTNAME}.tar.gz
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	okazaki/groff
-PATCHFILES=	${DISTNAME}-jgroff-0.0.2.diff.gz
+PATCH_SITES=	http://people.debian.org/~ukai/groff/
+PATCHFILES=	${DISTNAME:S,-,_,}-7.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@FreeBSD.org
+COMMENT=	Japanese enhancement of GNU groff
 
-TMAC_DATE=	20020918
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS=	pnmcut:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	pnmcut:${PORTSDIR}/graphics/netpbm
+
+TMAC_DATE=	20030303
 TMAC_DISTNAME=	tmac-${TMAC_DATE}
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-# declare USE_AUTOCONF_VER as 213 until bsd.port.mk supports 252 (or later)
-USE_AUTOCONF_VER=	213
-.if ${USE_AUTOCONF_VER} == 213
 USE_REINPLACE=	yes
-.endif
 
-CONFIGURE_ARGS=	--program-prefix=g --enable-nippon
-CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"
+CONFIGURE_ARGS=	--enable-multibyte
+CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}" \
+		LIBS="-L${LOCALBASE}/lib -liconv"
+CFLAGS+=	-I${LOCALBASE}/include
 
 TMACBASE=	${WRKDIR}/${TMAC_DISTNAME}
 TMACDIR=	share/groff/${PORTVERSION}/tmac
 SITETMACDIR=	share/groff/site-tmac
 MDOCDIR=	${TMACDIR}/mdoc
 INFODIR=	${PREFIX}/info
-DOCSDIR=	${PREFIX}/share/doc/jgroff
+DOCSDIR=	${PREFIX}/share/doc/groff/${PORTVERSION}
 PLIST_SUB=	GROFF_VERSION=${PORTVERSION}
 
-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 \
+MAN1=		addftinfo.1 afmtodit.1 \
+		eqn.1 eqn2graph.1 \
+		grn.1 grodvi.1 groff.1 groffer.1 grog.1 \
 		grohtml.1 grolbp.1 grolj4.1 grops.1 grotty.1 \
-		hpftodit.1 lkbib.1 pfbtops.1 tfmtodit.1
+		hpftodit.1 indxbib.1 lkbib.1 lookbib.1 mmroff.1 \
+		neqn.1 nroff.1 pfbtops.1 pic.1 pic2graph.1 \
+		refer.1 soelim.1 tbl.1 tfmtodit.1 troff.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
+MAN7=		ditroff.7 groff.7 groff_char.7 groff_diff.7 \
+		groff_man.7 groff_mdoc.7 \
+		groff_me.7 groff_mm.7 groff_mmse.7 groff_mom.7 groff_ms.7 \
+		groff_trace.7 groff_www.7 roff.7
 
 SITETMACFILES=	mdoc.local
 TMACFILES=	tmac.orig_me tmac.vgrind \
 		an-old.tmac doc.tmac e.tmac
-MDOCFILES=	eucJP doc-common doc-syms
+MDOCFILES=	ja.eucJP doc-common doc-syms
 
-DOCUMENTS=	ChangeLog.jp NEWS PROBLEMS README README.jp \
-		doc/meintro.me doc/meref.me doc/pic.ms
+DOCUMENTS=	ChangeLog.jp NEWS PROBLEMS README README.jp
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 350001
+# formatting groff.info requires texinfo 4.2
+.if ${OSVERSION} < 470000
 WITHOUT_INFO=	yes
 PLIST_SUB+=	INFO="@comment "
 .else
 PLIST_SUB+=	INFO=""
 .endif
 
-# workaround for autoconf-2.13
-
-CONFIGUREIN_FILTER=	\
-		-e 's|AC_INIT|dnl|g;' \
-		-e 's|AC_CONFIG_SRCDIR|AC_INIT|g;' \
-		-e 's|AC_OUTPUT|dnl|g;' \
-		-e 's|AC_CONFIG_FILES|AC_OUTPUT|g;'
-
-ACLOCAL_FILTER=	\
-	-e 's/AC_LANG_POP[(]C[+][+][)]/AC_LANG_RESTORE/g;' \
-	-e 's/AC_LANG_PUSH[(]C[+][+][)]/AC_LANG_SAVE[]AC_LANG_CPLUSPLUS/g;'
+# wchar.h is exist since 4.4-RELEASE
+.if ${OSVERSION} < 440000
+WITHOUT_WCHAR_H=	yes
+.endif
 
 post-patch:
-.if ${USE_AUTOCONF_VER} == 213
-	${CP} -p ${WRKSRC}/configure.ac ${WRKSRC}/configure.in
-	${REINPLACE_CMD} ${CONFIGUREIN_FILTER} ${WRKSRC}/configure.in
-	${REINPLACE_CMD} ${ACLOCAL_FILTER} ${WRKSRC}/aclocal.m4
+.ifdef ${WITHOUT_WCHAR_H}
+	${REINPLACE_CMD} -e 's|#include <wchar[.]h>||g;' \
+		${WRKSRC}/src/libs/libgroff/encoding.cc
 .endif
 
 post-build:
+	${RM} -f ${WRKSRC}/doc/groff ${WRKSRC}/doc/groff-*
 .if !defined(WITHOUT_INFO)
 	cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo
 .endif
+	cd ${WRKSRC} && ${FIND} font -name DESC \
+	| xargs ${REINPLACE_CMD} -e 's|pro \(.*\)|pro ${PREFIX}/bin/\1|g;'
 
-post-install:
+post-install: install-links
 .if !defined(WITHOUT_INFO)
 	@${MAKE} install-info
 .endif
@@ -122,4 +119,9 @@ install-info:
 	${INSTALL_DATA} ${WRKSRC}/doc/groff ${INFODIR}
 	install-info ${INFODIR}/groff ${INFODIR}/dir
 
+install-links:
+.for FILE in eqn neqn pic tbl
+	${LN} -sf ${FILE} ${PREFIX}/bin/g${FILE}
+.endfor
+
 .include <bsd.port.post.mk>
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index c5b0d9d..54bb032 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -1,3 +1,3 @@
-MD5 (groff-1.17.2.tar.gz) = 9564e58e553e7a8d4c6e73a782f296ce
-MD5 (tmac-20020918.tar.gz) = f4f92177563026b327b596840bbef4d4
-MD5 (groff-1.17.2-jgroff-0.0.2.diff.gz) = 31bb837203310c7c590c72b0cc656ca2
+MD5 (groff-1.18.1.tar.gz) = 4c7a1b478d230696f14743772f31639f
+MD5 (tmac-20030303.tar.gz) = 2dd19f98eaad1374e65256bfeb50d869
+MD5 (groff_1.18.1-7.diff.gz) = 957fad244caa648fdf3d6395ca27aa2e
diff --git a/japanese/groff/files/patch-ag b/japanese/groff/files/patch-ag
deleted file mode 100644
index 2c67d38..0000000
--- a/japanese/groff/files/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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)
--	g=
-+	if test "x$program_prefix" != xNONE; then
-+		g="$program_prefix"
-+	else
-+		g=
-+	fi
- fi
- AC_SUBST(g)])dnl
- dnl
diff --git a/japanese/groff/files/patch-ah b/japanese/groff/files/patch-ah
deleted file mode 100644
index dd02e77..0000000
--- a/japanese/groff/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-doc:Makefile.sub b/japanese/groff/files/patch-doc:Makefile.sub
new file mode 100644
index 0000000..ec67f64
--- /dev/null
+++ b/japanese/groff/files/patch-doc:Makefile.sub
@@ -0,0 +1,31 @@
+--- doc/Makefile.sub.bak	Fri Jul 26 22:48:54 2002
++++ doc/Makefile.sub	Thu Mar  6 12:49:07 2003
+@@ -110,7 +110,7 @@
+ 	$(GROFF) -Tps -ms -mwww >$@
+ 
+ 
+-all: groff $(PROCESSEDDOCFILES) prepare_examples \
++all: $(PROCESSEDDOCFILES) prepare_examples \
+      $(PROCESSEDEXAMPLEFILES) $(make_html)
+ 
+ html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
+@@ -133,18 +133,8 @@
+ 
+ distfiles: groff gnu.eps gnu.png
+ 
+-install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
++install_data: $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
+               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
+-	-test -d $(infodir) || $(mkinstalldirs) $(infodir)
+-# Prefer info files in builddir over srcdir; we test for
+-# the existence of `groff'.
+-	d=.; \
+-	  test -f "groff" || d=$(srcdir); \
+-	  for f in $$d/groff $$d/groff-*; do \
+-	    rm -f $(infodir)/`basename $$f`; \
+-	    $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \
+-	  done
+-	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff
+ 	-test -d $(docdir) || $(mkinstalldirs) $(docdir)
+ 	for f in $(DOCFILES); do \
+ 	  rm -f $(docdir)/$$f; \
diff --git a/japanese/groff/files/patch-src:libs:libgroff:encoding.cc b/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
new file mode 100644
index 0000000..5d8197a
--- /dev/null
+++ b/japanese/groff/files/patch-src:libs:libgroff:encoding.cc
@@ -0,0 +1,32 @@
+--- src/libs/libgroff/encoding.cc.bak	Tue Mar  4 20:26:04 2003
++++ src/libs/libgroff/encoding.cc	Tue Mar  4 21:33:16 2003
+@@ -177,7 +177,8 @@
+   inline wchar make_wchar(unsigned char c0, encoding_istream& eis) {
+     wchar wc = 0;
+     char inbuf[8], outbuf[8];
+-    char *inp, *outp;
++    const char *inp;
++    char *outp;
+     size_t inbytesleft, outbytesleft;
+     int i = 0;
+     
+@@ -212,7 +213,8 @@
+ 
+   inline int put_wchar(wchar wc, encoding_ostream& eos) {
+     char inbuf[4], outbuf[4];
+-    char *inp, *outp;
++    const char *inp;
++    char *outp;
+     size_t inbytesleft, outbytesleft;
+ 
+     if (!is_wchar_code(wc)) {
+@@ -377,6 +379,9 @@
+ #if HAVE_LANGINFO_CODESET
+   locale = nl_langinfo(CODESET);
+ #endif
++  if (strcmp(locale, "ja_JP.EUC") == 0 || strcmp(locale, "ja_JP.eucJP") == 0) {
++	  locale = "EUC-JP";
++  }
+   select_input_encoding_handler(locale);
+   select_output_encoding_handler(locale);
+ #endif
diff --git a/japanese/groff/files/patch-tmac:troffrc b/japanese/groff/files/patch-tmac:troffrc
new file mode 100644
index 0000000..087f2c2
--- /dev/null
+++ b/japanese/groff/files/patch-tmac:troffrc
@@ -0,0 +1,18 @@
+--- tmac/troffrc~	Thu Mar  6 12:33:17 2003
++++ tmac/troffrc	Thu Mar  6 13:21:54 2003
+@@ -38,7 +38,15 @@
+ .\" Load hyphenation patterns from `hyphen.us' (in the tmac directory).
+ .do hpf hyphen.us
+ .
++.\" Disable SGR support in grotty(1).
++.if n \{\
++.  do nop \X'tty: sgr 0'
++.  sp -1
++.  nr nl 0-1
++.  nr % -1
++.\}
+ .\" for Japanese hack
+ .if "\V[LANG]"ja_JP.eucJP" .do mso euc-jp.tmac
++.if "\V[LANG]"ja_JP.EUC" .do mso euc-jp.tmac
+ .
+ .\" Don't let blank lines creep in here.
diff --git a/japanese/groff/pkg-comment b/japanese/groff/pkg-comment
deleted file mode 100644
index 1dcd472..0000000
--- a/japanese/groff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese enhancement of GNU groff
diff --git a/japanese/groff/pkg-descr b/japanese/groff/pkg-descr
index b7ea11b..99c37a5 100644
--- a/japanese/groff/pkg-descr
+++ b/japanese/groff/pkg-descr
@@ -5,7 +5,6 @@ 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:
 
diff --git a/japanese/groff/pkg-plist b/japanese/groff/pkg-plist
index 67f8619..3427c16 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -1,30 +1,37 @@
 bin/addftinfo
 bin/afmtodit
+bin/eqn
+bin/eqn2graph
 bin/geqn
-bin/ggrn
-bin/gindxbib
-bin/glookbib
 bin/gneqn
-bin/gnroff
 bin/gpic
-bin/grefer
+bin/grn
 bin/grodvi
 bin/groff
+bin/groffer
 bin/grog
 bin/grolbp
 bin/grolj4
 bin/grops
 bin/grotty
-bin/gsoelim
 bin/gtbl
-bin/gtroff
 bin/hpftodit
+bin/indxbib
 bin/lkbib
+bin/lookbib
 bin/mmroff
+bin/neqn
+bin/nroff
 bin/pfbtops
+bin/pic
+bin/pic2graph
 bin/post-grohtml
 bin/pre-grohtml
+bin/refer
+bin/soelim
+bin/tbl
 bin/tfmtodit
+bin/troff
 %%INFO%%@unexec install-info --delete %D/info/groff %D/info/dir
 %%INFO%%info/groff
 %%INFO%%@exec install-info %D/info/groff %D/info/dir
@@ -114,55 +121,55 @@ 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/devascii8/B
+share/groff/%%GROFF_VERSION%%/font/devascii8/BI
+share/groff/%%GROFF_VERSION%%/font/devascii8/DESC
+share/groff/%%GROFF_VERSION%%/font/devascii8/I
+share/groff/%%GROFF_VERSION%%/font/devascii8/R
 share/groff/%%GROFF_VERSION%%/font/devdvi/CW
+share/groff/%%GROFF_VERSION%%/font/devdvi/CWEC
 share/groff/%%GROFF_VERSION%%/font/devdvi/CWI
+share/groff/%%GROFF_VERSION%%/font/devdvi/CWIEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/CWITC
+share/groff/%%GROFF_VERSION%%/font/devdvi/CWTC
 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/HBEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/HBI
+share/groff/%%GROFF_VERSION%%/font/devdvi/HBIEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/HBITC
+share/groff/%%GROFF_VERSION%%/font/devdvi/HBTC
 share/groff/%%GROFF_VERSION%%/font/devdvi/HI
-share/groff/%%GROFF_VERSION%%/font/devdvi/I
+share/groff/%%GROFF_VERSION%%/font/devdvi/HIEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/HITC
+share/groff/%%GROFF_VERSION%%/font/devdvi/HR
+share/groff/%%GROFF_VERSION%%/font/devdvi/HREC
+share/groff/%%GROFF_VERSION%%/font/devdvi/HRTC
 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/TB
+share/groff/%%GROFF_VERSION%%/font/devdvi/TBEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TBI
+share/groff/%%GROFF_VERSION%%/font/devdvi/TBIEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TBITC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TBTC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TI
+share/groff/%%GROFF_VERSION%%/font/devdvi/TIEC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TITC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TR
+share/groff/%%GROFF_VERSION%%/font/devdvi/TREC
+share/groff/%%GROFF_VERSION%%/font/devdvi/TRTC
 share/groff/%%GROFF_VERSION%%/font/devdvi/generate/CompileFonts
 share/groff/%%GROFF_VERSION%%/font/devdvi/generate/Makefile
+share/groff/%%GROFF_VERSION%%/font/devdvi/generate/ec.map
 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/tc.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
@@ -172,9 +179,14 @@ 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/CB
+share/groff/%%GROFF_VERSION%%/font/devhtml/CBI
+share/groff/%%GROFF_VERSION%%/font/devhtml/CI
 share/groff/%%GROFF_VERSION%%/font/devhtml/CR
 share/groff/%%GROFF_VERSION%%/font/devhtml/DESC
+share/groff/%%GROFF_VERSION%%/font/devhtml/G
 share/groff/%%GROFF_VERSION%%/font/devhtml/I
+share/groff/%%GROFF_VERSION%%/font/devhtml/M
 share/groff/%%GROFF_VERSION%%/font/devhtml/R
 share/groff/%%GROFF_VERSION%%/font/devhtml/S
 share/groff/%%GROFF_VERSION%%/font/devlatin1/B
@@ -182,10 +194,20 @@ 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/CB
+share/groff/%%GROFF_VERSION%%/font/devlbp/CI
+share/groff/%%GROFF_VERSION%%/font/devlbp/CR
 share/groff/%%GROFF_VERSION%%/font/devlbp/DESC
+share/groff/%%GROFF_VERSION%%/font/devlbp/EB
+share/groff/%%GROFF_VERSION%%/font/devlbp/EI
+share/groff/%%GROFF_VERSION%%/font/devlbp/ER
 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/HNB
+share/groff/%%GROFF_VERSION%%/font/devlbp/HNBI
+share/groff/%%GROFF_VERSION%%/font/devlbp/HNI
+share/groff/%%GROFF_VERSION%%/font/devlbp/HNR
 share/groff/%%GROFF_VERSION%%/font/devlbp/HR
 share/groff/%%GROFF_VERSION%%/font/devlbp/TB
 share/groff/%%GROFF_VERSION%%/font/devlbp/TBI
@@ -295,7 +317,9 @@ 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/G
 share/groff/%%GROFF_VERSION%%/font/devutf8/I
+share/groff/%%GROFF_VERSION%%/font/devutf8/M
 share/groff/%%GROFF_VERSION%%/font/devutf8/R
 share/groff/%%GROFF_VERSION%%/tmac/X.tmac
 share/groff/%%GROFF_VERSION%%/tmac/Xps.tmac
@@ -303,14 +327,20 @@ 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/andocj.tmac
+share/groff/%%GROFF_VERSION%%/tmac/cp1047.tmac
 share/groff/%%GROFF_VERSION%%/tmac/doc-old.tmac
 share/groff/%%GROFF_VERSION%%/tmac/doc.tmac
+share/groff/%%GROFF_VERSION%%/tmac/docj.tmac
 share/groff/%%GROFF_VERSION%%/tmac/dvi.tmac
 share/groff/%%GROFF_VERSION%%/tmac/e.tmac
+share/groff/%%GROFF_VERSION%%/tmac/ec.tmac
 share/groff/%%GROFF_VERSION%%/tmac/eqnrc
+share/groff/%%GROFF_VERSION%%/tmac/euc-jp.tmac
 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/lbp.tmac
 share/groff/%%GROFF_VERSION%%/tmac/lj4.tmac
 share/groff/%%GROFF_VERSION%%/tmac/m.tmac
 share/groff/%%GROFF_VERSION%%/tmac/man.tmac
@@ -320,7 +350,9 @@ 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/mdoc/docj-ditroff
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/docj-nroff
+share/groff/%%GROFF_VERSION%%/tmac/mdoc/ja.eucJP
 share/groff/%%GROFF_VERSION%%/tmac/me.tmac
 share/groff/%%GROFF_VERSION%%/tmac/mm/0.MT
 share/groff/%%GROFF_VERSION%%/tmac/mm/4.MT
@@ -329,9 +361,12 @@ 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/mm.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mmse.tmac
+share/groff/%%GROFF_VERSION%%/tmac/mom.tmac
 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/om.tmac
 share/groff/%%GROFF_VERSION%%/tmac/pic.tmac
 share/groff/%%GROFF_VERSION%%/tmac/ps.tmac
 share/groff/%%GROFF_VERSION%%/tmac/psatk.tmac
@@ -349,15 +384,54 @@ 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
-%%PORTDOCS%%share/doc/jgroff/README
-%%PORTDOCS%%share/doc/jgroff/README.jp
-%%PORTDOCS%%share/doc/jgroff/meintro.me
-%%PORTDOCS%%share/doc/jgroff/meref.me
-%%PORTDOCS%%share/doc/jgroff/pic.ms
-%%PORTDOCS%%@dirrm share/doc/jgroff
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/README.mom
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/elvis_syntax
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/grnexmpl.g
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/grnexmpl.me
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/grnexmpl.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/letter.mom
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/letter.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/macros.mom
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/macros.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/penguin.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typeset.mom
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typeset.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typewrite.mom
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/typewrite.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/webpage.ms
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/examples/webpage.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/appendices.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/cover.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/definitions.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/docelement.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/docprocessing.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/goodies.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/headfootpage.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/inlines.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/intro.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/letters.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/rectoverso.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/reserved.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/toc.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/typemacdoc.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/typesetting.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/html/momdoc/using.html
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meintro.me
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meintro.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meref.me
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/meref.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/pic.ms
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/pic.ps
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/ChangeLog.jp
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/NEWS
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/PROBLEMS
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/README
+%%PORTDOCS%%share/doc/groff/%%GROFF_VERSION%%/README.jp
+%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%/examples
+%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%/html/momdoc
+%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%/html
+%%PORTDOCS%%@dirrm share/doc/groff/%%GROFF_VERSION%%
+%%PORTDOCS%%@dirrm share/doc/groff
 @exec mkdir -p %D/lib/groff/site-tmac
 @dirrm lib/groff/site-tmac
 @dirrm lib/groff
@@ -366,10 +440,9 @@ share/groff/site-tmac/mdoc.local
 @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/devascii8
 @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