Hi,
after four years of development, groff-1.22.4 was released on
December 23, 2018. It contains lots of bugfixes, some minor
new features, and it incorporates most of our existing patches.
The patch below is +104 -571 LOC in the ports tree. :-)
I have been using groff-current for a long time for my own purposes,
so i'm quite convinced that it is stable. The release survives the
full mandoc test suite and also shows no regressions with my latest
conference slides.
OK to commit it?
Ingo
New optional dependencies that need to be disabled such that they
don't accidentally get picked up:
--without-uchardet # pointless on OpenBSD because we deliberately
# only support UTF-8 in the first place
--without-urw-fonts-dir # needed in order not to pick up stuff
# from print/ghostscript
CONFIGURE_ENV += ... # needed in order not to pick up stuff
# from print/poppler-utils and graphics/netpbm
README change:
Removed the quirk of putting "OpenBSD ports" into page footers,
it is simply "OpenBSD" now.
Patches that can be dropped:
Makefile_in # completely different build system now, automake-based
Merged upstream:
contrib_hdtbl_examples_common_roff
src_libs_libgroff_glyphuni_cpp
src_libs_libgroff_uniglyph_cpp
tmac_doc-nroff
tmac_groff_mdoc_man
tmac_groff_www_man
tmac_tty-char_tmac
tmac_tty_tmac
Patch substantially reduced:
tmac_doc_tmac-u
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/groff/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile 25 Oct 2018 13:26:48 -0000 1.42
+++ Makefile 24 Dec 2018 00:40:17 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.42 2018/10/25 13:26:48 sthen Exp $
COMMENT = GNU troff typesetter
-VERSION = 1.22.3
+VERSION = 1.22.4
SUBST_VARS = VERSION
DISTNAME = groff-${VERSION}
-REVISION = 12
CATEGORIES = textproc
DPB_PROPERTIES = parallel
@@ -28,12 +27,15 @@ MAKE_FLAGS += docdir=${PREFIX}/share/do
MODULES = perl
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --without-libiconv-prefix --without-gs --without-x \
- --with-awk=awk \
+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
-
-MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/src/libs/gnulib/build-aux
+CONFIGURE_ENV += ac_cv_prog_PDFFONTS= \
+ ac_cv_prog_PDFIMAGES= \
+ ac_cv_prog_PDFINFO= \
+ ac_cv_prog_XPMTOPPM=
pre-configure:
find ${WRKBUILD} -name \*.pl -type f -print0 | \
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/groff/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 6 Nov 2014 22:15:22 -0000 1.4
+++ distinfo 24 Dec 2018 00:40:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (groff-1.22.3.tar.gz) = Okip1sl3UL+9U1/utb4BEdtkBt23u3n8aAgJzabYKKU=
-SIZE (groff-1.22.3.tar.gz) = 4188772
+SHA256 (groff-1.22.4.tar.gz) = 5457TLfewxCEkAT6iIR8RHAejRM7XUwTBX2HbButApM=
+SIZE (groff-1.22.4.tar.gz) = 4137480
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 27 Aug 2018 00:16:24 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.8 2018/08/27 00:16:24 schwarze Exp $
-chunk 1: src/devices/gropdf depends on arch/misc.
-chunk 2: avoid bogus "is up to date" during fake.
-Upstream code is completely different now.
---- Makefile.in.orig Tue Nov 4 09:38:35 2014
-+++ Makefile.in Thu Sep 8 22:27:19 2016
-@@ -896,6 +896,8 @@ $(GNULIBDIRS): FORCE
- $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
- esac
-
-+$(SHPROGDIRS): $(PROGDEPDIRS)
-+
- $(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS)
-
- $(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) $(OTHERDIRS): FORCE
-@@ -964,7 +966,7 @@ dist:
- # refer lookbib indxbib lkbib: libbib
- # $(LIBDIRS) $(PROGDIRS): include
-
--.PHONY: $(ALLDIRS) dot $(TARGETS) FORCE
-+.PHONY: $(ALLDIRS) $(OTHERDIRS) dot $(TARGETS) FORCE
-
- # Create a Makefile in $(subdir). This is useful for development since it
- # avoids running make recursively.
Index: patches/patch-contrib_hdtbl_examples_common_roff
===================================================================
RCS file: patches/patch-contrib_hdtbl_examples_common_roff
diff -N patches/patch-contrib_hdtbl_examples_common_roff
--- patches/patch-contrib_hdtbl_examples_common_roff 30 Mar 2013 23:10:05
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-contrib_hdtbl_examples_common_roff,v 1.3 2013/03/30 23:10:05
schwarze Exp $
-Avoid noise in the build logs (local change).
---- contrib/hdtbl/examples/common.roff.orig Fri Dec 31 08:33:09 2010
-+++ contrib/hdtbl/examples/common.roff Sun May 27 12:41:37 2012
-@@ -64,9 +64,8 @@ along with this program. If not, see <http://www.gnu.o
- .\" ** standard form of the Unix date-command, **
- .\" ** for example "Sun Dec 5 22:27:57 2004" **
- .\" ******************************************************************
-+.\" deactivated to avoid noise in the build logs
- .de date
--. pso sh -c "echo -n .ds *date\ ;date"
--. tm \\*[*date] ***
- ..
- .
- .
-@@ -79,16 +78,8 @@ along with this program. If not, see <http://www.gnu.o
- .\" ** reg *time gets the difference of the **
- .\" ** end- and start-time (seconds) **
- .\" ******************************************************************
-+.\" deactivated to avoid noise in the build logs
- .de time
--. ds * \\$1\"
--. substring * 0 0
--. ie "\\*[*]"s" \
--. pso sh -c "echo -n .nr *time 0+;date +%s"
--. el \{\
--. pso sh -c "echo -n .nr *time -;date +%s"
--. nr *time 0-\\n[*time]
--. tm elapsed time: \\n[*time] seconds
--. \}
- ..
- .
- .
Index: patches/patch-src_libs_libgroff_glyphuni_cpp
===================================================================
RCS file: patches/patch-src_libs_libgroff_glyphuni_cpp
diff -N patches/patch-src_libs_libgroff_glyphuni_cpp
--- patches/patch-src_libs_libgroff_glyphuni_cpp 16 Feb 2015 15:45:11
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_libs_libgroff_glyphuni_cpp,v 1.1 2015/02/16 15:45:11
schwarze Exp $
-remove duplicate glyph definitions; accepted and committed upstream
---- src/libs/libgroff/glyphuni.cpp.orig Tue Nov 4 09:38:35 2014
-+++ src/libs/libgroff/glyphuni.cpp Tue Dec 30 10:19:07 2014
-@@ -474,12 +474,6 @@ struct S {
- { "bracerightbt", "23AD" },
- { "an", "23AF" },
- { "br", "2502" },
-- { "rk", "251D" },
-- { "lk", "2525" },
-- { "lt", "256D" },
-- { "rt", "256E" },
-- { "rb", "256F" },
-- { "lb", "2570" },
- { "sq", "25A1" },
- { "lz", "25CA" },
- { "ci", "25CB" },
Index: patches/patch-src_libs_libgroff_uniglyph_cpp
===================================================================
RCS file: patches/patch-src_libs_libgroff_uniglyph_cpp
diff -N patches/patch-src_libs_libgroff_uniglyph_cpp
--- patches/patch-src_libs_libgroff_uniglyph_cpp 16 Feb 2015 15:45:11
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_libs_libgroff_uniglyph_cpp,v 1.1 2015/02/16 15:45:11
schwarze Exp $
-remove duplicate glyph definitions; accepted and committed upstream
---- src/libs/libgroff/uniglyph.cpp.orig Tue Nov 4 09:38:35 2014
-+++ src/libs/libgroff/uniglyph.cpp Tue Dec 30 10:26:13 2014
-@@ -460,12 +460,6 @@ struct S {
- //{ "23AD", "bracerightbt" },
- { "23AF", "an" },
- { "2502", "br" },
-- { "251D", "rk" },
-- { "2525", "lk" },
-- { "256D", "lt" },
-- { "256E", "rt" },
-- { "256F", "rb" },
-- { "2570", "lb" },
- { "25A1", "sq" },
- { "25CA", "lz" },
- { "25CB", "ci" },
Index: patches/patch-tmac_an-old_tmac
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_an-old_tmac,v
retrieving revision 1.6
diff -u -p -r1.6 patch-tmac_an-old_tmac
--- patches/patch-tmac_an-old_tmac 4 Jul 2017 17:44:13 -0000 1.6
+++ patches/patch-tmac_an-old_tmac 24 Dec 2018 00:40:17 -0000
@@ -4,7 +4,7 @@ Tweak page headers (local change).
Index: tmac/an-old.tmac
--- tmac/an-old.tmac.orig
+++ tmac/an-old.tmac
-@@ -147,14 +147,14 @@
+@@ -148,14 +148,14 @@
. ds an-section "\\$2\"
. ds an-extra1 "\\$3\"
. ie (\\n[.$] > 3) .ds an-extra2 "\\$4\"
Index: patches/patch-tmac_doc-common
===================================================================
RCS file: patches/patch-tmac_doc-common
diff -N patches/patch-tmac_doc-common
--- patches/patch-tmac_doc-common 4 Jul 2017 17:44:13 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
-$OpenBSD: patch-tmac_doc-common,v 1.9 2017/07/04 17:44:13 schwarze Exp $
-chunks 1-3: Tweak page headers (local change).
-chunk 4: Set default operating system name (local change).
-chunk 5: Default value for the .Os macro (local change).
-chunk 6: Avoid groff warning "unbalanced .el request" (merged upstream).
-chunk 7: Do not use an ugly double dash in the NAME line (local change).
-Index: tmac/doc-common
---- tmac/doc-common.orig
-+++ tmac/doc-common
-@@ -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
-@@ -802,12 +791,12 @@
- . ie \n[.$] \{\
- . ie "\$1"$Mdocdate:" \
- . ds doc-date-string \$2\~\$3, \$4
--. el .ie (\n[.$] == 3) \
-+. 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]
--. \}
-+. \}\}
- . \}
- . el \
- . ds doc-date-string Epoch
-@@ -976,7 +965,7 @@
- .\" NS width register `Nd' set above
- .
- .de Nd
--. nop \[em] \$*
-+. nop \[en] \$*
- ..
- .
- .
Index: patches/patch-tmac_doc-common-u
===================================================================
RCS file: patches/patch-tmac_doc-common-u
diff -N patches/patch-tmac_doc-common-u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tmac_doc-common-u 24 Dec 2018 00:40:17 -0000
@@ -0,0 +1,74 @@
+$OpenBSD: patch-tmac_doc-common,v 1.8 2015/02/16 15:45:11 schwarze Exp $
+
+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/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
+@@ -976,7 +965,7 @@
+ .\" NS width register 'Nd' set above
+ .
+ .de Nd
+-. nop \[em] \$*
++. nop \[en] \$*
+ ..
+ .
+ .
Index: patches/patch-tmac_doc-nroff
===================================================================
RCS file: patches/patch-tmac_doc-nroff
diff -N patches/patch-tmac_doc-nroff
--- patches/patch-tmac_doc-nroff 14 Apr 2017 19:49:06 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tmac_doc-nroff,v 1.1 2017/04/14 19:49:06 schwarze Exp $
-Map \*[Lq]\*[Rq] to \[lq]\[rq] for all terminal devices (merged upstream).
---- tmac/doc-nroff.orig Tue Nov 4 09:38:35 2014
-+++ tmac/doc-nroff Fri Apr 14 21:04:21 2017
-@@ -148,6 +148,8 @@
- .ds aa \[aa]
- .ds ga \[ga]
- .ds q \[dq]
-+.ds Lq \[lq]
-+.ds Rq \[rq]
- .ds Ne \[!=]
- .ds Le \[<=]
- .ds Ge \[>=]
-@@ -162,15 +164,11 @@
- .\" character representations which are different from GNU troff's standard
- .\" forms.
- .ie '\*[.T]'utf8' \{\
--. ds Rq \[rq]
--. ds Lq \[lq]
- . ds ua \[ua]
- . ds Pi \[*p]
- . ds If \[if]
- .\}
- .el \{\
--. ds Rq ''
--. ds Lq ``
- . ds ua ^
- . ds Pi pi
- . ds If infinity
Index: patches/patch-tmac_doc_tmac
===================================================================
RCS file: patches/patch-tmac_doc_tmac
diff -N patches/patch-tmac_doc_tmac
--- patches/patch-tmac_doc_tmac 14 Apr 2017 19:49:06 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,244 +0,0 @@
-$OpenBSD: patch-tmac_doc_tmac,v 1.7 2017/04/14 19:49:06 schwarze Exp $
-chunks 1,2,4-6,8-14: Simplify .Bl -tag without -width (merged upstream).
-chunk 3: Trailing -width/-offset must not pick up old args (merged upstream).
-chunk 7: Always format .Pa the same way, as requested by jmc@ (local change).
-chunk 15: Use typographic quotes for .%T (merged upstream).
-chunk 16: Improve .Lk with more than two arguments (merged upstream).
---- tmac/doc.tmac.orig Tue Nov 4 09:38:35 2014
-+++ tmac/doc.tmac Fri Apr 14 21:02:49 2017
-@@ -2990,6 +2990,7 @@
- . \}
- . el \{ .ie "\$1"-tag" \{\
- . ds doc-list-type-stack\n[doc-list-depth] tag-list
-+. nr doc-list-indent-stack\n[doc-list-depth] 6n
- . nr doc-list-have-indent-stack\n[doc-list-depth] 1
- . \}
- . el \{ .ie "\$1"-item" \{\
-@@ -3105,7 +3106,6 @@
- .\" NS doc-list-offset-stackXXX
- .\" NS doc-num-columns
- .\" NS doc-tag-prefix-stackXXX
--.\" NS doc-tag-width-stackXXX
- .\" NS
- .\" NS local variables:
- .\" NS doc-box-dBla
-@@ -3126,7 +3126,7 @@
- .
- . \" avoid a warning message in case e.g. `-offset' has no parameter
- . nr doc-reg-dBla (\n[doc-arg-ptr] + 1)
--. if !d doc-arg\n[doc-reg-dBla] \
-+. if (\n[doc-arg-limit] < \n[doc-reg-dBla]) \
- . ds doc-arg\n[doc-reg-dBla]
- .
- . nr doc-reg-dBla 1
-@@ -3148,8 +3148,6 @@
- .
- . el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-width" \{\
- . nr doc-arg-ptr +1
--. ds doc-tag-width-stack\n[doc-list-depth] TagwidtH
--.
- . ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
- . substring doc-str-dBla 0 0
- . ie .\*[doc-str-dBla] \{\
-@@ -3394,7 +3392,6 @@
- . nr doc-list-indent-stack\n[doc-reg-dsgv]-saved
\n[doc-list-indent-stack\n[doc-reg-dsgv]]
- . nr doc-compact-list-stack\n[doc-reg-dsgv]-saved
\n[doc-compact-list-stack\n[doc-reg-dsgv]]
- . ds doc-tag-prefix-stack\n[doc-reg-dsgv]-saved
"\*[doc-tag-prefix-stack\n[doc-reg-dsgv]]
--. ds doc-tag-width-stack\n[doc-reg-dsgv]-saved
"\*[doc-tag-width-stack\n[doc-reg-dsgv]]
- . nr doc-list-offset-stack\n[doc-reg-dsgv]-saved
\n[doc-list-offset-stack\n[doc-reg-dsgv]]
- . nr doc-enum-list-count-stack\n[doc-reg-dsgv]-saved
\n[doc-enum-list-count-stack\n[doc-reg-dsgv]]
- . nr doc-reg-dsgv +1
-@@ -3538,7 +3535,6 @@
- . nr doc-list-indent-stack\n[doc-reg-drgv]
\n[doc-list-indent-stack\n[doc-reg-drgv]-saved]
- . nr doc-compact-list-stack\n[doc-reg-drgv]
\n[doc-compact-list-stack\n[doc-reg-drgv]-saved]
- . ds doc-tag-prefix-stack\n[doc-reg-drgv]
"\*[doc-tag-prefix-stack\n[doc-reg-drgv]-saved]
--. ds doc-tag-width-stack\n[doc-reg-drgv]
"\*[doc-tag-width-stack\n[doc-reg-drgv]-saved]
- . nr doc-list-offset-stack\n[doc-reg-drgv]
\n[doc-list-offset-stack\n[doc-reg-drgv]-saved]
- . nr doc-enum-list-count-stack\n[doc-reg-drgv]
\n[doc-enum-list-count-stack\n[doc-reg-drgv]-saved]
- . nr doc-reg-drgv +1
-@@ -3765,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) \
-@@ -4030,13 +4024,6 @@
- . ev
- . box
- .
--. if !"TagwidtH"\*[doc-tag-width-stack\n[doc-list-depth]]" \{\
--. if !\n[doc-list-have-indent-stack\n[doc-list-depth]] \{\
--. in -(\n[doc-list-indent-stack\n[doc-list-depth]]u +
\n[doc-digit-width]u)
--. nr doc-list-have-indent-stack\n[doc-list-depth] 1
--. \}
--. doc-get-tag-width
--. \}
- . doc-set-vertical-and-indent 1
- . nr doc-reg-dtl (\n[doc-list-indent-stack\n[doc-list-depth]]u +
\n[doc-digit-width]u)
- . ti -\n[doc-reg-dtl]u
-@@ -4064,29 +4051,6 @@
- ..
- .
- .
--.\" NS doc-get-tag-width macro
--.\" NS resolve unknown tag width (`tag' list-type only)
--.\" NS
--.\" NS modifies:
--.\" NS doc-list-indent-stackXXX
--.\" NS doc-tag-width-stackXXX
--.\" NS
--.\" NS requires:
--.\" NS doc-curr-arg
--.\" NS doc-curr-type
--.
--.de doc-get-tag-width
--. ie (\n[doc-curr-type] == 1) \{\
--. ds doc-tag-width-stack\n[doc-list-depth] \*[doc-curr-arg]
--. nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-curr-arg]]
--. \}
--. el \{\
--. ds doc-tag-width-stack\n[doc-list-depth] No
--. nr doc-list-indent-stack\n[doc-list-depth] \n[No]
--. \}
--..
--.
--.
- .\" NS doc-set-vertical-and-indent macro
- .\" NS set up vertical spacing (if not compact) and indentation (with
- .\" NS offset if argument is non-zero)
-@@ -4139,19 +4103,6 @@
- .ds doc-tag-prefix-stack1
- .
- .
--.\" NS doc-tag-width-stackXXX global string
--.\" NS stack of strings indicating how to set up current element of
--.\" NS doc-list-indent-stackXXX -- if set to TagwidtH, user has set it
--.\" NS directly; if it is a macro name, use the macro's width value;
--.\" NS otherwise, `doc-get-tag-width' uses width value of `No'.
--.\" NS
--.\" NS limit:
--.\" NS doc-list-depth
--.
--.ds doc-tag-width-stack0
--.ds doc-tag-width-stack1
--.
--.
- .\" NS doc-list-offset-stackXXX global register
- .\" NS stack of list offsets
- .\" NS
-@@ -4193,7 +4144,6 @@
- .\" NS doc-list-offset-stackXXX
- .\" NS doc-list-type-stackXXX
- .\" NS doc-tag-prefix-stackXXX
--.\" NS doc-tag-width-stackXXX
- .\" NS doc-enum-list-count-stackXXX
- .\" NS
- .\" NS local variables:
-@@ -4205,7 +4155,6 @@
- . nr doc-list-indent-stack\n[doc-reg-dils] 0
- . nr doc-list-offset-stack\n[doc-reg-dils] 0
- . ds doc-tag-prefix-stack\n[doc-reg-dils]
--. ds doc-tag-width-stack\n[doc-reg-dils]
\*[doc-tag-width-stack\n[doc-list-depth]]
- . ds doc-list-type-stack\n[doc-reg-dils]
- . nr doc-compact-list-stack\n[doc-reg-dils] 0
- . nr doc-enum-list-count-stack\n[doc-reg-dils] 0
-@@ -4222,7 +4171,6 @@
- .\" NS doc-list-offset-stackXXX
- .\" NS doc-list-type-stackXXX
- .\" NS doc-tag-prefix-stackXXX
--.\" NS doc-tag-width-stackXXX
- .\" NS doc-enum-list-count-stackXXX
- .
- .de doc-decrement-list-stack
-@@ -4231,7 +4179,6 @@
- . nr doc-list-indent-stack\n[doc-list-depth] 0
- . nr doc-list-offset-stack\n[doc-list-depth] 0
- . ds doc-tag-prefix-stack\n[doc-list-depth]
--. ds doc-tag-width-stack\n[doc-list-depth]
- . nr doc-compact-list-stack\n[doc-list-depth] 0
- . nr doc-enum-list-count-stack\n[doc-list-depth] 0
- ..
-@@ -5296,7 +5243,7 @@
- . unformat doc-reference-title-name-for-book
- . chop doc-reference-title-name-for-book
- . ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\
--. nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c
-+. nop \)\*[Lq]\)\*[doc-reference-title-name-for-book]\)\*[Rq]\c
- . doc-finish-reference \n[doc-reference-title-count]
- . \}
- . el \{\
-@@ -6498,36 +6445,53 @@
- .\" NS link (for conversion to HTML)
- .\" NS
- .\" NS local variables:
-+.\" NS doc-delim-Lk
- .\" NS doc-reg-Lk
--.\" NS doc-str-Lk
-+.\" NS doc-target-Lk
-+.\" NS doc-text-Lk
- .
- .de Lk
--. ds doc-str-Lk Sy \$@
-+. \" The first argument is the target URI.
-+. ds doc-target-Lk \$1
-+. shift
- .
--. ie (\n[.$] > 1) \{\
--. doc-get-arg-type \$2
--. ie (\n[doc-arg-type] < 3) \{\
--. Em \)\$2:
--. ds doc-str-Lk Sy "\$1"
--. doc-get-width "\$1"
--. shift 2
--. if \n[.$] \
--. as doc-str-Lk " \$@
-+. \" Split the remaining arguments into link text and delimiters.
-+. ds doc-text-Lk
-+. ds doc-delim-Lk
-+. while \n[.$] \{\
-+. doc-get-width "\$1"
-+. doc-get-arg-type \$1
-+. ie (\n[doc-arg-type] > 2) \
-+. as doc-delim-Lk \$1
-+. el \{\
-+. if !'\*[doc-delim-Lk]'' \{\
-+. \" More text follows delimiter(s); go back to text mode.
-+. as doc-text-Lk \*[doc-delim-Lk]
-+. ds doc-delim-Lk
-+. \}
-+. ie '\*[doc-text-Lk]'' \
-+. ds doc-text-Lk \$1
-+. el \
-+. as doc-text-Lk " \$1
- . \}
--. el \
--. doc-get-width "\$1"
-+. shift
- . \}
--. el \
--. doc-get-width "\$1"
- .
-+. \" Print the link text, if any.
-+. if !'\*[doc-text-Lk]'' \
-+. Em \*[doc-text-Lk] Ns :
-+.
-+. \" Print the link target.
- . ie n \
- . nr doc-reg-Lk 26
- . el \
- . nr doc-reg-Lk 38
-+. doc-get-width "\*[doc-target-Lk]"
- . ie (\n[doc-width] >= \n[doc-reg-Lk]) \
--. D1 \*[doc-str-Lk]
--. el \
--. \*[doc-str-Lk]
-+. D1 Sy \*[doc-target-Lk] Ns \*[doc-delim-Lk]\&
-+. el .ie \n[doc-width] \
-+. Sy \*[doc-target-Lk] Ns \*[doc-delim-Lk]\&
-+. el \*[doc-delim-Lk]\&
- ..
- .
- .
Index: patches/patch-tmac_doc_tmac-u
===================================================================
RCS file: patches/patch-tmac_doc_tmac-u
diff -N patches/patch-tmac_doc_tmac-u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tmac_doc_tmac-u 24 Dec 2018 00:40:17 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Always format .Pa the same way, as requested by jmc@ (local change).
+
+--- tmac/doc.tmac-u.orig Wed Oct 5 15:47:31 2016
++++ tmac/doc.tmac-u Wed Oct 5 16:23:42 2016
+@@ -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) \
Index: patches/patch-tmac_groff_mdoc_man
===================================================================
RCS file: patches/patch-tmac_groff_mdoc_man
diff -N patches/patch-tmac_groff_mdoc_man
--- patches/patch-tmac_groff_mdoc_man 17 Oct 2016 18:32:34 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-tmac_groff_mdoc_man,v 1.7 2016/10/17 18:32:34 schwarze Exp $
-Simplify .Bl -tag without -width (merged upstream).
---- tmac/groff_mdoc.man.orig Tue Nov 4 09:38:35 2014
-+++ tmac/groff_mdoc.man Sun Oct 9 20:36:47 2016
-@@ -3925,14 +3925,8 @@ the width of
- .Aq Ar string
- (typeset with a fixed-width font) is taken as the width.
- .Pp
--If a width is not specified for the tag list type, every time
--.Ql .It
--is invoked, an attempt is made to determine an appropriate width.
--If the first argument to
--.Ql .It
--is a callable macro, the default width for that macro will be used;
--otherwise, the default width of
--.Ql .No
-+If a width is not specified for the tag list type,
-+.Sq 6n
- is used.
- .It Fl offset Ao Ar string Ac
- If
Index: patches/patch-tmac_groff_www_man
===================================================================
RCS file: patches/patch-tmac_groff_www_man
diff -N patches/patch-tmac_groff_www_man
--- patches/patch-tmac_groff_www_man 27 Aug 2018 00:16:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-tmac_groff_www_man,v 1.1 2018/08/27 00:16:24 schwarze Exp $
-
-This manual page uses the groff_www(7) macro set.
-Map that to the usual man-ext macros for now.
-I have pushed a slightly more invasive fix upstream:
-http://git.savannah.gnu.org/cgit/groff.git/commit/?id=14aef0ff0
-
-Index: tmac/groff_www.man
---- tmac/groff_www.man.orig
-+++ tmac/groff_www.man
-@@ -1,4 +1,11 @@
- .TH GROFF_WWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-+.de URL
-+. UR \\$1
-+. nop \\$2
-+. UE \\$3\\&
-+..
-+.als FTP URL
-+.als MTO URL
- .SH NAME
- groff_www \- groff macros for authoring web pages
- .
Index: patches/patch-tmac_troffrc
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_troffrc,v
retrieving revision 1.4
diff -u -p -r1.4 patch-tmac_troffrc
--- patches/patch-tmac_troffrc 6 Nov 2014 22:15:23 -0000 1.4
+++ patches/patch-tmac_troffrc 24 Dec 2018 00:40:17 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-tmac_troffrc,v 1.4 2014/11/06 22:15:23 schwarze Exp $
Disable hyphenation and adjustment (local change).
---- tmac/troffrc.orig Sun Oct 12 23:00:09 2014
-+++ tmac/troffrc Sun Oct 12 23:27:06 2014
-@@ -43,10 +43,16 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp tro
- .\" Set the hyphenation language to `us'.
+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.
Index: patches/patch-tmac_tty-char_tmac
===================================================================
RCS file: patches/patch-tmac_tty-char_tmac
diff -N patches/patch-tmac_tty-char_tmac
--- patches/patch-tmac_tty-char_tmac 22 Aug 2017 23:28:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,268 +0,0 @@
-$OpenBSD: patch-tmac_tty-char_tmac,v 1.1 2017/08/22 23:28:52 schwarze Exp $
-
-Intelligible ASCII rendering of mathematical symbols and greek letters.
-Accepted and committed upstream.
-
-Index: tmac/tty-char.tmac
---- tmac/tty-char.tmac.orig
-+++ tmac/tty-char.tmac
-@@ -9,7 +9,8 @@
- .\" - work with all of -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
- .\" - work on devices that display only the last overstruck character
- .\" as well as on devices that support overstriking
--.\" - represent the character's graphical shape (not its meaning)
-+.\" - help understanding the character's meaning, only aiming to imitate
-+.\" a particular graphical shape when that doesn't hinder understanding
- .\"
- .\" Note that the optical appearance of the definitions contained in this
- .\" file is inferior compared to that of the replacement characters defined
-@@ -30,70 +31,68 @@
- .tty-char \[rn] \*[tty-rn]
- .tty-char \[ua] \z|^
- .tty-char \[da] \z|v
--.tty-char \[sc] S
-+.tty-char \[sc] <section>
- .tty-char \[ct] \z/c
--.tty-char \[dg] \z|-
--.tty-char \[dd] \z|=
--.tty-char \[ib] (\z=_
--.tty-char \[ip] \z=_)
--.tty-char \[sb] (=
--.tty-char \[sp] =)
--.tty-char \[if] oo
--.tty-char \[pt] oc
-+.tty-char \[dg] <*>
-+.tty-char \[dd] <**>
-+.tty-char \[ib] <subset\~or\~equal>
-+.tty-char \[ip] <superset\~or\~equal>
-+.tty-char \[sb] <proper\~subset>
-+.tty-char \[sp] <proper\~superset>
-+.tty-char \[if] <infinity>
-+.tty-char \[pt] <proportional\~to>
- .tty-char \[es] {}
--.tty-char \[ca] (^)
--.tty-char \[cu] U
--.tty-char \[de] o
--.tty-char \[di] -:-
--.tty-char \[tdi] -:-
-+.tty-char \[ca] <intersection>
-+.tty-char \[cu] <union>
-+.tty-char \[de] <degree>
-+.tty-char \[di] /
-+.tty-char \[tdi] /
- .tty-char \[no] ~
- .tty-char \[tno] ~
--.tty-char \[gr] \Z'\*[tty-rn]'V
--.tty-char \[is] \z'\z,I
--.tty-char \[mo] E
--.tty-char \[pd] a
--.tty-char \[sr] \e/
--.tty-char \[*C] \z_H
--.tty-char \[*D] \z_/\z_\e
--.tty-char \[*F] \zIO
--.tty-char \[*G] |\*[tty-rn]
--.tty-char \[*H] \z-O
--.tty-char \[*L] /\e
--.tty-char \[*P] TT
--.tty-char \[*Q] \zIY
--.tty-char \[*S] \z_\Z'\*[tty-rn]'>
--.tty-char \[*W] \z_O
--.if c\[ss] .tty-char \[*b] \[ss]
--.tty-char \[*b] B
--.tty-char \[*a] a
--.tty-char \[*c] \z,E
--.tty-char \[*d] d
--.tty-char \[*e] e
--.tty-char \[+e] e
--.tty-char \[*f] \z|o
--.tty-char \[+f] \z|o
--.tty-char \[*g] y
--.tty-char \[*h] \z-0
--.tty-char \[+h] \z-0
--.tty-char \[*i] i
--.tty-char \[*k] k
--.tty-char \[*l] \z>\e
--.tty-char \[*m] \z,u
--.tty-char \[*n] v
--.tty-char \[*p] \z-n
--.tty-char \[+p] \z-w
--.tty-char \[*q] \z|u
--.tty-char \[*r] p
--.tty-char \[*s] \z-o
--.tty-char \[*t] \z~t
--.tty-char \[*u] u
--.tty-char \[*w] w
--.tty-char \[*x] x
--.tty-char \[*y] n
--.tty-char \[*z] \z,C
--.tty-char \[ts] s
--.\" Definition of \[ss] should follow that of \[*b].
--.tty-char \[ss] B
-+.tty-char \[gr] <nabla>
-+.tty-char \[is] <integral>
-+.tty-char \[mo] <element\~of>
-+.tty-char \[pd] <del>
-+.tty-char \[sr] <sqrt>
-+.tty-char \[*C] <Xi>
-+.tty-char \[*D] <Delta>
-+.tty-char \[*F] <Phi>
-+.tty-char \[*G] <Gamma>
-+.tty-char \[*H] <Theta>
-+.tty-char \[*L] <Lambda>
-+.tty-char \[*P] <Pi>
-+.tty-char \[*Q] <Psi>
-+.tty-char \[*S] <Sigma>
-+.tty-char \[*W] <Omega>
-+.tty-char \[*b] <beta>
-+.tty-char \[*a] <alpha>
-+.tty-char \[*c] <xi>
-+.tty-char \[*d] <delta>
-+.tty-char \[*e] <epsilon>
-+.tty-char \[+e] <epsilon>
-+.tty-char \[*f] <phi>
-+.tty-char \[+f] <phi>
-+.tty-char \[*g] <gamma>
-+.tty-char \[*h] <theta>
-+.tty-char \[+h] <theta>
-+.tty-char \[*i] <iota>
-+.tty-char \[*k] <kappa>
-+.tty-char \[*l] <lambda>
-+.tty-char \[*m] <mu>
-+.tty-char \[*n] <nu>
-+.tty-char \[*p] <pi>
-+.tty-char \[+p] <pi>
-+.tty-char \[*q] <psi>
-+.tty-char \[*r] <rho>
-+.tty-char \[*s] <sigma>
-+.tty-char \[*t] <tau>
-+.tty-char \[*u] <upsilon>
-+.tty-char \[*w] <omega>
-+.tty-char \[*x] <chi>
-+.tty-char \[*y] <eta>
-+.tty-char \[*z] <zeta>
-+.tty-char \[ts] <sigma>
-+.tty-char \[ss] ss
- .tty-char \[c*] \zO\[mu]
- .tty-char \[c+] \zO+
- .tty-char \[AN] ^
-@@ -103,31 +102,31 @@
- .if c\[md] .tty-char \[pc] \[md]
- .if c\[pc] .tty-char \[md] \[pc]
- .if c\[pc] .tty-char \[a.] \[pc]
--.tty-char \[Im] I
--.tty-char \[Re] R
-+.tty-char \[Im] <Im>
-+.tty-char \[Re] <Re>
- .tty-char \[/L] \z/L
- .tty-char \[/l] \z/l
--.tty-char \[%0] %o
-+.tty-char \[%0] <permille>
- .tty-char \[ao] o
- .tty-char \[a"] """"
- .tty-char \[ab] \z'`
- .tty-char \[ah] v
- .tty-char \[ho] \[ac]
--.tty-char \[/_] \z_/
-+.tty-char \[/_] <angle>
- .tty-char \[=~] =~
- .tty-char \[|=] -~
--.tty-char \[Ah] N
--.tty-char \[CR] _|
--.tty-char \[fa] \z-V
--.tty-char \[nm] \z/E
--.tty-char \[pp] \z_|
-+.tty-char \[Ah] <Aleph>
-+.tty-char \[CR] <cr>
-+.tty-char \[fa] <for\~all>
-+.tty-char \[nm] <not\~element\~of>
-+.tty-char \[pp] <perpendicular>
- .tty-char \[sd] ''
--.tty-char \[st] -)
--.tty-char \[te] 3
-+.tty-char \[st] <such\~that>
-+.tty-char \[te] <there\~exists>
- .if c\[md] .tty-char \[tf] .\[md].
--.tty-char \[tf] .:.
-+.tty-char \[tf] <therefore>
- .if c\[md] .tty-char \[3d] .\[md].
--.tty-char \[3d] .:.
-+.tty-char \[3d] <therefore>
- .tty-char \[wp] p
- .tty-char \[~~] ~~
- .tty-char \[Fn] \z,f
-@@ -144,7 +143,7 @@
- .tty-char \[lt] ,-
- .tty-char \[rt] -.
- .\" Latin characters
--.tty-char \[r!] \z,i
-+.tty-char \[r!] !
- .tty-char \[Po] \z-L
- .tty-char \[Cs] \zox
- .tty-char \[Ye] \z=Y
-@@ -153,16 +152,16 @@
- .tty-char \[Of] \z_a
- .tty-char \[Fo] <<
- .tty-char \[a-] \*[tty-rn]
--.tty-char \[S2] 2
--.tty-char \[S3] 3
--.tty-char \[ps] 9|
-+.tty-char \[S2] ^2
-+.tty-char \[S3] ^3
-+.tty-char \[ps] <paragraph>
- .tty-char \[md] .
- .tty-char \[pc] .
- .tty-char \[ac] ,
--.tty-char \[S1] 1
-+.tty-char \[S1] ^1
- .tty-char \[Om] \z_o
- .tty-char \[Fc] >>
--.tty-char \[r?] \z'c
-+.tty-char \[r?] ?
- .tty-char \[`A] \z`A
- .tty-char \['A] \z'A
- .tty-char \[^A] \z^A
-@@ -179,7 +178,7 @@
- .tty-char \['I] \z'I
- .tty-char \[^I] \z^I
- .tty-char \[:I] \z"I
--.tty-char \[-D] \z-D
-+.tty-char \[-D] Dh
- .tty-char \[~N] \z~N
- .tty-char \[`O] \z`O
- .tty-char \['O] \z'O
-@@ -192,7 +191,7 @@
- .tty-char \[^U] \z^U
- .tty-char \[:U] \z"U
- .tty-char \['Y] \z'Y
--.tty-char \[TP] \zIb
-+.tty-char \[TP] Th
- .tty-char \[`a] \z`a
- .tty-char \['a] \z'a
- .tty-char \[^a] \z^a
-@@ -209,7 +208,7 @@
- .tty-char \['i] \z'i
- .tty-char \[^i] \z^i
- .tty-char \[:i] \z"i
--.tty-char \[Sd] \z`\z'o
-+.tty-char \[Sd] dh
- .tty-char \[~n] \z~n
- .tty-char \[`o] \z`o
- .tty-char \['o] \z'o
-@@ -222,7 +221,7 @@
- .tty-char \[^u] \z^u
- .tty-char \[:u] \z"u
- .tty-char \['y] \z'y
--.tty-char \[Tp] \zpb
-+.tty-char \[Tp] th
- .tty-char \[:y] \z"y
- .\" for Turkish
- .tty-char "\[G ab]" G
-@@ -230,7 +229,7 @@
- .tty-char "\[I .]" I
- .\"tty-char \[:y] \ij
- .tty-char \[arrowvertex] |
--.tty-char \[mc] \z,u
-+.tty-char \[mc] <micro>
- .cp \n[_C]
- .
- .ie '\*(.T'cp1047' \
Index: patches/patch-tmac_tty_tmac
===================================================================
RCS file: patches/patch-tmac_tty_tmac
diff -N patches/patch-tmac_tty_tmac
--- patches/patch-tmac_tty_tmac 18 Jul 2015 04:32:26 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-tmac_tty_tmac,v 1.3 2015/07/18 04:32:26 schwarze Exp $
-Fix bullet character for UTF-8 output. From upstream git.
---- tmac/tty.tmac.orig Tue Nov 4 01:38:35 2014
-+++ tmac/tty.tmac Fri Jul 17 22:04:39 2015
-@@ -13,11 +13,12 @@
- .
- .po 0
- .
--.ie c\[pc] \
--. tr \[bu]\[pc]
--.el \
--. if c\[md] \
--. tr \[bu]\[md]
-+.if !'\*[.T]'utf8' \
-+. ie c\[pc] \
-+. tr \[bu]\[pc]
-+. el \
-+. if c\[md] \
-+. tr \[bu]\[md]
- .
- .fchar \[bu] \z+o
- .fchar \[14] 1/4
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/groff/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:24 -0000 1.9
+++ pkg/PLIST 24 Dec 2018 00:40:17 -0000
@@ -66,7 +66,6 @@ lib/groff/groffer/subs.pl
lib/groff/groffer/version.sh
lib/groff/grog/
lib/groff/grog/subs.pl
-lib/groff/refer/
lib/groff/site-tmac/
@man man/man1/addftinfo.1
@man man/man1/afmtodit.1
@@ -113,6 +112,7 @@ lib/groff/site-tmac/
@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
@@ -121,7 +121,6 @@ lib/groff/site-tmac/
@man man/man7/groff.7
@man man/man7/groff_char.7
@man man/man7/groff_diff.7
-@man man/man7/groff_filenames.7
@man man/man7/groff_hdtbl.7
@man man/man7/groff_man.7
@man man/man7/groff_mdoc.7
@@ -255,16 +254,21 @@ 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/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/elvis_syntax
share/examples/groff/mom/elvis_syntax.new
share/examples/groff/mom/letter.mom
share/examples/groff/mom/mom-pdf.mom
share/examples/groff/mom/mom.vim
+share/examples/groff/mom/mon_premier_doc.mom
share/examples/groff/mom/penguin.pdf
share/examples/groff/mom/penguin.ps
share/examples/groff/mom/sample_docs.mom
+share/examples/groff/mom/slide-demo.mom
share/examples/groff/mom/typesetting.mom
share/examples/groff/webpage.ms
share/examples/groff/webpage.ps
@@ -278,6 +282,12 @@ 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/CW
share/groff/${VERSION}/font/devdvi/CWEC
@@ -449,8 +459,6 @@ share/groff/${VERSION}/font/devpdf/map/d
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/util/
-share/groff/${VERSION}/font/devpdf/util/BuildFoundries
share/groff/${VERSION}/font/devps/
share/groff/${VERSION}/font/devps/AB
share/groff/${VERSION}/font/devps/ABI
@@ -583,7 +591,6 @@ share/groff/${VERSION}/tmac/hyphen.fr
share/groff/${VERSION}/tmac/hyphen.sv
share/groff/${VERSION}/tmac/hyphen.us
share/groff/${VERSION}/tmac/hyphenex.cs
-share/groff/${VERSION}/tmac/hyphenex.det
share/groff/${VERSION}/tmac/hyphenex.us
share/groff/${VERSION}/tmac/ja.tmac
share/groff/${VERSION}/tmac/latin1.tmac
@@ -619,6 +626,7 @@ 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/ps.tmac
share/groff/${VERSION}/tmac/psatk.tmac
@@ -640,6 +648,7 @@ share/groff/${VERSION}/tmac/tty-char.tma
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
share/groff/site-font/
share/groff/site-tmac/
Index: pkg/README
===================================================================
RCS file: /cvs/ports/textproc/groff/pkg/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- pkg/README 4 Sep 2018 12:46:24 -0000 1.4
+++ pkg/README 24 Dec 2018 00:40:17 -0000
@@ -30,14 +30,6 @@ documents can adjust text to the right m
.de ad
..
-In case you dislike the default string "OpenBSD ports" in mdoc(7)
-manual footers, you can add the the line
-
-.ds default-operating-system my fancy system
-
-to the file ${TRUEPREFIX}/share/groff/site-tmac/mdoc.local.
-But don't do that on a machine you intend to build ports(7) on.
-
To suit the taste of OpenBSD developers, two mdoc(7) formatting
details have been changed with respect to the upstream distribution:
