Maintainer update to groff-1.22.3, released yesterday.
New features:
* glilypond(1) - new preprocessor for music typesetting
* gperl(1) - new preprocessor for embedding Perl code in roff documents
* gpinyin(1) - new preprocessor to pretty-print Pinyin syllables
* groff_mom(7) now has full eqn(7), pic(7), and tbl(7) support
* mdoc(7) now supports the %C macro (already available in mandoc)
* Various bugfixes.
>From the porting perspective:
* Many of our patches have been integrated upstream.
* Changing the bullet is no longer needed, mandoc can now handle it.
* Regenerate patches.
I'm running this for weeks already and see no regressions.
In particular, it doesn't change the formatting of any base
system manuals and it doesn't break the mandoc test suite.
OK to commit, or does anybody think a bulk test is needed first?
Yours,
Ingo
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/groff/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 15 Dec 2013 15:19:50 -0000 1.26
+++ Makefile 6 Nov 2014 01:39:31 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2013/12/15 15:19:50 schwarze Exp $
COMMENT = GNU troff typesetter
-VERSION = 1.22.2
+VERSION = 1.22.3
SUBST_VARS = VERSION
DISTNAME = groff-${VERSION}
-REVISION = 4
CATEGORIES = textproc
DPB_PROPERTIES = parallel
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/groff/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 30 Mar 2013 23:10:05 -0000 1.3
+++ distinfo 6 Nov 2014 01:39:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (groff-1.22.2.tar.gz) = OAhk2sR3LgwNexKC0l0MX9f2O69FyHxGV6/tIqE9IHY=
-SIZE (groff-1.22.2.tar.gz) = 4019913
+SHA256 (groff-1.22.3.tar.gz) = Okip1sl3UL+9U1/utb4BEdtkBt23u3n8aAgJzabYKKU=
+SIZE (groff-1.22.3.tar.gz) = 4188772
Index: patches/patch-Makefile_comm
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-Makefile_comm,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_comm
--- patches/patch-Makefile_comm 4 Dec 2011 15:41:26 -0000 1.2
+++ patches/patch-Makefile_comm 6 Nov 2014 01:39:31 -0000
@@ -3,58 +3,58 @@ $OpenBSD: patch-Makefile_comm,v 1.2 2011
# since mandoc(1) does not format the groff manuals well.
# But install groff_mdoc(7) as source
# because mandoc(1) handles that one better than groff.
---- Makefile.comm.orig Fri Dec 31 08:33:08 2010
-+++ Makefile.comm Fri Oct 21 22:19:48 2011
-@@ -176,27 +176,44 @@ install_man:
+--- Makefile.comm.orig Mon Oct 13 00:16:08 2014
++++ Makefile.comm Mon Oct 13 00:32:56 2014
+@@ -172,27 +172,44 @@ install_man:
-test -d $(DESTDIR)$(man1dir) || $(mkinstalldirs) $(DESTDIR)$(man1dir)
@-pages="$(MAN1)"; \
- for p in $$pages; do \
-- prog=`basename $$p .n`; \
-- target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
-+ p0="$${p%.n}.0"; \
-+ echo "groff -t -mandoc -Tascii -P -c $$p > $$p0"; \
-+ $(top_srcdir)/test-groff -t -mandoc -Tascii -P -c $$p > $$p0; \
-+ target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$p0; \
- rm -f $$target; \
-- echo $(INSTALL_DATA) $$p $$target; \
-- $(INSTALL_DATA) $$p $$target; \
-+ echo $(INSTALL_DATA) $$p0 $$target; \
-+ $(INSTALL_DATA) $$p0 $$target; \
+ for p in $$pages; do \
+- prog=`basename $$p .n`; \
+- target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
++ p0="$${p%.n}.0"; \
++ echo "groff -t -mandoc -Tascii -P -c $$p > $$p0"; \
++ $(top_srcdir)/test-groff -t -mandoc -Tascii -P -c $$p > $$p0; \
++ target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$p0; \
+ rm -f $$target; \
+- echo $(INSTALL_DATA) $$p $$target; \
+- $(INSTALL_DATA) $$p $$target; \
++ echo $(INSTALL_DATA) $$p0 $$target; \
++ $(INSTALL_DATA) $$p0 $$target; \
done
-test -d $(DESTDIR)$(man5dir) || $(mkinstalldirs) $(DESTDIR)$(man5dir)
@-pages="$(MAN5)"; \
- for p in $$pages; do \
-- target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
-+ p0="$${p%.n}.0"; \
-+ echo "groff -t -mandoc -Tascii -P -c $$p > $$p0"; \
-+ $(top_srcdir)/test-groff -t -mandoc -Tascii -P -c $$p > $$p0; \
-+ target=$(DESTDIR)$(man5dir)/$$p0; \
- rm -f $$target; \
-- echo $(INSTALL_DATA) $$p $$target; \
-- $(INSTALL_DATA) $$p $$target; \
-+ echo $(INSTALL_DATA) $$p0 $$target; \
-+ $(INSTALL_DATA) $$p0 $$target; \
+ for p in $$pages; do \
+- target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
++ p0="$${p%.n}.0"; \
++ echo "groff -t -mandoc -Tascii -P -c $$p > $$p0"; \
++ $(top_srcdir)/test-groff -t -mandoc -Tascii -P -c $$p > $$p0; \
++ target=$(DESTDIR)$(man5dir)/$$p0; \
+ rm -f $$target; \
+- echo $(INSTALL_DATA) $$p $$target; \
+- $(INSTALL_DATA) $$p $$target; \
++ echo $(INSTALL_DATA) $$p0 $$target; \
++ $(INSTALL_DATA) $$p0 $$target; \
done
-test -d $(DESTDIR)$(man7dir) || $(mkinstalldirs) $(DESTDIR)$(man7dir)
@-pages="$(MAN7)"; \
- for p in $$pages; do \
-- target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
-+ if [ "X$$p" = "Xgroff_mdoc.n" ]; then \
-+ mdocdir=$(DESTDIR)$(manroot)/man$(man7ext); \
-+ test -d $$mdocdir || $(mkinstalldirs) $$mdocdir; \
-+ target=$$mdocdir/groff_mdoc.7; \
- rm -f $$target; \
- echo $(INSTALL_DATA) $$p $$target; \
- $(INSTALL_DATA) $$p $$target; \
-+ else \
-+ p0="$${p%.n}.0"; \
-+ echo "groff -t -mandoc -Tascii -P -c $$p > $$p0"; \
-+ $(top_srcdir)/test-groff -t -mandoc -Tascii -P -c $$p > $$p0; \
-+ target=$(DESTDIR)$(man7dir)/$$p0; \
-+ rm -f $$target; \
-+ echo $(INSTALL_DATA) $$p0 $$target; \
-+ $(INSTALL_DATA) $$p0 $$target; \
-+ fi; \
+ for p in $$pages; do \
+- target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
++ if [ "X$$p" = "Xgroff_mdoc.n" ]; then \
++ mdocdir=$(DESTDIR)$(manroot)/man$(man7ext); \
++ test -d $$mdocdir || $(mkinstalldirs) $$mdocdir; \
++ target=$$mdocdir/groff_mdoc.7; \
+ rm -f $$target; \
+ echo $(INSTALL_DATA) $$p $$target; \
+ $(INSTALL_DATA) $$p $$target; \
++ else \
++ p0="$${p%.n}.0"; \
++ echo "groff -t -mandoc -Tascii -P -c $$p > $$p0"; \
++ $(top_srcdir)/test-groff -t -mandoc -Tascii -P -c $$p > $$p0; \
++ target=$(DESTDIR)$(man7dir)/$$p0; \
++ rm -f $$target; \
++ echo $(INSTALL_DATA) $$p0 $$target; \
++ $(INSTALL_DATA) $$p0 $$target; \
++ fi; \
done
.PHONY: uninstall_man
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 30 Mar 2013 23:10:05 -0000 1.4
+++ patches/patch-Makefile_in 6 Nov 2014 01:39:31 -0000
@@ -1,10 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.4 2013/03/30 23:10:05 schwarze Exp $
-chunk 1: Install preformatted manuals, not source pages (local change).
-chunks 2-6: Building contrib/mom/examples requires src/devices/gropdf;
- fixes parallel builds (to be submitted upstream).
---- Makefile.in.orig Thu Feb 7 13:06:06 2013
-+++ Makefile.in Thu Mar 28 21:48:11 2013
-@@ -249,15 +249,15 @@ manroot=$(mandir)
+Install preformatted manuals, not source pages (local change).
+--- Makefile.in.orig Sun Oct 12 23:00:07 2014
++++ Makefile.in Sun Oct 12 23:27:06 2014
+@@ -253,15 +253,15 @@ manroot=$(mandir)
# `man1ext' is the man section for user commands.
man1ext=1
@@ -21,70 +19,5 @@ chunks 2-6: Building contrib/mom/example
-man7dir=$(manroot)/man$(man7ext)
+man7dir=$(manroot)/cat$(man7ext)
- # The configure script checks whether all necessary utility programs for
- # grohtml are available -- only then we can build the HTML documentation.
-@@ -608,14 +608,16 @@ ALLTTYDEVDIRS=\
- font/devutf8 \
- font/devcp1047
- # `doc' must be processed before `contrib/pdfmark',
--# pdf stuff must be processed before `contrib/mom
-+# pdf stuff must be processed before `contrib/mom'.
-+MIDDIRS=\
-+ doc \
-+ src/devices/gropdf
- OTHERDIRS=\
- man \
- tmac \
- src/utils/afmtodit \
- src/roff/grog \
- src/roff/nroff \
-- doc \
- contrib/mm \
- contrib/chem \
- contrib/pic2graph \
-@@ -624,7 +626,6 @@ OTHERDIRS=\
- contrib/groffer \
- contrib/hdtbl \
- contrib/pdfmark \
-- src/devices/gropdf \
- font/devpdf \
- contrib/mom \
- contrib/gdiffmk
-@@ -678,6 +679,7 @@ DISTDIRS=\
- $(XDEVDIRS) \
- $(OTHERDEVDIRS) \
- $(ALLTTYDEVDIRS) \
-+ $(MIDDIRS) \
- $(OTHERDIRS) \
- $(EXTRADIRS) \
- $(NOMAKEDIRS) \
-@@ -702,13 +704,14 @@ ENVSETUP=\
- fi
-
- do=all
--dodirs=$(ALLDIRS) $(OTHERDIRS) dot
-+dodirs=$(ALLDIRS) $(MIDDIRS) $(OTHERDIRS) dot
- # Default target for subdir_Makefile
- subdir=src/roff/troff
-
-
- $(TARGETS):
- @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(ALLDIRS)
-+ @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(MIDDIRS)
- @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(OTHERDIRS) dot
-
- dot: FORCE
-@@ -796,9 +799,11 @@ $(GNULIBDIRS): FORCE
- $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
- esac
-
--$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
-+$(MIDDIRS): $(PROGDEPDIRS)
-
--$(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
-+$(OTHERDIRS): $(PROGDEPDIRS) $(MIDDIRS) $(CCPROGDIRS) $(CPROGDIRS)
-+
-+$(INCDIRS) $(PROGDEPDIRS) $(MIDDIRS) $(OTHERDIRS): FORCE
- @$(ENVSETUP); \
- if test $(srcdir) = .; then \
- srcdir=.; \
+ # `dist' target is disallowed in some `configure' combinations.
+ doc_dist_target_ok=@doc_dist_target_ok@
Index: patches/patch-font_devpdf_Makefile_sub
===================================================================
RCS file: patches/patch-font_devpdf_Makefile_sub
diff -N patches/patch-font_devpdf_Makefile_sub
--- patches/patch-font_devpdf_Makefile_sub 30 Mar 2013 23:10:05 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-font_devpdf_Makefile_sub,v 1.1 2013/03/30 23:10:05 schwarze
Exp $
-chunk 1: Avoid installing Makefile.sub.orig (submitted and accepted upstream).
-chunk 2: Add missing subdirectory (submitted and accepted upstream).
---- font/devpdf/Makefile.sub.orig Thu Feb 7 13:06:09 2013
-+++ font/devpdf/Makefile.sub Mon Mar 4 09:23:08 2013
-@@ -18,7 +18,7 @@
-
- DEV=pdf
- GROFF_FONT_FILES=`cd $(top_builddir)/font/devpdf \
-- && find * -maxdepth 0 -type f ! -name Makefile.sub \
-+ && find * -maxdepth 0 -type f ! -name 'Makefile.sub*' \
- -exec grep -l internalname {} \;`
- ENC_FILES=`cd $(top_builddir)/font/devpdf; ls enc/*`
- MAP_FILES=`cd $(top_builddir)/font/devpdf; ls map/*`
-@@ -105,6 +105,8 @@ install_data:
- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/enc
- -test -d $(DESTDIR)$(fontsubdir)/map \
- || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/map
-+ -test -d $(DESTDIR)$(fontsubdir)/util \
-+ || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/util
- for f in $(MOSTLYCLEANADD); do \
- $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
- if test -f $$f; then \
Index: patches/patch-tmac_an-old_tmac
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_an-old_tmac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-tmac_an-old_tmac
--- patches/patch-tmac_an-old_tmac 15 Dec 2013 15:19:50 -0000 1.4
+++ patches/patch-tmac_an-old_tmac 6 Nov 2014 01:39:31 -0000
@@ -1,88 +1,15 @@
$OpenBSD: patch-tmac_an-old_tmac,v 1.4 2013/12/15 15:19:50 schwarze Exp $
-chunks 1,3-5: Fix indentation after RE without RS (approved upstream).
-chunk 2: Keep traditional OpenBSD page headers (local change).
-chunk 6: Correct right margin after double .TP (accepted & committed upstream).
---- tmac/an-old.tmac.orig Thu Feb 7 13:06:08 2013
-+++ tmac/an-old.tmac Sat Dec 14 21:24:58 2013
-@@ -122,7 +122,11 @@
- .\}
- .
- .de set-an-margin
-+. nr an-level 1
- . nr an-margin \\n[IN]
-+. nr an-saved-margin1 \\n[IN]
-+. nr an-prevailing-indent \\n[IN]
-+. nr an-saved-prevailing-indent1 \\n[IN]
- ..
- .
- .ds an-extra1
-@@ -145,16 +149,16 @@
- . 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
+Tweak page headers (local change).
+--- tmac/an-old.tmac.orig Sun Oct 12 23:00:09 2014
++++ tmac/an-old.tmac Sun Oct 12 23:27:06 2014
+@@ -153,8 +153,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 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 \{ .ie '\\$2'1' .ds an-extra3 OpenBSD Reference Manual
-+. el \{ .ie '\\$2'2' .ds an-extra3 OpenBSD Programmer's Manual
-+. el \{ .ie '\\$2'3' .ds an-extra3 OpenBSD Programmer's Manual
-+. el \{ .ie '\\$2'3p' .ds an-extra3 Perl Programmers Reference Guide
-+. el \{ .ie '\\$2'4' .ds an-extra3 OpenBSD Programmer's Manual
-+. el \{ .ie '\\$2'5' .ds an-extra3 OpenBSD Programmer's Manual
-+. el \{ .ie '\\$2'6' .ds an-extra3 OpenBSD Reference Manual
-+. el \{ .ie '\\$2'7' .ds an-extra3 OpenBSD Reference Manual
-+. el \{ .ie '\\$2'8' .ds an-extra3 OpenBSD System Manager's Manual
-+. el \{ .ie '\\$2'9' .ds an-extra3 OpenBSD Kernel Manual
- . el .ds an-extra3
- . \}\}\}\}\}\}\}\}\}\}
- . ds an-init
-@@ -198,9 +202,7 @@
- . PD
- . if !r SN \
- . nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
--. nr an-level 1
- . set-an-margin
--. nr an-prevailing-indent \\n[IN]
- . nr an-tag-sep 1n
- .
- . nr an-no-space-flag 0
-@@ -342,9 +344,7 @@
- .
- .de1 SH
- . sp \\n[PD]u
--. nr an-level 1
- . set-an-margin
--. nr an-prevailing-indent \\n[IN]
- . fi
- . in \\n[an-margin]u
- . ti 0
-@@ -361,9 +361,7 @@
- .
- .de1 SS
- . sp \\n[PD]u
--. nr an-level 1
- . set-an-margin
--. nr an-prevailing-indent \\n[IN]
- . fi
- . in \\n[IN]u
- . ti \\n[SN]u
-@@ -406,8 +404,10 @@
- . if \\n[.$] .nr an-prevailing-indent (n;\\$1)
- . it 1 an-trap
- . in 0
--. ll -\\n[an-margin]u
--. if !\\n[an-div?] .di an-div
-+. if !\\n[an-div?] \{\
-+. ll -\\n[an-margin]u
-+. di an-div
-+. \}
- . nr an-div? 1
- ..
- .
++. 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
Index: patches/patch-tmac_doc-common
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_doc-common,v
retrieving revision 1.6
diff -u -p -r1.6 patch-tmac_doc-common
--- patches/patch-tmac_doc-common 11 Nov 2013 06:41:02 -0000 1.6
+++ patches/patch-tmac_doc-common 6 Nov 2014 01:39:31 -0000
@@ -1,48 +1,57 @@
$OpenBSD: patch-tmac_doc-common,v 1.6 2013/11/11 06:41:02 schwarze Exp $
-chunk 1: Implement .%C (accepted and committed upstream).
-chunk 2: Keep traditional OpenBSD page headers (local change).
-chunk 3: Default value for the .Os macro (local change).
-chunk 4: More OpenBSD release versions (to be submitted upstream).
-chunk 5: Handle .Dd Mdocdate (local change).
-chunk 6: Do not use an ugly double dash in the NAME line (local change).
---- tmac/doc-common.orig Thu Feb 7 13:06:08 2013
-+++ tmac/doc-common Wed Jul 24 23:28:04 2013
-@@ -37,6 +37,7 @@
- .
- .nr %A 1
- .nr %B 1
-+.nr %C 1
- .nr %D 1
- .nr %I 1
- .nr %J 1
-@@ -231,17 +232,17 @@
+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).
+--- tmac/doc-common.orig Tue Nov 4 09:38:35 2014
++++ tmac/doc-common Wed Nov 5 23:16:57 2014
+@@ -234,12 +234,10 @@
.
.\" an alternative, more detailed scheme for naming the manual sections
.\"
-.ds doc-volume-operating-system BSD
-+.ds doc-volume-operating-system OpenBSD
- .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
+-.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-5 File Formats Manual
--.ds doc-volume-ds-6 Games Manual
--.ds doc-volume-ds-7 Miscellaneous Information Manual
-+.ds doc-volume-ds-1 Reference Manual
-+.ds doc-volume-ds-2 Programmer's Manual
-+.ds doc-volume-ds-3 Programmer's Manual
-+.ds doc-volume-ds-4 Programmer's Manual
-+.ds doc-volume-ds-5 Programmer's Manual
-+.ds doc-volume-ds-6 Reference Manual
-+.ds doc-volume-ds-7 Reference Manual
- .ds doc-volume-ds-8 System Manager's Manual
--.ds doc-volume-ds-9 Kernel Developer's Manual
-+.ds doc-volume-ds-9 Kernel Manual
- .
- .ds doc-volume-ds-USD User's Supplementary Documents
- .ds doc-volume-ds-PS1 Programmer's Supplementary Documents
-@@ -399,7 +400,7 @@
++.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
.
@@ -51,29 +60,7 @@ chunk 6: Do not use an ugly double dash
.
.
.\" NS doc-operating-system global string
-@@ -517,6 +518,10 @@
- .ds doc-operating-system-OpenBSD-4.8 4.8
- .ds doc-operating-system-OpenBSD-4.9 4.9
- .ds doc-operating-system-OpenBSD-5.0 5.0
-+.ds doc-operating-system-OpenBSD-5.1 5.1
-+.ds doc-operating-system-OpenBSD-5.2 5.2
-+.ds doc-operating-system-OpenBSD-5.3 5.3
-+.ds doc-operating-system-OpenBSD-5.4 5.4
- .
- .ds doc-operating-system-FreeBSD-1.0 1.0
- .ds doc-operating-system-FreeBSD-1.1 1.1
-@@ -732,7 +737,9 @@
- . ds doc-command-name
- .
- . ie \n[.$] \{\
--. ie (\n[.$] == 3) \
-+. 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]]
-@@ -906,7 +913,7 @@
+@@ -976,7 +965,7 @@
.\" NS width register `Nd' set above
.
.de Nd
Index: patches/patch-tmac_doc_tmac
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_doc_tmac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tmac_doc_tmac
--- patches/patch-tmac_doc_tmac 11 Nov 2013 06:41:02 -0000 1.3
+++ patches/patch-tmac_doc_tmac 6 Nov 2014 01:39:31 -0000
@@ -1,27 +1,8 @@
$OpenBSD: patch-tmac_doc_tmac,v 1.3 2013/11/11 06:41:02 schwarze Exp $
-chunks 1,2,4-8: Implement .%C (accepted and committed upstream).
-chunk 3: Always format .Pa the same way, as requested by jmc@ (local change).
---- tmac/doc.tmac.orig Thu Feb 7 13:06:08 2013
-+++ tmac/doc.tmac Wed Jul 24 23:24:51 2013
-@@ -3423,6 +3423,8 @@
- .
- . nr doc-book-count-saved \n[doc-book-count]
- . ds doc-book-name-saved "\*[doc-book-name]
-+. nr doc-city-count-saved \n[doc-city-count]
-+. ds doc-city-name-saved "\*[doc-city-name]
- . nr doc-date-count-saved \n[doc-date-count]
- . ds doc-date-saved "\*[doc-date]
- . nr doc-publisher-count-saved \n[doc-publisher-count]
-@@ -3565,6 +3567,8 @@
- .
- . nr doc-book-count \n[doc-book-count-saved]
- . ds doc-book-name "\*[doc-book-name-saved]
-+. nr doc-city-count \n[doc-city-count-saved]
-+. ds doc-city-name "\*[doc-city-name-saved]
- . nr doc-date-count \n[doc-date-count-saved]
- . ds doc-date "\*[doc-date-saved]
- . nr doc-publisher-count \n[doc-publisher-count-saved]
-@@ -3759,8 +3763,6 @@
+Always format .Pa the same way, as requested by jmc@ (local change).
+--- tmac/doc.tmac.orig Sun Oct 12 23:00:09 2014
++++ tmac/doc.tmac Sun Oct 12 23:27:06 2014
+@@ -3765,8 +3765,6 @@
.
. if \n[doc-in-files-section] \{\
. ds doc-saved-Pa-font "\*[doc-Pa-font]
@@ -30,103 +11,3 @@ chunk 3: Always format .Pa the same way,
. \}
.
. ie (\n[doc-type1] == 1) \
-@@ -5190,6 +5192,8 @@
- .\" NS doc-author-nameXXX
- .\" NS doc-book-count
- .\" NS doc-book-name
-+.\" NS doc-city-count
-+.\" NS doc-city-name
- .\" NS doc-corporate-count
- .\" NS doc-corporate-name
- .\" NS doc-date
-@@ -5228,6 +5232,7 @@
- . nr doc-reference-title-count 0
- . nr doc-url-count 0
- . nr doc-volume-count 0
-+. nr doc-city-count 0
- . nr doc-date-count 0
- . nr doc-page-number-count 0
- . nr doc-book-count 0
-@@ -5243,6 +5248,7 @@
- . ds doc-reference-title-name-for-book
- . ds doc-url-name
- . ds doc-volume-name
-+. ds doc-city-name
- . ds doc-date
- . ds doc-page-number-string
- . ds doc-book-name
-@@ -5357,6 +5363,13 @@
- . doc-finish-reference \n[doc-corporate-count]
- . \}
- .
-+. if \n[doc-city-count] \{\
-+. unformat doc-city-name
-+. chop doc-city-name
-+. nop \*[doc-city-name]\c
-+. doc-finish-reference \n[doc-city-count]
-+. \}
-+.
- . if \n[doc-date-count] \{\
- . unformat doc-date
- . chop doc-date
-@@ -5525,6 +5538,60 @@
- . nop \*[doc-Em-font]\c
- . doc-print-recursive
- . \}
-+..
-+.
-+.
-+.\" NS doc-city-count global register
-+.\" NS counter of city references
-+.
-+.nr doc-city-count 0
-+.
-+.
-+.\" NS doc-city-name global box
-+.\" NS string of collected city references
-+.
-+.ds doc-city-name
-+.
-+.
-+.\" NS %C user macro
-+.\" NS [reference] city
-+.\" NS
-+.\" NS modifies:
-+.\" NS doc-arg-ptr
-+.\" NS doc-curr-font
-+.\" NS doc-curr-size
-+.\" NS doc-city-count
-+.\" NS doc-macro-name
-+.\" NS doc-reference-count
-+.\" NS
-+.\" NS local variables:
-+.\" NS doc-env-%C
-+.\" NS
-+.\" NS width register `%C' set in doc-common
-+.
-+.de %C
-+. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
-+. tm Usage: .%C city_name ... (#\n[.c])
-+. return
-+. \}
-+.
-+. nr doc-city-count +1
-+. nr doc-reference-count +1
-+.
-+. ds doc-macro-name %C
-+. doc-parse-args \$@
-+.
-+. nr doc-arg-ptr +1
-+. nr doc-curr-font \n[.f]
-+. nr doc-curr-size \n[.ps]
-+.
-+. \" append to reference box
-+. boxa doc-city-name
-+. ev doc-env-%C
-+. evc 0
-+. in 0
-+. nf
-+. doc-do-references
- ..
- .
- .
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 11 Nov 2013 06:41:02 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-tmac_groff_mdoc_man,v 1.5 2013/11/11 06:41:02 schwarze Exp $
-chunk 1: More OpenBSD versions (to be submitted upstream).
-chunks 2-4: Implement %C (accepted and committed upstream).
---- tmac/groff_mdoc.man.orig Thu Feb 7 13:06:08 2013
-+++ tmac/groff_mdoc.man Wed Jul 24 23:31:38 2013
-@@ -883,7 +883,7 @@ the release ID.
- .It OpenBSD
- 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4,
- 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9,
--5.0
-+5.0, 5.1, 5.2, 5.3, 5.4
- .It DragonFly
- 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.8, 1.8.1, 1.10, 1.12, 1.12.2, 2.0, 2.2,
- 2.4, 2.6, 2.8, 2.9, 2.9.1, 2.10, 2.10.1, 2.11
-@@ -2637,7 +2637,7 @@ Reference author name; one name per invocation.
- .It Li .%B
- Book title.
- .It Li .%C
--City/place (not implemented yet).
-+City/place.
- .It Li .%D
- Date.
- .It Li .%I
-@@ -2684,7 +2684,8 @@ Example:
- \&.%A "John Foo"
- \&.%T "Implementation Notes on foobar(1)"
- \&.%R "Technical Report ABC\-DE\-12\-345"
--\&.%Q "Drofnats College, Nowhere"
-+\&.%Q "Drofnats College"
-+\&.%C "Nowhere"
- \&.%D "April 1991"
- \&.Re
- .Ed
-@@ -2697,7 +2698,8 @@ produces
- .%A "John Foo"
- .%T "Implementation Notes on foobar(1)"
- .%R "Technical Report ABC-DE-12-345"
--.%Q "Drofnats College, Nowhere"
-+.%Q "Drofnats College"
-+.%C "Nowhere"
- .%D "April 1991"
- .Re
- .Ed
Index: patches/patch-tmac_troffrc
===================================================================
RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_troffrc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tmac_troffrc
--- patches/patch-tmac_troffrc 30 Mar 2013 23:10:05 -0000 1.3
+++ patches/patch-tmac_troffrc 6 Nov 2014 01:39:31 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-tmac_troffrc,v 1.3 2013/03/30 23:10:05 schwarze Exp $
Disable hyphenation and adjustment (local change).
---- tmac/troffrc.orig Sun Dec 30 08:40:29 2012
-+++ tmac/troffrc Tue Jan 1 15:07:29 2013
-@@ -41,10 +41,16 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp tro
+--- 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'.
.do hla us
.
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 7 Jul 2011 05:27:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-# Make this behave exactly the same way as mandoc(1).
-# This makes my life easier for comparisions, and users won't notice.
-# Changing mandoc output to "+\bo" would kill -Tps, so that's out.
-$OpenBSD: patch-tmac_tty_tmac,v 1.1 2011/07/07 05:27:15 schwarze Exp $
---- tmac/tty.tmac.orig Fri Dec 31 00:33:09 2010
-+++ tmac/tty.tmac Wed Jul 6 19:19:12 2011
-@@ -17,7 +17,7 @@
- . if c\[md] \
- . tr \[bu]\[md]
- .
--.fchar \[bu] \z+o
-+.fchar \[bu] o
- .fchar \[14] 1/4
- .fchar \[12] 1/2
- .fchar \[34] 3/4
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/groff/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 30 Mar 2013 23:10:05 -0000 1.6
+++ pkg/PLIST 6 Nov 2014 01:39:31 -0000
@@ -7,6 +7,9 @@ bin/chem
@bin bin/eqn
bin/eqn2graph
bin/gdiffmk
+bin/glilypond
+bin/gperl
+bin/gpinyin
bin/grap2graph
@bin bin/grn
@bin bin/grodvi
@@ -47,12 +50,23 @@ 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/func.pl
+lib/groff/groffer/main_subs.pl
lib/groff/groffer/man.pl
-lib/groff/groffer/perl_test.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/refer/
lib/groff/site-tmac/
@man man/cat1/addftinfo.0
@man man/cat1/afmtodit.0
@@ -60,6 +74,9 @@ lib/groff/site-tmac/
@man man/cat1/eqn.0
@man man/cat1/eqn2graph.0
@man man/cat1/gdiffmk.0
+@man man/cat1/glilypond.0
+@man man/cat1/gperl.0
+@man man/cat1/gpinyin.0
@man man/cat1/grap2graph.0
@man man/cat1/grn.0
@man man/cat1/grodvi.0
@@ -104,6 +121,7 @@ lib/groff/site-tmac/
@man man/cat7/groff.0
@man man/cat7/groff_char.0
@man man/cat7/groff_diff.0
+@man man/cat7/groff_filenames.0
@man man/cat7/groff_hdtbl.0
@man man/cat7/groff_man.0
@man man/cat7/groff_me.0
@@ -143,10 +161,10 @@ share/doc/groff/html/mom/using.html
share/doc/groff/html/mom/version-2.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/pdf/
-share/doc/groff/pdf/mom-pdf.pdf
share/doc/groff/pic.ms
share/doc/groff/pic.ps
share/doc/pkg-readmes/${FULLPKGNAME}
@@ -242,16 +260,12 @@ 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/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/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/typesetting.mom
-share/examples/groff/mom/typesetting.pdf
share/examples/groff/webpage.ms
share/examples/groff/webpage.ps
share/groff/
