1) Install up-to-date tmac suite from recent 4-STABLE live-tree

   instead of copying unknown stock versions from /usr/share/tmac.

Submitted by: Yoshisato Yanagisawa <Yoshisato.Yanagisawa@is.titech.ac.jp>,
              Kazuo Horikawa <horikawa@psinet.com>
          at: [man-jp 3155], [man-jp 3158]

2) Read mdoc localization file not only in localized tty mode
   but in all troff mode.  This tweak avoids the problem that
   headers and footers are not displayed for translated manual
   pages when troff output device was a non typewriter-like one.

Submitted by: MORI Kouji <moriko@hh.iij4u.or.jp> at: [man-jp 2723]

Obey %%PORTDOCS%%.  Increment PORTREVISION.

5 files changed, 56 insertions, 98 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index ed272f949dd8..edbdbeb4a3be 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -7,11 +7,13 @@
 
 PORTNAME=	groff
 PORTVERSION=	0.100
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	groff
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	groff okazaki/groff
 DISTNAME=	${PORTNAME}-1.15
+DISTFILES=	${DISTNAME}.tar.gz ${TMAC_DISTNAME}.tar.gz
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR= okazaki
@@ -20,6 +22,9 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@FreeBSD.org
 
+TMAC_DATE=	20010207
+TMAC_DISTNAME=	tmac-${TMAC_DATE}
+
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
 
@@ -29,9 +34,8 @@ CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_MAN="${INSTALL_MAN}"
-PLIST_SUB=	PORTDOCDIR="${PORTDOCDIR}"
 
-TMACBASE=	/usr/share/tmac
+TMACBASE=	${WRKDIR}/${TMAC_DISTNAME}
 TMACDIR=	share/groff/tmac
 MDOCDIR=	${TMACDIR}/mdoc
 LOCALEDIR=	${MDOCDIR}/locale
@@ -52,35 +56,21 @@ 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.an tmac.andoc tmac.orig_me tmac.vgrind \
-		eqnrc troffrc
-.if exists(${TMACBASE}/tmac.groff_an)
-PLIST_SUB+=	TMAC_GROFF_AN:=""
-TMACFILES+=	tmac.groff_an
-.else
-PLIST_SUB+=	TMAC_GROFF_AN:="@comment "
-.endif
-MDOCFILES=	doc-common doc-syms
+TMACFILES=	tmac.X tmac.a4 \
+		tmac.an 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
 
 DOCUMENTS=	ChangeLog.jp NEWS PROBLEMS README README.jp \
 		doc/meintro.me doc/meref.me doc/pic.ms
 
-.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
-
 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% !,;'
 
@@ -99,18 +89,18 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MAKE} install-documents
 .endif
-	${CP} -p ${TMACFILES:S|^|${TMACBASE}/|g} ${PREFIX}/${TMACDIR}
-	${CP} -p ${MDOCFILES:S|^|${TMACBASE}/mdoc/|g} ${PREFIX}/${MDOCDIR}
+.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}
-	${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
-.if defined(PERL_ARGS) && !empty(PERL_ARGS)
-	${PERL} -pi ${PERL_ARGS} ${TMPPLIST}
-.endif
+.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
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index 7fc601f98e6c..41d01f5832b7 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -1,2 +1,3 @@
 MD5 (groff-1.15.tar.gz) = 0c87c54b39a71da4ad92a67f13b740a2
+MD5 (tmac-20010207.tar.gz) = 2a89dfdd435e419c3a2d25b3d89ec838
 MD5 (groff-1.15-jgroff-0.100-pl1.diff.gz) = 6bfa9ec3a3dee8dca3a4f2cf930e8cd9
diff --git a/japanese/groff/files/locale-list b/japanese/groff/files/locale-list
index 0beba8a5ae35..18232ab9cb02 100644
--- a/japanese/groff/files/locale-list
+++ b/japanese/groff/files/locale-list
@@ -30,3 +30,9 @@
 .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-ai b/japanese/groff/files/patch-ai
deleted file mode 100644
index 5a8639baa2e6..000000000000
--- a/japanese/groff/files/patch-ai
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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/pkg-plist b/japanese/groff/pkg-plist
index d35e970667df..41c7c5954abe 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -308,6 +308,7 @@ 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.andoc
 share/groff/tmac/tmac.arkup
@@ -315,11 +316,17 @@ share/groff/tmac/tmac.doc
 share/groff/tmac/tmac.doc.old
 share/groff/tmac/tmac.dvi
 share/groff/tmac/tmac.e
-%%TMAC_GROFF_AN:%%share/groff/tmac/tmac.groff_an
 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
@@ -330,19 +337,21 @@ 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
-%%PORTDOCDIR%%/ChangeLog.jp
-%%PORTDOCDIR%%/NEWS
-%%PORTDOCDIR%%/PROBLEMS
-%%PORTDOCDIR%%/README
-%%PORTDOCDIR%%/README.jp
-%%PORTDOCDIR%%/meintro.me
-%%PORTDOCDIR%%/meref.me
-%%PORTDOCDIR%%/pic.ms
-@dirrm %%PORTDOCDIR%%
+share/groff/tmac/troffrc-end
+%%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
 @dirrm share/groff/font/devascii
 @dirrm share/groff/font/devdvi/generate
 @dirrm share/groff/font/devdvi