git: a1246c57197e - main - textproc/groff: Update 1.23.0 => 1.24.0, take maintainership

From: Älven <alven_at_FreeBSD.org>
Date: Thu, 05 Mar 2026 12:00:33 UTC
The branch main has been updated by alven:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a1246c57197ee106c7a973f81cfb248ba3f1a4c3

commit a1246c57197ee106c7a973f81cfb248ba3f1a4c3
Author:     Älven <alven@FreeBSD.org>
AuthorDate: 2026-03-03 20:19:17 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2026-03-05 11:57:03 +0000

    textproc/groff: Update 1.23.0 => 1.24.0, take maintainership
    
    * Clarify LICENSE
    * Add LICENSE_FILE
    * Add DOCS and EXAMPLES options
    * Switch from custom to canonical EXAMPLESDIR
    * Pet portclippy(1) and portfmt(1)
    
    Reviewed by:            vvd@
    Approved by:            yuri@ (Mentor)
    Approved by:            db@, yuri@ (Mentors, implicit)
    Differential Revision:  https://reviews.freebsd.org/D55637
---
 textproc/groff/Makefile                  |  40 ++++---
 textproc/groff/distinfo                  |   6 +-
 textproc/groff/files/mdoc.local          |  28 +----
 textproc/groff/files/patch-Makefile.in   |   4 +-
 textproc/groff/files/patch-lib_math.in.h |  16 +--
 textproc/groff/pkg-plist                 | 189 ++++++++-----------------------
 6 files changed, 84 insertions(+), 199 deletions(-)

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 771ebd9ce3b9..80d32f68d9f0 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,33 +1,27 @@
 PORTNAME=	groff
-DISTVERSION=	1.23.0
-PORTREVISION=	5
+DISTVERSION=	1.24.0
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alven@FreeBSD.org
 COMMENT=	Software typesetting package
 WWW=		https://www.gnu.org/software/groff/
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsfonts>=0:print/gsfonts \
 		psselect:print/psutils
 RUN_DEPENDS=	psselect:print/psutils
 
-USES=		cpe gmake iconv:wchar_t makeinfo perl5
+USES=		cpe gmake iconv:wchar_t perl5
 CPE_VENDOR=	gnu
 USE_CXXSTD=	gnu++98
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk \
-			--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
+CONFIGURE_ARGS+=	--with-urw-fonts-dir=${LOCALBASE}/share/ghostscript/fonts/ \
 			--without-gs \
-			--without-x \
-			pnmcrop=missing \
-			pnmcut=missing \
-			pnmtopng=missing \
-			pnmtops=missing \
-			psselect=missing
+			--without-x
 
 # Canonicalize to A4 if set.
 .if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4")
@@ -37,20 +31,20 @@ PAPERSIZE=	A4
 CONFIGURE_ENV+=	PAGE=${PAPERSIZE}
 .endif
 
-MAKE_JOBS_UNSAFE=	yes
-
 CONFLICTS=	heirloom-doctools ja-groff
 
 DATADIR=	${PREFIX}/share/${PORTNAME}/${DISTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
-EXAMPLESDIR=	${DOCSDIR}/examples
 
 INFO=		groff
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		UCHARDET
+OPTIONS_DEFINE=		DOCS EXAMPLES UCHARDET
 OPTIONS_DEFAULT=	UCHARDET
 
 UCHARDET_DESC=		Automatic encoding detection in preconv(1)
+
 UCHARDET_LIB_DEPENDS=	libuchardet.so:textproc/uchardet
 UCHARDET_USES=		pkgconfig
 UCHARDET_CONFIGURE_OFF=	--with-uchardet=no
@@ -59,4 +53,16 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/mdoc.local ${STAGEDIR}${PREFIX}/share/groff/site-tmac
 	${REINPLACE_CMD} -i "" -e "s/missing/gs/" ${STAGEDIR}${DATADIR}/font/devhtml/DESC
 
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${STAGEDIR}${DOCSDIR}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	${RM} -r ${STAGEDIR}${DOCSDIR}/examples
+
+	${RLN} ${STAGEDIR}${EXAMPLESDIR}/mom/mom-pdf.pdf ${STAGEDIR}${DOCSDIR}/pdf
+
+post-install-DOCS-off:
+	${RM} -r ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-off:
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}
+
 .include <bsd.port.mk>
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 04bdbf585808..d0ccdb87b281 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690695604
-SHA256 (groff-1.23.0.tar.gz) = 6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13
-SIZE (groff-1.23.0.tar.gz) = 7433031
+TIMESTAMP = 1772436103
+SHA256 (groff-1.24.0.tar.gz) = e79bbcd8ff3ed0200e7ac55d3962a15e118c1229990213025f2fc8b264727570
+SIZE (groff-1.24.0.tar.gz) = 9002796
diff --git a/textproc/groff/files/mdoc.local b/textproc/groff/files/mdoc.local
index eaf689c78a96..0cce57114234 100644
--- a/textproc/groff/files/mdoc.local
+++ b/textproc/groff/files/mdoc.local
@@ -48,31 +48,9 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~14.3
+.ds doc-default-operating-system FreeBSD\~15.0
 .
 .\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-2.2.0  2.2.0
