Adapt this package to NetBSD.

15 files changed, 402 insertions, 563 deletions

diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 2917de953cf..b754b2274a9 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -1,55 +1,21 @@
-# New ports collection makefile for:	ja-groff
-# Version required:	1.10+0.99
-# Date created:		14 April 1995
-# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $Id: Makefile,v 1.1.1.1 1999/06/08 09:29:17 sakamoto Exp $
-#
+# $NetBSD: Makefile,v 1.2 1999/06/08 09:35:20 sakamoto Exp $
+# FreeBSD Id: Makefile,v 1.15 1999/01/27 07:41:16 fenner Exp $
 
 DISTNAME=	groff-1.10
 PKGNAME=	ja-groff-0.99
 CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	groff
+MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
 PATCH_SITES=	ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
 		ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/
 PATCHFILES=	jgroff-0.99.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	graphite@jp.freebsd.org
+MAINTAINER=	sakamoto@netbsd.org
+HOMEPAGE=	http://www.gnu.org/software/groff/groff.html
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O"
 
-DESCS=		${WRKSRC}/devnippon/DESC.proto ${WRKSRC}/devps/DESC.in
-
-#for not writing "/usr/local" explicitly in the patch
-post-patch:
-	@for f in ${DESCS}; do \
-	  /bin/mv -f $${f} $${f}.tmp; \
-	  ${SED} -e '$$d' $${f}.tmp > $${f}; \
-	  case $${f} in \
-  	    */devnippon/*) \
-		${ECHO} "postpro ${PREFIX}/bin/grotty" >> $${f}; \
-		;; \
-	    */devps/*) \
-		${ECHO} "postpro ${PREFIX}/bin/grops" >> $${f}; \
-		;; \
-	  esac; \
-	done
-
-post-install:
-	@${CP} -p /usr/share/tmac/tmac.an ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.andoc ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.groff_an ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.orig_me ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/tmac.vgrind ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/eqnrc ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/hyphen.us-ru ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/troffrc ${PREFIX}/share/groff/tmac
-	@${CP} -p /usr/share/tmac/mdoc/doc-common ${PREFIX}/share/groff/tmac/mdoc
-	@${CP} -p /usr/share/tmac/mdoc/doc-syms ${PREFIX}/share/groff/tmac/mdoc
-	@/usr/bin/patch -d ${PREFIX}/share/groff/tmac < ${FILESDIR}/rc.diff
-
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/groff/files/md5 b/japanese/groff/files/md5
index 4ed910f07ca..4950978100e 100644
--- a/japanese/groff/files/md5
+++ b/japanese/groff/files/md5
@@ -1,2 +1,4 @@
+$NetBSD: md5,v 1.2 1999/06/08 09:35:20 sakamoto Exp $
+
 MD5 (groff-1.10.tar.gz) = cc58a06abafe82ada7c02f0f2b2c8509
 MD5 (jgroff-0.99.diff.gz) = 0055c596a6cb641e3a8e844465e81623
diff --git a/japanese/groff/files/rc.diff b/japanese/groff/files/rc.diff
deleted file mode 100644
index 1bb111dacb8..00000000000
--- a/japanese/groff/files/rc.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- tmac/eqnrc.orig	Tue Mar 25 23:40:57 1997
-+++ tmac/eqnrc	Fri May  2 23:37:04 1997
-@@ -51,6 +51,7 @@
- ifdef ascii ! define n %1% !
- ifdef latin1 ! define n %1% !
- ifdef koi8-r ! define n %1% !
-+ifdef nippon ! define n %1% !
- ifdef n !
- set nroff 1
- !
---- tmac/troffrc.orig	Tue Mar 25 23:40:57 1997
-+++ tmac/troffrc	Fri May  2 23:37:43 1997
-@@ -13,6 +13,7 @@
- .do ds troffrc!ascii tmac.tty
- .do ds troffrc!latin1 tmac.tty
- .do ds troffrc!koi8-r tmac.tty
-+.do ds troffrc!nippon tmac.tty
- .do ds troffrc!lj4 tmac.lj4
- .do if d troffrc!\*[.T] \
- .	do mso \*[troffrc!\*[.T]]
diff --git a/japanese/groff/patches/patch-aa b/japanese/groff/patches/patch-aa
index 13fb6381377..78a033eda78 100644
--- a/japanese/groff/patches/patch-aa
+++ b/japanese/groff/patches/patch-aa
@@ -1,59 +1,4 @@
---- Makefile.comm.orig	Tue Jun 27 20:08:27 1995
-+++ Makefile.comm	Tue Mar 26 22:05:36 1996
-@@ -137,44 +137,47 @@
- 	for p in $$pages; do \
- 	 prog=`basename $$p .n`; \
- 	 target=$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
--	 rm -f $$target; \
-+	 rm -f $$target.gz; \
- 	 echo $(INSTALL_DATA) $$p $$target; \
- 	 $(INSTALL_DATA) $$p $$target; \
-+	 gzip -9n $$target ; \
- 	done
- 	-test -d $(man5dir) || mkdir $(man5dir)
- 	@-pages="$(MAN5)"; \
- 	for p in $$pages; do \
- 	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
--	 rm -f $$target; \
-+	 rm -f $$target.gz; \
- 	 echo $(INSTALL_DATA) $$p $$target; \
- 	 $(INSTALL_DATA) $$p $$target; \
-+	 gzip -9n $$target ; \
- 	done
- 	-test -d $(man7dir) || mkdir $(man7dir)
- 	@-pages="$(MAN7)"; \
- 	for p in $$pages; do \
- 	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
--	 rm -f $$target; \
-+	 rm -f $$target.gz; \
- 	 echo $(INSTALL_DATA) $$p $$target; \
- 	 $(INSTALL_DATA) $$p $$target; \
-+	 gzip -9n $$target ; \
- 	done
- 
- .PHONY: uninstall_man
- uninstall_man:
- 	@-pages="$(MAN1)"; \
- 	for p in $$pages; do \
--	 target=$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext); \
-+	 target=$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext).gz; \
- 	 echo rm -f $$target; \
- 	 rm -f $$target; \
- 	done
- 	@-pages="$(MAN5)"; \
- 	for p in $$pages; do \
--	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
-+	 target=$(man5dir)/`basename $$p .n`.$(man5ext).gz; \
- 	 echo rm -f $$target; \
- 	 rm -f $$target; \
- 	done
- 	@-pages="$(MAN7)"; \
- 	for p in $$pages; do \
--	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
-+	 target=$(man7dir)/`basename $$p .n`.$(man7ext).gz; \
- 	 echo rm -f $$target; \
- 	 rm -f $$target; \
- 	done
+$NetBSD: patch-aa,v 1.2 1999/06/08 09:35:20 sakamoto Exp $
 --- afmtodit/Makefile.sub.orig	Wed Oct 28 21:48:22 1992
 +++ afmtodit/Makefile.sub	Tue Mar 26 22:38:08 1996
 @@ -15,7 +15,7 @@
@@ -83,7 +28,7 @@
  	-test -d $(bindir) || mkdir $(bindir)
  	-rm -f $(bindir)/grog
 -	$(INSTALL_PROGRAM) grog $(bindir)/grog
-+	$(INSTALL) -m 555 grog $(bindir)/grog
++	$(INSTALL) -m 555 grog $(bindir)/$(NAMEPREFIX)grog
  
  uninstall_sub:
  	-rm -f $(bindir)/grog
@@ -98,16 +43,6 @@
  
  uninstall_sub:
  	-rm -f $(bindir)/$(NAMEPREFIX)nroff
---- Makefile.in.orig	Wed Mar 27 02:35:00 1996
-+++ Makefile.in	Wed Mar 27 02:48:42 1996
-@@ -240,6 +240,7 @@
-   "CCFLAGS=$(CCFLAGS)" "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" \
-   "YACC=$(YACC)" "YACCFLAGS=$(YACCFLAGS)" \
-   "LIBS=$(LIBS)" "LIBOBJS=$(LIBOBJS)" "RANLIB=$(RANLIB)" "AR=$(AR)" \
-+  "INSTALL=$(INSTALL)" \
-   "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_DATA=$(INSTALL_DATA)" \
-   "ETAGS=$(ETAGS)" "ETAGSFLAGS=$(ETAGSFLAGS)" "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
-   "PERLPATH=$(PERLPATH)" "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
 --- configure.orig	Mon Nov 20 20:36:05 1995
 +++ configure	Sat Mar 30 00:54:44 1996
 @@ -1904,7 +1904,7 @@
@@ -115,7 +50,7 @@
  else
  	echo "$ac_t""no" 1>&6
 -	g=
-+	g=g
++	g=jg
  fi
  
  
diff --git a/japanese/groff/patches/patch-ab b/japanese/groff/patches/patch-ab
new file mode 100644
index 00000000000..99ff3508cca
--- /dev/null
+++ b/japanese/groff/patches/patch-ab
@@ -0,0 +1,34 @@
+$NetBSD: patch-ab,v 1.1 1999/06/08 09:35:20 sakamoto Exp $
+--- Makefile.in.orig	Fri May 28 16:26:33 1999
++++ Makefile.in	Fri May 28 16:34:14 1999
+@@ -175,7 +175,21 @@
+ # -DHAVE_STRUCT_EXCEPTION	if <math.h> defines struct exception
+ # -DRETSIGTYPE=int		if signal handlers return int not void	
+ # -DNIPPON			enable japanese extention
+-DEFINES=@DEFS@
++DEFINES= -DHAVE_UNISTD_H=1 \
++	-DHAVE_DIRENT_H=1 \
++	-DHAVE_LIMITS_H=1 \
++	-DHAVE_STDLIB_H=1 \
++	-DHAVE_SYS_DIR_H=1 \
++	-DHAVE_CC_LIMITS_H=1 \
++	-DHAVE_CC_UNISTD_H=1 \
++	-DUNISTD_H_DECLARES_GETOPT=1 \
++	-DSTDLIB_H_DECLARES_PUTENV=1 \
++	-DRETSIGTYPE=void \
++	-DHAVE_MMAP=1 \
++	-DHAVE_RENAME=1 \
++	-DHAVE_MKSTEMP=1 \
++	-DHAVE_SYS_SIGLIST=1 \
++	-DNIPPON=1
+ 
+ # Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o  in LIBOBJS if
+ # your C library is missing the corresponding function.
+@@ -240,6 +254,7 @@
+   "CCFLAGS=$(CCFLAGS)" "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" \
+   "YACC=$(YACC)" "YACCFLAGS=$(YACCFLAGS)" \
+   "LIBS=$(LIBS)" "LIBOBJS=$(LIBOBJS)" "RANLIB=$(RANLIB)" "AR=$(AR)" \
++  "INSTALL=$(INSTALL)" \
+   "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_DATA=$(INSTALL_DATA)" \
+   "ETAGS=$(ETAGS)" "ETAGSFLAGS=$(ETAGSFLAGS)" "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
+   "PERLPATH=$(PERLPATH)" "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
diff --git a/japanese/groff/patches/patch-ac b/japanese/groff/patches/patch-ac
index 2890cbc0599..48cb8fa26d6 100644
--- a/japanese/groff/patches/patch-ac
+++ b/japanese/groff/patches/patch-ac
@@ -1,159 +1,11 @@
---- tmac/doc-ditroff.orig	Thu Feb 17 01:55:54 1994
-+++ tmac/doc-ditroff	Fri May  2 01:53:41 1997
-@@ -240,33 +240,58 @@
- '       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
-+.	ie "\\$1"名称" \{\
-+.		hK
-+'		in 0
- .	\}
--.       if "\\$1"DESCRIPTION" \{\
--.		nr fY 0
--.		nr fZ 0
--.		nr fB 0
--.		nr Fb 0
--.		ds Fb
-+.	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"書式" \{\
-+.			na
-+.			nr nS 1
-+.		\}
-+.	       if "\\$1"DESCRIPTION" \{\
-+.			nr fY 0
-+.			nr fZ 0
-+.			nr fB 0
-+.			nr Fb 0
-+.			ds Fb
-+.		\}
-+.	       if "\\$1"解説" \{\
-+.			nr fY 0
-+.			nr fZ 0
-+.			nr fB 0
-+.			nr Fb 0
-+.			ds Fb
-+.		\}
-+.       	if "\\$1"SEE" \{\
-+.               	nr nA 1
-+.	               na
-+.       	\}
-+.       	if "\\$1"関連項目" \{\
-+.               	nr nA 1
-+.	               na
-+.       	\}
-+.		if "\\$1"FILES" .nr nF 1
-+.		if "\\$1"関連ファイル" .nr nF 1
-+.       	if "\\$1"STANDARDS" .nr nT 1
-+.       	if "\\$1"規格" .nr nT 1
-+.		if "\\$1"AUTHORS" .nr nY 1
-+.		if "\\$1"作者" .nr nY 1
-+.		if "\\$1"SEE" .nr sE 1
-+.		if "\\$1"関連項目" .nr sE 1
-+.		in 0
-+.       	nr aN 0
- .	\}
--.       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
--.       in 0
--.       nr aN 0
- .\}
- .pL
- 'sp
---- tmac/doc-nroff.orig	Sat Jan  4 21:39:20 1992
-+++ tmac/doc-nroff	Fri May  2 01:53:48 1997
-@@ -190,26 +190,44 @@
- '       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
-+.	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"関連項目" .nr nA 1
-+.       	if "\\$1"FILES" .nr nF 1
-+.       	if "\\$1"関連ファイル" .nr nF 1
-+.       	if "\\$1"STANDARDS" .nr nT 1
-+.       	if "\\$1"規格" .nr nT 1
-+.       	if "\\$1"SYNOPSIS" .nr nS 1
-+.       	if "\\$1"書式" .nr nS 1
-+.       	if "\\$1"DESCRIPTION" \{\
-+.               	rr fB
-+.               	rr Fb
-+.               	ds Fb
-+.               	nr fY 0
-+.               	nr fZ 0
-+.       	\}
-+.       	if "\\$1"解説" \{\
-+.               	rr fB
-+.               	rr Fb
-+.               	ds Fb
-+.               	nr fY 0
-+.               	nr fZ 0
-+.       	\}
-+.		if "\\$1"AUTHORS" .nr nY 1
-+.		if "\\$1"作者" .nr nY 1
-+.       	in 0
- .       \}
--.	if "\\$1"AUTHORS" .nr nY 1
--.       in 0
- .\}
- .pL
- 'sp
-@@ -221,5 +239,6 @@
- \&\fP\s0\&
- .in \\n(.iu+\\n(Tiu
- .if "\\$1"SEE" .nr sE 1
-+.if "\\$1"関連項目" .nr sE 1
- .ns
- ..
+$NetBSD: patch-ac,v 1.2 1999/06/08 09:35:21 sakamoto Exp $
+--- troff/env.cc.orig	Fri May 28 14:52:15 1999
++++ troff/env.cc	Fri May 28 15:00:12 1999
+@@ -765,7 +765,6 @@
+ #endif /* WIDOW_CONTROL */
+   hyphen_line_max(e->hyphen_line_max),
+   hyphen_line_count(0),
+-  met_with_kword_space(0),
+   hyphenation_space(e->hyphenation_space),
+   hyphenation_margin(e->hyphenation_margin),
+   composite(0)
diff --git a/japanese/groff/patches/patch-ad b/japanese/groff/patches/patch-ad
new file mode 100644
index 00000000000..b7dfad96f2e
--- /dev/null
+++ b/japanese/groff/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- Makefile.comm.orig	Tue Jun 27 20:08:27 1995
++++ Makefile.comm	Fri May 28 16:10:13 1999
+@@ -44,7 +44,7 @@
+ CLEANFILES=$(LIBCLEAN)
+ DISTCLEANFILES=TAGS Makefile
+ REALCLEANFILES=$(YTABC) $(YTABH)
+-NAMEPREFIX=
++NAMEPREFIX=j
+ HDRS=
+ MANPAGES=$(MAN1) $(MAN5) $(MAN7)
+ MANCLEAN=$(MANPAGES)
diff --git a/japanese/groff/patches/patch-ae b/japanese/groff/patches/patch-ae
new file mode 100644
index 00000000000..06044e4bc85
--- /dev/null
+++ b/japanese/groff/patches/patch-ae
@@ -0,0 +1,9 @@
+$NetBSD: patch-ae,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- nroff/nroff.sh.orig	Fri May 28 17:03:23 1999
++++ nroff/nroff.sh	Fri May 28 18:24:04 1999
+@@ -58,4 +58,4 @@
+ 
+ # This shell script is intended for use with man, so warnings are
+ # probably not wanted.  Also load nroff-style character definitions.
+-exec groff -Wall -mtty-char $T $opts ${1+"$@"}
++exec jgroff -Wall -mtty-char $T $opts ${1+"$@"}
diff --git a/japanese/groff/patches/patch-af b/japanese/groff/patches/patch-af
new file mode 100644
index 00000000000..c48a38c7291
--- /dev/null
+++ b/japanese/groff/patches/patch-af
@@ -0,0 +1,9 @@
+$NetBSD: patch-af,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- devascii/DESC.proto.orig	Wed Jul 29 22:32:04 1992
++++ devascii/DESC.proto	Mon May 31 14:38:42 1999
+@@ -5,4 +5,4 @@
+ sizes 10 0
+ fonts 4 R I B BI
+ tcommand
+-postpro grotty
++postpro jgrotty
diff --git a/japanese/groff/patches/patch-ag b/japanese/groff/patches/patch-ag
new file mode 100644
index 00000000000..cfe270f00af
--- /dev/null
+++ b/japanese/groff/patches/patch-ag
@@ -0,0 +1,9 @@
+$NetBSD: patch-ag,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- devdvi/DESC.in.orig	Mon May 31 13:36:28 1999
++++ devdvi/DESC.in	Mon May 31 14:38:55 1999
+@@ -8,4 +8,4 @@
+ fonts 15 R I B BI 0 0 0 0 0 MI S EX CW M G
+ ondemand M G
+ tcommand
+-postpro grodvi
++postpro jgrodvi
diff --git a/japanese/groff/patches/patch-ah b/japanese/groff/patches/patch-ah
new file mode 100644
index 00000000000..82904caa5a7
--- /dev/null
+++ b/japanese/groff/patches/patch-ah
@@ -0,0 +1,9 @@
+$NetBSD: patch-ah,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- devlatin1/DESC.proto.orig	Wed Jul 29 22:32:26 1992
++++ devlatin1/DESC.proto	Mon May 31 14:39:13 1999
+@@ -5,4 +5,4 @@
+ sizes 10 0
+ fonts 4 R I B BI
+ tcommand
+-postpro grotty
++postpro jgrotty
diff --git a/japanese/groff/patches/patch-ai b/japanese/groff/patches/patch-ai
new file mode 100644
index 00000000000..e37ef85f6a3
--- /dev/null
+++ b/japanese/groff/patches/patch-ai
@@ -0,0 +1,9 @@
+$NetBSD: patch-ai,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- devlj4/DESC.in.orig	Wed Jul  6 22:10:25 1994
++++ devlj4/DESC.in	Mon May 31 14:39:27 1999
+@@ -6,4 +6,4 @@
+ fonts 6 0 0 0 0 0 S
+ family T
+ tcommand
+-postpro grolj4
++postpro jgrolj4
diff --git a/japanese/groff/patches/patch-aj b/japanese/groff/patches/patch-aj
new file mode 100644
index 00000000000..6ffb62912c2
--- /dev/null
+++ b/japanese/groff/patches/patch-aj
@@ -0,0 +1,9 @@
+$NetBSD: patch-aj,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- devnippon/DESC.proto.orig	Mon May 31 13:36:29 1999
++++ devnippon/DESC.proto	Mon May 31 14:39:40 1999
+@@ -6,4 +6,4 @@
+ fonts 6 R I B BI M G
+ ondemand M G
+ tcommand
+-postpro grotty
++postpro jgrotty
diff --git a/japanese/groff/patches/patch-ak b/japanese/groff/patches/patch-ak
new file mode 100644
index 00000000000..65fed262bde
--- /dev/null
+++ b/japanese/groff/patches/patch-ak
@@ -0,0 +1,9 @@
+$NetBSD: patch-ak,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
+--- devps/DESC.in.orig	Mon May 31 13:36:29 1999
++++ devps/DESC.in	Mon May 31 14:39:52 1999
+@@ -11,4 +11,4 @@
+ fonts 11 0 0 0 0 0 SS S ZD ZDR M G
+ ondemand M G
+ tcommand
+-postpro grops
++postpro jgrops
diff --git a/japanese/groff/pkg/PLIST b/japanese/groff/pkg/PLIST
index 572bebc0d4e..2a7203d9360 100644
--- a/japanese/groff/pkg/PLIST
+++ b/japanese/groff/pkg/PLIST
@@ -1,167 +1,159 @@
-bin/groff
-bin/gtroff
-bin/gtbl
-bin/gpic
-bin/geqn
-bin/gneqn
-bin/grops
-bin/grotty
-bin/grodvi
-bin/tfmtodit
-bin/grolj4
-bin/hpftodit
-bin/grefer
-bin/glookbib
-bin/gindxbib
-bin/lkbib
-bin/gsoelim
-bin/addftinfo
-bin/pfbtops
-bin/psbb
+@comment $NetBSD: PLIST,v 1.2 1999/06/08 09:35:21 sakamoto Exp $
 bin/afmtodit
