Upgrade, 1.09+0.98 -> 1.10+0.99.

Submitted by:	Noritaka Ishizumi <graphite@taurus.bekkoame.or.jp>

3 files changed, 274 insertions, 245 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index f10dbed62036..4ff26a037fd4 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -1,43 +1,25 @@
 # New ports collection makefile for:	jp-groff
-# Version required:	1.09+0.98
+# Version required:	1.10+0.99
 # Date created:		14 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.4 1995/05/29 08:39:34 asami Exp $
+# $Id$
 #
 
-DISTNAME=	groff-1.09
-PKGNAME=	jp-groff-0.98
+DISTNAME=	groff-1.10
+PKGNAME=	jp-groff-0.99
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
+		ftp://prep.ai.mit.edu/pub/gnu/
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	graphite@taurus.bekkoame.or.jp
 
-PATCH_SITES=	ftp://ftp.iij.ad.jp/pub/NetNews/fj.sources/volume95/Apr/
-PATCHFILES=	jgroff-0.98.diff.gz
-DISTPATCHES=	950414.01.Z 950414.02.Z
+PATCH_SITES=	ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
+		ftp://ftp.iij.ad.jp/pub/linux-j/JF/misc/
+PATCHFILES=	jgroff-0.99.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=/usr/local
-
-.if !defined(MASTER_SITE_OVERRIDE)
-pre-fetch: 
-	@(cd ${DISTDIR}; \
-	 if [ ! -f ${PATCHFILES} ]; then \
-	    ${ECHO_MSG} ">> ${PATCHFILES} doesn't seem to exist on this system."; \
-	    for file in ${DISTPATCHES} ; do \
-		for site in ${PATCH_SITES} ; do \
-		    if ${NCFTP} ${NCFTPFLAGS} $${site}$${file}; then \
-			break; \
-		    fi \
-		done; \
-	    done; \
-	    for file in ${DISTPATCHES} ; do zcat $${file}; done | \
-		sed '/^END -----/,/^BEGIN ----/d' | uudecode; \
-	    rm -f ${DISTPATCHES};\
-	 fi)
-.endif
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
index 275c56adac1b..4ed910f07ca9 100644
--- a/japanese/groff/distinfo
+++ b/japanese/groff/distinfo
@@ -1,2 +1,2 @@
-MD5 (groff-1.09.tar.gz) = 759cb03fbccce45ce59478a26325480d
-MD5 (jgroff-0.98.diff.gz) = 84147e01b4c3a30eb05dfe2196972d40
+MD5 (groff-1.10.tar.gz) = cc58a06abafe82ada7c02f0f2b2c8509
+MD5 (jgroff-0.99.diff.gz) = 0055c596a6cb641e3a8e844465e81623
diff --git a/japanese/groff/pkg-plist b/japanese/groff/pkg-plist
index cba95ce18e8d..558368efdee3 100644
--- a/japanese/groff/pkg-plist
+++ b/japanese/groff/pkg-plist
@@ -10,6 +10,8 @@ bin/grops
 bin/grotty
 bin/grodvi
 bin/tfmtodit
+bin/grolj4
+bin/hpftodit
 bin/grefer
 bin/glookbib
 bin/gindxbib
@@ -31,6 +33,8 @@ man/man1/grops.1.gz
 man/man1/grotty.1.gz
 man/man1/grodvi.1.gz
 man/man1/tfmtodit.1.gz
+man/man1/grolj4.1.gz
+man/man1/hpftodit.1.gz
 man/man1/grefer.1.gz
 man/man1/glookbib.1.gz
 man/man1/gindxbib.1.gz
@@ -44,223 +48,266 @@ man/man5/groff_out.5.gz
 man/man7/groff_char.7.gz
 man/man7/groff_ms.7.gz
 man/man7/me.7.gz
+man/man7/msafer.7.gz
 man/man1/afmtodit.1.gz
 man/man1/grog.1.gz
 man/man1/gnroff.1.gz
 man/man7/groff_mm.7.gz
 man/man7/groff_mmse.7.gz
 @mode 444