-.ds doc-operating-system-FreeBSD-2.2.9  2.2.9
-.ds doc-operating-system-FreeBSD-7.4    7.4
-.ds doc-operating-system-FreeBSD-8.3    8.3
-.ds doc-operating-system-FreeBSD-8.4    8.4
-.ds doc-operating-system-FreeBSD-9      9  
-.ds doc-operating-system-FreeBSD-9.1    9.1
-.ds doc-operating-system-FreeBSD-9.2    9.2
-.ds doc-operating-system-FreeBSD-9.3    9.3
-.ds doc-operating-system-FreeBSD-10     10
-.ds doc-operating-system-FreeBSD-10.0   10.0
-.ds doc-operating-system-FreeBSD-10.1   10.1
-.ds doc-operating-system-FreeBSD-10.2   10.2
-.ds doc-operating-system-FreeBSD-10.3   10.3
-.ds doc-operating-system-FreeBSD-10.4   10.4
-.ds doc-operating-system-FreeBSD-11     11
-.ds doc-operating-system-FreeBSD-11.0   11.0
-.ds doc-operating-system-FreeBSD-11.1   11.1
-.ds doc-operating-system-FreeBSD-11.2   11.2
-.ds doc-operating-system-FreeBSD-12     12
-.ds doc-operating-system-FreeBSD-12.0   12.0
-.ds doc-operating-system-FreeBSD-12.1   12.1
 .ds doc-operating-system-FreeBSD-12.2   12.2
 .ds doc-operating-system-FreeBSD-12.3   12.3
 .ds doc-operating-system-FreeBSD-12.4   12.4
@@ -106,10 +84,6 @@
 .ds doc-operating-system-FreeBSD-17     17
 .ds doc-operating-system-FreeBSD-17.0   17.0
 .
-.\" Definitions for other *BSDs not (yet) in doc-common
-.ds doc-operating-system-NetBSD-7       7
-.ds doc-operating-system-NetBSD-7.0     7.0
-.
 .\" Definitions not (yet) in doc-syms
 .
 .ec
diff --git a/textproc/groff/files/patch-Makefile.in b/textproc/groff/files/patch-Makefile.in
index 6a9c4dee5b39..4144cd06d5c0 100644
--- a/textproc/groff/files/patch-Makefile.in
+++ b/textproc/groff/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2023-07-05 20:58:38 UTC
+--- Makefile.in.orig	2026-02-28 15:49:29 UTC
 +++ Makefile.in
-@@ -15157,7 +15157,7 @@ ref-del.sed: $(libgroff_srcdir)/ref-del.sin
+@@ -20215,7 +20215,7 @@ ref-del.sed: $(libgroff_srcdir)/ref-del.sin
  	    $(libgroff_srcdir)/ref-del.sin > t-$@ \
  	  && mv t-$@ $@
  
diff --git a/textproc/groff/files/patch-lib_math.in.h b/textproc/groff/files/patch-lib_math.in.h
index dde8df96f971..3fc36ee21149 100644
--- a/textproc/groff/files/patch-lib_math.in.h
+++ b/textproc/groff/files/patch-lib_math.in.h
@@ -1,11 +1,11 @@
---- lib/math.in.h.orig	2023-07-05 20:58:27 UTC
+--- lib/math.in.h.orig	2026-02-23 04:26:00 UTC
 +++ lib/math.in.h
