Hi, Bertrand Garrigues put up a release candidate for the upcoming groff-1.23.0 release. Here is an update of our textproc/groff port NOT INTENDED FOR COMMIT. Before commit, i will wait for the official release. But i'm sending this out early such that people who like to can test for regressions, hoping to still get them fixed before release if we find any.
Testing is very welcome, and so are opinions on the paradigmatic change discussed below. Our groff port has long been focussed on formatting manual pages. About a decade ago, more than 3000 ports used it for that purpose. Of these, less than 30 remain because mandoc can now cope with 99% of ports manual pages. For that reason, time might be ripe to switch focus of the port: away from being predominantly a manual page formatter and adapting it better to general purpose typesetting. There is another reason why now is a good time to switch priorities. Upstream has been doing lots of work on documentation, and in that context, they decided to use newer makeinfo(1) features that our ancient /usr/bin/makeinfo does not support. The natural consequence is to make groff depend on the print/texinfo port and use the newer gmakeinfo(1) version contained in that port to format the groff documentation. (Yes, the irony that groff does *not* use roff for its own documentation but instead uses TeX is not lost on me.) Now, print/texinfo isn't exactly a lean port. Here is its list of dependencies according to "make full-all-depends": docbook-dsssl-1.79 metaauto-1.0p4 xz-5.2.5 help2man-1.47.16 autoconf-2.69p3 libb2-0.98.1v0 automake-1.14.1p1 automake-1.15.1 automake-1.16.2 autoconf-2.67p1 libltdl-2.4.2p1 libtool-2.4.2p0 autoconf-2.63p1 gpatch-2.7.6p0 re2c-2.0.3 dvi2tty-5.3.1p0 p5-IPC-Run3-0.048p0 ffcall-1.10p5 libiconv-1.16p0 libunistring-0.9.7 libidn2-2.3.0p0 lzo2-2.10p2 unzip-6.0p13 iso8879-1986p1 yasm-1.3.0p1 ghostscript-fonts-8.11p3 tcl-8.5.19p4 tk-8.5.19p1 t1utils-1.41p0 sqlite2mdoc-0.1.4 sqlite3-3.31.1p0 p5-XML-Parser-2.44p0 xmltoman-0.4 zip-3.0p1 pcre-8.41p2 lunzip-1.11 ijs-0.35p3 libsigsegv-2.12 m4-1.4.18p1 db-4.6.21p7v0 dwz-0.13p0 gettext-runtime-0.21p0 gmake-4.3 lz4-1.9.2p0 libpaper-1.1.28 icu4c-67.1 gdbm-1.18.1p0 ggrep-3.4 zstd-1.4.5p0 bash-5.0.18 gmp-6.2.0 libnettle-3.6 gmp-6.2.0 mpfr-4.0.2.1 gawk-5.1.0 bzip2-1.0.8p0 clisp-2.49p5 libarchive-3.4.3 gtar-1.32p1 libgpg-error-1.39 libgcrypt-1.8.6 lynx-2.8.9rel1p0 zziplib-0.13.62p1 libusb1-1.0.23p2 detex-2.8.1 libtextstyle-0.21p0 gettext-tools-0.21p0 intltool-0.51.0p2 gnugetopt-1.1.6p2 bison-3.3.2p2 png-1.6.37 libffi-3.3 python-3.8.6 py3-setuptools-41.6.0p0v0 py3-tz-2020.1p0 py3-babel-2.8.0p0 py3-six-1.13.0p1 py3-imagesize-1.1.0p2 py3-alabaster-0.7.10p2 py3-pygments-2.5.2p0 py3-docutils-0.12p3 py3-sphinx_rtd_theme-0.2.4p2 py3-setuptools-git-1.2p1 py3-cython-0.29.21 py3-stemmer-1.3.0p5 py3-snowballstemmer-1.2.1p3 py3-MarkupSafe-1.1.1p0 py3-jinja2-2.11.2p1 py3-sphinx-1.4.8p4 py3-markdown-2.6.11p3 py3-cryptodome-3.9.8 py3-beaker-1.10.0p1 py3-mako-1.1.1p0 libxml-2.9.10p2 docbook-4.5p3 libxslt-1.1.34p0 docbook-xsl-1.68.1p7 xmlto-0.0.28p0 giflib-5.1.6 dbus-1.12.20v0 dbus-1.12.20v0 dbus-daemon-launch-helper-1.12.20 python-2.7.18p0 py-setuptools-41.6.0p0v0 py-tz-2020.1p0 py-babel-2.8.0p0 py-six-1.13.0p1 py-imagesize-1.1.0p2 py-alabaster-0.7.10p2 py-pygments-2.5.2p0 py-docutils-0.12p3 py-sphinx_rtd_theme-0.2.4p2 py-setuptools-git-1.2p1 py-cython-0.29.21 py-stemmer-1.3.0p5 py-snowballstemmer-1.2.1p3 py-MarkupSafe-1.1.1p0 py-jinja2-2.11.2p1 py-sphinx-1.4.8p4 libuv-1.30.1 ninja-1.10.1 meson-0.55.3v0 jsoncpp-1.8.4p2 glib2-2.64.6 cairo-1.16.0 gobject-introspection-1.64.1p0 desktop-file-utils-0.26 jbig2dec-0.11 nghttp2-1.41.0p1 curl-7.72.0 rhash-1.4.0 cmake-3.17.2p1v0 jpeg-2.0.5v0 tiff-4.1.0 libwebp-1.1.0 gd-2.3.0p0 lcms2-2.9p0 graphite2-1.3.14 harfbuzz-2.7.2 cmocka-1.1.3 libevent-2.1.11 libunbound-1.12.0 libtasn1-4.16.0 p11-kit-0.23.21 gnutls-3.6.15 libdaemon-0.14p1 avahi-0.8p0 cups-libs-2.3.3 ghostscript-9.07p7 texlive_mktexlsr-2020p0 lcdf-typetools-2.108 texlive_texmf-buildset-2020p0 ps2eps-1.68p0 psutils-2.03p1 texlive_synctex-2020p0 texlive_base-2020p0 So, given that groff needs to depend on all that crap anyway, adding a few lighter dependencies in addition that are actually useful for real-world typesetting tasks sounds like a no-brainer. And bingo, with that, we have a completely new role for the port: No longer a small thing to be built at the beginning of a bulk and to be used by most of the rest of the world for USE_GROFF, but a medium-sized pig now to be built somewhere in the middle, among all those other fat ports pigs... Changes in detail, ordered as in the Makefile: * The X11 libraries are only used by gxditview(1) and xtotroff(1). Those programs have long been part of the groff package upstream, but we used to exclude them to keep the port lean. * Upstream uses the iconv and uchardet libraries in preconv(1), but we used to exclude them to keep the port lean. They are less useful on OpenBSD than elsewhere because we do not support non-UTF-8 character encodings in the first place, but they are not quite as heavy as gmakeinfo(1) and may come in handy occasionally when dealing with foreign files. * The change to MASTER_SITES is temporary and will of course never get committed. * I adjusted the order of variables to match the template. * Adding ghostscript makes a lot of sense because it contains fonts that people expect when doing real PostScript/PDF typesetting. Those issues keep causing frequently asked questions on the groff lists, so i really think we should provide them out of the box. * The other three RUN_DEPENDS are less important but may occasionally come in handy when creating HTML output (netpbm), PDF output (poppler-utils), or PostScript output (psutils), and the groff build systems wants them. So why not. * Texinfo is needed to build the documentation. The alternative would be to ship groff without documentation and point people to https://www.gnu.org/software/groff/manual/html_node/ . But frankly, we don't generally like telling people "get the manual from the web" in OpenBSD. * ac_cv_path_mkdir=/bin/mkdir now appears to be the default, and so does --with-awk=awk . * ac_cv_prog_MAKEINFO and ac_cv_prog_INSTALL_INFO are needed because upstream only looks for makeinfo and install-info, finds our old versions, and those kill the build. * PAGE=letter avoids random behaviour, which would othervise depend on whatever the default is for the user doing the build. * Several patches have been included upstream or are no longer needed for other reasons. * The groffer(1) script had such an abysmal code quality and was so useless in the first place that upstream decided to delete it without any replacement. Just use groff(1) itself, it isn't that hard. * By virtue of the new dependencies, lots of additional documentation in HTML and PDF format can now be installed. * The classical -ms tutorial by Larry Kollar was rediscovered and is now installed to /usr/local/share/doc/groff/ms.ps . * There are large numbers of additional fonts that weren't available before because we avoided the ghostscript dependency. So, here we go: Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/groff/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile 21 Oct 2020 21:21:59 -0000 1.50 +++ Makefile 13 Nov 2020 18:31:51 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile,v 1.50 2020/10/21 21:21:59 jca Exp $ COMMENT = GNU troff typesetter -VERSION = 1.22.4 +VERSION = 1.23.0 SUBST_VARS = VERSION -DISTNAME = groff-${VERSION} -REVISION = 4 +DISTNAME = groff-${VERSION}.rc1 +PKGNAME = groff-${VERSION} CATEGORIES = textproc DPB_PROPERTIES = parallel @@ -15,28 +15,31 @@ MAINTAINER = Ingo Schwarze <schwarze@op # GPLv3+ PERMIT_PACKAGE = Yes -WANTLIB = c m ${COMPILER_LIBCXX} +WANTLIB += ICE SM X11 Xaw Xmu Xt c iconv m uchardet +WANTLIB += ${COMPILER_LIBCXX} + +MASTER_SITES = https://alpha.gnu.org/gnu/groff/ # Groff does not use C++, but merely pre-1995 C with classes. COMPILER = base-clang base-gcc -MASTER_SITES = ${MASTER_SITE_GNU:=groff/} +MODULES = perl +LIB_DEPENDS = converters/libiconv \ + textproc/uchardet +RUN_DEPENDS = graphics/netpbm \ + print/ghostscript/gnu \ + print/poppler,-utils \ + print/psutils +BUILD_DEPENDS = ${RUN_DEPENDS} \ + print/texinfo MAKE_FLAGS += docdir=${PREFIX}/share/doc/groff \ - exampledir=${PREFIX}/share/examples/groff \ - ac_cv_path_mkdir=/bin/mkdir + exampledir=${PREFIX}/share/examples/groff -MODULES = perl CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --with-awk=awk --without-gs \ - --without-libiconv-prefix --without-uchardet \ - --without-urw-fonts-dir --without-x \ - pnmcrop=missing pnmcut=missing pnmtopng=missing \ - pnmtops=missing psselect=missing -CONFIGURE_ENV += ac_cv_prog_PDFFONTS= \ - ac_cv_prog_PDFIMAGES= \ - ac_cv_prog_PDFINFO= \ - ac_cv_prog_XPMTOPPM= +CONFIGURE_ENV += ac_cv_prog_MAKEINFO=gmakeinfo \ + ac_cv_prog_INSTALL_INFO=ginstall-info \ + PAGE=letter TEST_TARGET = check pre-configure: Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/groff/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 24 Dec 2018 10:42:00 -0000 1.5 +++ distinfo 13 Nov 2020 18:31:51 -0000 @@ -1,2 +1,2 @@ -SHA256 (groff-1.22.4.tar.gz) = 5457TLfewxCEkAT6iIR8RHAejRM7XUwTBX2HbButApM= -SIZE (groff-1.22.4.tar.gz) = 4137480 +SHA256 (groff-1.23.0.rc1.tar.gz) = NGAd/XXSPR6bg7/qDAlJFQKvvelqW3JKE+x3CYrcIFE= +SIZE (groff-1.23.0.rc1.tar.gz) = 4204813 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 26 Dec 2018 00:49:22 -0000 1.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.10 2018/12/26 00:49:22 schwarze Exp $ - -To process the hdtbl example files, eqn(1) is used, so build it first. - -Index: Makefile.in ---- Makefile.in.orig -+++ Makefile.in -@@ -11545,7 +11545,7 @@ $(hdtblexample_DATA): $(HDTBLSTRIPFILES) - && sed -e "s|[@]fontdir[@]|$(fontdir)|" \ - -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ - --$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \ -+$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff eqn pic tbl \ - contrib/hdtbl/examples/common.roff - - $(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed Index: patches/patch-lib_vasnprintf_c =================================================================== RCS file: patches/patch-lib_vasnprintf_c diff -N patches/patch-lib_vasnprintf_c --- patches/patch-lib_vasnprintf_c 21 Oct 2020 21:21:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-lib_vasnprintf_c,v 1.1 2020/10/21 21:21:59 jca Exp $ - -Don't use printf %n. - -Index: lib/vasnprintf.c ---- lib/vasnprintf.c.orig -+++ lib/vasnprintf.c -@@ -4871,10 +4871,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -- && !defined __UCLIBC__) \ -- || (defined __APPLE__ && defined __MACH__) \ -- || (defined _WIN32 && ! defined __CYGWIN__)) -+# if 0 - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; Index: patches/patch-tmac_an-old_tmac =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_an-old_tmac,v retrieving revision 1.9 diff -u -p -r1.9 patch-tmac_an-old_tmac --- patches/patch-tmac_an-old_tmac 18 Jan 2020 17:33:56 -0000 1.9 +++ patches/patch-tmac_an-old_tmac 13 Nov 2020 18:31:51 -0000 @@ -1,81 +1,28 @@ -$OpenBSD: patch-tmac_an-old_tmac,v 1.9 2020/01/18 17:33:56 schwarze Exp $ +$OpenBSD$ -chunks 1-4: Repair the .AT and .UC macros (committed upstream, too). -chunk 2: Tweak section headers (local change). -chunk 3: Set the default operating system name (local change). +chunk 1: Tweak section headers (local change). +chunk 2: Set the default operating system name (local change). Index: tmac/an-old.tmac --- tmac/an-old.tmac.orig +++ tmac/an-old.tmac -@@ -146,29 +146,6 @@ - . DEVTAG-EO-TL - . \} +@@ -165,8 +165,8 @@ + . el \{ .ie '\\$2'1' .ds an-extra3 General Commands Manual\" + . el \{ .ie '\\$2'2' .ds an-extra3 System Calls Manual\" + . el \{ .ie '\\$2'3' .ds an-extra3 Library Functions Manual\" +-. el \{ .ie '\\$2'3p' .ds an-extra3 Perl Programmer's Reference Guide\" +-. el \{ .ie '\\$2'4' .ds an-extra3 Kernel Interfaces Manual\" ++. el \{ .ie '\\$2'3p' .ds an-extra3 Perl Library Manual\" ++. el \{ .ie '\\$2'4' .ds an-extra3 Device Drivers Manual\" + . el \{ .ie '\\$2'5' .ds an-extra3 File Formats Manual\" + . el \{ .ie '\\$2'6' .ds an-extra3 Games Manual\" + . el \{ .ie '\\$2'7' .ds an-extra3 Miscellaneous Information Manual\" +@@ -190,7 +190,7 @@ . --. de an-init \" This approach gets multiple man pages right. --. ds an-title "\\$1\" --. ds an-section "\\$2\" --. ds an-extra1 "\\$3\" --. ie (\\n[.$] > 3) .ds an-extra2 "\\$4\" --. el .ds an-extra2 \"Sun Release 4.0 --. --. ie (\\n[.$] > 4) .ds an-extra3 "\\$5\" --. el \{ .ie '\\$2'1' .ds an-extra3 General Commands Manual --. el \{ .ie '\\$2'2' .ds an-extra3 System Calls Manual --. el \{ .ie '\\$2'3' .ds an-extra3 Library Functions Manual --. el \{ .ie '\\$2'3p' .ds an-extra3 Perl Programmers Reference Guide --. el \{ .ie '\\$2'4' .ds an-extra3 Kernel Interfaces Manual --. el \{ .ie '\\$2'5' .ds an-extra3 File Formats Manual --. el \{ .ie '\\$2'6' .ds an-extra3 Games Manual --. el \{ .ie '\\$2'7' .ds an-extra3 Miscellaneous Information Manual --. el \{ .ie '\\$2'8' .ds an-extra3 System Manager's Manual --. el \{ .ie '\\$2'9' .ds an-extra3 Kernel Developer's Manual --. el .ds an-extra3 --. \}\}\}\}\}\}\}\}\}\} --. ds an-init --\\.. --. - . DT - . - . nr PS 10z \" default point size -@@ -214,6 +191,22 @@ - . nr an-break-flag 0 - . nr an-div? 0 - . -+. ds an-title "\\$1\" -+. ds an-section "\\$2\" -+. ie (\\n[.$] > 4) .ds an-extra3 "\\$5\" -+. el \{ .ie '\\$2'1' .ds an-extra3 General Commands Manual -+. el \{ .ie '\\$2'2' .ds an-extra3 System Calls Manual -+. el \{ .ie '\\$2'3' .ds an-extra3 Library Functions Manual -+. el \{ .ie '\\$2'3p' .ds an-extra3 Perl Library Manual -+. el \{ .ie '\\$2'4' .ds an-extra3 Device Drivers Manual -+. el \{ .ie '\\$2'5' .ds an-extra3 File Formats Manual -+. el \{ .ie '\\$2'6' .ds an-extra3 Games Manual -+. el \{ .ie '\\$2'7' .ds an-extra3 Miscellaneous Information Manual -+. el \{ .ie '\\$2'8' .ds an-extra3 System Manager's Manual -+. el \{ .ie '\\$2'9' .ds an-extra3 Kernel Developer's Manual -+. el .ds an-extra3 -+. \}\}\}\}\}\}\}\}\}\} -+. - . ie \\n[cR] \ - . an-header - . el \{\ -@@ -226,6 +219,10 @@ - . el .bp 1 - . \} - . \} -+. -+. ds an-extra1 "\\$3\" -+. ie (\\n[.$] > 3) .ds an-extra2 "\\$4\" -+. el .ds an-extra2 OpenBSD + . ds an-extra1 "\\$3\" + . ie (\\n[.$] > 3) .ds an-extra2 "\\$4\" +-. el .ds an-extra2 \" empty ++. el .ds an-extra2 OpenBSD\" .. . .\" BSD compatibility macros: .AT and .UC -@@ -276,7 +273,6 @@ - .. - . - .de1 an-header --. an-init - . if \\n[cR] \{\ - . ie \\n[an-first] \ - . nr an-first 0 Index: patches/patch-tmac_doc-common-u =================================================================== RCS file: patches/patch-tmac_doc-common-u diff -N patches/patch-tmac_doc-common-u --- patches/patch-tmac_doc-common-u 18 Jan 2020 17:33:56 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,118 +0,0 @@ -$OpenBSD: patch-tmac_doc-common-u,v 1.4 2020/01/18 17:33:56 schwarze Exp $ - -chunks 1-3: Tweak page headers (local change). -chunk 4: Default value for the .Os macro (local change). -chunk 5: Accept any number of arguments for .Dd (committed upstream, too). -chunk 6: Do not use an ugly double dash in the NAME line (local change). - -Index: tmac/doc-common-u ---- tmac/doc-common-u.orig -+++ tmac/doc-common-u -@@ -234,12 +234,10 @@ - . - .\" an alternative, more detailed scheme for naming the manual sections - .\" --.ds doc-volume-operating-system BSD --.nr doc-volume-operating-system-ateol 0 - .ds doc-volume-ds-1 General Commands Manual - .ds doc-volume-ds-2 System Calls Manual - .ds doc-volume-ds-3 Library Functions Manual --.ds doc-volume-ds-4 Kernel Interfaces Manual -+.ds doc-volume-ds-4 Device Drivers Manual - .ds doc-volume-ds-5 File Formats Manual - .ds doc-volume-ds-6 Games Manual - .ds doc-volume-ds-7 Miscellaneous Information Manual -@@ -358,19 +356,10 @@ - . ds doc-section \$2 - . ie \B\$2 \{\ - . if ((\$2 >= 1) & (\$2 <= 9)) \{\ --. ie \n[doc-volume-operating-system-ateol] \{\ --. ds doc-volume "\*[doc-volume-ds-\$2] \*[doc-volume-operating-system] --. if \A\$3 \{\ --. if d doc-volume-as-\$3 \ --. as doc-volume "/\*[doc-volume-as-\$3] --. \}\} --. el \{\ --. ds doc-volume "\*[doc-volume-operating-system] --. if \A\$3 \{\ --. if d doc-volume-as-\$3 \ --. as doc-volume "/\*[doc-volume-as-\$3] --. \} --. as doc-volume " \*[doc-volume-ds-\$2] -+. ds doc-volume "\*[doc-volume-ds-\$2] -+. if \A\$3 \{\ -+. if d doc-volume-as-\$3 \ -+. as doc-volume " (\*[doc-volume-as-\$3]) - . \}\}\} - . el \{\ - . ie "\$2"unass" \ -@@ -379,7 +368,7 @@ - . ds doc-volume DRAFT - . el .if "\$2"paper" \ - . ds doc-volume UNTITLED --. \}\} -+. \} - . if \A\$3 \{\ - . if d doc-volume-ds-\$3 \ - . ds doc-volume "\*[doc-volume-ds-\$3] -@@ -402,7 +391,7 @@ - .\" NS - .\" NS override this in 'mdoc.local', if necessary - . --.ds doc-default-operating-system BSD -+.ds doc-default-operating-system OpenBSD - . - . - .\" NS doc-operating-system global string -@@ -778,39 +767,14 @@ - .\" NS doc-date-string - .\" NS doc-command-name - .\" NS --.\" NS local variables: --.\" NS doc-date-XXX --.\" NS - .\" NS width register 'Dd' set above - . --.ds doc-date-1 January --.ds doc-date-2 February --.ds doc-date-3 March --.ds doc-date-4 April --.ds doc-date-5 May --.ds doc-date-6 June --.ds doc-date-7 July --.ds doc-date-8 August --.ds doc-date-9 September --.ds doc-date-10 October --.ds doc-date-11 November --.ds doc-date-12 December --. - .de Dd - . ds doc-command-name --. --. ie \n[.$] \{\ --. ie "\$1"$Mdocdate:" \ --. ds doc-date-string \$2\~\$3, \$4 --. el \{ .ie (\n[.$] == 3) \ --. ds doc-date-string \$1\~\$2 \$3 --. el \{\ --. ds doc-date-string "\*[doc-date-\n[mo]] --. as doc-date-string \~\n[dy], \n[year] --. \}\} --. \} -+. ie "\$1"$Mdocdate:" \ -+. ds doc-date-string \$2\~\$3, \$4 - . el \ --. ds doc-date-string Epoch -+. ds doc-date-string \$* - .. - . - . -@@ -976,7 +940,7 @@ - .\" NS width register 'Nd' set above - . - .de Nd --. nop \[em] \$* -+. nop \[en] \$* - .. - . - . Index: patches/patch-tmac_doc_tmac-u =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_doc_tmac-u,v retrieving revision 1.2 diff -u -p -r1.2 patch-tmac_doc_tmac-u --- patches/patch-tmac_doc_tmac-u 12 Jan 2019 17:01:35 -0000 1.2 +++ patches/patch-tmac_doc_tmac-u 13 Nov 2020 18:31:51 -0000 @@ -1,12 +1,11 @@ $OpenBSD: patch-tmac_doc_tmac-u,v 1.2 2019/01/12 17:01:35 schwarze Exp $ -chunk 1: Always format .Pa the same way, as requested by jmc@ (local change). -chunks 2-3: Do not misinterpret .Lk args as macros (committed upstream, too). +Always format .Pa the same way, as requested by jmc@ (local change). Index: tmac/doc.tmac-u --- tmac/doc.tmac-u.orig +++ tmac/doc.tmac-u -@@ -3761,8 +3761,6 @@ +@@ -3766,8 +3766,6 @@ . . if \n[doc-in-files-section] \{\ . ds doc-saved-Pa-font "\*[doc-Pa-font] @@ -15,26 +14,3 @@ Index: tmac/doc.tmac-u . \} . . ie (\n[doc-type1] == 1) \ -@@ -6485,10 +6483,11 @@ - . if (\n[doc-arg-ptr] <= \n[doc-lasttext-Lk]) \{\ - . nop \*[doc-Em-font]\c - . while (\n[doc-arg-ptr] < \n[doc-lasttext-Lk]) \{\ --. nop \*[doc-arg\n[doc-arg-ptr]] -+. nop \&\*[doc-arg\n[doc-arg-ptr]] - . nr doc-arg-ptr +1 - . \} --. nop \*[doc-arg\n[doc-arg-ptr]]\f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]: -+. nop \&\*[doc-arg\n[doc-arg-ptr]]\c -+. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]: - . nr doc-arg-ptr +1 - . \} - . -@@ -6498,7 +6497,7 @@ - . - . \" Print the delimiters, if any. - . while (\n[doc-arg-ptr] <= \n[doc-arg-limit]) \{\ --. nop \*[doc-arg\n[doc-arg-ptr]]\c -+. nop \&\*[doc-arg\n[doc-arg-ptr]]\c - . nr doc-arg-ptr +1 - . \} - . nop \& Index: patches/patch-tmac_mdoc_doc-common-u =================================================================== RCS file: patches/patch-tmac_mdoc_doc-common-u diff -N patches/patch-tmac_mdoc_doc-common-u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tmac_mdoc_doc-common-u 13 Nov 2020 18:31:51 -0000 @@ -0,0 +1,74 @@ +$OpenBSD$ + +chunks 1-3: Tweak page headers (local change). +chunk 4: Default value for the .Os macro (local change). +chunk 5: Do not use an ugly double dash in the NAME line (local change). + +Index: tmac/mdoc/doc-common-u +--- tmac/mdoc/doc-common-u.orig ++++ tmac/mdoc/doc-common-u +@@ -234,12 +234,10 @@ + . + .\" an alternative, more detailed scheme for naming the manual sections + .\" +-.ds doc-volume-operating-system BSD +-.nr doc-volume-operating-system-ateol 0 + .ds doc-volume-ds-1 General Commands Manual + .ds doc-volume-ds-2 System Calls Manual + .ds doc-volume-ds-3 Library Functions Manual +-.ds doc-volume-ds-4 Kernel Interfaces Manual ++.ds doc-volume-ds-4 Device Drivers Manual + .ds doc-volume-ds-5 File Formats Manual + .ds doc-volume-ds-6 Games Manual + .ds doc-volume-ds-7 Miscellaneous Information Manual +@@ -361,19 +359,10 @@ + . ds doc-section \$2 + . ie \B\$2 \{\ + . if ((\$2 >= 1) & (\$2 <= 9)) \{\ +-. ie \n[doc-volume-operating-system-ateol] \{\ +-. ds doc-volume "\*[doc-volume-ds-\$2] \*[doc-volume-operating-system] +-. if \A\$3 \{\ +-. if d doc-volume-as-\$3 \ +-. as doc-volume "/\*[doc-volume-as-\$3] +-. \}\} +-. el \{\ +-. ds doc-volume "\*[doc-volume-operating-system] +-. if \A\$3 \{\ +-. if d doc-volume-as-\$3 \ +-. as doc-volume "/\*[doc-volume-as-\$3] +-. \} +-. as doc-volume " \*[doc-volume-ds-\$2] ++. ds doc-volume "\*[doc-volume-ds-\$2] ++. if \A\$3 \{\ ++. if d doc-volume-as-\$3 \ ++. as doc-volume " (\*[doc-volume-as-\$3]) + . \}\}\} + . el \{\ + . ie "\$2"unass" \ +@@ -382,7 +371,7 @@ + . ds doc-volume DRAFT + . el .if "\$2"paper" \ + . ds doc-volume UNTITLED +-. \}\} ++. \} + . if \A\$3 \{\ + . if d doc-volume-ds-\$3 \ + . ds doc-volume "\*[doc-volume-ds-\$3] +@@ -405,7 +394,7 @@ + .\" NS + .\" NS override this in 'mdoc.local', if necessary + . +-.ds doc-default-operating-system BSD ++.ds doc-default-operating-system OpenBSD + . + . + .\" NS doc-operating-system global string +@@ -1076,7 +1065,7 @@ + .\" NS width register 'Nd' set above + . + .de Nd +-. nop \[em] \$* ++. nop \[en] \$* + .. + . + . Index: patches/patch-tmac_troffrc =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_troffrc,v retrieving revision 1.5 diff -u -p -r1.5 patch-tmac_troffrc --- patches/patch-tmac_troffrc 24 Dec 2018 10:42:00 -0000 1.5 +++ patches/patch-tmac_troffrc 13 Nov 2020 18:31:51 -0000 @@ -1,9 +1,11 @@ $OpenBSD: patch-tmac_troffrc,v 1.5 2018/12/24 10:42:00 schwarze Exp $ + Disable hyphenation and adjustment (local change). + Index: tmac/troffrc --- tmac/troffrc.orig +++ tmac/troffrc -@@ -41,10 +41,16 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp tro +@@ -43,10 +43,16 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp tro .\" Set the hyphenation language to 'us'. .do hla us . Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/groff/pkg/PLIST,v retrieving revision 1.10 diff -u -p -r1.10 PLIST --- pkg/PLIST 24 Dec 2018 10:42:00 -0000 1.10 +++ pkg/PLIST 13 Nov 2020 18:31:51 -0000 @@ -14,13 +14,13 @@ bin/grap2graph @bin bin/grn @bin bin/grodvi @bin bin/groff -bin/groffer bin/grog @bin bin/grolbp @bin bin/grolj4 bin/gropdf @bin bin/grops @bin bin/grotty +@bin bin/gxditview @bin bin/hpftodit @bin bin/indxbib @bin bin/lkbib @@ -37,17 +37,14 @@ bin/pic2graph @bin bin/pre-grohtml @bin bin/preconv @bin bin/refer -bin/roff2dvi -bin/roff2html -bin/roff2pdf -bin/roff2ps -bin/roff2text -bin/roff2x @bin bin/soelim @bin bin/tbl @bin bin/tfmtodit @bin bin/troff +@bin bin/xtotroff @info info/groff.info +lib/X11/app-defaults/GXditview +lib/X11/app-defaults/GXditview-color @comment lib/charset.alias lib/groff/ lib/groff/glilypond/ @@ -58,12 +55,6 @@ lib/groff/gpinyin/ lib/groff/gpinyin/subs.pl lib/groff/groff_opts_no_arg.txt lib/groff/groff_opts_with_arg.txt -lib/groff/groffer/ -lib/groff/groffer/main_subs.pl -lib/groff/groffer/man.pl -lib/groff/groffer/split_env.sh -lib/groff/groffer/subs.pl -lib/groff/groffer/version.sh lib/groff/grog/ lib/groff/grog/subs.pl lib/groff/site-tmac/ @@ -80,7 +71,6 @@ lib/groff/site-tmac/ @man man/man1/grn.1 @man man/man1/grodvi.1 @man man/man1/groff.1 -@man man/man1/groffer.1 @man man/man1/grog.1 @man man/man1/grohtml.1 @man man/man1/grolbp.1 @@ -88,6 +78,7 @@ lib/groff/site-tmac/ @man man/man1/gropdf.1 @man man/man1/grops.1 @man man/man1/grotty.1 +@man man/man1/gxditview.1 @man man/man1/hpftodit.1 @man man/man1/indxbib.1 @man man/man1/lkbib.1 @@ -102,16 +93,11 @@ lib/groff/site-tmac/ @man man/man1/pic2graph.1 @man man/man1/preconv.1 @man man/man1/refer.1 -@man man/man1/roff2dvi.1 -@man man/man1/roff2html.1 -@man man/man1/roff2pdf.1 -@man man/man1/roff2ps.1 -@man man/man1/roff2text.1 -@man man/man1/roff2x.1 @man man/man1/soelim.1 @man man/man1/tbl.1 @man man/man1/tfmtodit.1 @man man/man1/troff.1 +@man man/man1/xtotroff.1 @man man/man5/groff_filenames.5 @man man/man5/groff_font.5 @man man/man5/groff_out.5 @@ -123,6 +109,7 @@ lib/groff/site-tmac/ @man man/man7/groff_diff.7 @man man/man7/groff_hdtbl.7 @man man/man7/groff_man.7 +@man man/man7/groff_man_style.7 @man man/man7/groff_mdoc.7 @man man/man7/groff_me.7 @man man/man7/groff_mm.7 @@ -134,6 +121,57 @@ lib/groff/site-tmac/ @man man/man7/roff.7 share/doc/groff/ share/doc/groff/html/ +share/doc/groff/html/img/ +share/doc/groff/html/img/pic1.png +share/doc/groff/html/img/pic10.png +share/doc/groff/html/img/pic11.png +share/doc/groff/html/img/pic12.png +share/doc/groff/html/img/pic13.png +share/doc/groff/html/img/pic14.png +share/doc/groff/html/img/pic15.png +share/doc/groff/html/img/pic16.png +share/doc/groff/html/img/pic17.png +share/doc/groff/html/img/pic18.png +share/doc/groff/html/img/pic19.png +share/doc/groff/html/img/pic2.png +share/doc/groff/html/img/pic20.png +share/doc/groff/html/img/pic21.png +share/doc/groff/html/img/pic22.png +share/doc/groff/html/img/pic23.png +share/doc/groff/html/img/pic24.png +share/doc/groff/html/img/pic25.png +share/doc/groff/html/img/pic26.png +share/doc/groff/html/img/pic27.png +share/doc/groff/html/img/pic28.png +share/doc/groff/html/img/pic29.png +share/doc/groff/html/img/pic3.png +share/doc/groff/html/img/pic30.png +share/doc/groff/html/img/pic31.png +share/doc/groff/html/img/pic32.png +share/doc/groff/html/img/pic33.png +share/doc/groff/html/img/pic34.png +share/doc/groff/html/img/pic35.png +share/doc/groff/html/img/pic36.png +share/doc/groff/html/img/pic37.png +share/doc/groff/html/img/pic38.png +share/doc/groff/html/img/pic39.png +share/doc/groff/html/img/pic4.png +share/doc/groff/html/img/pic40.png +share/doc/groff/html/img/pic41.png +share/doc/groff/html/img/pic42.png +share/doc/groff/html/img/pic43.png +share/doc/groff/html/img/pic44.png +share/doc/groff/html/img/pic45.png +share/doc/groff/html/img/pic47.png +share/doc/groff/html/img/pic48.png +share/doc/groff/html/img/pic49.png +share/doc/groff/html/img/pic5.png +share/doc/groff/html/img/pic50.png +share/doc/groff/html/img/pic51.png +share/doc/groff/html/img/pic6.png +share/doc/groff/html/img/pic7.png +share/doc/groff/html/img/pic8.png +share/doc/groff/html/img/pic9.png share/doc/groff/html/mom/ share/doc/groff/html/mom/appendices.html share/doc/groff/html/mom/color.html @@ -158,12 +196,42 @@ share/doc/groff/html/mom/toc.html share/doc/groff/html/mom/typesetting.html share/doc/groff/html/mom/using.html share/doc/groff/html/mom/version-2.html +share/doc/groff/html/pic-1.html +share/doc/groff/html/pic-10.html +share/doc/groff/html/pic-11.html +share/doc/groff/html/pic-12.html +share/doc/groff/html/pic-13.html +share/doc/groff/html/pic-14.html +share/doc/groff/html/pic-15.html +share/doc/groff/html/pic-16.html +share/doc/groff/html/pic-17.html +share/doc/groff/html/pic-18.html +share/doc/groff/html/pic-19.html +share/doc/groff/html/pic-2.html +share/doc/groff/html/pic-20.html +share/doc/groff/html/pic-21.html +share/doc/groff/html/pic-22.html +share/doc/groff/html/pic-23.html +share/doc/groff/html/pic-3.html +share/doc/groff/html/pic-4.html +share/doc/groff/html/pic-5.html +share/doc/groff/html/pic-6.html +share/doc/groff/html/pic-7.html +share/doc/groff/html/pic-8.html +share/doc/groff/html/pic-9.html +share/doc/groff/html/pic.html share/doc/groff/meintro.me share/doc/groff/meintro.ps share/doc/groff/meintro_fr.me share/doc/groff/meintro_fr.ps share/doc/groff/meref.me share/doc/groff/meref.ps +share/doc/groff/ms.ms +share/doc/groff/ms.ps +share/doc/groff/pdf/ +share/doc/groff/pdf/automake.pdf +share/doc/groff/pdf/mom-pdf.pdf +share/doc/groff/pdf/pdfmark.pdf share/doc/groff/pic.ms share/doc/groff/pic.ps share/doc/pkg-readmes/${PKGSTEM} @@ -254,28 +322,135 @@ share/examples/groff/hdtbl/rainbow.ps share/examples/groff/hdtbl/rainbow.roff share/examples/groff/hdtbl/short_reference.ps share/examples/groff/hdtbl/short_reference.roff +share/examples/groff/img/ +share/examples/groff/img/webpage1.png +share/examples/groff/img/webpage2.png share/examples/groff/mm/ share/examples/groff/mm/letter.mm share/examples/groff/mom/ share/examples/groff/mom/README-fr.txt share/examples/groff/mom/README.txt +share/examples/groff/mom/copyright-chapter.mom +share/examples/groff/mom/copyright-chapter.pdf +share/examples/groff/mom/copyright-default.mom +share/examples/groff/mom/copyright-default.pdf share/examples/groff/mom/elvis_syntax share/examples/groff/mom/elvis_syntax.new share/examples/groff/mom/letter.mom +share/examples/groff/mom/letter.pdf share/examples/groff/mom/mom-pdf.mom +share/examples/groff/mom/mom-pdf.pdf share/examples/groff/mom/mom.vim share/examples/groff/mom/mon_premier_doc.mom +share/examples/groff/mom/mon_premier_doc.pdf share/examples/groff/mom/penguin.pdf share/examples/groff/mom/penguin.ps share/examples/groff/mom/sample_docs.mom +share/examples/groff/mom/sample_docs.pdf share/examples/groff/mom/slide-demo.mom +share/examples/groff/mom/slide-demo.pdf share/examples/groff/mom/typesetting.mom +share/examples/groff/mom/typesetting.pdf +share/examples/groff/webpage-1.html +share/examples/groff/webpage-10.html +share/examples/groff/webpage-11.html +share/examples/groff/webpage-12.html +share/examples/groff/webpage-13.html +share/examples/groff/webpage-14.html +share/examples/groff/webpage-15.html +share/examples/groff/webpage-16.html +share/examples/groff/webpage-17.html +share/examples/groff/webpage-2.html +share/examples/groff/webpage-3.html +share/examples/groff/webpage-4.html +share/examples/groff/webpage-5.html +share/examples/groff/webpage-6.html +share/examples/groff/webpage-7.html +share/examples/groff/webpage-8.html +share/examples/groff/webpage-9.html +share/examples/groff/webpage.html share/examples/groff/webpage.ms share/examples/groff/webpage.ps share/groff/ share/groff/${VERSION}/ share/groff/${VERSION}/eign share/groff/${VERSION}/font/ +share/groff/${VERSION}/font/devX100/ +share/groff/${VERSION}/font/devX100-12/ +share/groff/${VERSION}/font/devX100-12/CB +share/groff/${VERSION}/font/devX100-12/CBI +share/groff/${VERSION}/font/devX100-12/CI +share/groff/${VERSION}/font/devX100-12/CR +share/groff/${VERSION}/font/devX100-12/DESC +share/groff/${VERSION}/font/devX100-12/HB +share/groff/${VERSION}/font/devX100-12/HBI +share/groff/${VERSION}/font/devX100-12/HI +share/groff/${VERSION}/font/devX100-12/HR +share/groff/${VERSION}/font/devX100-12/NB +share/groff/${VERSION}/font/devX100-12/NBI +share/groff/${VERSION}/font/devX100-12/NI +share/groff/${VERSION}/font/devX100-12/NR +share/groff/${VERSION}/font/devX100-12/S +share/groff/${VERSION}/font/devX100-12/TB +share/groff/${VERSION}/font/devX100-12/TBI +share/groff/${VERSION}/font/devX100-12/TI +share/groff/${VERSION}/font/devX100-12/TR +share/groff/${VERSION}/font/devX100/CB +share/groff/${VERSION}/font/devX100/CBI +share/groff/${VERSION}/font/devX100/CI +share/groff/${VERSION}/font/devX100/CR +share/groff/${VERSION}/font/devX100/DESC +share/groff/${VERSION}/font/devX100/HB +share/groff/${VERSION}/font/devX100/HBI +share/groff/${VERSION}/font/devX100/HI +share/groff/${VERSION}/font/devX100/HR +share/groff/${VERSION}/font/devX100/NB +share/groff/${VERSION}/font/devX100/NBI +share/groff/${VERSION}/font/devX100/NI +share/groff/${VERSION}/font/devX100/NR +share/groff/${VERSION}/font/devX100/S +share/groff/${VERSION}/font/devX100/TB +share/groff/${VERSION}/font/devX100/TBI +share/groff/${VERSION}/font/devX100/TI +share/groff/${VERSION}/font/devX100/TR +share/groff/${VERSION}/font/devX75/ +share/groff/${VERSION}/font/devX75-12/ +share/groff/${VERSION}/font/devX75-12/CB +share/groff/${VERSION}/font/devX75-12/CBI +share/groff/${VERSION}/font/devX75-12/CI +share/groff/${VERSION}/font/devX75-12/CR +share/groff/${VERSION}/font/devX75-12/DESC +share/groff/${VERSION}/font/devX75-12/HB +share/groff/${VERSION}/font/devX75-12/HBI +share/groff/${VERSION}/font/devX75-12/HI +share/groff/${VERSION}/font/devX75-12/HR +share/groff/${VERSION}/font/devX75-12/NB +share/groff/${VERSION}/font/devX75-12/NBI +share/groff/${VERSION}/font/devX75-12/NI +share/groff/${VERSION}/font/devX75-12/NR +share/groff/${VERSION}/font/devX75-12/S +share/groff/${VERSION}/font/devX75-12/TB +share/groff/${VERSION}/font/devX75-12/TBI +share/groff/${VERSION}/font/devX75-12/TI +share/groff/${VERSION}/font/devX75-12/TR +share/groff/${VERSION}/font/devX75/CB +share/groff/${VERSION}/font/devX75/CBI +share/groff/${VERSION}/font/devX75/CI +share/groff/${VERSION}/font/devX75/CR +share/groff/${VERSION}/font/devX75/DESC +share/groff/${VERSION}/font/devX75/HB +share/groff/${VERSION}/font/devX75/HBI +share/groff/${VERSION}/font/devX75/HI +share/groff/${VERSION}/font/devX75/HR +share/groff/${VERSION}/font/devX75/NB +share/groff/${VERSION}/font/devX75/NBI +share/groff/${VERSION}/font/devX75/NI +share/groff/${VERSION}/font/devX75/NR +share/groff/${VERSION}/font/devX75/S +share/groff/${VERSION}/font/devX75/TB +share/groff/${VERSION}/font/devX75/TBI +share/groff/${VERSION}/font/devX75/TI +share/groff/${VERSION}/font/devX75/TR share/groff/${VERSION}/font/devascii/ share/groff/${VERSION}/font/devascii/B share/groff/${VERSION}/font/devascii/BI @@ -434,6 +609,14 @@ share/groff/${VERSION}/font/devlj4/gener share/groff/${VERSION}/font/devlj4/generate/text.map share/groff/${VERSION}/font/devlj4/generate/wingdings.map share/groff/${VERSION}/font/devpdf/ +share/groff/${VERSION}/font/devpdf/AB +share/groff/${VERSION}/font/devpdf/ABI +share/groff/${VERSION}/font/devpdf/AI +share/groff/${VERSION}/font/devpdf/AR +share/groff/${VERSION}/font/devpdf/BMB +share/groff/${VERSION}/font/devpdf/BMBI +share/groff/${VERSION}/font/devpdf/BMI +share/groff/${VERSION}/font/devpdf/BMR share/groff/${VERSION}/font/devpdf/CB share/groff/${VERSION}/font/devpdf/CBI share/groff/${VERSION}/font/devpdf/CI @@ -444,12 +627,60 @@ share/groff/${VERSION}/font/devpdf/Found share/groff/${VERSION}/font/devpdf/HB share/groff/${VERSION}/font/devpdf/HBI share/groff/${VERSION}/font/devpdf/HI +share/groff/${VERSION}/font/devpdf/HNB +share/groff/${VERSION}/font/devpdf/HNBI +share/groff/${VERSION}/font/devpdf/HNI +share/groff/${VERSION}/font/devpdf/HNR share/groff/${VERSION}/font/devpdf/HR +share/groff/${VERSION}/font/devpdf/NB +share/groff/${VERSION}/font/devpdf/NBI +share/groff/${VERSION}/font/devpdf/NI +share/groff/${VERSION}/font/devpdf/NR +share/groff/${VERSION}/font/devpdf/PB +share/groff/${VERSION}/font/devpdf/PBI +share/groff/${VERSION}/font/devpdf/PI +share/groff/${VERSION}/font/devpdf/PR share/groff/${VERSION}/font/devpdf/S share/groff/${VERSION}/font/devpdf/TB share/groff/${VERSION}/font/devpdf/TBI share/groff/${VERSION}/font/devpdf/TI share/groff/${VERSION}/font/devpdf/TR +share/groff/${VERSION}/font/devpdf/U-AB +share/groff/${VERSION}/font/devpdf/U-ABI +share/groff/${VERSION}/font/devpdf/U-AI +share/groff/${VERSION}/font/devpdf/U-AR +share/groff/${VERSION}/font/devpdf/U-BMB +share/groff/${VERSION}/font/devpdf/U-BMBI +share/groff/${VERSION}/font/devpdf/U-BMI +share/groff/${VERSION}/font/devpdf/U-BMR +share/groff/${VERSION}/font/devpdf/U-CB +share/groff/${VERSION}/font/devpdf/U-CBI +share/groff/${VERSION}/font/devpdf/U-CI +share/groff/${VERSION}/font/devpdf/U-CR +share/groff/${VERSION}/font/devpdf/U-HB +share/groff/${VERSION}/font/devpdf/U-HBI +share/groff/${VERSION}/font/devpdf/U-HI +share/groff/${VERSION}/font/devpdf/U-HNB +share/groff/${VERSION}/font/devpdf/U-HNBI +share/groff/${VERSION}/font/devpdf/U-HNI +share/groff/${VERSION}/font/devpdf/U-HNR +share/groff/${VERSION}/font/devpdf/U-HR +share/groff/${VERSION}/font/devpdf/U-NB +share/groff/${VERSION}/font/devpdf/U-NBI +share/groff/${VERSION}/font/devpdf/U-NI +share/groff/${VERSION}/font/devpdf/U-NR +share/groff/${VERSION}/font/devpdf/U-PB +share/groff/${VERSION}/font/devpdf/U-PBI +share/groff/${VERSION}/font/devpdf/U-PI +share/groff/${VERSION}/font/devpdf/U-PR +share/groff/${VERSION}/font/devpdf/U-S +share/groff/${VERSION}/font/devpdf/U-TB +share/groff/${VERSION}/font/devpdf/U-TBI +share/groff/${VERSION}/font/devpdf/U-TI +share/groff/${VERSION}/font/devpdf/U-TR +share/groff/${VERSION}/font/devpdf/U-ZCMI +share/groff/${VERSION}/font/devpdf/U-ZD +share/groff/${VERSION}/font/devpdf/ZCMI share/groff/${VERSION}/font/devpdf/ZD share/groff/${VERSION}/font/devpdf/download share/groff/${VERSION}/font/devpdf/enc/ @@ -572,9 +803,12 @@ share/groff/${VERSION}/tmac/de.tmac share/groff/${VERSION}/tmac/den.tmac share/groff/${VERSION}/tmac/devtag.tmac share/groff/${VERSION}/tmac/doc-old.tmac +@comment share/groff/${VERSION}/tmac/doc-old.tmac-u share/groff/${VERSION}/tmac/doc.tmac +@comment share/groff/${VERSION}/tmac/doc.tmac-u share/groff/${VERSION}/tmac/dvi.tmac share/groff/${VERSION}/tmac/e.tmac +@comment share/groff/${VERSION}/tmac/e.tmac-u share/groff/${VERSION}/tmac/ec.tmac share/groff/${VERSION}/tmac/eqnrc share/groff/${VERSION}/tmac/europs.tmac
