Update to 1.22.4

Changelog:
VERSION 1.22.4
==============

Troff
-----

o The `hy' request has been extended.  Value 16 enables hyphenation before
  the last character, and value 32 enables hyphenation after the first
  character.


PDFPIC
------

o PDFPIC has been corrected so the behaviour is the same whether you use the
  PostScript or PDF drivers.  However, this means that any documents which
  were written using the old behaviour will not be rendered correctly if
  using the PDF driver with the new version.

  The change would mean that documents which relied on the previous
  behaviour are likely to have a gap underneath the image which was not
  there before.  If you see this effect there are three ways you can restore
  the previous behaviour:

  Add the line ".nr PDFPIC_NOSPACE 1" to the document before the first call
  to .PDFPIC.

  If it is just a single document which exhibits this behaviour you can run
  groff adding "-rPDFPIC_NOSPACE=1" to the command line.

  If you have many documents which rely on the previous behaviour you can
  set an environment variable "export GROFF_PDFPIC_NOSPACE=1" which will
  restore the previous behaviour for all runs.

  Note that this change has no effect if you were using .PDFPIC with the
  PostScript driver--only if you used it with the PDF driver.


Gropdf
------

o Type 1 font loading is fixed to handle newer Ghostscript versions.

o Handling of glyphs above position 255 is improved to allow many more
  glyphs to be used.

o New macros .pdftransition and .pdfpause are introduced to allow creation
  of presentation slides.  Partially backward-compatible with present.tmac,
  specifically the PAUSE, BLOCKS and BLOCKE commands.  Supports all the
  transition types introduced in PDF v1.5 (see the gropdf man page).


Miscellaneous
-------------

o A new 'configure' option --with-compatibility-wrappers controls how groff
  compatibility wrappers for vendor-provided non-GNU macro sets are
  installed (see ./configure --help).

o eqn2graph, grap2graph, and pic2graph now attempt to adapt to very old
  installed versions of the ImageMagick and GraphicsMagick programs
  "convert".  They search the output of convert's "-help" option, and use
  "-trim" if that string is found; otherwise, the old "-crop 0x0" method
  (which produces incompatible results on versions that _do_ support
  "-trim") is used.  The programs emit a warning to standard error if the
  search fails and the old method is used.

o eqn2graph no longer supports the "-unsafe" option.  It did nothing.

o groffer now supports the output of XHTML.  Use the "--xhtml" or
  "--mode=xhtml" command-line options to generate it.

o Much work has been done, and is ongoing, to make groff's man pages better
  examples for man page writers to follow.  groff_man(7) itself has been
  expanded and largely rewritten to more precisely document the macro
  package's behavior and to be more helpful and accessible to man page
  writers who may never read any other groff documentation.

9 files changed, 242 insertions, 227 deletions

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 60c92df0ec8..6a0d209ddec 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.87 2018/08/22 09:46:45 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2019/04/01 16:48:37 ryoon Exp $
 
-DISTNAME=	groff-1.22.3
-PKGREVISION=	6
+DISTNAME=	groff-1.22.4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
@@ -14,14 +13,18 @@ CHECK_PERMS=		NO
 MAKE_JOBS_SAFE=		NO
 OVERRIDE_DIRDEPTH=	4
 
+DEPENDS+=		urw-fonts-[0-9]*:../../fonts/urw-fonts
+
 INSTALLATION_DIRS=	share/groff/site-tmac
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PERLPATH=${PERL5:Q}
-USE_TOOLS+=		perl:run sed:run awk:run gmake
+TEXINFO_REQD+=		4.8
+USE_TOOLS+=		perl sed:run awk:run gmake makeinfo
 EXTRACT_USING=		bsdtar
 USE_FEATURES=		getopt_long
+CONFIGURE_ARGS+=	--with-urw-fonts-dir=${PREFIX}/share/fonts/urw
 
 INFO_FILES=		YES
 
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index 76f5f7b0be4..c6925b6cbf8 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,15 +1,21 @@
-@comment $NetBSD: PLIST,v 1.26 2017/01/18 13:44:46 leot Exp $
+@comment $NetBSD: PLIST,v 1.27 2019/04/01 16:48:37 ryoon Exp $
 bin/addftinfo
 bin/afmtodit
-bin/gchem
-bin/geqn
 bin/eqn2graph
+bin/gchem
 bin/gdiffmk
+bin/geqn
+bin/ggrn
+bin/gindxbib
 bin/glilypond
+bin/glookbib
+bin/gneqn
+bin/gnroff
 bin/gperl
+bin/gpic
 bin/gpinyin
 bin/grap2graph
-bin/ggrn
+bin/grefer
 bin/grodvi
 bin/groff
 bin/groffer
@@ -19,32 +25,26 @@ bin/grolj4
 bin/gropdf
 bin/grops
 bin/grotty
+bin/gsoelim
+bin/gtbl
+bin/gtroff
 bin/hpftodit
-bin/gindxbib
 bin/lkbib
-bin/glookbib
 bin/mmroff
-bin/gneqn
-bin/gnroff
 bin/pdfmom
 bin/pdfroff
 bin/pfbtops
-bin/gpic
 bin/pic2graph
 bin/post-grohtml
 bin/pre-grohtml
 bin/preconv
-bin/grefer
 bin/roff2dvi
 bin/roff2html
 bin/roff2pdf
 bin/roff2ps
 bin/roff2text
 bin/roff2x
-bin/gsoelim
-bin/gtbl
 bin/tfmtodit
-bin/gtroff
 gnu/bin/chem
 gnu/bin/diffmk
 gnu/bin/eqn
@@ -70,7 +70,6 @@ gnu/man/man1/refer.1
 gnu/man/man1/soelim.1
 gnu/man/man1/tbl.1
 gnu/man/man1/troff.1
-info/groff.info
 lib/groff/glilypond/args.pl
 lib/groff/glilypond/oop_fh.pl
 lib/groff/glilypond/subs.pl
@@ -85,15 +84,21 @@ lib/groff/groffer/version.sh
 lib/groff/grog/subs.pl
 man/man1/addftinfo.1
 man/man1/afmtodit.1
-man/man1/gchem.1
-man/man1/geqn.1
 man/man1/eqn2graph.1
+man/man1/gchem.1
 man/man1/gdiffmk.1
+man/man1/geqn.1
+man/man1/ggrn.1
+man/man1/gindxbib.1
 man/man1/glilypond.1
+man/man1/glookbib.1
+man/man1/gneqn.1
+man/man1/gnroff.1
 man/man1/gperl.1
+man/man1/gpic.1
 man/man1/gpinyin.1
 man/man1/grap2graph.1
-man/man1/ggrn.1
+man/man1/grefer.1
 man/man1/grodvi.1
 man/man1/groff.1
 man/man1/groffer.1
@@ -104,30 +109,25 @@ man/man1/grolj4.1
 man/man1/gropdf.1
 man/man1/grops.1
 man/man1/grotty.1
+man/man1/gsoelim.1
+man/man1/gtbl.1
+man/man1/gtroff.1
 man/man1/hpftodit.1
-man/man1/gindxbib.1
 man/man1/lkbib.1
-man/man1/glookbib.1
 man/man1/mmroff.1
-man/man1/gneqn.1
-man/man1/gnroff.1
 man/man1/pdfmom.1
 man/man1/pdfroff.1
 man/man1/pfbtops.1
-man/man1/gpic.1
 man/man1/pic2graph.1
 man/man1/preconv.1
-man/man1/grefer.1
 man/man1/roff2dvi.1
 man/man1/roff2html.1
 man/man1/roff2pdf.1
 man/man1/roff2ps.1
 man/man1/roff2text.1
 man/man1/roff2x.1
-man/man1/gsoelim.1
-man/man1/gtbl.1
 man/man1/tfmtodit.1
-man/man1/gtroff.1
+man/man5/groff_filenames.5
 man/man5/groff_font.5
 man/man5/groff_out.5
 man/man5/groff_tmac.5
@@ -136,7 +136,6 @@ man/man7/ditroff.7
 man/man7/groff.7
 man/man7/groff_char.7
 man/man7/groff_diff.7
-man/man7/groff_filenames.7
 man/man7/groff_hdtbl.7
 man/man7/groff_man.7
 man/man7/groff_mdoc.7
@@ -148,138 +147,18 @@ man/man7/groff_ms.7
 man/man7/groff_trace.7
 man/man7/groff_www.7
 man/man7/roff.7
-share/doc/${PKGNAME}/examples/chem/122/README
-share/doc/${PKGNAME}/examples/chem/122/ch2a_ethyl.chem
-share/doc/${PKGNAME}/examples/chem/122/ch2b_benzene.chem
-share/doc/${PKGNAME}/examples/chem/122/ch2c_benzene_right.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4a_stick.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4b_methyl_acetate.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4c_colon.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4d_HCl.H2O.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4e_CaSO4.2H2O.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4f_C.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4g_BP.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4h_methacrylate.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4i_cyclo.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4j_ring4.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4k_ring3.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4l_vertex.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4m_double.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4n_triple.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4o_aromatic.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4p_cholestanol.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4q_rings.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4r_spiro.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4s_heteroatoms.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4t_polycyclic.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4u_nicotine.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4v_histidine.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4w_lsd.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4x_anisole.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4y_reserpine.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4z1_eqn_glutamic.chem
-share/doc/${PKGNAME}/examples/chem/122/ch4z2_text.chem
-share/doc/${PKGNAME}/examples/chem/122/ch5a_size.chem
-share/doc/${PKGNAME}/examples/chem/122/ch6a_pic.chem
-share/doc/${PKGNAME}/examples/chem/122/ch6b_dna.chem
-share/doc/${PKGNAME}/examples/chem/122/chAa_polymer.chem
-share/doc/${PKGNAME}/examples/chem/122/chAb_vinyl_chloro.chem
-share/doc/${PKGNAME}/examples/chem/122/chAc_morphine.chem
-share/doc/${PKGNAME}/examples/chem/122/chAd_chlorophyll.chem
-share/doc/${PKGNAME}/examples/chem/122/chAe_chair.chem
-share/doc/${PKGNAME}/examples/chem/122/chAf_arrow.chem
-share/doc/${PKGNAME}/examples/chem/122/chAg_circle.chem
-share/doc/${PKGNAME}/examples/chem/122/chAh_brackets.chem
-share/doc/${PKGNAME}/examples/chem/122/chAi_poly_vinyl_chloride.chem
-share/doc/${PKGNAME}/examples/chem/122/chBa_jump.chem
-share/doc/${PKGNAME}/examples/chem/122/chBb_bonds.chem
-share/doc/${PKGNAME}/examples/chem/122/chBc_rings.chem
-share/doc/${PKGNAME}/examples/chem/README
-share/doc/${PKGNAME}/examples/chem/atp.chem
-share/doc/${PKGNAME}/examples/chem/cholesterin.chem
-share/doc/${PKGNAME}/examples/chem/ethamivan.chem
-share/doc/${PKGNAME}/examples/chem/lsd.chem
-share/doc/${PKGNAME}/examples/chem/morphine.chem
-share/doc/${PKGNAME}/examples/chem/penicillin.chem
-share/doc/${PKGNAME}/examples/chem/reserpine.chem
-share/doc/${PKGNAME}/examples/gnu.eps
-share/doc/${PKGNAME}/examples/grnexmpl.g
-share/doc/${PKGNAME}/examples/grnexmpl.me
-share/doc/${PKGNAME}/examples/grnexmpl.ps
-share/doc/${PKGNAME}/examples/groff.css
-share/doc/${PKGNAME}/examples/hdtbl/chess_board.ps
-share/doc/${PKGNAME}/examples/hdtbl/chess_board.roff
-share/doc/${PKGNAME}/examples/hdtbl/col_rowspan_colors.ps
-share/doc/${PKGNAME}/examples/hdtbl/col_rowspan_colors.roff
-share/doc/${PKGNAME}/examples/hdtbl/color_boxes.ps
-share/doc/${PKGNAME}/examples/hdtbl/color_boxes.roff
-share/doc/${PKGNAME}/examples/hdtbl/color_nested_tables.ps
-share/doc/${PKGNAME}/examples/hdtbl/color_nested_tables.roff
-share/doc/${PKGNAME}/examples/hdtbl/color_table_cells.ps
-share/doc/${PKGNAME}/examples/hdtbl/color_table_cells.roff
-share/doc/${PKGNAME}/examples/hdtbl/color_transitions.ps
-share/doc/${PKGNAME}/examples/hdtbl/color_transitions.roff
-share/doc/${PKGNAME}/examples/hdtbl/common.roff
-share/doc/${PKGNAME}/examples/hdtbl/fonts_n.ps
-share/doc/${PKGNAME}/examples/hdtbl/fonts_n.roff
-share/doc/${PKGNAME}/examples/hdtbl/fonts_x.ps
-share/doc/${PKGNAME}/examples/hdtbl/fonts_x.roff
-share/doc/${PKGNAME}/examples/hdtbl/gnu.eps
-share/doc/${PKGNAME}/examples/hdtbl/mixed_pickles.ps
-share/doc/${PKGNAME}/examples/hdtbl/mixed_pickles.roff
-share/doc/${PKGNAME}/examples/hdtbl/rainbow.ps
-share/doc/${PKGNAME}/examples/hdtbl/rainbow.roff
-share/doc/${PKGNAME}/examples/hdtbl/short_reference.ps
-share/doc/${PKGNAME}/examples/hdtbl/short_reference.roff
-share/doc/${PKGNAME}/examples/mom/README.txt
-share/doc/${PKGNAME}/examples/mom/elvis_syntax
-share/doc/${PKGNAME}/examples/mom/elvis_syntax.new
-share/doc/${PKGNAME}/examples/mom/letter.mom
-share/doc/${PKGNAME}/examples/mom/mom-pdf.mom
-share/doc/${PKGNAME}/examples/mom/mom.vim
-share/doc/${PKGNAME}/examples/mom/penguin.pdf
-share/doc/${PKGNAME}/examples/mom/penguin.ps
-share/doc/${PKGNAME}/examples/mom/sample_docs.mom
-share/doc/${PKGNAME}/examples/mom/typesetting.mom
-share/doc/${PKGNAME}/examples/webpage.ms
-share/doc/${PKGNAME}/examples/webpage.ps
-share/doc/${PKGNAME}/html/mom/appendices.html
-share/doc/${PKGNAME}/html/mom/color.html
-share/doc/${PKGNAME}/html/mom/cover.html
-share/doc/${PKGNAME}/html/mom/definitions.html
-share/doc/${PKGNAME}/html/mom/docelement.html
-share/doc/${PKGNAME}/html/mom/docprocessing.html
-share/doc/${PKGNAME}/html/mom/goodies.html
-share/doc/${PKGNAME}/html/mom/graphical.html
-share/doc/${PKGNAME}/html/mom/headfootpage.html
-share/doc/${PKGNAME}/html/mom/images.html
-share/doc/${PKGNAME}/html/mom/inlines.html
-share/doc/${PKGNAME}/html/mom/intro.html
-share/doc/${PKGNAME}/html/mom/letters.html
-share/doc/${PKGNAME}/html/mom/macrolist.html
-share/doc/${PKGNAME}/html/mom/rectoverso.html
-share/doc/${PKGNAME}/html/mom/refer.html
-share/doc/${PKGNAME}/html/mom/reserved.html
-share/doc/${PKGNAME}/html/mom/stylesheet.css
-share/doc/${PKGNAME}/html/mom/tables-of-contents.html
-share/doc/${PKGNAME}/html/mom/toc.html
-share/doc/${PKGNAME}/html/mom/typesetting.html
-share/doc/${PKGNAME}/html/mom/using.html
-share/doc/${PKGNAME}/html/mom/version-2.html
-share/doc/${PKGNAME}/meintro.me
-share/doc/${PKGNAME}/meintro.ps
-share/doc/${PKGNAME}/meintro_fr.me
-share/doc/${PKGNAME}/meintro_fr.ps
-share/doc/${PKGNAME}/meref.me
-share/doc/${PKGNAME}/meref.ps
-share/doc/${PKGNAME}/pic.ms
-share/doc/${PKGNAME}/pic.ps
+share/doc/${PKGNAME}/examples/mm/letter.mm
 share/groff/${PKGVERSION}/eign
 share/groff/${PKGVERSION}/font/devascii/B
 share/groff/${PKGVERSION}/font/devascii/BI
 share/groff/${PKGVERSION}/font/devascii/DESC
 share/groff/${PKGVERSION}/font/devascii/I
 share/groff/${PKGVERSION}/font/devascii/R
+share/groff/${PKGVERSION}/font/devcp1047/B
+share/groff/${PKGVERSION}/font/devcp1047/BI
+share/groff/${PKGVERSION}/font/devcp1047/DESC
+share/groff/${PKGVERSION}/font/devcp1047/I
+share/groff/${PKGVERSION}/font/devcp1047/R
 share/groff/${PKGVERSION}/font/devdvi/CW
 share/groff/${PKGVERSION}/font/devdvi/CWEC
 share/groff/${PKGVERSION}/font/devdvi/CWI
@@ -434,6 +313,41 @@ share/groff/${PKGVERSION}/font/devpdf/TB
 share/groff/${PKGVERSION}/font/devpdf/TBI
 share/groff/${PKGVERSION}/font/devpdf/TI
 share/groff/${PKGVERSION}/font/devpdf/TR
+share/groff/${PKGVERSION}/font/devpdf/U-AB
+share/groff/${PKGVERSION}/font/devpdf/U-ABI
+share/groff/${PKGVERSION}/font/devpdf/U-AI
+share/groff/${PKGVERSION}/font/devpdf/U-AR
+share/groff/${PKGVERSION}/font/devpdf/U-BMB
+share/groff/${PKGVERSION}/font/devpdf/U-BMBI
+share/groff/${PKGVERSION}/font/devpdf/U-BMI
+share/groff/${PKGVERSION}/font/devpdf/U-BMR
+share/groff/${PKGVERSION}/font/devpdf/U-CB
+share/groff/${PKGVERSION}/font/devpdf/U-CBI
+share/groff/${PKGVERSION}/font/devpdf/U-CI
+share/groff/${PKGVERSION}/font/devpdf/U-CR
+share/groff/${PKGVERSION}/font/devpdf/U-HB
+share/groff/${PKGVERSION}/font/devpdf/U-HBI
+share/groff/${PKGVERSION}/font/devpdf/U-HI
+share/groff/${PKGVERSION}/font/devpdf/U-HNB
+share/groff/${PKGVERSION}/font/devpdf/U-HNBI
+share/groff/${PKGVERSION}/font/devpdf/U-HNI
+share/groff/${PKGVERSION}/font/devpdf/U-HNR
+share/groff/${PKGVERSION}/font/devpdf/U-HR
+share/groff/${PKGVERSION}/font/devpdf/U-NB
+share/groff/${PKGVERSION}/font/devpdf/U-NBI
+share/groff/${PKGVERSION}/font/devpdf/U-NI
+share/groff/${PKGVERSION}/font/devpdf/U-NR
+share/groff/${PKGVERSION}/font/devpdf/U-PB
+share/groff/${PKGVERSION}/font/devpdf/U-PBI
+share/groff/${PKGVERSION}/font/devpdf/U-PI
+share/groff/${PKGVERSION}/font/devpdf/U-PR
+share/groff/${PKGVERSION}/font/devpdf/U-S
+share/groff/${PKGVERSION}/font/devpdf/U-TB
+share/groff/${PKGVERSION}/font/devpdf/U-TBI
+share/groff/${PKGVERSION}/font/devpdf/U-TI
+share/groff/${PKGVERSION}/font/devpdf/U-TR
+share/groff/${PKGVERSION}/font/devpdf/U-ZCMI
+share/groff/${PKGVERSION}/font/devpdf/U-ZD
 share/groff/${PKGVERSION}/font/devpdf/ZD
 share/groff/${PKGVERSION}/font/devpdf/download
 share/groff/${PKGVERSION}/font/devpdf/enc/text.enc
@@ -441,7 +355,6 @@ share/groff/${PKGVERSION}/font/devpdf/map/dingbats.map
 share/groff/${PKGVERSION}/font/devpdf/map/symbolchars
 share/groff/${PKGVERSION}/font/devpdf/map/symbolmap
 share/groff/${PKGVERSION}/font/devpdf/map/textmap
-share/groff/${PKGVERSION}/font/devpdf/util/BuildFoundries
 share/groff/${PKGVERSION}/font/devps/AB
 share/groff/${PKGVERSION}/font/devps/ABI
 share/groff/${PKGVERSION}/font/devps/AI
@@ -539,7 +452,6 @@ share/groff/${PKGVERSION}/tmac/Xps.tmac
 share/groff/${PKGVERSION}/tmac/a4.tmac
 share/groff/${PKGVERSION}/tmac/an-ext.tmac
 share/groff/${PKGVERSION}/tmac/an-old.tmac
-@comment handled dynamically: share/groff/${PKGVERSION}/tmac/an.tmac
 share/groff/${PKGVERSION}/tmac/andoc.tmac
 share/groff/${PKGVERSION}/tmac/composite.tmac
 share/groff/${PKGVERSION}/tmac/cp1047.tmac
@@ -567,7 +479,6 @@ share/groff/${PKGVERSION}/tmac/hyphen.fr
 share/groff/${PKGVERSION}/tmac/hyphen.sv
 share/groff/${PKGVERSION}/tmac/hyphen.us
 share/groff/${PKGVERSION}/tmac/hyphenex.cs
-share/groff/${PKGVERSION}/tmac/hyphenex.det
 share/groff/${PKGVERSION}/tmac/hyphenex.us
 share/groff/${PKGVERSION}/tmac/ja.tmac
 share/groff/${PKGVERSION}/tmac/latin1.tmac
@@ -576,7 +487,6 @@ share/groff/${PKGVERSION}/tmac/latin5.tmac
 share/groff/${PKGVERSION}/tmac/latin9.tmac
 share/groff/${PKGVERSION}/tmac/lbp.tmac
 share/groff/${PKGVERSION}/tmac/lj4.tmac
-@comment handled dynamically: share/groff/${PKGVERSION}/tmac/m.tmac
 share/groff/${PKGVERSION}/tmac/man.tmac
 share/groff/${PKGVERSION}/tmac/mandoc.tmac
 share/groff/${PKGVERSION}/tmac/mdoc.tmac
@@ -585,7 +495,6 @@ share/groff/${PKGVERSION}/tmac/mdoc/doc-ditroff
 share/groff/${PKGVERSION}/tmac/mdoc/doc-nroff
 share/groff/${PKGVERSION}/tmac/mdoc/doc-syms
 share/groff/${PKGVERSION}/tmac/me.tmac
-@comment handled dynamically: share/groff/${PKGVERSION}/tmac/mm.tmac
 share/groff/${PKGVERSION}/tmac/mm/0.MT
 share/groff/${PKGVERSION}/tmac/mm/4.MT
 share/groff/${PKGVERSION}/tmac/mm/5.MT
@@ -593,14 +502,13 @@ share/groff/${PKGVERSION}/tmac/mm/locale
 share/groff/${PKGVERSION}/tmac/mm/ms.cov
 share/groff/${PKGVERSION}/tmac/mm/se_locale
 share/groff/${PKGVERSION}/tmac/mm/se_ms.cov
-@comment handled dynamically: share/groff/${PKGVERSION}/tmac/mmse.tmac
 share/groff/${PKGVERSION}/tmac/mom.tmac
 share/groff/${PKGVERSION}/tmac/ms.tmac
-@comment handled dynamically: share/groff/${PKGVERSION}/tmac/mse.tmac
 share/groff/${PKGVERSION}/tmac/om.tmac
 share/groff/${PKGVERSION}/tmac/papersize.tmac
 share/groff/${PKGVERSION}/tmac/pdf.tmac
 share/groff/${PKGVERSION}/tmac/pdfmark.tmac
+share/groff/${PKGVERSION}/tmac/pdfpic.tmac
 share/groff/${PKGVERSION}/tmac/pic.tmac
 share/groff/${PKGVERSION}/tmac/ps.tmac
 share/groff/${PKGVERSION}/tmac/psatk.tmac
@@ -610,7 +518,6 @@ share/groff/${PKGVERSION}/tmac/refer-me.tmac
 share/groff/${PKGVERSION}/tmac/refer-mm.tmac
 share/groff/${PKGVERSION}/tmac/refer-ms.tmac
 share/groff/${PKGVERSION}/tmac/refer.tmac
-@comment handled dynamically: share/groff/${PKGVERSION}/tmac/s.tmac
 share/groff/${PKGVERSION}/tmac/safer.tmac
 share/groff/${PKGVERSION}/tmac/spdf.tmac
 share/groff/${PKGVERSION}/tmac/sv.tmac
@@ -622,9 +529,9 @@ share/groff/${PKGVERSION}/tmac/tty-char.tmac
 share/groff/${PKGVERSION}/tmac/tty.tmac
 share/groff/${PKGVERSION}/tmac/unicode.tmac
 share/groff/${PKGVERSION}/tmac/www.tmac
+share/groff/${PKGVERSION}/tmac/zh.tmac
 share/groff/current
 share/groff/site-tmac/man.local
 share/groff/site-tmac/mdoc.local
 @pkgdir share/groff/site-font
 @pkgdir lib/groff/site-tmac
-@pkgdir lib/groff/refer
diff --git a/textproc/groff/PLIST.docs b/textproc/groff/PLIST.docs
index 04de26efa7b..952aac7771c 100644
--- a/textproc/groff/PLIST.docs
+++ b/textproc/groff/PLIST.docs
@@ -1,9 +1,108 @@
-@comment $NetBSD: PLIST.docs,v 1.5 2017/01/18 13:44:46 leot Exp $
+@comment $NetBSD: PLIST.docs,v 1.6 2019/04/01 16:48:37 ryoon Exp $
+info/groff.info
+share/doc/${PKGNAME}/examples/chem/122/README
+share/doc/${PKGNAME}/examples/chem/122/ch2a_ethyl.chem
+share/doc/${PKGNAME}/examples/chem/122/ch2b_benzene.chem
+share/doc/${PKGNAME}/examples/chem/122/ch2c_benzene_right.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4a_stick.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4b_methyl_acetate.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4c_colon.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4d_HCl.H2O.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4e_CaSO4.2H2O.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4f_C.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4g_BP.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4h_methacrylate.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4i_cyclo.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4j_ring4.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4k_ring3.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4l_vertex.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4m_double.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4n_triple.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4o_aromatic.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4p_cholestanol.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4q_rings.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4r_spiro.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4s_heteroatoms.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4t_polycyclic.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4u_nicotine.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4v_histidine.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4w_lsd.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4x_anisole.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4y_reserpine.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4z1_eqn_glutamic.chem
+share/doc/${PKGNAME}/examples/chem/122/ch4z2_text.chem
+share/doc/${PKGNAME}/examples/chem/122/ch5a_size.chem
+share/doc/${PKGNAME}/examples/chem/122/ch6a_pic.chem
+share/doc/${PKGNAME}/examples/chem/122/ch6b_dna.chem
+share/doc/${PKGNAME}/examples/chem/122/chAa_polymer.chem
+share/doc/${PKGNAME}/examples/chem/122/chAb_vinyl_chloro.chem
+share/doc/${PKGNAME}/examples/chem/122/chAc_morphine.chem
+share/doc/${PKGNAME}/examples/chem/122/chAd_chlorophyll.chem
+share/doc/${PKGNAME}/examples/chem/122/chAe_chair.chem
+share/doc/${PKGNAME}/examples/chem/122/chAf_arrow.chem
+share/doc/${PKGNAME}/examples/chem/122/chAg_circle.chem
+share/doc/${PKGNAME}/examples/chem/122/chAh_brackets.chem
+share/doc/${PKGNAME}/examples/chem/122/chAi_poly_vinyl_chloride.chem
+share/doc/${PKGNAME}/examples/chem/122/chBa_jump.chem
+share/doc/${PKGNAME}/examples/chem/122/chBb_bonds.chem
+share/doc/${PKGNAME}/examples/chem/122/chBc_rings.chem
+share/doc/${PKGNAME}/examples/chem/README
+share/doc/${PKGNAME}/examples/chem/atp.chem
+share/doc/${PKGNAME}/examples/chem/cholesterin.chem
+share/doc/${PKGNAME}/examples/chem/ethamivan.chem
+share/doc/${PKGNAME}/examples/chem/lsd.chem
+share/doc/${PKGNAME}/examples/chem/morphine.chem
+share/doc/${PKGNAME}/examples/chem/penicillin.chem
+share/doc/${PKGNAME}/examples/chem/reserpine.chem
+share/doc/${PKGNAME}/examples/gnu.eps
+share/doc/${PKGNAME}/examples/grnexmpl.g
+share/doc/${PKGNAME}/examples/grnexmpl.me
+share/doc/${PKGNAME}/examples/grnexmpl.ps
+share/doc/${PKGNAME}/examples/groff.css
+share/doc/${PKGNAME}/examples/hdtbl/chess_board.ps
+share/doc/${PKGNAME}/examples/hdtbl/chess_board.roff
+share/doc/${PKGNAME}/examples/hdtbl/col_rowspan_colors.ps
+share/doc/${PKGNAME}/examples/hdtbl/col_rowspan_colors.roff
+share/doc/${PKGNAME}/examples/hdtbl/color_boxes.ps
+share/doc/${PKGNAME}/examples/hdtbl/color_boxes.roff
+share/doc/${PKGNAME}/examples/hdtbl/color_nested_tables.ps
+share/doc/${PKGNAME}/examples/hdtbl/color_nested_tables.roff
+share/doc/${PKGNAME}/examples/hdtbl/color_table_cells.ps
+share/doc/${PKGNAME}/examples/hdtbl/color_table_cells.roff
+share/doc/${PKGNAME}/examples/hdtbl/color_transitions.ps
+share/doc/${PKGNAME}/examples/hdtbl/color_transitions.roff
+share/doc/${PKGNAME}/examples/hdtbl/common.roff
+share/doc/${PKGNAME}/examples/hdtbl/fonts_n.ps
+share/doc/${PKGNAME}/examples/hdtbl/fonts_n.roff
+share/doc/${PKGNAME}/examples/hdtbl/fonts_x.ps
+share/doc/${PKGNAME}/examples/hdtbl/fonts_x.roff
+share/doc/${PKGNAME}/examples/hdtbl/gnu.eps
+share/doc/${PKGNAME}/examples/hdtbl/mixed_pickles.ps
+share/doc/${PKGNAME}/examples/hdtbl/mixed_pickles.roff
+share/doc/${PKGNAME}/examples/hdtbl/rainbow.ps
+share/doc/${PKGNAME}/examples/hdtbl/rainbow.roff
+share/doc/${PKGNAME}/examples/hdtbl/short_reference.ps
+share/doc/${PKGNAME}/examples/hdtbl/short_reference.roff
 share/doc/${PKGNAME}/examples/img/webpage1.png
 share/doc/${PKGNAME}/examples/img/webpage2.png
+share/doc/${PKGNAME}/examples/mom/README-fr.txt
+share/doc/${PKGNAME}/examples/mom/README.txt
+share/doc/${PKGNAME}/examples/mom/elvis_syntax
+share/doc/${PKGNAME}/examples/mom/elvis_syntax.new
+share/doc/${PKGNAME}/examples/mom/letter.mom
 share/doc/${PKGNAME}/examples/mom/letter.pdf
+share/doc/${PKGNAME}/examples/mom/mom-pdf.mom
 share/doc/${PKGNAME}/examples/mom/mom-pdf.pdf
+share/doc/${PKGNAME}/examples/mom/mom.vim
+share/doc/${PKGNAME}/examples/mom/mon_premier_doc.mom
+share/doc/${PKGNAME}/examples/mom/mon_premier_doc.pdf
+share/doc/${PKGNAME}/examples/mom/penguin.pdf
+share/doc/${PKGNAME}/examples/mom/penguin.ps
+share/doc/${PKGNAME}/examples/mom/sample_docs.mom
 share/doc/${PKGNAME}/examples/mom/sample_docs.pdf
+share/doc/${PKGNAME}/examples/mom/slide-demo.mom
+share/doc/${PKGNAME}/examples/mom/slide-demo.pdf
+share/doc/${PKGNAME}/examples/mom/typesetting.mom
 share/doc/${PKGNAME}/examples/mom/typesetting.pdf
 share/doc/${PKGNAME}/examples/webpage-1.html
 share/doc/${PKGNAME}/examples/webpage-10.html
@@ -23,6 +122,8 @@ share/doc/${PKGNAME}/examples/webpage-7.html
 share/doc/${PKGNAME}/examples/webpage-8.html
 share/doc/${PKGNAME}/examples/webpage-9.html
 share/doc/${PKGNAME}/examples/webpage.html
+share/doc/${PKGNAME}/examples/webpage.ms
+share/doc/${PKGNAME}/examples/webpage.ps
 share/doc/${PKGNAME}/html/img/pic1.png
 share/doc/${PKGNAME}/html/img/pic10.png
 share/doc/${PKGNAME}/html/img/pic11.png
@@ -73,6 +174,29 @@ share/doc/${PKGNAME}/html/img/pic6.png
 share/doc/${PKGNAME}/html/img/pic7.png
 share/doc/${PKGNAME}/html/img/pic8.png
 share/doc/${PKGNAME}/html/img/pic9.png
+share/doc/${PKGNAME}/html/mom/appendices.html
+share/doc/${PKGNAME}/html/mom/color.html
+share/doc/${PKGNAME}/html/mom/cover.html
+share/doc/${PKGNAME}/html/mom/definitions.html
+share/doc/${PKGNAME}/html/mom/docelement.html
+share/doc/${PKGNAME}/html/mom/docprocessing.html
+share/doc/${PKGNAME}/html/mom/goodies.html
+share/doc/${PKGNAME}/html/mom/graphical.html
+share/doc/${PKGNAME}/html/mom/headfootpage.html
+share/doc/${PKGNAME}/html/mom/images.html
+share/doc/${PKGNAME}/html/mom/inlines.html
+share/doc/${PKGNAME}/html/mom/intro.html
+share/doc/${PKGNAME}/html/mom/letters.html
+share/doc/${PKGNAME}/html/mom/macrolist.html
+share/doc/${PKGNAME}/html/mom/rectoverso.html
+share/doc/${PKGNAME}/html/mom/refer.html
+share/doc/${PKGNAME}/html/mom/reserved.html
+share/doc/${PKGNAME}/html/mom/stylesheet.css
+share/doc/${PKGNAME}/html/mom/tables-of-contents.html
+share/doc/${PKGNAME}/html/mom/toc.html
+share/doc/${PKGNAME}/html/mom/typesetting.html
+share/doc/${PKGNAME}/html/mom/using.html
+share/doc/${PKGNAME}/html/mom/version-2.html
 share/doc/${PKGNAME}/html/pic-1.html
 share/doc/${PKGNAME}/html/pic-10.html
 share/doc/${PKGNAME}/html/pic-11.html
@@ -97,5 +221,14 @@ share/doc/${PKGNAME}/html/pic-7.html
 share/doc/${PKGNAME}/html/pic-8.html
 share/doc/${PKGNAME}/html/pic-9.html
 share/doc/${PKGNAME}/html/pic.html
+share/doc/${PKGNAME}/meintro.me
+share/doc/${PKGNAME}/meintro.ps
+share/doc/${PKGNAME}/meintro_fr.me
+share/doc/${PKGNAME}/meintro_fr.ps
+share/doc/${PKGNAME}/meref.me
+share/doc/${PKGNAME}/meref.ps
+share/doc/${PKGNAME}/pdf/automake.pdf
 share/doc/${PKGNAME}/pdf/mom-pdf.pdf
 share/doc/${PKGNAME}/pdf/pdfmark.pdf
+share/doc/${PKGNAME}/pic.ms
+share/doc/${PKGNAME}/pic.ps
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index cab4fe44fa9..6421769fe4e 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.25 2016/08/03 10:31:28 leot Exp $
+$NetBSD: distinfo,v 1.26 2019/04/01 16:48:37 ryoon Exp $
 
-SHA1 (groff-1.22.3.tar.gz) = 61a6808ea1ef715df9fa8e9b424e1f6b9fa8c091
-RMD160 (groff-1.22.3.tar.gz) = 8f6d364f759e559c12c497091118f6d68f3a3b85
-SHA512 (groff-1.22.3.tar.gz) = c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
-Size (groff-1.22.3.tar.gz) = 4188772 bytes
-SHA1 (patch-aa) = 3f5d2c29397377f673a863e0ea953eaac4088898
-SHA1 (patch-ab) = 64ba9805a0798bfce543a258cd66347caa1bf860
-SHA1 (patch-font_devpdf_Makefile.sub) = 2d73140fe036cf48fe93eea3ad71a273c181e298
+SHA1 (groff-1.22.4.tar.gz) = 2ce4ab107e3fab1414fef2c5b5312f562a4e4d35
+RMD160 (groff-1.22.4.tar.gz) = 6f0555695ac882a8e1f925cce22f7e3d267188cb
+SHA512 (groff-1.22.4.tar.gz) = 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
+Size (groff-1.22.4.tar.gz) = 4137480 bytes
+SHA1 (patch-aa) = 98c10a0ef1854ee4baca00c702746a948f5a0fe2
+SHA1 (patch-configure) = b4193e18b1e7159f5dfbc96f9a84787f6648f616
 SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 3794a028dc7c569e5adea6b7b876c3ac085376ba
diff --git a/textproc/groff/options.mk b/textproc/groff/options.mk
index 3a66a4d695b..ebd8d87a47d 100644
--- a/textproc/groff/options.mk
+++ b/textproc/groff/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2016/02/26 10:32:47 jperkin Exp $
+# $NetBSD: options.mk,v 1.9 2019/04/01 16:48:37 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.groff
 PKG_SUPPORTED_OPTIONS=	groff-docs x11
@@ -7,12 +7,12 @@ PKG_SUGGESTED_OPTIONS=	groff-docs x11
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgroff-docs)
-TEXINFO_REQD+=		4.8
-USE_TOOLS+=		makeinfo
 DEPENDS+=		netpbm>=10.0:../../graphics/netpbm
 DEPENDS+=		psutils>=1.17:../../print/psutils
 USE_TOOLS+=		gs:run
 PLIST_SRC+=		PLIST.docs
+.else
+CONFIGURE_ENV+=		with_doc=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
diff --git a/textproc/groff/patches/patch-aa b/textproc/groff/patches/patch-aa
index 2cbf0fd8a4b..5f044cc2c4e 100644
--- a/textproc/groff/patches/patch-aa
+++ b/textproc/groff/patches/patch-aa
@@ -1,26 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2015/10/15 14:11:20 richard Exp $
+$NetBSD: patch-aa,v 1.7 2019/04/01 16:48:37 ryoon Exp $
 
 Fix path to papers directory on NetBSD.
 Avoid arbitrary decisions wrt troff being present or not to use a g'prefix.
 Force it instead and use PKGGNUDIR logic to work it out.
 
---- Makefile.in.orig	2014-11-04 08:38:35.145524997 +0000
+--- Makefile.in.orig	2018-12-23 14:34:27.000000000 +0000
 +++ Makefile.in
-@@ -123,7 +123,7 @@ DVIPRINT=@DVIPRINT@
- # gtroff.  This doesn't affect programs like grops or groff that have
- # no Unix counterparts.  Note that the groff versions of eqn and tbl
- # will not work with Unix troff.
--g=@g@
-+g=g
- 
- # Common prefix for installation directories.
- # Used in definitions of exec_prefix, datasubdir, fontpath, manroot.
-@@ -237,7 +237,7 @@ tmac_an_prefix=\
- indexext=.i
+@@ -3681,7 +3681,7 @@ tmac_an_prefix = \
+ indexext = .i
  
  # Directory containing the default index for refer.
--indexdir=/usr/dict/papers
-+indexdir=/usr/share/dict/papers
+-indexdir = /usr/dict/papers
++indexdir = /usr/share/dict/papers
  
  # The filename (without suffix) of the default index for refer.
- indexname=Ind
+ indexname = Ind
diff --git a/textproc/groff/patches/patch-ab b/textproc/groff/patches/patch-ab
deleted file mode 100644
index b12a511ccb1..00000000000
--- a/textproc/groff/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2015/01/08 09:02:27 wiz Exp $
-
---- src/libs/libgroff/Makefile.sub.orig	2014-11-04 08:38:35.000000000 +0000
-+++ src/libs/libgroff/Makefile.sub
-@@ -153,6 +153,9 @@ version.cpp: $(top_srcdir)/VERSION $(top
- snprintf.$(OBJEXT): $(srcdir)/../snprintf/snprintf.c
- 	$(CC) -c $(CDEFINES) $(CFLAGS) $(CPPFLAGS) \
- 	  $(srcdir)/../snprintf/snprintf.c
-+	# provided by pkgsrc/converters/libiconv
-+
-+install_charset_data_disabled:
- 
- # Data for localcharset.c.  Taken from libiconv/libcharset.
- 
diff --git a/textproc/groff/patches/patch-configure b/textproc/groff/patches/patch-configure
new file mode 100644
index 00000000000..637c46d3799
--- /dev/null
+++ b/textproc/groff/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.4 2019/04/01 16:48:37 ryoon Exp $
+
+* Add g prefix to some commands
+
+--- configure.orig	2018-12-23 14:34:25.000000000 +0000
++++ configure
+@@ -23841,7 +23841,7 @@ $as_echo "$PAGE" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existing troff installation" >&5
+ $as_echo_n "checking for existing troff installation... " >&6; }
+-   if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then
++   if test true; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+      g=g
diff --git a/textproc/groff/patches/patch-font_devpdf_Makefile.sub b/textproc/groff/patches/patch-font_devpdf_Makefile.sub
deleted file mode 100644
index 8bb93b5f75f..00000000000
--- a/textproc/groff/patches/patch-font_devpdf_Makefile.sub
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-font_devpdf_Makefile.sub,v 1.1 2016/08/03 10:31:28 leot Exp $
-
-Solaris find(1) doesn't have -maxdepth. Adapt new logic from upstream that
-avoid to use find for that (this will not needed for future groff version).
-pkg/51332
-
---- font/devpdf/Makefile.sub.orig	2014-11-04 08:38:35.427521472 +0000
-+++ font/devpdf/Makefile.sub
-@@ -21,9 +21,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
- 
- DEV=pdf
--GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \
--                  && find * -maxdepth 0 -type f ! -name 'Makefile.sub*' \
--                            -exec grep -l internalname {} \;`
-+GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf && grep -l internalname * | grep -v Makefile.sub`
- ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*`
- MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*`
-