-bin/grog
-bin/gnroff
-man/man1/groff.1.gz
-man/man1/gtroff.1.gz
-man/man1/gtbl.1.gz
-man/man1/gpic.1.gz
-man/man1/geqn.1.gz
-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
-man/man1/lkbib.1.gz
-man/man1/gsoelim.1.gz
-man/man1/addftinfo.1.gz
-man/man1/pfbtops.1.gz
-man/man1/psbb.1.gz
-man/man5/groff_font.5.gz
-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
+bin/jaddftinfo
+bin/jgeqn
+bin/jgindxbib
+bin/jglookbib
+bin/jgneqn
+bin/jgnroff
+bin/jgpic
+bin/jgrefer
+bin/jgrodvi
+bin/jgroff
+bin/jgrog
+bin/jgrolj4
+bin/jgrops
+bin/jgrotty
+bin/jgsoelim
+bin/jgtbl
+bin/jgtroff
+bin/jhpftodit
+bin/jlkbib
+bin/jpfbtops
+bin/jpsbb
+bin/jtfmtodit
+man/man1/jaddftinfo.1
+man/man1/jafmtodit.1
+man/man1/jgeqn.1
+man/man1/jgindxbib.1
+man/man1/jglookbib.1
+man/man1/jgnroff.1
+man/man1/jgpic.1
+man/man1/jgrefer.1
+man/man1/jgrodvi.1
+man/man1/jgroff.1
+man/man1/jgrog.1
+man/man1/jgrolj4.1
+man/man1/jgrops.1
+man/man1/jgrotty.1
+man/man1/jgsoelim.1
+man/man1/jgtbl.1
+man/man1/jgtroff.1
+man/man1/jhpftodit.1
+man/man1/jlkbib.1
+man/man1/jpfbtops.1
+man/man1/jpsbb.1
+man/man1/jtfmtodit.1
+man/man5/groff_font.5
+man/man5/groff_out.5
+man/man7/groff_char.7
+man/man7/groff_mm.7
+man/man7/groff_mmse.7
+man/man7/groff_ms.7
+man/man7/me.7
+man/man7/msafer.7
 share/groff/eign