-@@ -54,7 +54,7 @@
- #endif
- 
- #ifndef _GL_INLINE_HEADER_BEGIN
+@@ -51,7 +51,7 @@
+ /* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_ATTRIBUTE_CONST,
+    GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+ #if !_GL_CONFIG_H_INCLUDED
 - #error "Please include config.h first."
-+# include "config.h"
++ # include "config.h" 
  #endif
- _GL_INLINE_HEADER_BEGIN
- #ifndef _GL_MATH_INLINE
+ 
+ /* On OpenVMS, NAN, INFINITY, and HUGEVAL macros are defined in <fp.h>.  */
diff --git a/textproc/groff/pkg-plist b/textproc/groff/pkg-plist
index 6a1811c1732d..a5460e646b79 100644
--- a/textproc/groff/pkg-plist
+++ b/textproc/groff/pkg-plist
@@ -1,3 +1,5 @@
+@dir lib/groff/site-tmac
+@dir share/groff/site-font
 bin/addftinfo
 bin/afmtodit
 bin/chem
@@ -25,7 +27,6 @@ bin/mmroff
 bin/neqn
 bin/nroff
 bin/pdfmom
-bin/pdfroff
 bin/pfbtops
 bin/pic
 bin/pic2graph
@@ -37,143 +38,16 @@ bin/soelim
 bin/tbl
 bin/tfmtodit
 bin/troff
-%%EXAMPLESDIR%%/chem/122/README
-%%EXAMPLESDIR%%/chem/122/ch2a_ethyl.chem
-%%EXAMPLESDIR%%/chem/122/ch2b_benzene.chem
-%%EXAMPLESDIR%%/chem/122/ch2c_benzene_right.chem
-%%EXAMPLESDIR%%/chem/122/ch4a_stick.chem
-%%EXAMPLESDIR%%/chem/122/ch4b_methyl_acetate.chem
-%%EXAMPLESDIR%%/chem/122/ch4c_colon.chem
-%%EXAMPLESDIR%%/chem/122/ch4d_HCl.H2O.chem
-%%EXAMPLESDIR%%/chem/122/ch4e_CaSO4.2H2O.chem
-%%EXAMPLESDIR%%/chem/122/ch4f_C.chem
-%%EXAMPLESDIR%%/chem/122/ch4g_BP.chem
-%%EXAMPLESDIR%%/chem/122/ch4h_methacrylate.chem
-%%EXAMPLESDIR%%/chem/122/ch4i_cyclo.chem
-%%EXAMPLESDIR%%/chem/122/ch4j_ring4.chem
-%%EXAMPLESDIR%%/chem/122/ch4k_ring3.chem
-%%EXAMPLESDIR%%/chem/122/ch4l_vertex.chem
-%%EXAMPLESDIR%%/chem/122/ch4m_double.chem
-%%EXAMPLESDIR%%/chem/122/ch4n_triple.chem
-%%EXAMPLESDIR%%/chem/122/ch4o_aromatic.chem
-%%EXAMPLESDIR%%/chem/122/ch4p_cholestanol.chem
-%%EXAMPLESDIR%%/chem/122/ch4q_rings.chem
-%%EXAMPLESDIR%%/chem/122/ch4r_spiro.chem
-%%EXAMPLESDIR%%/chem/122/ch4s_heteroatoms.chem
-%%EXAMPLESDIR%%/chem/122/ch4t_polycyclic.chem
-%%EXAMPLESDIR%%/chem/122/ch4u_nicotine.chem
-%%EXAMPLESDIR%%/chem/122/ch4v_histidine.chem
-%%EXAMPLESDIR%%/chem/122/ch4w_lsd.chem
-%%EXAMPLESDIR%%/chem/122/ch4x_anisole.chem
-%%EXAMPLESDIR%%/chem/122/ch4y_reserpine.chem
-%%EXAMPLESDIR%%/chem/122/ch4z1_eqn_glutamic.chem
-%%EXAMPLESDIR%%/chem/122/ch4z2_text.chem
-%%EXAMPLESDIR%%/chem/122/ch5a_size.chem
-%%EXAMPLESDIR%%/chem/122/ch6a_pic.chem
-%%EXAMPLESDIR%%/chem/122/ch6b_dna.chem
-%%EXAMPLESDIR%%/chem/122/chAa_polymer.chem
-%%EXAMPLESDIR%%/chem/122/chAb_vinyl_chloro.chem
-%%EXAMPLESDIR%%/chem/122/chAc_morphine.chem
-%%EXAMPLESDIR%%/chem/122/chAd_chlorophyll.chem
-%%EXAMPLESDIR%%/chem/122/chAe_chair.chem
-%%EXAMPLESDIR%%/chem/122/chAf_arrow.chem
-%%EXAMPLESDIR%%/chem/122/chAg_circle.chem
-%%EXAMPLESDIR%%/chem/122/chAh_brackets.chem
-%%EXAMPLESDIR%%/chem/122/chAi_poly_vinyl_chloride.chem
-%%EXAMPLESDIR%%/chem/122/chBa_jump.chem
-%%EXAMPLESDIR%%/chem/122/chBb_bonds.chem
-%%EXAMPLESDIR%%/chem/122/chBc_rings.chem
-%%EXAMPLESDIR%%/chem/README
-%%EXAMPLESDIR%%/chem/atp.chem
-%%EXAMPLESDIR%%/chem/cholesterin.chem
-%%EXAMPLESDIR%%/chem/ethamivan.chem
-%%EXAMPLESDIR%%/chem/lsd.chem
-%%EXAMPLESDIR%%/chem/morphine.chem
-%%EXAMPLESDIR%%/chem/penicillin.chem
-%%EXAMPLESDIR%%/chem/reserpine.chem
-%%EXAMPLESDIR%%/gnu.eps
-%%EXAMPLESDIR%%/grnexmpl.g
-%%EXAMPLESDIR%%/grnexmpl.me
-%%EXAMPLESDIR%%/grnexmpl.ps
-%%EXAMPLESDIR%%/groff.css
-%%EXAMPLESDIR%%/hdtbl/chess_board.ps
-%%EXAMPLESDIR%%/hdtbl/chess_board.roff
-%%EXAMPLESDIR%%/hdtbl/col_rowspan_colors.ps
-%%EXAMPLESDIR%%/hdtbl/col_rowspan_colors.roff
-%%EXAMPLESDIR%%/hdtbl/color_boxes.ps
-%%EXAMPLESDIR%%/hdtbl/color_boxes.roff
-%%EXAMPLESDIR%%/hdtbl/color_nested_tables.ps
-%%EXAMPLESDIR%%/hdtbl/color_nested_tables.roff
-%%EXAMPLESDIR%%/hdtbl/color_table_cells.ps
-%%EXAMPLESDIR%%/hdtbl/color_table_cells.roff
-%%EXAMPLESDIR%%/hdtbl/color_transitions.ps
-%%EXAMPLESDIR%%/hdtbl/color_transitions.roff
-%%EXAMPLESDIR%%/hdtbl/common.roff
-%%EXAMPLESDIR%%/hdtbl/fonts_n.ps
-%%EXAMPLESDIR%%/hdtbl/fonts_n.roff
-%%EXAMPLESDIR%%/hdtbl/fonts_x.ps
-%%EXAMPLESDIR%%/hdtbl/fonts_x.roff
-%%EXAMPLESDIR%%/hdtbl/gnu.eps
-%%EXAMPLESDIR%%/hdtbl/mixed_pickles.ps
-%%EXAMPLESDIR%%/hdtbl/mixed_pickles.roff
-%%EXAMPLESDIR%%/hdtbl/rainbow.ps
-%%EXAMPLESDIR%%/hdtbl/rainbow.roff
-%%EXAMPLESDIR%%/hdtbl/short_reference.ps
-%%EXAMPLESDIR%%/hdtbl/short_reference.roff
-%%EXAMPLESDIR%%/mom/README.txt
-%%EXAMPLESDIR%%/mom/elvis_syntax
-%%EXAMPLESDIR%%/mom/elvis_syntax.new
-%%EXAMPLESDIR%%/mom/letter.mom
-%%EXAMPLESDIR%%/mom/mom-pdf.mom
-%%EXAMPLESDIR%%/mom/mom.vim
-%%EXAMPLESDIR%%/mom/penguin.pdf
-%%EXAMPLESDIR%%/mom/penguin.ps
-%%EXAMPLESDIR%%/mom/sample_docs.mom
-%%EXAMPLESDIR%%/mom/typesetting.mom
-%%EXAMPLESDIR%%/webpage.ms
-%%EXAMPLESDIR%%/webpage.ps
-%%DOCSDIR%%/html/mom/appendices.html
-%%DOCSDIR%%/html/mom/color.html
-%%DOCSDIR%%/html/mom/cover.html
-%%DOCSDIR%%/html/mom/definitions.html
-%%DOCSDIR%%/html/mom/docelement.html
-%%DOCSDIR%%/html/mom/docprocessing.html
-%%DOCSDIR%%/html/mom/goodies.html
-%%DOCSDIR%%/html/mom/graphical.html
-%%DOCSDIR%%/html/mom/headfootpage.html
-%%DOCSDIR%%/html/mom/images.html
-%%DOCSDIR%%/html/mom/inlines.html
-%%DOCSDIR%%/html/mom/intro.html
-%%DOCSDIR%%/html/mom/letters.html
-%%DOCSDIR%%/html/mom/macrolist.html
-%%DOCSDIR%%/html/mom/rectoverso.html
-%%DOCSDIR%%/html/mom/refer.html
-%%DOCSDIR%%/html/mom/reserved.html
-%%DOCSDIR%%/html/mom/stylesheet.css
-%%DOCSDIR%%/html/mom/tables-of-contents.html
-%%DOCSDIR%%/html/mom/toc.html
-%%DOCSDIR%%/html/mom/typesetting.html
-%%DOCSDIR%%/html/mom/using.html
-%%DOCSDIR%%/html/mom/version-2.html
-%%DOCSDIR%%/meintro.me
-%%DOCSDIR%%/meintro.ps
-%%DOCSDIR%%/meintro_fr.me
-%%DOCSDIR%%/meintro_fr.ps
-%%DOCSDIR%%/meref.me
-%%DOCSDIR%%/meref.ps
-%%DOCSDIR%%/pic.ms
-%%DOCSDIR%%/pic.ps
 %%DATADIR%%/eign
 %%DATADIR%%/font/devascii/B
 %%DATADIR%%/font/devascii/BI
 %%DATADIR%%/font/devascii/DESC
 %%DATADIR%%/font/devascii/I
 %%DATADIR%%/font/devascii/R
