Download raw body.
textproc/groff 1.24.1
On 2026/07/21 14:45, Andrew Kloet wrote:
> Hello ports@
>
> Attached is an update for groff 1.22.4 -> 1.24.1. A jump of 8 years!
>
> Ingo Schwarze is the maintainer of this port and previously did work to
> update to 1.23.0 [1], much of this diff was made cross referencing
> upstream, -current, and his patch.
If a port has a maintainer, CC them on updates (or send directly to
them). Added to CCs on this mail.
> [1] https://marc.info/?l=openbsd-ports&m=160529500629494
>
> In his 1.23.0, Ingo undid a lot of the OpenBSD-specific fat-trimming in
> CONFIGURE_ARGS. I'm not as confident in my own ability to make sure
> that's done properly so I've left that as-is in case there is interest
> in it perhaps in a later revision.
>
> Regression test results:
> - Without patches, groff's regression tests fail the following check:
> FAIL: font/devpdf/tests/check-urw-foundry.sh
>
> - With patches, testing this port fails the following checks:
> FAIL: contrib/mm/tests/letter-with-bottom-block-works.sh
> FAIL: contrib/mm/tests/letters-format-correctly.sh
> FAIL: contrib/mm/tests/memoranda-format-correctly.sh
> FAIL: font/devpdf/tests/check-urw-foundry.sh
> FAIL: src/preproc/eqn/tests/neqn-smoke-test.sh
> FAIL: src/roff/groff/tests/adjustment-works.sh
> FAIL: src/roff/groff/tests/backslash-X-is-transparent-to-hyphenation.sh
> FAIL: src/roff/groff/tests/br-and-brp-requests-work.sh
> FAIL: src/roff/groff/tests/hcode-request-copies-spec-char-code.sh
> FAIL: src/roff/groff/tests/hla-request-works.sh
> FAIL: src/roff/groff/tests/warn-on-underset-adjusted-line.sh
> FAIL: tmac/tests/an_HY-register-works.sh
> FAIL: tmac/tests/an_MT-body-hyphenates.sh
> FAIL: tmac/tests/an_TH-repairs-ad-damage.sh
> FAIL: tmac/tests/an_TH-repairs-hy-damage.sh
> FAIL: tmac/tests/an_UE-breaks-before-long-URIs.sh
> FAIL: tmac/tests/an_UR-body-hyphenates.sh
> FAIL: tmac/tests/an_adjust-link-text-correctly.sh
> FAIL: tmac/tests/an_adjustment-mode-preserved-after-paragraph-tag.sh
> FAIL: tmac/tests/an_adjustment-mode-restoration-works.sh
> FAIL: tmac/tests/an_hyphenation-mode-restoration-works.sh
> FAIL: tmac/tests/an_paragraph-reset-restores-hyphenation-mode.sh
> FAIL: tmac/tests/andoc_clear-doc-traps.sh
> FAIL: tmac/tests/doc_Nm-works.sh
> FAIL: tmac/tests/doc_adjustment-mode-restoration-works.sh
> FAIL: tmac/tests/doc_indents-correctly.sh
> FAIL: tmac/tests/s_vertical-margins-are-correct.sh
>
> As far as I can tell, these additional failures are a benign result of
> the stylistic changes made in patches that have carried over from
> 1.22.4.
>
> Patch changes:
> * patch-Makefile_in Fixed upstream
> * patch-contrib_pdfmark_pdfroff_sh pdfroff removed since 1.24.0
> * patch-lib_vasnprintf_c Fixed upstream
> * patch-tmac_an-old_tmac -> patch-tmac_an_tmac
> * patch-tmac_doc-common-u -> patch-tmac_mdoc_doc-common.
> * patch-tmac_doc_tmac-u Fixed upstream
>
> Looking for review and testing.
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index c7608a927..2c2d62e58 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,8 +1,7 @@
COMMENT = GNU troff typesetter
-VERSION = 1.22.4
+VERSION = 1.24.1
SUBST_VARS = VERSION
DISTNAME = groff-${VERSION}
-REVISION = 4
CATEGORIES = textproc
DPB_PROPERTIES = parallel
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 2f2ac156c..f8aebf357 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (groff-1.22.4.tar.gz) = 5457TLfewxCEkAT6iIR8RHAejRM7XUwTBX2HbButApM=
-SIZE (groff-1.22.4.tar.gz) = 4137480
+SHA256 (groff-1.24.1.tar.gz) = dOKBl5W2r/QxrqyYPWOpyJaO6roqLrp9+LpMe0Hnz9g=
+SIZE (groff-1.24.1.tar.gz) = 9005760
diff --git a/textproc/groff/patches/patch-Makefile_in b/textproc/groff/patches/patch-Makefile_in
deleted file mode 100644
index c5d2e3528..000000000
--- a/textproc/groff/patches/patch-Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff_sh b/textproc/groff/patches/patch-contrib_pdfmark_pdfroff_sh
deleted file mode 100644
index 1af12f7c9..000000000
--- a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff_sh
+++ /dev/null
@@ -1,22 +0,0 @@
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538330
-# references a large patch by Solar Designer.
-# Some of those things are fixed in 1.21, most do not look exploitable.
-# This is the only one that seems worth patching away:
---- contrib/pdfmark/pdfroff.sh.orig Fri Dec 31 08:33:09 2010
-+++ contrib/pdfmark/pdfroff.sh Wed Jun 22 01:37:47 2011
-@@ -153,11 +153,10 @@
- else
- #
- # Creation of a private temporary directory was unsuccessful;
-- # fall back to user nominated directory, (using current directory
-- # as default), and schedule removal of only the temporary files.
-- #
-- GROFF_TMPDIR=${TMPDIR}
-- trap "rm -f ${GROFF_TMPDIR}/pdf$$.*" 0
-+ # DO NOT fall back to user nominated directory,
-+ # because that would allow symlink attacks.
-+ echo >&2 "$CMD: mktemp(1) -d failure"
-+ exit 1
- fi
- #
- # In the case of abnormal termination events, we force an exit
diff --git a/textproc/groff/patches/patch-lib_vasnprintf_c b/textproc/groff/patches/patch-lib_vasnprintf_c
deleted file mode 100644
index fb502cf8c..000000000
--- a/textproc/groff/patches/patch-lib_vasnprintf_c
+++ /dev/null
@@ -1,17 +0,0 @@
-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';
diff --git a/textproc/groff/patches/patch-tmac_an-old_tmac b/textproc/groff/patches/patch-tmac_an-old_tmac
deleted file mode 100644
index 09988b511..000000000
--- a/textproc/groff/patches/patch-tmac_an-old_tmac
+++ /dev/null
@@ -1,79 +0,0 @@
-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).
-
-Index: tmac/an-old.tmac
---- tmac/an-old.tmac.orig
-+++ tmac/an-old.tmac
-@@ -146,29 +146,6 @@
- . DEVTAG-EO-TL
- . \}
- .
--. 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
- ..
- .
- .\" 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
diff --git a/textproc/groff/patches/patch-tmac_an_tmac b/textproc/groff/patches/patch-tmac_an_tmac
new file mode 100644
index 000000000..c65810659
--- /dev/null
+++ b/textproc/groff/patches/patch-tmac_an_tmac
@@ -0,0 +1,25 @@
+chunk 1: Tweak section headers (local change).
+chunk 2: Set the default operating system name (local change).
+
+Index: tmac/an.tmac
+--- tmac/an.tmac.orig
++++ tmac/an.tmac
+@@ -282,7 +282,8 @@
+ . ds an*section1 General Commands Manual\"
+ . ds an*section2 System Calls Manual\"
+ . ds an*section3 Library Functions Manual\"
+-. ds an*section4 Kernel Interfaces Manual\"
++. ds an*section3p Perl Library Manual\"
++. ds an*section4 Device Drivers Manual\"
+ . ds an*section5 File Formats Manual\"
+ . ds an*section6 Games Manual\"
+ . ds an*section7 Miscellaneous Information Manual\"
+@@ -387,7 +388,7 @@
+ .
+ . ds an-extra1 "\\$3\"
+ . ie (\\n[.$] > 3) .ds an-extra2 "\\$4\"
+-. el .ds an-extra2 \" empty; but .AT/.UC can override
++. el .ds an-extra2 OpenBSD
+ .
+ . if '\\*[an-extra1]'' \{\
+ . ds an-msg .\\$0 missing third argument; consider document\"
diff --git a/textproc/groff/patches/patch-tmac_doc-common-u b/textproc/groff/patches/patch-tmac_doc-common-u
deleted file mode 100644
index 85fb4848e..000000000
--- a/textproc/groff/patches/patch-tmac_doc-common-u
+++ /dev/null
@@ -1,116 +0,0 @@
-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] \$*
- ..
- .
- .
diff --git a/textproc/groff/patches/patch-tmac_doc_tmac-u b/textproc/groff/patches/patch-tmac_doc_tmac-u
deleted file mode 100644
index 920547e08..000000000
--- a/textproc/groff/patches/patch-tmac_doc_tmac-u
+++ /dev/null
@@ -1,38 +0,0 @@
-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).
-
-Index: tmac/doc.tmac-u
---- tmac/doc.tmac-u.orig
-+++ tmac/doc.tmac-u
-@@ -3761,8 +3761,6 @@
- .
- . if \n[doc-in-files-section] \{\
- . ds doc-saved-Pa-font "\*[doc-Pa-font]
--. if n \
--. ds doc-Pa-font "\*[doc-No-font]
- . \}
- .
- . 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 \&
diff --git a/textproc/groff/patches/patch-tmac_en_tmac b/textproc/groff/patches/patch-tmac_en_tmac
new file mode 100644
index 000000000..c1d67bbb4
--- /dev/null
+++ b/textproc/groff/patches/patch-tmac_en_tmac
@@ -0,0 +1,18 @@
+Disable hyphenation (local change).
+
+Index: tmac/en.tmac
+--- tmac/en.tmac.orig
++++ tmac/en.tmac
+@@ -82,8 +82,10 @@
+ .rr locale*use-trap-hyphenation-mode
+ .
+ .hla en
+-.hpf hyphen.en
+-.hpfa hyphenex.en
++.\" Disable hyphenation:
++.\" Do not load hyphenation patterns and exceptions.
++.\"hpf hyphen.en
++.\"hpfa hyphenex.en
+ .
+ .
+ .\" man package
diff --git a/textproc/groff/patches/patch-tmac_mdoc_doc-common b/textproc/groff/patches/patch-tmac_mdoc_doc-common
new file mode 100644
index 000000000..351105c16
--- /dev/null
+++ b/textproc/groff/patches/patch-tmac_mdoc_doc-common
@@ -0,0 +1,66 @@
+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
+--- tmac/mdoc/doc-common.orig
++++ tmac/mdoc/doc-common
+@@ -345,7 +345,7 @@
+ .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
+@@ -464,12 +464,11 @@
+ . ds doc-section \$2
+ . ie \B'\$2' \{\
+ . if ((\$2 >= 1) & (\$2 <= 9)) \{\
+-. ds doc-volume \" empty (not "LOCAL")
++. ds doc-volume "\*[doc-volume-ds-\$2]
+ . if \A'\$3' \{\
+ . if d doc-volume-as-\$3 \
+-. as doc-volume "\*[doc-volume-as-\$3]
+-. \}
+-. as doc-volume " \*[doc-volume-ds-\$2]
++. as doc-volume " (\*[doc-volume-as-\$3])
++. \}
+ . \}
+ . \}
+ . el \{\
+@@ -481,15 +480,7 @@
+ . ds doc-volume UNTITLED
+ . \}
+ . \}
+-. if \A'\$3' \{\
+-. if d doc-volume-ds-\$3 \
+-. ds doc-volume "\*[doc-volume-ds-\$3]
+-. \}
+ . \}
+-.
+-. if !"\$3"" \
+-. if "\*[doc-volume]"LOCAL" \
+-. ds doc-volume \$3
+ ..
+ .ec
+ .
+@@ -499,7 +490,7 @@
+ .\" NS
+ .\" NS override this in 'mdoc.local', if necessary
+ .
+-.ds doc-default-operating-system GNU\"
++.ds doc-default-operating-system OpenBSD\"
+ .
+ .
+ .\" NS doc-operating-system global string
+@@ -1336,7 +1327,7 @@
+ .de Nd
+ . doc-reset-adjustment-mode
+ . doc-reset-hyphenation-mode
+-. nop \[em] \$*
++. nop \[en] \$*
+ ..
+ .ec
+ .
diff --git a/textproc/groff/patches/patch-tmac_troffrc b/textproc/groff/patches/patch-tmac_troffrc
index e6353d5b6..b8cfa0336 100644
--- a/textproc/groff/patches/patch-tmac_troffrc
+++ b/textproc/groff/patches/patch-tmac_troffrc
@@ -1,24 +1,17 @@
-Disable hyphenation and adjustment (local change).
+Disable 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
- .\" Set the hyphenation language to 'us'.
- .do hla us
- .
--.\" Load hyphenation patterns and exceptions.
--.do hpf hyphen.us
--.do hpfa hyphenex.us
-+.\" Disable hyphenation:
-+.\" Do not load hyphenation patterns and exceptions.
-+.\"do hpf hyphen.us
-+.\"do hpfa hyphenex.us
+@@ -61,6 +61,11 @@ troffrc!html
+ .\" Set the input localization to English.
+ .do mso en.tmac
.
+.\" Disable adjustment by default,
+.\" such that manuals look similar with groff and mandoc(1).
+.ad l
+.de ad
+..
- .\" Handle paper formats.
- .do mso papersize.tmac
+ .\" Handle paper formats on typesetting devices.
+ .if t .do mso papersize.tmac
.
diff --git a/textproc/groff/pkg/PLIST b/textproc/groff/pkg/PLIST
index 087474352..f3a18fe38 100644
--- a/textproc/groff/pkg/PLIST
+++ b/textproc/groff/pkg/PLIST
@@ -13,7 +13,6 @@ bin/grap2graph
@bin bin/grn
@bin bin/grodvi
@bin bin/groff
-bin/groffer
bin/grog
@bin bin/grolbp
@bin bin/grolj4
@@ -28,7 +27,6 @@ bin/mmroff
bin/neqn
bin/nroff
bin/pdfmom
-bin/pdfroff
@bin bin/pfbtops
@bin bin/pic
bin/pic2graph
@@ -36,12 +34,6 @@ 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
@@ -49,22 +41,6 @@ bin/roff2x
@info info/groff.info
@comment lib/charset.alias
lib/groff/
-lib/groff/glilypond/
-lib/groff/glilypond/args.pl
-lib/groff/glilypond/oop_fh.pl
-lib/groff/glilypond/subs.pl
-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/
@man man/man1/addftinfo.1
@man man/man1/afmtodit.1
@@ -79,7 +55,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
@@ -95,43 +70,37 @@ lib/groff/site-tmac/
@man man/man1/neqn.1
@man man/man1/nroff.1
@man man/man1/pdfmom.1
-@man man/man1/pdfroff.1
@man man/man1/pfbtops.1
@man man/man1/pic.1
@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/man5/groff_filenames.5
@man man/man5/groff_font.5
@man man/man5/groff_out.5
@man man/man5/groff_tmac.5
-@man man/man5/lj4_font.5
-@man man/man7/ditroff.7
@man man/man7/groff.7
@man man/man7/groff_char.7
@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
@man man/man7/groff_mmse.7
@man man/man7/groff_mom.7
@man man/man7/groff_ms.7
+@man man/man7/groff_rfc1345.7
@man man/man7/groff_trace.7
@man man/man7/groff_www.7
@man man/man7/roff.7
share/doc/groff/
+share/doc/groff/groff-man-pages.utf8.txt
+share/doc/groff/groff.txt
share/doc/groff/html/
share/doc/groff/html/mom/
share/doc/groff/html/mom/appendices.html
@@ -157,69 +126,79 @@ 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/me-revisions
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/msboxes.ms
+share/doc/groff/pdf/
+share/doc/groff/pdf/automake.pdf
+share/doc/groff/pdf/groff-man-pages.pdf
+share/doc/groff/pdf/mom-pdf.pdf
+share/doc/groff/pdf/msboxes.pdf
share/doc/groff/pic.ms
share/doc/groff/pic.ps
share/doc/pkg-readmes/${PKGSTEM}
share/examples/groff/
share/examples/groff/chem/
-share/examples/groff/chem/122/
-share/examples/groff/chem/122/README
-share/examples/groff/chem/122/ch2a_ethyl.chem
-share/examples/groff/chem/122/ch2b_benzene.chem
-share/examples/groff/chem/122/ch2c_benzene_right.chem
-share/examples/groff/chem/122/ch4a_stick.chem
-share/examples/groff/chem/122/ch4b_methyl_acetate.chem
-share/examples/groff/chem/122/ch4c_colon.chem
-share/examples/groff/chem/122/ch4d_HCl.H2O.chem
-share/examples/groff/chem/122/ch4e_CaSO4.2H2O.chem
-share/examples/groff/chem/122/ch4f_C.chem
-share/examples/groff/chem/122/ch4g_BP.chem
-share/examples/groff/chem/122/ch4h_methacrylate.chem
-share/examples/groff/chem/122/ch4i_cyclo.chem
-share/examples/groff/chem/122/ch4j_ring4.chem
-share/examples/groff/chem/122/ch4k_ring3.chem
-share/examples/groff/chem/122/ch4l_vertex.chem
-share/examples/groff/chem/122/ch4m_double.chem
-share/examples/groff/chem/122/ch4n_triple.chem
-share/examples/groff/chem/122/ch4o_aromatic.chem
-share/examples/groff/chem/122/ch4p_cholestanol.chem
-share/examples/groff/chem/122/ch4q_rings.chem
-share/examples/groff/chem/122/ch4r_spiro.chem
-share/examples/groff/chem/122/ch4s_heteroatoms.chem
-share/examples/groff/chem/122/ch4t_polycyclic.chem
-share/examples/groff/chem/122/ch4u_nicotine.chem
-share/examples/groff/chem/122/ch4v_histidine.chem
-share/examples/groff/chem/122/ch4w_lsd.chem
-share/examples/groff/chem/122/ch4x_anisole.chem
-share/examples/groff/chem/122/ch4y_reserpine.chem
-share/examples/groff/chem/122/ch4z1_eqn_glutamic.chem
-share/examples/groff/chem/122/ch4z2_text.chem
-share/examples/groff/chem/122/ch5a_size.chem
-share/examples/groff/chem/122/ch6a_pic.chem
-share/examples/groff/chem/122/ch6b_dna.chem
-share/examples/groff/chem/122/chAa_polymer.chem
-share/examples/groff/chem/122/chAb_vinyl_chloro.chem
-share/examples/groff/chem/122/chAc_morphine.chem
-share/examples/groff/chem/122/chAd_chlorophyll.chem
-share/examples/groff/chem/122/chAe_chair.chem
-share/examples/groff/chem/122/chAf_arrow.chem
-share/examples/groff/chem/122/chAg_circle.chem
-share/examples/groff/chem/122/chAh_brackets.chem
-share/examples/groff/chem/122/chAi_poly_vinyl_chloride.chem
-share/examples/groff/chem/122/chBa_jump.chem
-share/examples/groff/chem/122/chBb_bonds.chem
-share/examples/groff/chem/122/chBc_rings.chem
share/examples/groff/chem/README
share/examples/groff/chem/atp.chem
-share/examples/groff/chem/cholesterin.chem
+share/examples/groff/chem/cholesterol.chem
+share/examples/groff/chem/cstr-122/
+share/examples/groff/chem/cstr-122/README
+share/examples/groff/chem/cstr-122/ch2a_ethyl.chem
+share/examples/groff/chem/cstr-122/ch2b_benzene.chem
+share/examples/groff/chem/cstr-122/ch2c_benzene_right.chem
+share/examples/groff/chem/cstr-122/ch4a_stick.chem
+share/examples/groff/chem/cstr-122/ch4b_methyl_acetate.chem
+share/examples/groff/chem/cstr-122/ch4c_colon.chem
+share/examples/groff/chem/cstr-122/ch4d_HCl.H2O.chem
+share/examples/groff/chem/cstr-122/ch4e_CaSO4.2H2O.chem
+share/examples/groff/chem/cstr-122/ch4f_C.chem
+share/examples/groff/chem/cstr-122/ch4g_BP.chem
+share/examples/groff/chem/cstr-122/ch4h_methacrylate.chem
+share/examples/groff/chem/cstr-122/ch4i_cyclo.chem
+share/examples/groff/chem/cstr-122/ch4j_ring4.chem
+share/examples/groff/chem/cstr-122/ch4k_ring3.chem
+share/examples/groff/chem/cstr-122/ch4l_vertex.chem
+share/examples/groff/chem/cstr-122/ch4m_double.chem
+share/examples/groff/chem/cstr-122/ch4n_triple.chem
+share/examples/groff/chem/cstr-122/ch4o_aromatic.chem
+share/examples/groff/chem/cstr-122/ch4p_cholestanol.chem
+share/examples/groff/chem/cstr-122/ch4q_rings.chem
+share/examples/groff/chem/cstr-122/ch4r_spiro.chem
+share/examples/groff/chem/cstr-122/ch4s_heteroatoms.chem
+share/examples/groff/chem/cstr-122/ch4t_polycyclic.chem
+share/examples/groff/chem/cstr-122/ch4u_nicotine.chem
+share/examples/groff/chem/cstr-122/ch4v_histidine.chem
+share/examples/groff/chem/cstr-122/ch4w_lsd.chem
+share/examples/groff/chem/cstr-122/ch4x_anisole.chem
+share/examples/groff/chem/cstr-122/ch4y_reserpine.chem
+share/examples/groff/chem/cstr-122/ch4z1_eqn_glutamic.chem
+share/examples/groff/chem/cstr-122/ch4z2_text.chem
+share/examples/groff/chem/cstr-122/ch5a_size.chem
+share/examples/groff/chem/cstr-122/ch6a_pic.chem
+share/examples/groff/chem/cstr-122/ch6b_dna.chem
+share/examples/groff/chem/cstr-122/chAa_polymer.chem
+share/examples/groff/chem/cstr-122/chAb_vinyl_chloro.chem
+share/examples/groff/chem/cstr-122/chAc_morphine.chem
+share/examples/groff/chem/cstr-122/chAd_chlorophyll.chem
+share/examples/groff/chem/cstr-122/chAe_chair.chem
+share/examples/groff/chem/cstr-122/chAf_arrow.chem
+share/examples/groff/chem/cstr-122/chAg_circle.chem
+share/examples/groff/chem/cstr-122/chAh_brackets.chem
+share/examples/groff/chem/cstr-122/chAi_poly_vinyl_chloride.chem
+share/examples/groff/chem/cstr-122/chBa_jump.chem
+share/examples/groff/chem/cstr-122/chBb_bonds.chem
+share/examples/groff/chem/cstr-122/chBc_rings.chem
share/examples/groff/chem/ethamivan.chem
share/examples/groff/chem/lsd.chem
+share/examples/groff/chem/mepacrine.chem
share/examples/groff/chem/morphine.chem
share/examples/groff/chem/penicillin.chem
share/examples/groff/chem/reserpine.chem
@@ -253,22 +232,35 @@ 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/install-font.bash
share/examples/groff/mm/
share/examples/groff/mm/letter.mm
+share/examples/groff/mm/memorandum.mm
+share/examples/groff/mm/story.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.ms
share/examples/groff/webpage.ps
share/groff/
@@ -281,13 +273,11 @@ share/groff/${VERSION}/font/devascii/BI
share/groff/${VERSION}/font/devascii/DESC
share/groff/${VERSION}/font/devascii/I
share/groff/${VERSION}/font/devascii/R
-share/groff/${VERSION}/font/devcp1047/
-share/groff/${VERSION}/font/devcp1047/B
-share/groff/${VERSION}/font/devcp1047/BI
-share/groff/${VERSION}/font/devcp1047/DESC
-share/groff/${VERSION}/font/devcp1047/I
-share/groff/${VERSION}/font/devcp1047/R
share/groff/${VERSION}/font/devdvi/
+share/groff/${VERSION}/font/devdvi/CSH
+share/groff/${VERSION}/font/devdvi/CSS
+share/groff/${VERSION}/font/devdvi/CTH
+share/groff/${VERSION}/font/devdvi/CTS
share/groff/${VERSION}/font/devdvi/CW
share/groff/${VERSION}/font/devdvi/CWEC
share/groff/${VERSION}/font/devdvi/CWI
@@ -308,6 +298,10 @@ share/groff/${VERSION}/font/devdvi/HITC
share/groff/${VERSION}/font/devdvi/HR
share/groff/${VERSION}/font/devdvi/HREC
share/groff/${VERSION}/font/devdvi/HRTC
+share/groff/${VERSION}/font/devdvi/JPG
+share/groff/${VERSION}/font/devdvi/JPM
+share/groff/${VERSION}/font/devdvi/KOG
+share/groff/${VERSION}/font/devdvi/KOM
share/groff/${VERSION}/font/devdvi/MI
share/groff/${VERSION}/font/devdvi/S
share/groff/${VERSION}/font/devdvi/SA
@@ -347,8 +341,16 @@ share/groff/${VERSION}/font/devhtml/CB
share/groff/${VERSION}/font/devhtml/CBI
share/groff/${VERSION}/font/devhtml/CI
share/groff/${VERSION}/font/devhtml/CR
+share/groff/${VERSION}/font/devhtml/CSH
+share/groff/${VERSION}/font/devhtml/CSS
+share/groff/${VERSION}/font/devhtml/CTH
+share/groff/${VERSION}/font/devhtml/CTS
share/groff/${VERSION}/font/devhtml/DESC
share/groff/${VERSION}/font/devhtml/I
+share/groff/${VERSION}/font/devhtml/JPG
+share/groff/${VERSION}/font/devhtml/JPM
+share/groff/${VERSION}/font/devhtml/KOG
+share/groff/${VERSION}/font/devhtml/KOM
share/groff/${VERSION}/font/devhtml/R
share/groff/${VERSION}/font/devhtml/S
share/groff/${VERSION}/font/devlatin1/
@@ -445,6 +447,7 @@ share/groff/${VERSION}/font/devpdf/HBI
share/groff/${VERSION}/font/devpdf/HI
share/groff/${VERSION}/font/devpdf/HR
share/groff/${VERSION}/font/devpdf/S
+share/groff/${VERSION}/font/devpdf/SS
share/groff/${VERSION}/font/devpdf/TB
share/groff/${VERSION}/font/devpdf/TBI
share/groff/${VERSION}/font/devpdf/TI
@@ -455,9 +458,10 @@ share/groff/${VERSION}/font/devpdf/enc/
share/groff/${VERSION}/font/devpdf/enc/text.enc
share/groff/${VERSION}/font/devpdf/map/
share/groff/${VERSION}/font/devpdf/map/dingbats.map
-share/groff/${VERSION}/font/devpdf/map/symbolchars
-share/groff/${VERSION}/font/devpdf/map/symbolmap
-share/groff/${VERSION}/font/devpdf/map/textmap
+share/groff/${VERSION}/font/devpdf/map/symbol.map
+share/groff/${VERSION}/font/devpdf/map/text.map
+share/groff/${VERSION}/font/devpdf/symbolsl.afm
+share/groff/${VERSION}/font/devpdf/symbolsl.pfb
share/groff/${VERSION}/font/devps/
share/groff/${VERSION}/font/devps/AB
share/groff/${VERSION}/font/devps/ABI
@@ -471,6 +475,10 @@ share/groff/${VERSION}/font/devps/CB
share/groff/${VERSION}/font/devps/CBI
share/groff/${VERSION}/font/devps/CI
share/groff/${VERSION}/font/devps/CR
+share/groff/${VERSION}/font/devps/CSH
+share/groff/${VERSION}/font/devps/CSS
+share/groff/${VERSION}/font/devps/CTH
+share/groff/${VERSION}/font/devps/CTS
share/groff/${VERSION}/font/devps/DESC
share/groff/${VERSION}/font/devps/EURO
share/groff/${VERSION}/font/devps/HB
@@ -481,6 +489,10 @@ share/groff/${VERSION}/font/devps/HNBI
share/groff/${VERSION}/font/devps/HNI
share/groff/${VERSION}/font/devps/HNR
share/groff/${VERSION}/font/devps/HR
+share/groff/${VERSION}/font/devps/JPG
+share/groff/${VERSION}/font/devps/JPM
+share/groff/${VERSION}/font/devps/KOG
+share/groff/${VERSION}/font/devps/KOM
share/groff/${VERSION}/font/devps/NB
share/groff/${VERSION}/font/devps/NBI
share/groff/${VERSION}/font/devps/NI
@@ -504,22 +516,32 @@ share/groff/${VERSION}/font/devps/freeeuro.pfa
share/groff/${VERSION}/font/devps/generate/
share/groff/${VERSION}/font/devps/generate/Makefile
share/groff/${VERSION}/font/devps/generate/afmname
+share/groff/${VERSION}/font/devps/generate/dingbats-reversed.map
share/groff/${VERSION}/font/devps/generate/dingbats.map
-share/groff/${VERSION}/font/devps/generate/dingbats.rmap
-share/groff/${VERSION}/font/devps/generate/lgreekmap
+share/groff/${VERSION}/font/devps/generate/slanted-symbol.map
+share/groff/${VERSION}/font/devps/generate/symbol.map
share/groff/${VERSION}/font/devps/generate/symbol.sed
-share/groff/${VERSION}/font/devps/generate/symbolchars
-share/groff/${VERSION}/font/devps/generate/symbolsl.afm
-share/groff/${VERSION}/font/devps/generate/textmap
+share/groff/${VERSION}/font/devps/generate/symbolsl.awk
+share/groff/${VERSION}/font/devps/generate/text.map
share/groff/${VERSION}/font/devps/prologue
+share/groff/${VERSION}/font/devps/symbolsl.afm
share/groff/${VERSION}/font/devps/symbolsl.pfa
share/groff/${VERSION}/font/devps/text.enc
+share/groff/${VERSION}/font/devps/zapfdr.afm
share/groff/${VERSION}/font/devps/zapfdr.pfa
share/groff/${VERSION}/font/devutf8/
share/groff/${VERSION}/font/devutf8/B
share/groff/${VERSION}/font/devutf8/BI
+share/groff/${VERSION}/font/devutf8/CSH
+share/groff/${VERSION}/font/devutf8/CSS
+share/groff/${VERSION}/font/devutf8/CTH
+share/groff/${VERSION}/font/devutf8/CTS
share/groff/${VERSION}/font/devutf8/DESC
share/groff/${VERSION}/font/devutf8/I
+share/groff/${VERSION}/font/devutf8/JPG
+share/groff/${VERSION}/font/devutf8/JPM
+share/groff/${VERSION}/font/devutf8/KOG
+share/groff/${VERSION}/font/devutf8/KOM
share/groff/${VERSION}/font/devutf8/R
share/groff/${VERSION}/oldfont/
share/groff/${VERSION}/oldfont/devps/
@@ -553,19 +575,15 @@ share/groff/${VERSION}/oldfont/devps/symbol.afm
share/groff/${VERSION}/oldfont/devps/symbolsl.afm
share/groff/${VERSION}/oldfont/devps/zapfdr.afm
share/groff/${VERSION}/oldfont/devps/zapfdr.ps
-share/groff/${VERSION}/pic/
-share/groff/${VERSION}/pic/chem.pic
share/groff/${VERSION}/tmac/
share/groff/${VERSION}/tmac/62bit.tmac
share/groff/${VERSION}/tmac/X.tmac
share/groff/${VERSION}/tmac/Xps.tmac
-share/groff/${VERSION}/tmac/a4.tmac
share/groff/${VERSION}/tmac/an-ext.tmac
-share/groff/${VERSION}/tmac/an-old.tmac
share/groff/${VERSION}/tmac/an.tmac
share/groff/${VERSION}/tmac/andoc.tmac
+share/groff/${VERSION}/tmac/chem.pic
share/groff/${VERSION}/tmac/composite.tmac
-share/groff/${VERSION}/tmac/cp1047.tmac
share/groff/${VERSION}/tmac/cs.tmac
share/groff/${VERSION}/tmac/de.tmac
share/groff/${VERSION}/tmac/den.tmac
@@ -575,7 +593,9 @@ share/groff/${VERSION}/tmac/doc.tmac
share/groff/${VERSION}/tmac/dvi.tmac
share/groff/${VERSION}/tmac/e.tmac
share/groff/${VERSION}/tmac/ec.tmac
+share/groff/${VERSION}/tmac/en.tmac
share/groff/${VERSION}/tmac/eqnrc
+share/groff/${VERSION}/tmac/es.tmac
share/groff/${VERSION}/tmac/europs.tmac
share/groff/${VERSION}/tmac/fallbacks.tmac
share/groff/${VERSION}/tmac/fr.tmac
@@ -586,12 +606,18 @@ share/groff/${VERSION}/tmac/html.tmac
share/groff/${VERSION}/tmac/hyphen.cs
share/groff/${VERSION}/tmac/hyphen.den
share/groff/${VERSION}/tmac/hyphen.det
+share/groff/${VERSION}/tmac/hyphen.en
+share/groff/${VERSION}/tmac/hyphen.es
share/groff/${VERSION}/tmac/hyphen.fr
+share/groff/${VERSION}/tmac/hyphen.it
+share/groff/${VERSION}/tmac/hyphen.pl
+share/groff/${VERSION}/tmac/hyphen.ru
share/groff/${VERSION}/tmac/hyphen.sv
-share/groff/${VERSION}/tmac/hyphen.us
share/groff/${VERSION}/tmac/hyphenex.cs
-share/groff/${VERSION}/tmac/hyphenex.us
+share/groff/${VERSION}/tmac/hyphenex.en
+share/groff/${VERSION}/tmac/it.tmac
share/groff/${VERSION}/tmac/ja.tmac
+share/groff/${VERSION}/tmac/koi8-r.tmac
share/groff/${VERSION}/tmac/latin1.tmac
share/groff/${VERSION}/tmac/latin2.tmac
share/groff/${VERSION}/tmac/latin5.tmac
@@ -613,9 +639,7 @@ share/groff/${VERSION}/tmac/mm.tmac
share/groff/${VERSION}/tmac/mm/0.MT
share/groff/${VERSION}/tmac/mm/4.MT
share/groff/${VERSION}/tmac/mm/5.MT
-share/groff/${VERSION}/tmac/mm/locale
share/groff/${VERSION}/tmac/mm/ms.cov
-share/groff/${VERSION}/tmac/mm/se_locale
share/groff/${VERSION}/tmac/mm/se_ms.cov
share/groff/${VERSION}/tmac/mmse.tmac
share/groff/${VERSION}/tmac/mom.tmac
@@ -624,20 +648,23 @@ share/groff/${VERSION}/tmac/mse.tmac
share/groff/${VERSION}/tmac/om.tmac
share/groff/${VERSION}/tmac/papersize.tmac
share/groff/${VERSION}/tmac/pdf.tmac
-share/groff/${VERSION}/tmac/pdfmark.tmac
share/groff/${VERSION}/tmac/pdfpic.tmac
share/groff/${VERSION}/tmac/pic.tmac
+share/groff/${VERSION}/tmac/pl.tmac
share/groff/${VERSION}/tmac/ps.tmac
share/groff/${VERSION}/tmac/psatk.tmac
+share/groff/${VERSION}/tmac/psfig.tmac
share/groff/${VERSION}/tmac/psold.tmac
share/groff/${VERSION}/tmac/pspic.tmac
+share/groff/${VERSION}/tmac/ptx.tmac
share/groff/${VERSION}/tmac/refer-me.tmac
share/groff/${VERSION}/tmac/refer-mm.tmac
share/groff/${VERSION}/tmac/refer-ms.tmac
share/groff/${VERSION}/tmac/refer.tmac
+share/groff/${VERSION}/tmac/rfc1345.tmac
+share/groff/${VERSION}/tmac/ru.tmac
share/groff/${VERSION}/tmac/s.tmac
-share/groff/${VERSION}/tmac/safer.tmac
-share/groff/${VERSION}/tmac/spdf.tmac
+share/groff/${VERSION}/tmac/sboxes.tmac
share/groff/${VERSION}/tmac/sv.tmac
share/groff/${VERSION}/tmac/trace.tmac
share/groff/${VERSION}/tmac/trans.tmac
@@ -645,7 +672,6 @@ share/groff/${VERSION}/tmac/troffrc
share/groff/${VERSION}/tmac/troffrc-end
share/groff/${VERSION}/tmac/tty-char.tmac
share/groff/${VERSION}/tmac/tty.tmac
-share/groff/${VERSION}/tmac/unicode.tmac
share/groff/${VERSION}/tmac/www.tmac
share/groff/${VERSION}/tmac/zh.tmac
share/groff/current
diff --git a/textproc/groff/pkg/README b/textproc/groff/pkg/README
index 92f84727d..f54bdd9d1 100644
--- a/textproc/groff/pkg/README
+++ b/textproc/groff/pkg/README
@@ -9,24 +9,26 @@ mandoc output, the following two groff features have been disabled by
default: adjustment of text to the right margin and hyphenation.
If you want to use groff for serious typesetting work and need these
-features, please set up your own troff(1) configuration file:
+features, please set up your own troff(1) configuration files:
mkdir ~/.tmac
- cp ${TRUEPREFIX}/share/groff/current/tmac/troffrc ~/.tmac/
export GROFF_TMAC_PATH=~/.tmac
-In your new troffrc file, uncomment these two lines to enable
-hyphenation:
+To enable hyphenation, copy en.tmac and uncomment these two lines:
+
+ cp ${TRUEPREFIX}/share/groff/current/tmac/en.tmac ~/.tmac/
-.do hpf hyphen.us
-.do hpfa hyphenex.us
+ .hpf hyphen.en
+ .hpfa hyphenex.en
-Delete these three lines to enable the roff `ad' request, such that
-documents can adjust text to the right margin:
+To enable the roff `ad' request (allowing documents to adjust text
+to the right margin), copy troffrc and delete these four lines:
-.ad l
-.de ad
-..
+ cp ${TRUEPREFIX}/share/groff/current/tmac/troffrc ~/.tmac/
+
+ .ad l
+ .de ad
+ ..
To suit the taste of OpenBSD developers, two mdoc(7) formatting
@@ -34,6 +36,3 @@ details have been changed with respect to the upstream distribution:
* Title lines use an n-dash, not an m-dash between the manual page
name and the manual page description.
-
- * The .Pa macro always produces emphasized text,
- even in the FILES section.
textproc/groff 1.24.1