-lib/groff/tmac/hyphen.us
-lib/groff/tmac/tmac.an
-lib/groff/tmac/tmac.andoc
-lib/groff/tmac/tmac.pic
-lib/groff/tmac/tmac.ps
-lib/groff/tmac/tmac.psnew
-lib/groff/tmac/tmac.psold
-lib/groff/tmac/tmac.pspic
-lib/groff/tmac/tmac.psatk
-lib/groff/tmac/tmac.dvi
-lib/groff/tmac/tmac.tty
-lib/groff/tmac/tmac.tty-char
-lib/groff/tmac/tmac.X
-lib/groff/tmac/tmac.Xps
-lib/groff/tmac/tmac.latin1
-lib/groff/tmac/eqnrc
-lib/groff/tmac/troffrc
-lib/groff/tmac/tmac.gs
-lib/groff/tmac/tmac.e
-lib/groff/tmac/tmac.doc
-lib/groff/tmac/tmac.doc.old
-lib/groff/tmac/mdoc/doc-common
-lib/groff/tmac/mdoc/doc-ditroff
-lib/groff/tmac/mdoc/doc-nroff
-lib/groff/tmac/mdoc/doc-syms
-lib/groff/tmac/man.local
-lib/groff/tmac/tmac.gm
-lib/groff/tmac/tmac.gmse
-lib/groff/tmac/mm/0.MT
-lib/groff/tmac/mm/5.MT
-lib/groff/tmac/mm/4.MT
-lib/groff/tmac/mm/ms.cov
-lib/groff/tmac/mm/se_ms.cov
-lib/groff/tmac/mm/locale
-lib/groff/tmac/mm/se_locale
-lib/groff/eign
-lib/groff/font/devnippon/R
-lib/groff/font/devnippon/I
-lib/groff/font/devnippon/B
-lib/groff/font/devnippon/BI
-lib/groff/font/devnippon/M
-lib/groff/font/devnippon/G
-lib/groff/font/devnippon/DESC
-lib/groff/font/devps/generate/Makefile
-lib/groff/font/devps/generate/afmname
-lib/groff/font/devps/generate/dingbatsmap
-lib/groff/font/devps/generate/dingbatsrmap
-lib/groff/font/devps/generate/lgreekmap
-lib/groff/font/devps/generate/symbol.sed
-lib/groff/font/devps/generate/symbolchars
-lib/groff/font/devps/generate/symbolsl.afm
-lib/groff/font/devps/generate/textmap
-lib/groff/font/devps/DESC
-lib/groff/font/devps/prologue
-lib/groff/font/devps/symbolsl.pfa
-lib/groff/font/devps/zapfdr.pfa
-lib/groff/font/devps/text.enc
-lib/groff/font/devps/download
-lib/groff/font/devps/S
-lib/groff/font/devps/ZD
-lib/groff/font/devps/ZDR
-lib/groff/font/devps/SS
-lib/groff/font/devps/AB
-lib/groff/font/devps/ABI
-lib/groff/font/devps/AI
-lib/groff/font/devps/AR
-lib/groff/font/devps/BMB
-lib/groff/font/devps/BMBI
-lib/groff/font/devps/BMI
-lib/groff/font/devps/BMR
-lib/groff/font/devps/CB
-lib/groff/font/devps/CBI
-lib/groff/font/devps/CI
-lib/groff/font/devps/CR
-lib/groff/font/devps/HB
-lib/groff/font/devps/HBI
-lib/groff/font/devps/HI
-lib/groff/font/devps/HR
-lib/groff/font/devps/HNB
-lib/groff/font/devps/HNBI
-lib/groff/font/devps/HNI
-lib/groff/font/devps/HNR
-lib/groff/font/devps/NB
-lib/groff/font/devps/NBI
-lib/groff/font/devps/NI
-lib/groff/font/devps/NR
-lib/groff/font/devps/PB
-lib/groff/font/devps/PBI
-lib/groff/font/devps/PI
-lib/groff/font/devps/PR
-lib/groff/font/devps/TB
-lib/groff/font/devps/TBI
-lib/groff/font/devps/TI
-lib/groff/font/devps/TR
-lib/groff/font/devps/ZCMI
-lib/groff/font/devps/M
-lib/groff/font/devps/G
-lib/groff/font/devdvi/generate/CompileFonts
-lib/groff/font/devdvi/generate/Makefile
-lib/groff/font/devdvi/generate/msam.map
-lib/groff/font/devdvi/generate/msbm.map
-lib/groff/font/devdvi/generate/texb.map
-lib/groff/font/devdvi/generate/texex.map
-lib/groff/font/devdvi/generate/texi.map
-lib/groff/font/devdvi/generate/texmi.map
-lib/groff/font/devdvi/generate/texr.map
-lib/groff/font/devdvi/generate/texsy.map
-lib/groff/font/devdvi/generate/textt.map
-lib/groff/font/devdvi/DESC
-lib/groff/font/devdvi/R
-lib/groff/font/devdvi/I
-lib/groff/font/devdvi/B
-lib/groff/font/devdvi/BI
-lib/groff/font/devdvi/CW
-lib/groff/font/devdvi/MI
-lib/groff/font/devdvi/S
-lib/groff/font/devdvi/EX
-lib/groff/font/devdvi/H
-lib/groff/font/devdvi/HI
-lib/groff/font/devdvi/HB
-lib/groff/font/devdvi/SA
-lib/groff/font/devdvi/SB
-lib/groff/font/devdvi/M
-lib/groff/font/devdvi/G
-lib/groff/font/devascii/R
-lib/groff/font/devascii/I
-lib/groff/font/devascii/B
-lib/groff/font/devascii/BI
-lib/groff/font/devascii/DESC
-lib/groff/font/devlatin1/R
-lib/groff/font/devlatin1/I
-lib/groff/font/devlatin1/B
-lib/groff/font/devlatin1/BI
-lib/groff/font/devlatin1/DESC
-lib/groff/font/devX75/DESC
-lib/groff/font/devX75/TR
-lib/groff/font/devX75/TI
-lib/groff/font/devX75/TB
-lib/groff/font/devX75/TBI
-lib/groff/font/devX75/CR
-lib/groff/font/devX75/CI
-lib/groff/font/devX75/CB
-lib/groff/font/devX75/CBI
-lib/groff/font/devX75/HR
-lib/groff/font/devX75/HI
-lib/groff/font/devX75/HB
-lib/groff/font/devX75/HBI
-lib/groff/font/devX75/NR
-lib/groff/font/devX75/NI
-lib/groff/font/devX75/NB
-lib/groff/font/devX75/NBI
-lib/groff/font/devX75/S
-lib/groff/font/devX75/M
-lib/groff/font/devX75/G
-lib/groff/font/devX75-12/DESC
-lib/groff/font/devX75-12/TR
-lib/groff/font/devX75-12/TI
-lib/groff/font/devX75-12/TB
-lib/groff/font/devX75-12/TBI
-lib/groff/font/devX75-12/CR
-lib/groff/font/devX75-12/CI
-lib/groff/font/devX75-12/CB
-lib/groff/font/devX75-12/CBI
-lib/groff/font/devX75-12/HR
-lib/groff/font/devX75-12/HI
-lib/groff/font/devX75-12/HB
-lib/groff/font/devX75-12/HBI
-lib/groff/font/devX75-12/NR
-lib/groff/font/devX75-12/NI
-lib/groff/font/devX75-12/NB
-lib/groff/font/devX75-12/NBI
-lib/groff/font/devX75-12/S
-lib/groff/font/devX75-12/M
-lib/groff/font/devX75-12/G
-lib/groff/font/devX100/DESC
-lib/groff/font/devX100/TR
-lib/groff/font/devX100/TI
-lib/groff/font/devX100/TB
-lib/groff/font/devX100/TBI
-lib/groff/font/devX100/CR
-lib/groff/font/devX100/CI
-lib/groff/font/devX100/CB
-lib/groff/font/devX100/CBI
-lib/groff/font/devX100/HR
-lib/groff/font/devX100/HI
-lib/groff/font/devX100/HB
-lib/groff/font/devX100/HBI
-lib/groff/font/devX100/NR
-lib/groff/font/devX100/NI
-lib/groff/font/devX100/NB
-lib/groff/font/devX100/NBI
-lib/groff/font/devX100/S
-lib/groff/font/devX100/M
-lib/groff/font/devX100/G
-lib/groff/font/devX100-12/DESC
-lib/groff/font/devX100-12/TR
-lib/groff/font/devX100-12/TI
-lib/groff/font/devX100-12/TB
-lib/groff/font/devX100-12/TBI
-lib/groff/font/devX100-12/CR
-lib/groff/font/devX100-12/CI
-lib/groff/font/devX100-12/CB
-lib/groff/font/devX100-12/CBI
-lib/groff/font/devX100-12/HR
-lib/groff/font/devX100-12/HI
-lib/groff/font/devX100-12/HB
-lib/groff/font/devX100-12/HBI
-lib/groff/font/devX100-12/NR
-lib/groff/font/devX100-12/NI
-lib/groff/font/devX100-12/NB
-lib/groff/font/devX100-12/NBI
-lib/groff/font/devX100-12/S
-lib/groff/font/devX100-12/M
-lib/groff/font/devX100-12/G
+share/groff/eign
+share/groff/tmac/hyphen.us
+share/groff/tmac/tmac.an
+share/groff/tmac/tmac.andoc
+share/groff/tmac/tmac.pic
+share/groff/tmac/tmac.ps
+share/groff/tmac/tmac.psnew
+share/groff/tmac/tmac.psold
+share/groff/tmac/tmac.pspic
+share/groff/tmac/tmac.psatk
+share/groff/tmac/tmac.dvi
+share/groff/tmac/tmac.tty
+share/groff/tmac/tmac.tty-char
+share/groff/tmac/tmac.X
+share/groff/tmac/tmac.Xps
+share/groff/tmac/tmac.latin1
+share/groff/tmac/tmac.lj4
+share/groff/tmac/eqnrc
+share/groff/tmac/troffrc
+share/groff/tmac/tmac.s
+share/groff/tmac/tmac.safer
+share/groff/tmac/tmac.e
+share/groff/tmac/tmac.doc
+share/groff/tmac/tmac.doc.old
+share/groff/tmac/man.local
+share/groff/tmac/tmac.m
+share/groff/tmac/tmac.mse
+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/mm/0.MT
+share/groff/tmac/mm/5.MT
+share/groff/tmac/mm/4.MT
+share/groff/tmac/mm/ms.cov
+share/groff/tmac/mm/se_ms.cov
+share/groff/tmac/mm/locale
+share/groff/tmac/mm/se_locale
+share/groff/font/devnippon/R
+share/groff/font/devnippon/I
+share/groff/font/devnippon/B
+share/groff/font/devnippon/BI
+share/groff/font/devnippon/M
+share/groff/font/devnippon/G
+share/groff/font/devnippon/DESC
+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/DESC
+share/groff/font/devps/prologue
+share/groff/font/devps/symbolsl.pfa
+share/groff/font/devps/zapfdr.pfa
+share/groff/font/devps/text.enc
+share/groff/font/devps/download
+share/groff/font/devps/S
+share/groff/font/devps/ZD
+share/groff/font/devps/ZDR
+share/groff/font/devps/SS
+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/HB
+share/groff/font/devps/HBI
+share/groff/font/devps/HI
+share/groff/font/devps/HR
+share/groff/font/devps/HNB
+share/groff/font/devps/HNBI
+share/groff/font/devps/HNI
+share/groff/font/devps/HNR
+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/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/M
+share/groff/font/devps/G
+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/DESC
+share/groff/font/devdvi/R
+share/groff/font/devdvi/I
+share/groff/font/devdvi/B
+share/groff/font/devdvi/BI
+share/groff/font/devdvi/CW
+share/groff/font/devdvi/MI
+share/groff/font/devdvi/S
+share/groff/font/devdvi/EX
+share/groff/font/devdvi/H
+share/groff/font/devdvi/HI
+share/groff/font/devdvi/HB
+share/groff/font/devdvi/SA
+share/groff/font/devdvi/SB
+share/groff/font/devdvi/M
+share/groff/font/devdvi/G
+share/groff/font/devascii/R
+share/groff/font/devascii/I
+share/groff/font/devascii/B
+share/groff/font/devascii/BI
+share/groff/font/devascii/DESC
+share/groff/font/devlatin1/R
+share/groff/font/devlatin1/I
+share/groff/font/devlatin1/B
+share/groff/font/devlatin1/BI
+share/groff/font/devlatin1/DESC
+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/devX75/DESC
+share/groff/font/devX75/TR
+share/groff/font/devX75/TI
+share/groff/font/devX75/TB
+share/groff/font/devX75/TBI
+share/groff/font/devX75/CR
+share/groff/font/devX75/CI
+share/groff/font/devX75/CB
+share/groff/font/devX75/CBI
+share/groff/font/devX75/HR
+share/groff/font/devX75/HI
+share/groff/font/devX75/HB
+share/groff/font/devX75/HBI
+share/groff/font/devX75/NR
+share/groff/font/devX75/NI
+share/groff/font/devX75/NB
+share/groff/font/devX75/NBI
+share/groff/font/devX75/S
+share/groff/font/devX75/M
+share/groff/font/devX75/G
+share/groff/font/devX75-12/DESC
+share/groff/font/devX75-12/TR
+share/groff/font/devX75-12/TI
+share/groff/font/devX75-12/TB
+share/groff/font/devX75-12/TBI
+share/groff/font/devX75-12/CR
+share/groff/font/devX75-12/CI
+share/groff/font/devX75-12/CB
+share/groff/font/devX75-12/CBI
+share/groff/font/devX75-12/HR
+share/groff/font/devX75-12/HI
+share/groff/font/devX75-12/HB
+share/groff/font/devX75-12/HBI
+share/groff/font/devX75-12/NR
+share/groff/font/devX75-12/NI
+share/groff/font/devX75-12/NB
+share/groff/font/devX75-12/NBI
+share/groff/font/devX75-12/S
+share/groff/font/devX75-12/M
+share/groff/font/devX75-12/G
+share/groff/font/devX100/DESC
+share/groff/font/devX100/TR
+share/groff/font/devX100/TI
+share/groff/font/devX100/TB
+share/groff/font/devX100/TBI
+share/groff/font/devX100/CR
+share/groff/font/devX100/CI
+share/groff/font/devX100/CB
+share/groff/font/devX100/CBI
+share/groff/font/devX100/HR
+share/groff/font/devX100/HI
+share/groff/font/devX100/HB
+share/groff/font/devX100/HBI
+share/groff/font/devX100/NR
+share/groff/font/devX100/NI
+share/groff/font/devX100/NB
+share/groff/font/devX100/NBI
+share/groff/font/devX100/S
+share/groff/font/devX100/M
+share/groff/font/devX100/G
+share/groff/font/devX100-12/DESC
+share/groff/font/devX100-12/TR
+share/groff/font/devX100-12/TI
+share/groff/font/devX100-12/TB
+share/groff/font/devX100-12/TBI
+share/groff/font/devX100-12/CR
+share/groff/font/devX100-12/CI
+share/groff/font/devX100-12/CB
+share/groff/font/devX100-12/CBI
+share/groff/font/devX100-12/HR
+share/groff/font/devX100-12/HI
+share/groff/font/devX100-12/HB
+share/groff/font/devX100-12/HBI
+share/groff/font/devX100-12/NR
+share/groff/font/devX100-12/NI
+share/groff/font/devX100-12/NB
+share/groff/font/devX100-12/NBI
+share/groff/font/devX100-12/S
+share/groff/font/devX100-12/M
+share/groff/font/devX100-12/G