-%%DATADIR%%/font/devcp1047/B
-%%DATADIR%%/font/devcp1047/BI
-%%DATADIR%%/font/devcp1047/DESC
-%%DATADIR%%/font/devcp1047/I
-%%DATADIR%%/font/devcp1047/R
+%%DATADIR%%/font/devdvi/CSH
+%%DATADIR%%/font/devdvi/CSS
+%%DATADIR%%/font/devdvi/CTH
+%%DATADIR%%/font/devdvi/CTS
 %%DATADIR%%/font/devdvi/CW
 %%DATADIR%%/font/devdvi/CWEC
 %%DATADIR%%/font/devdvi/CWI
@@ -194,6 +68,10 @@ bin/troff
 %%DATADIR%%/font/devdvi/HR
 %%DATADIR%%/font/devdvi/HREC
 %%DATADIR%%/font/devdvi/HRTC
+%%DATADIR%%/font/devdvi/JPG
+%%DATADIR%%/font/devdvi/JPM
+%%DATADIR%%/font/devdvi/KOG
+%%DATADIR%%/font/devdvi/KOM
 %%DATADIR%%/font/devdvi/MI
 %%DATADIR%%/font/devdvi/S
 %%DATADIR%%/font/devdvi/SA
@@ -231,8 +109,16 @@ bin/troff
 %%DATADIR%%/font/devhtml/CBI
 %%DATADIR%%/font/devhtml/CI
 %%DATADIR%%/font/devhtml/CR
+%%DATADIR%%/font/devhtml/CSH
+%%DATADIR%%/font/devhtml/CSS
+%%DATADIR%%/font/devhtml/CTH
+%%DATADIR%%/font/devhtml/CTS
 %%DATADIR%%/font/devhtml/DESC
 %%DATADIR%%/font/devhtml/I