-share/groff/tmac/hyphen.us
-share/groff/tmac/hyphen.us-ru
-share/groff/tmac/tmac.an
-share/groff/tmac/tmac.andoc
-share/groff/tmac/tmac.groff_an
-share/groff/tmac/tmac.orig_me
-share/groff/tmac/tmac.vgrind
-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/eqnrc.orig
-share/groff/tmac/troffrc
-share/groff/tmac/troffrc.orig
-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
-@dirrm share/groff/tmac/mdoc
-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
-@dirrm share/groff/tmac/mm
-@dirrm share/groff/tmac
-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
-@dirrm share/groff/font/devnippon
-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
-@dirrm share/groff/font/devps/generate
-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
-@dirrm share/groff/font/devps
+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/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/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/generate/CompileFonts
 share/groff/font/devdvi/generate/Makefile
 share/groff/font/devdvi/generate/msam.map
@@ -173,40 +165,11 @@ 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
-@dirrm share/groff/font/devdvi/generate
-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
-@dirrm share/groff/font/devdvi
-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
-@dirrm share/groff/font/devascii
-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
-@dirrm share/groff/font/devlatin1
-share/groff/font/devlj4/generate/Makefile
-share/groff/font/devlj4/generate/special.map
-share/groff/font/devlj4/generate/text.map
-@dirrm share/groff/font/devlj4/generate
+share/groff/font/devlatin1/I
+share/groff/font/devlatin1/R
 share/groff/font/devlj4/ALBB
 share/groff/font/devlj4/ALBR
 share/groff/font/devlj4/AOB