+%%DATADIR%%/font/devhtml/JPG
+%%DATADIR%%/font/devhtml/JPM
+%%DATADIR%%/font/devhtml/KOG
+%%DATADIR%%/font/devhtml/KOM
 %%DATADIR%%/font/devhtml/R
 %%DATADIR%%/font/devhtml/S
 %%DATADIR%%/font/devlatin1/B
@@ -344,6 +230,7 @@ bin/troff
 %%DATADIR%%/font/devpdf/PI
 %%DATADIR%%/font/devpdf/PR
 %%DATADIR%%/font/devpdf/S
+%%DATADIR%%/font/devpdf/SS
 %%DATADIR%%/font/devpdf/TB
 %%DATADIR%%/font/devpdf/TBI
 %%DATADIR%%/font/devpdf/TI
@@ -389,8 +276,9 @@ bin/troff
 %%DATADIR%%/font/devpdf/enc/text.enc
 %%DATADIR%%/font/devpdf/map/dingbats.map
 %%DATADIR%%/font/devpdf/map/symbol.map
-%%DATADIR%%/font/devpdf/map/symbolchars
 %%DATADIR%%/font/devpdf/map/text.map
+%%DATADIR%%/font/devpdf/symbolsl.afm
+%%DATADIR%%/font/devpdf/symbolsl.pfb
 %%DATADIR%%/font/devps/AB
 %%DATADIR%%/font/devps/ABI
 %%DATADIR%%/font/devps/AI
@@ -403,6 +291,10 @@ bin/troff
 %%DATADIR%%/font/devps/CBI
 %%DATADIR%%/font/devps/CI
 %%DATADIR%%/font/devps/CR
+%%DATADIR%%/font/devps/CSH
+%%DATADIR%%/font/devps/CSS
+%%DATADIR%%/font/devps/CTH
+%%DATADIR%%/font/devps/CTS
 %%DATADIR%%/font/devps/DESC
 %%DATADIR%%/font/devps/EURO
 %%DATADIR%%/font/devps/HB
@@ -413,6 +305,10 @@ bin/troff
 %%DATADIR%%/font/devps/HNI
 %%DATADIR%%/font/devps/HNR
 %%DATADIR%%/font/devps/HR
+%%DATADIR%%/font/devps/JPG
+%%DATADIR%%/font/devps/JPM
+%%DATADIR%%/font/devps/KOG
+%%DATADIR%%/font/devps/KOM
 %%DATADIR%%/font/devps/NB
 %%DATADIR%%/font/devps/NBI
 %%DATADIR%%/font/devps/NI
@@ -440,7 +336,7 @@ bin/troff
 %%DATADIR%%/font/devps/generate/slanted-symbol.map
 %%DATADIR%%/font/devps/generate/symbol.map
 %%DATADIR%%/font/devps/generate/symbol.sed
-%%DATADIR%%/font/devps/generate/symbolchars
+%%DATADIR%%/font/devps/generate/symbolsl.awk
 %%DATADIR%%/font/devps/generate/text.map
 %%DATADIR%%/font/devps/prologue
 %%DATADIR%%/font/devps/symbolsl.afm
@@ -450,8 +346,16 @@ bin/troff
 %%DATADIR%%/font/devps/zapfdr.pfa
 %%DATADIR%%/font/devutf8/B
 %%DATADIR%%/font/devutf8/BI
+%%DATADIR%%/font/devutf8/CSH
+%%DATADIR%%/font/devutf8/CSS
+%%DATADIR%%/font/devutf8/CTH
+%%DATADIR%%/font/devutf8/CTS
 %%DATADIR%%/font/devutf8/DESC
 %%DATADIR%%/font/devutf8/I
+%%DATADIR%%/font/devutf8/JPG
+%%DATADIR%%/font/devutf8/JPM
+%%DATADIR%%/font/devutf8/KOG
+%%DATADIR%%/font/devutf8/KOM
 %%DATADIR%%/font/devutf8/R
 %%DATADIR%%/oldfont/devps/CB
 %%DATADIR%%/oldfont/devps/CBI
@@ -483,15 +387,14 @@ bin/troff
 %%DATADIR%%/oldfont/devps/symbolsl.afm
 %%DATADIR%%/oldfont/devps/zapfdr.afm
 %%DATADIR%%/oldfont/devps/zapfdr.ps
-%%DATADIR%%/pic/chem.pic
 %%DATADIR%%/tmac/62bit.tmac
 %%DATADIR%%/tmac/X.tmac
 %%DATADIR%%/tmac/Xps.tmac
 %%DATADIR%%/tmac/an-ext.tmac
 %%DATADIR%%/tmac/an.tmac
 %%DATADIR%%/tmac/andoc.tmac
+%%DATADIR%%/tmac/chem.pic
 %%DATADIR%%/tmac/composite.tmac
-%%DATADIR%%/tmac/cp1047.tmac
 %%DATADIR%%/tmac/cs.tmac
 %%DATADIR%%/tmac/de.tmac
 %%DATADIR%%/tmac/den.tmac
@@ -503,6 +406,7 @@ bin/troff
 %%DATADIR%%/tmac/ec.tmac
 %%DATADIR%%/tmac/en.tmac
 %%DATADIR%%/tmac/eqnrc
+%%DATADIR%%/tmac/es.tmac
 %%DATADIR%%/tmac/europs.tmac
 %%DATADIR%%/tmac/fallbacks.tmac
 %%DATADIR%%/tmac/fr.tmac
@@ -514,13 +418,17 @@ bin/troff
 %%DATADIR%%/tmac/hyphen.den
 %%DATADIR%%/tmac/hyphen.det
 %%DATADIR%%/tmac/hyphen.en
+%%DATADIR%%/tmac/hyphen.es
 %%DATADIR%%/tmac/hyphen.fr
 %%DATADIR%%/tmac/hyphen.it
+%%DATADIR%%/tmac/hyphen.pl
+%%DATADIR%%/tmac/hyphen.ru
 %%DATADIR%%/tmac/hyphen.sv
 %%DATADIR%%/tmac/hyphenex.cs
 %%DATADIR%%/tmac/hyphenex.en
 %%DATADIR%%/tmac/it.tmac
 %%DATADIR%%/tmac/ja.tmac
+%%DATADIR%%/tmac/koi8-r.tmac
 %%DATADIR%%/tmac/latin1.tmac
 %%DATADIR%%/tmac/latin2.tmac
 %%DATADIR%%/tmac/latin5.tmac
@@ -549,11 +457,12 @@ bin/troff
 %%DATADIR%%/tmac/om.tmac
 %%DATADIR%%/tmac/papersize.tmac
 %%DATADIR%%/tmac/pdf.tmac
-%%DATADIR%%/tmac/pdfmark.tmac
 %%DATADIR%%/tmac/pdfpic.tmac
 %%DATADIR%%/tmac/pic.tmac
+%%DATADIR%%/tmac/pl.tmac
 %%DATADIR%%/tmac/ps.tmac
 %%DATADIR%%/tmac/psatk.tmac
+%%DATADIR%%/tmac/psfig.tmac
 %%DATADIR%%/tmac/psold.tmac
 %%DATADIR%%/tmac/pspic.tmac
 %%DATADIR%%/tmac/ptx.tmac
@@ -562,10 +471,9 @@ bin/troff
 %%DATADIR%%/tmac/refer-ms.tmac
 %%DATADIR%%/tmac/refer.tmac
 %%DATADIR%%/tmac/rfc1345.tmac
+%%DATADIR%%/tmac/ru.tmac
 %%DATADIR%%/tmac/s.tmac
-%%DATADIR%%/tmac/sanitize.tmac
 %%DATADIR%%/tmac/sboxes.tmac
-%%DATADIR%%/tmac/spdf.tmac
 %%DATADIR%%/tmac/sv.tmac
 %%DATADIR%%/tmac/trace.tmac
 %%DATADIR%%/tmac/trans.tmac
@@ -606,7 +514,6 @@ share/man/man1/mmroff.1.gz
 share/man/man1/neqn.1.gz
 share/man/man1/nroff.1.gz
 share/man/man1/pdfmom.1.gz
-share/man/man1/pdfroff.1.gz
 share/man/man1/pfbtops.1.gz
 share/man/man1/pic.1.gz
 share/man/man1/pic2graph.1.gz
@@ -635,5 +542,3 @@ share/man/man7/groff_rfc1345.7.gz
 share/man/man7/groff_trace.7.gz
 share/man/man7/groff_www.7.gz
 share/man/man7/roff.7.gz
-@dir lib/groff/site-tmac
-@dir share/groff/site-font