@@ -244,90 +207,122 @@ share/groff/font/devlj4/UCI
 share/groff/font/devlj4/UCR
 share/groff/font/devlj4/UI
 share/groff/font/devlj4/UR
+share/groff/font/devlj4/generate/Makefile
+share/groff/font/devlj4/generate/special.map
+share/groff/font/devlj4/generate/text.map
+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/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/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/prologue
+share/groff/font/devps/symbolsl.pfa
+share/groff/font/devps/text.enc
+share/groff/font/devps/zapfdr.pfa
+share/groff/tmac/eqnrc
+share/groff/tmac/hyphen.us
+share/groff/tmac/man.local
+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/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/tmac.X
+share/groff/tmac/tmac.Xps
+share/groff/tmac/tmac.an
+share/groff/tmac/tmac.andoc
+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.latin1
+share/groff/tmac/tmac.lj4
+share/groff/tmac/tmac.m
+share/groff/tmac/tmac.mse
+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.tty
+share/groff/tmac/tmac.tty-char
+share/groff/tmac/troffrc
+@dirrm share/groff/tmac/mm
+@dirrm share/groff/tmac/mdoc
+@dirrm share/groff/tmac
+@dirrm share/groff/font/devps/generate
+@dirrm share/groff/font/devps
+@dirrm share/groff/font/devnippon
+@dirrm share/groff/font/devlj4/generate
 @dirrm share/groff/font/devlj4
-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
-@dirrm share/groff/font/devX75
-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
+@dirrm share/groff/font/devlatin1
+@dirrm share/groff/font/devdvi/generate
+@dirrm share/groff/font/devdvi
+@dirrm share/groff/font/devascii
 @dirrm share/groff/font/devX75-12
-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
-@dirrm share/groff/font/devX100
-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
+@dirrm share/groff/font/devX75
 @dirrm share/groff/font/devX100-12
+@dirrm share/groff/font/devX100
 @dirrm share/groff/font
 @dirrm share/groff