Hi, here is a cleanup of the groff port.
I'm running with this on i386 since well before p2k11; and the last communication with upstream regarding these patches has just been completed successfully. As breaking groff is typically a major hindrance for bulk builds, checking it in a bulk before commit might make sense - even though i see nothing particularly dangerous here, but who knows... Changes: * Unbreak groff manuals by using tbl(1); reported by pascal@. * Deal with our Mdocdate cvs keyword; local change. * Use troffrc for OpenBSD config changes, don't fiddle with the code. * Unbreak the hdtbl examples; from upstream. * Nice man(7) volume names in page headers; accepted upstream. * Update various string tables; coordinated with upstream. * Better description, and a README explaining local changes. * Bump. Comments, test reports, OKs? Thanks, Ingo Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/groff/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 12 Oct 2011 22:00:07 -0000 1.14 +++ Makefile 2 Dec 2011 02:18:15 -0000 @@ -2,7 +2,7 @@ COMMENT = GNU troff typesetter DISTNAME = groff-1.21 -REVISION = 5 +REVISION = 6 CATEGORIES = textproc HOMEPAGE = http://www.gnu.org/software/groff/ Index: patches/patch-Makefile_comm =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-Makefile_comm,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile_comm --- patches/patch-Makefile_comm 12 Oct 2011 22:00:07 -0000 1.1 +++ patches/patch-Makefile_comm 2 Dec 2011 02:18:15 -0000 @@ -4,7 +4,7 @@ $OpenBSD: patch-Makefile_comm,v 1.1 2011 # 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 Tue Oct 11 02:57:44 2011 ++++ Makefile.comm Fri Oct 21 22:19:48 2011 @@ -176,27 +176,44 @@ install_man: -test -d $(DESTDIR)$(man1dir) || $(mkinstalldirs) $(DESTDIR)$(man1dir) @-pages="$(MAN1)"; \ @@ -12,8 +12,8 @@ $OpenBSD: patch-Makefile_comm,v 1.1 2011 - prog=`basename $$p .n`; \ - target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \ + p0="$${p%.n}.0"; \ -+ echo "groff -mandoc -Tascii -P -c $$p > $$p0"; \ -+ $(top_srcdir)/test-groff -mandoc -Tascii -P -c $$p > $$p0; \ ++ 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; \ @@ -26,8 +26,8 @@ $OpenBSD: patch-Makefile_comm,v 1.1 2011 for p in $$pages; do \ - target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \ + p0="$${p%.n}.0"; \ -+ echo "groff -mandoc -Tascii -P -c $$p > $$p0"; \ -+ $(top_srcdir)/test-groff -mandoc -Tascii -P -c $$p > $$p0; \ ++ 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; \ @@ -48,8 +48,8 @@ $OpenBSD: patch-Makefile_comm,v 1.1 2011 $(INSTALL_DATA) $$p $$target; \ + else \ + p0="$${p%.n}.0"; \ -+ echo "groff -mandoc -Tascii -P -c $$p > $$p0"; \ -+ $(top_srcdir)/test-groff -mandoc -Tascii -P -c $$p > $$p0; \ ++ 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; \ Index: patches/patch-contrib_hdtbl_Makefile_sub =================================================================== RCS file: patches/patch-contrib_hdtbl_Makefile_sub diff -N patches/patch-contrib_hdtbl_Makefile_sub --- patches/patch-contrib_hdtbl_Makefile_sub 19 Mar 2011 16:48:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ -$OpenBSD: patch-contrib_hdtbl_Makefile_sub,v 1.1 2011/03/19 16:48:53 schwarze Exp $ -# These examples use bash at build time, but i don't want a bash dependency. ---- contrib/hdtbl/Makefile.sub.orig Sun Mar 13 18:14:15 2011 -+++ contrib/hdtbl/Makefile.sub Sun Mar 13 18:19:24 2011 -@@ -47,34 +47,11 @@ STRIPFILES=\ - hdmisc.tmac - - # These files are handled by the `.in.roff' rule. --GENFILES=\ -- examples/fonts_n.roff \ -- examples/fonts_x.roff -+GENFILES= - --EXAMPLEFILES=\ -- examples/common.roff \ -- examples/chess_board.roff \ -- examples/color_boxes.roff \ -- examples/color_nested_tables.roff \ -- examples/color_table_cells.roff \ -- examples/color_transitions.roff \ -- examples/col_rowspan_colors.roff \ -- examples/mixed_pickles.roff \ -- examples/rainbow.roff \ -- examples/short_reference.roff -+EXAMPLEFILES= - --PROCESSEDEXAMPLEFILES=\ -- examples/chess_board.ps \ -- examples/color_boxes.ps \ -- examples/color_nested_tables.ps \ -- examples/color_table_cells.ps \ -- examples/color_transitions.ps \ -- examples/col_rowspan_colors.ps \ -- examples/fonts_n.ps \ -- examples/fonts_x.ps \ -- examples/mixed_pickles.ps \ -- examples/rainbow.ps \ -- examples/short_reference.ps -+PROCESSEDEXAMPLEFILES= - - EXAMPLEFILES_=`echo $(EXAMPLEFILES) | sed 's|examples/||g'` - GENFILES_=`echo $(GENFILES) | sed 's|examples/||g'` 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-contrib_hdtbl_examples_common_roff 2 Dec 2011 02:18:15 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ +Do not depend on bash (from upstream CVS). +--- contrib/hdtbl/examples/common.roff.orig Fri Dec 31 08:33:09 2010 ++++ contrib/hdtbl/examples/common.roff Sun Oct 23 19:25:35 2011 +@@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.o + .\" ** for example "Sun Dec 5 22:27:57 2004" ** + .\" ****************************************************************** + .de date +-. pso bash -c "echo -n .ds *date\ ;date" ++. pso sh -c "echo -n .ds *date\ ;date" + . tm \\*[*date] *** + .. + . +@@ -83,9 +83,9 @@ along with this program. If not, see <http://www.gnu.o + . ds * \\$1\" + . substring * 0 0 + . ie "\\*[*]"s" \ +-. pso bash -c "echo -n .nr *time 0+;date +%s" ++. pso sh -c "echo -n .nr *time 0+;date +%s" + . el \{\ +-. pso bash -c "echo -n .nr *time -;date +%s" ++. pso sh -c "echo -n .nr *time -;date +%s" + . nr *time 0-\\n[*time] + . tm elapsed time: \\n[*time] seconds + . \} Index: patches/patch-contrib_hdtbl_examples_fonts_n_in =================================================================== RCS file: patches/patch-contrib_hdtbl_examples_fonts_n_in diff -N patches/patch-contrib_hdtbl_examples_fonts_n_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-contrib_hdtbl_examples_fonts_n_in 2 Dec 2011 02:18:15 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +Do not depend on bash (from upstream CVS). +--- contrib/hdtbl/examples/fonts_n.in.orig Fri Dec 31 08:33:09 2010 ++++ contrib/hdtbl/examples/fonts_n.in Sun Oct 23 19:24:56 2011 +@@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.o + . el \ + . ds *args \\n[.fn] + . +-. pso bash -c \ ++. pso sh -c \ + "echo -n .ds *f\ ; \ + ls \\*[fontpath]/dev\*[.T] \ + | tr '[:cntrl:]' ' '" Index: patches/patch-contrib_hdtbl_examples_fonts_x_in =================================================================== RCS file: patches/patch-contrib_hdtbl_examples_fonts_x_in diff -N patches/patch-contrib_hdtbl_examples_fonts_x_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-contrib_hdtbl_examples_fonts_x_in 2 Dec 2011 02:18:15 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +Do not depend on bash (from upstream CVS). +--- contrib/hdtbl/examples/fonts_x.in.orig Fri Dec 31 08:33:09 2010 ++++ contrib/hdtbl/examples/fonts_x.in Sun Oct 23 19:25:11 2011 +@@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.o + . el \ + . ds *args \\n[.fn] + . +-. pso bash -c \ ++. pso sh -c \ + "echo -n .ds *f\ ; \ + ls \\*[fontpath]/dev\*[.T] \ + | tr '[:cntrl:]' ' '" Index: patches/patch-src_roff_troff_env_cpp =================================================================== RCS file: patches/patch-src_roff_troff_env_cpp diff -N patches/patch-src_roff_troff_env_cpp --- patches/patch-src_roff_troff_env_cpp 19 Mar 2011 16:48:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$OpenBSD: patch-src_roff_troff_env_cpp,v 1.1 2011/03/19 16:48:53 schwarze Exp $ -# completely disable adjustment -# to help automatic comparisons with mandoc ---- src/roff/troff/env.cpp.orig Fri Dec 31 00:33:08 2010 -+++ src/roff/troff/env.cpp Sat Mar 12 13:09:47 2011 -@@ -627,7 +627,7 @@ environment::environment(symbol nm) - char_slant(0), - space_size(12), - sentence_space_size(12), -- adjust_mode(ADJUST_BOTH), -+ adjust_mode(ADJUST_LEFT), - fill(1), - interrupted(0), - prev_line_interrupted(0), -@@ -2499,7 +2499,7 @@ void adjust() - - void no_adjust() - { -- curenv->adjust_mode &= ~1; -+ curenv->adjust_mode = ADJUST_LEFT; - skip_line(); - } - -@@ -3395,7 +3395,7 @@ void print_env() - - void init_env_requests() - { -- init_request("ad", adjust); -+ init_request("ad", no_adjust); - init_request("br", break_request); - init_request("brp", break_spread_request); - init_request("c2", no_break_control_char); Index: patches/patch-tmac_an-old_tmac =================================================================== RCS file: patches/patch-tmac_an-old_tmac diff -N patches/patch-tmac_an-old_tmac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tmac_an-old_tmac 2 Dec 2011 02:18:15 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ +In man(7), show default volume headers like in mdoc(7). +Inspired by IllumOS, suggested by Yuri Pankov. +Similar patch accepted upstream into groff by Werner Lemberg. +--- tmac/an-old.tmac.orig Fri Dec 31 08:33:09 2010 ++++ tmac/an-old.tmac Sun Oct 30 22:37:29 2011 +@@ -145,7 +145,17 @@ + . ie (\\n[.$] > 3) .ds an-extra2 "\\$4\" + . el .ds an-extra2 \"Sun Release 4.0 + . ie (\\n[.$] > 4) .ds an-extra3 "\\$5\" +-. el .ds an-extra3 \"System Programmer'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 + \\.. + . Index: patches/patch-tmac_doc-common =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_doc-common,v retrieving revision 1.1 diff -u -p -r1.1 patch-tmac_doc-common --- patches/patch-tmac_doc-common 19 Mar 2011 16:48:53 -0000 1.1 +++ patches/patch-tmac_doc-common 2 Dec 2011 02:18:15 -0000 @@ -1,8 +1,12 @@ -$OpenBSD: patch-tmac_doc-common,v 1.1 2011/03/19 16:48:53 schwarze Exp $ -# Keep traditional OpenBSD page headers, -# and do not use an ugly double dash in the NAME line. ---- tmac/doc-common.orig Fri Dec 31 00:33:09 2010 -+++ tmac/doc-common Sat Mar 12 13:09:47 2011 +$OpenBSD$ +chunk 1: Keep traditional OpenBSD page headers (local change). +chunk 2+3: Sync with mandoc: more architectures (accepted upstream). +chunk 4: default value for the .Os macro (local change). +chunk 5-9: More OS versions (from upstream CVS). +chunk 10: Handle .Dd Mdocdate (local change). +chunk 11: Do not use an ugly double dash in the NAME line (local change). +--- tmac/doc-common.orig Fri Dec 31 08:33:09 2010 ++++ tmac/doc-common Sun Oct 30 23:21:38 2011 @@ -231,17 +231,17 @@ . .\" an alternative, more detailed scheme for naming the manual sections @@ -30,7 +34,173 @@ $OpenBSD: patch-tmac_doc-common,v 1.1 20 . .ds doc-volume-ds-USD User's Supplementary Documents .ds doc-volume-ds-PS1 Programmer's Supplementary Documents -@@ -859,7 +859,7 @@ +@@ -264,50 +264,72 @@ + .ds doc-volume-as-algor algor + .ds doc-volume-as-amd64 amd64 + .ds doc-volume-as-amiga amiga ++.ds doc-volume-as-amigappc amigappc + .ds doc-volume-as-arc arc ++.ds doc-volume-as-arm arm + .ds doc-volume-as-arm26 arm26 + .ds doc-volume-as-arm32 arm32 ++.ds doc-volume-as-armish armish + .ds doc-volume-as-atari atari ++.ds doc-volume-as-aviion aviion ++.ds doc-volume-as-beagle beagle + .ds doc-volume-as-bebox bebox + .ds doc-volume-as-cats cats + .ds doc-volume-as-cesfic cesfic + .ds doc-volume-as-cobalt cobalt + .ds doc-volume-as-dreamcast dreamcast ++.ds doc-volume-as-emips emips + .ds doc-volume-as-evbarm evbarm + .ds doc-volume-as-evbmips evbmips + .ds doc-volume-as-evbppc evbppc + .ds doc-volume-as-evbsh3 evbsh3 ++.ds doc-volume-as-ews4800mips ews4800mips + .ds doc-volume-as-hp300 hp300 + .ds doc-volume-as-hp700 hp700 + .ds doc-volume-as-hpcarm hpcarm + .ds doc-volume-as-hpcmips hpcmips + .ds doc-volume-as-hpcsh hpcsh ++.ds doc-volume-as-hppa hppa ++.ds doc-volume-as-hppa64 hppa64 + .ds doc-volume-as-i386 i386 ++.ds doc-volume-as-ia64 ia64 ++.ds doc-volume-as-ibmnws ibmnws ++.ds doc-volume-as-iyonix iyonix ++.ds doc-volume-as-landisk landisk ++.ds doc-volume-as-loongson loongson + .ds doc-volume-as-luna68k luna68k ++.ds doc-volume-as-luna88k luna88k + .ds doc-volume-as-m68k m68k + .ds doc-volume-as-mac68k mac68k + .ds doc-volume-as-macppc macppc + .ds doc-volume-as-mips mips ++.ds doc-volume-as-mips64 mips64 + .ds doc-volume-as-mipsco mipsco + .ds doc-volume-as-mmeye mmeye + .ds doc-volume-as-mvme68k mvme68k ++.ds doc-volume-as-mvme88k mvme88k + .ds doc-volume-as-mvmeppc mvmeppc + .ds doc-volume-as-netwinder netwinder + .ds doc-volume-as-news68k news68k + .ds doc-volume-as-newsmips newsmips + .ds doc-volume-as-next68k next68k + .ds doc-volume-as-ofppc ofppc ++.ds doc-volume-as-palm palm + .ds doc-volume-as-pc532 pc532 + .ds doc-volume-as-playstation2 playstation2 + .ds doc-volume-as-pmax pmax + .ds doc-volume-as-pmppc pmppc + .ds doc-volume-as-powerpc powerpc + .ds doc-volume-as-prep prep ++.ds doc-volume-as-rs6000 rs6000 + .ds doc-volume-as-sandpoint sandpoint + .ds doc-volume-as-sbmips sbmips ++.ds doc-volume-as-sgi sgi + .ds doc-volume-as-sgimips sgimips + .ds doc-volume-as-sh3 sh3 + .ds doc-volume-as-shark shark ++.ds doc-volume-as-socppc socppc ++.ds doc-volume-as-solbourne solbourne + .ds doc-volume-as-sparc sparc + .ds doc-volume-as-sparc64 sparc64 + .ds doc-volume-as-sun2 sun2 +@@ -316,6 +338,8 @@ + .ds doc-volume-as-vax vax + .ds doc-volume-as-x68k x68k + .ds doc-volume-as-x86_64 x86_64 ++.ds doc-volume-as-xen xen ++.ds doc-volume-as-zaurus zaurus + . + .de Dt + . \" reset default arguments +@@ -375,7 +399,7 @@ + .\" NS + .\" NS override this in `mdoc.local', if necessary + . +-.ds doc-default-operating-system BSD ++.ds doc-default-operating-system OpenBSD\~5.0 + . + . + .\" NS doc-operating-system global string +@@ -451,12 +475,16 @@ + .ds doc-operating-system-NetBSD-3.0 3.0 + .ds doc-operating-system-NetBSD-3.0.1 3.0.1 + .ds doc-operating-system-NetBSD-3.0.2 3.0.2 ++.ds doc-operating-system-NetBSD-3.0.3 3.0.3 + .ds doc-operating-system-NetBSD-3.1 3.1 ++.ds doc-operating-system-NetBSD-3.1.1 3.1.1 + .ds doc-operating-system-NetBSD-4.0 4.0 + .ds doc-operating-system-NetBSD-4.0.1 4.0.1 + .ds doc-operating-system-NetBSD-5.0 5.0 + .ds doc-operating-system-NetBSD-5.0.1 5.0.1 + .ds doc-operating-system-NetBSD-5.0.2 5.0.2 ++.ds doc-operating-system-NetBSD-5.1 5.1 ++.ds doc-operating-system-NetBSD-6.0 6.0 + . + .ds doc-operating-system-OpenBSD-2.0 2.0 + .ds doc-operating-system-OpenBSD-2.1 2.1 +@@ -487,6 +515,8 @@ + .ds doc-operating-system-OpenBSD-4.6 4.6 + .ds doc-operating-system-OpenBSD-4.7 4.7 + .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-FreeBSD-1.0 1.0 + .ds doc-operating-system-FreeBSD-1.1 1.1 +@@ -543,6 +573,8 @@ + .ds doc-operating-system-FreeBSD-7.3 7.3 + .ds doc-operating-system-FreeBSD-8.0 8.0 + .ds doc-operating-system-FreeBSD-8.1 8.1 ++.ds doc-operating-system-FreeBSD-8.2 8.2 ++.ds doc-operating-system-FreeBSD-9.0 9.0 + . + .ds doc-operating-system-Darwin-8.0.0 8.0.0 + .ds doc-operating-system-Darwin-8.1.0 8.1.0 +@@ -563,6 +595,16 @@ + .ds doc-operating-system-Darwin-9.4.0 9.4.0 + .ds doc-operating-system-Darwin-9.5.0 9.5.0 + .ds doc-operating-system-Darwin-9.6.0 9.6.0 ++.ds doc-operating-system-Darwin-9.7.0 9.7.0 ++.ds doc-operating-system-Darwin-9.8.0 9.8.0 ++.ds doc-operating-system-Darwin-10.1.0 10.1.0 ++.ds doc-operating-system-Darwin-10.2.0 10.2.0 ++.ds doc-operating-system-Darwin-10.3.0 10.3.0 ++.ds doc-operating-system-Darwin-10.4.0 10.4.0 ++.ds doc-operating-system-Darwin-10.5.0 10.5.0 ++.ds doc-operating-system-Darwin-10.6.0 10.6.0 ++.ds doc-operating-system-Darwin-10.7.0 10.7.0 ++.ds doc-operating-system-Darwin-11.0.0 11.0.0 + . + .ds doc-operating-system-DragonFly-1.0 1.0 + .ds doc-operating-system-DragonFly-1.1 1.1 +@@ -581,6 +623,11 @@ + .ds doc-operating-system-DragonFly-2.4 2.4 + .ds doc-operating-system-DragonFly-2.6 2.6 + .ds doc-operating-system-DragonFly-2.8 2.8 ++.ds doc-operating-system-DragonFly-2.9 2.9 ++.ds doc-operating-system-DragonFly-2.9.1 2.9.1 ++.ds doc-operating-system-DragonFly-2.10 2.10 ++.ds doc-operating-system-DragonFly-2.10.1 2.10.1 ++.ds doc-operating-system-DragonFly-2.11 2.11 + . + .de Os + . ds doc-command-name +@@ -685,7 +732,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]] +@@ -859,7 +908,7 @@ .\" NS width register `Nd' set above . .de Nd Index: patches/patch-tmac_doc-syms =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_doc-syms,v retrieving revision 1.1 diff -u -p -r1.1 patch-tmac_doc-syms --- patches/patch-tmac_doc-syms 19 Mar 2011 16:48:53 -0000 1.1 +++ patches/patch-tmac_doc-syms 2 Dec 2011 02:18:16 -0000 @@ -1,7 +1,8 @@ -$OpenBSD: patch-tmac_doc-syms,v 1.1 2011/03/19 16:48:53 schwarze Exp $ -# One newer POSIX standards required by base manuals. ---- tmac/doc-syms.orig Fri Dec 31 00:33:09 2010 -+++ tmac/doc-syms Sat Mar 12 16:02:28 2011 +$OpenBSD$ +chunk 1: One newer POSIX standard required by base manuals (accepted upstream). +chunk 2: Sync to mandoc: more Lb arguments (accepted upstream). +--- tmac/doc-syms.orig Fri Dec 31 08:33:09 2010 ++++ tmac/doc-syms Sun Oct 23 16:44:32 2011 @@ -617,6 +617,8 @@ .\" POSIX Part 1: System API .ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 @@ -11,3 +12,78 @@ $OpenBSD: patch-tmac_doc-syms,v 1.1 2011 .ds doc-str-St--p1003.1-88 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988 .as doc-str-St--p1003.1-88 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) .ds doc-str-St--p1003.1-90 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990 +@@ -752,36 +754,74 @@ + .\" NS + .\" NS width register `Lb' defined in doc-common + . ++.ds doc-str-Lb-libarchive Reading and Writing Streaming Archives Library (libarchive, \-larchive) + .ds doc-str-Lb-libarm ARM Architecture Library (libarm, \-larm) + .ds doc-str-Lb-libarm32 ARM32 Architecture Library (libarm32, \-larm32) ++.ds doc-str-Lb-libbluetooth Bluetooth Library (libbluetooth, \-lbluetooth) ++.ds doc-str-Lb-libbsm Basic Security Module Library (libbsm, \-lbsm) + .ds doc-str-Lb-libc Standard C\~Library (libc, \-lc) ++.ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) ++.ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) ++.ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) + .ds doc-str-Lb-libcdk Curses Development Kit Library (libcdk, \-lcdk) ++.ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher) + .ds doc-str-Lb-libcompat Compatibility Library (libcompat, \-lcompat) + .ds doc-str-Lb-libcrypt Crypt Library (libcrypt, \-lcrypt) + .ds doc-str-Lb-libcurses Curses Library (libcurses, \-lcurses) ++.ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) ++.ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) ++.ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) ++.ds doc-str-Lb-libdwarf DWARF Access Library (libdwarf, \-ldwarf) + .ds doc-str-Lb-libedit Command Line Editor Library (libedit, \-ledit) ++.ds doc-str-Lb-libelf ELF Access Library (libelf, \-lelf) + .ds doc-str-Lb-libevent Event Notification Library (libevent, \-levent) ++.ds doc-str-Lb-libfetch File Transfer Library for URLs (libfetch, \-lfetch) + .ds doc-str-Lb-libform Curses Form Library (libform, \-lform) ++.ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) ++.ds doc-str-Lb-libgpib General-Purpose Instrument Bus (GPIB) library (libgpib, \-lgpib) + .ds doc-str-Lb-libi386 i386 Architecture Library (libi386, \-li386) + .ds doc-str-Lb-libintl Internationalized Message Handling Library (libintl, \-lintl) + .ds doc-str-Lb-libipsec IPsec Policy Control Library (libipsec, \-lipsec) ++.ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) ++.ds doc-str-Lb-libiscsi iSCSI protocol library (libiscsi, \-liscsi) ++.ds doc-str-Lb-libjail Jail Library (libjail, \-ljail) ++.ds doc-str-Lb-libkiconv Kernel side iconv library (libkiconv, \-lkiconv) ++.ds doc-str-Lb-libkse N:M Threading Library (libkse, \-lkse) + .ds doc-str-Lb-libkvm Kernel Data Access Library (libkvm, \-lkvm) + .ds doc-str-Lb-libm Math Library (libm, \-lm) + .ds doc-str-Lb-libm68k m68k Architecture Library (libm68k, \-lm68k) + .ds doc-str-Lb-libmagic Magic Number Recognition Library (libmagic, \-lmagic) ++.ds doc-str-Lb-libmd Message Digest (MD4, MD5, etc.) Support Library (libmd, \-lmd) ++.ds doc-str-Lb-libmemstat Kernel Memory Allocator Statistics Library (libmemstat, \-lmemstat) + .ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) ++.ds doc-str-Lb-libnetgraph Netgraph User Library (libnetgraph, \-lnetgraph) ++.ds doc-str-Lb-libnetpgp Netpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) + .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) + .ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) + .ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) + .ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) + .ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) + .ds doc-str-Lb-libposix \*[Px] \*[doc-str-Lb]Compatibility Library (libposix, \-lposix) ++.ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) + .ds doc-str-Lb-libpthread \*[Px] \*[doc-str-Lb]Threads Library (libpthread, \-lpthread) ++.ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) ++.ds doc-str-Lb-librefuse File System in Userspace Convenience Library (librefuse, \-lrefuse) + .ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) ++.ds doc-str-Lb-librpcsec_gss RPC GSS-API Authentication Library (librpcsec_gss, \-lrpcsec_gss) ++.ds doc-str-Lb-librpcsvc RPC Service Library (librpcsvc, \-lrpcsvc) + .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) ++.ds doc-str-Lb-libsdp Bluetooth Service Discovery Protocol User Library (libsdp, \-lsdp) ++.ds doc-str-Lb-libssp Buffer Overflow Protection Library (libssp, \-lssp) ++.ds doc-str-Lb-libSystem System Library (libSystem, \-lSystem) + .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) ++.ds doc-str-Lb-libterminfo Terminal Information Library (libterminfo, \-lterminfo) ++.ds doc-str-Lb-libthr 1:1 Threading Library (libthr, \-lthr) ++.ds doc-str-Lb-libufs UFS File System Access Library (libufs, \-lufs) ++.ds doc-str-Lb-libugidfw File System Firewall Interface Library (libugidfw, \-lugidfw) ++.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) + .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) + .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) ++.ds doc-str-Lb-libvgl Video Graphics Library (libvgl, \-lvgl) + .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) + .ds doc-str-Lb-libz Compression Library (libz, \-lz) + . Index: patches/patch-tmac_groff_mdoc_man =================================================================== RCS file: patches/patch-tmac_groff_mdoc_man diff -N patches/patch-tmac_groff_mdoc_man --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tmac_groff_mdoc_man 2 Dec 2011 02:18:16 -0000 @@ -0,0 +1,203 @@ +$OpenBSD$ +chunk 1: Sync with mandoc: more architectures (accepted upstream). +chunk 2: More OS versions (from upstream). +chunk 3-5: Sync with mandoc: more libraries (accepted upstream). +--- tmac/groff_mdoc.man.orig Fri Dec 31 08:33:09 2010 ++++ tmac/groff_mdoc.man Sun Oct 23 17:27:13 2011 +@@ -769,13 +769,18 @@ By default, the following architecture keywords are de + . + \# we use `No' to avoid hyphenation + .Bd -ragged -offset indent +-.No alpha , acorn26 , acorn32 , algor , amd64 , amiga , arc , arm26 , +-.No arm32 , atari , bebox , cats , cesfic , cobalt , dreamcast , evbarm , +-.No evbmips , evbppc , evbsh3 , hp300 , hp700 , hpcmips , i386 , luna68k , +-.No m68k , mac68k , macppc , mips , mmeye , mvme68k , mvmeppc , netwinder , +-.No news68k , newsmips , next68k , ofppc , pc532 , pmax , pmppc , powerpc , +-.No prep , sandpoint , sgimips , sh3 , shark , sparc , sparc64 , sun3 , +-.No tahoe , vax , x68k , x86_64 ++.No acorn26 , acorn32 , algor , alpha , amd64 , amiga , amigappc , ++.No arc , arm , arm26 , arm32 , armish , atari , aviion , ++.No beagle , bebox , cats , cesfic , cobalt , dreamcast , ++.No emips , evbarm , evbmips , evbppc , evbsh3 , ews4800mips , ++.No hp300 , hp700 , hpcarm , hpcmips , hpcsh , hppa , hppa64 , ++.No i386 , ia64 , ibmnws , iyonix , landisk , loongson , luna68k , luna88k , ++.No m68k , mac68k , macppc , mips , mips64 , mipsco , mmeye , ++.No mvme68k , mvme88k , mvmeppc , netwinder , news68k , newsmips , next68k , ++.No ofppc , palm , pc532 , playstation2 , pmax , pmppc , powerpc , prep , ++.No rs6000 , sandpoint , sbmips , sgi , sgimips , sh3 , shark , ++.No socppc , solbourne , sparc , sparc64 , sun2 , sun3 , ++.No tahoe , vax , x68k , x86_64 , xen , zaurus + .Ed + .Pp + . +@@ -864,23 +869,25 @@ the release ID. + .It NetBSD + 0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e, + 1.3, 1.3a, 1.4, 1.4.1, 1.4.2, 1.4.3, 1.5, 1.5.1, 1.5.2, 1.5.3, 1.6, 1.6.1, +-1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.1, 4.0, +-4.0.1, 5.0, 5.0.1, 5.0.2 ++1.6.2, 1.6.3, 2.0, 2.0.1, 2.0.2, 2.0.3, 2.1, 3.0, 3.0.1, 3.0.2, 3.0.3, ++3.1, 3.1.1, 4.0, 4.0.1, 5.0, 5.0.1, 5.0.2, 5.1, 6.0 + .It FreeBSD + 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, + 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, + 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, + 5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 6.3, 6.4, 7.0, 7.1, 7.2, 7.3, 8.0, +-8.1 ++8.1, 8.2, 9.0 + .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 ++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 + .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.4, 2.6, 2.8, 2.9, 2.9.1, 2.10, 2.10.1, 2.11 + .It Darwin + 8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0, 8.6.0, 8.7.0, 8.8.0, 8.9.0, +-8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0 ++8.10.0, 8.11.0, 9.0.0, 9.1.0, 9.2.0, 9.3.0, 9.4.0, 9.5.0, 9.6.0, 9.7.0, ++9.8.0, 10.1.0, 10.2.0, 10.3.0, 10.4.0, 10.5.0, 10.6.0, 10.7.0, 11.0.0 + .El + .Ed + .Pp +@@ -1673,33 +1680,73 @@ Available arguments to + and their results are: + . + .Pp +-.Bl -tag -width ".Li libossaudio" -compact -offset indent ++.Bl -tag -width ".Li librpcsec_gss" -compact -offset indent ++.It Li libarchive ++.Lb libarchive + .It Li libarm + .Lb libarm + .It Li libarm32 + .Lb libarm32 ++.It Li libbluetooth ++.Lb libbluetooth ++.It Li libbsm ++.Lb libbsm + .It Li libc + .Lb libc ++.It Li libc_r ++.Lb libc_r ++.It Li libcalendar ++.Lb libcalendar ++.It Li libcam ++.Lb libcam + .It Li libcdk + .Lb libcdk ++.It Li libcipher ++.Lb libcipher + .It Li libcompat + .Lb libcompat + .It Li libcrypt + .Lb libcrypt + .It Li libcurses + .Lb libcurses ++.It Li libdevinfo ++.Lb libdevinfo ++.It Li libdevstat ++.Lb libdevstat ++.It Li libdisk ++.Lb libdisk ++.It Li libdwarf ++.Lb libdwarf + .It Li libedit + .Lb libedit ++.It Li libelf ++.Lb libelf + .It Li libevent + .Lb libevent ++.It Li libfetch ++.Lb libfetch + .It Li libform + .Lb libform ++.It Li libgeom ++.Lb libgeom ++.It Li libgpib ++.Lb libgpib + .It Li libi386 + .Lb libi386 + .It Li libintl + .Lb libintl + .It Li libipsec + .Lb libipsec ++.It Li libipx ++.Lb libipx ++.It Li libiscsi ++.Lb libiscsi ++.It Li libjail ++.Lb libjail ++.It Li libkiconv ++.Lb libkiconv ++.It Li libkse ++.Lb libkse + .It Li libkvm + .Lb libkvm + .It Li libm +@@ -1708,8 +1755,16 @@ and their results are: + .Lb libm68k + .It Li libmagic + .Lb libmagic ++.It Li libmd ++.Lb libmd ++.It Li libmemstat ++.Lb libmemstat + .It Li libmenu + .Lb libmenu ++.It Li libnetgraph ++.Lb libnetgraph ++.It Li libnetpgp ++.Lb libnetpgp + .It Li libossaudio + .Lb libossaudio + .It Li libpam +@@ -1722,18 +1777,46 @@ and their results are: + .Lb libpmc + .It Li libposix + .Lb libposix ++.It Li libprop ++.Lb libprop + .It Li libpthread + .Lb libpthread ++.It Li libpuffs ++.Lb libpuffs ++.It Li librefuse ++.Lb librefuse + .It Li libresolv + .Lb libresolv ++.It Li librpcsec_gss ++.Lb librpcsec_gss ++.It Li librpcsvc ++.Lb librpcsvc + .It Li librt + .Lb librt ++.It Li libsdp ++.Lb libsdp ++.It Li libssp ++.Lb libssp ++.It Li libSystem ++.Lb libSystem + .It Li libtermcap + .Lb libtermcap ++.It Li libterminfo ++.Lb libterminfo ++.It Li libthr ++.Lb libthr ++.It Li libufs ++.Lb libufs ++.It Li libugidfw ++.Lb libugidfw ++.It Li libulog ++.Lb libulog + .It Li libusbhid + .Lb libusbhid + .It Li libutil + .Lb libutil ++.It Li libvgl ++.Lb libvgl + .It Li libx86_64 + .Lb libx86_64 + .It Li libz Index: patches/patch-tmac_troffrc =================================================================== RCS file: /cvs/ports/textproc/groff/patches/patch-tmac_troffrc,v retrieving revision 1.1 diff -u -p -r1.1 patch-tmac_troffrc --- patches/patch-tmac_troffrc 19 Mar 2011 16:48:53 -0000 1.1 +++ patches/patch-tmac_troffrc 2 Dec 2011 02:18:16 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-tmac_troffrc,v 1.1 2011/03/19 16:48:53 schwarze Exp $ ---- tmac/troffrc.orig Fri Jan 9 07:25:52 2009 -+++ tmac/troffrc Sun Dec 5 18:16:38 2010 -@@ -37,9 +37,10 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp tro +--- tmac/troffrc.orig Fri Dec 31 08:33:09 2010 ++++ tmac/troffrc Sun Oct 16 14:28:38 2011 +@@ -37,10 +37,16 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp tro .\" Set the hyphenation language to `us'. .do hla us . @@ -13,5 +13,11 @@ $OpenBSD: patch-tmac_troffrc,v 1.1 2011/ +.\"do hpf hyphen.us +.\"do hpfa hyphenex.us . ++.\" 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 + . Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/textproc/groff/pkg/DESCR,v retrieving revision 1.2 diff -u -p -r1.2 DESCR --- pkg/DESCR 5 Apr 2010 14:49:25 -0000 1.2 +++ pkg/DESCR 2 Dec 2011 02:18:16 -0000 @@ -1,2 +1,8 @@ -nroff is an old-style unix text processor. -This is the reimplementation under the GNU license. +GNU troff (Groff) is the GNU reimplementation of the traditional +general-purpose UNIX typesetting system, roff. + +The groff distribution includes: + * various macro packages including man, mdoc, ms, me, mm, and mom; + * postprocessors for various output devices, including character + terminals, X terminals, PostScript, HTML and XHTML, and TeX DVI; + * and many utility programs. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/groff/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 12 Oct 2011 22:00:07 -0000 1.4 +++ pkg/PLIST 2 Dec 2011 02:18:16 -0000 @@ -142,6 +142,7 @@ share/doc/groff/meref.me share/doc/groff/meref.ps share/doc/groff/pic.ms share/doc/groff/pic.ps +share/doc/pkg-readmes/${FULLPKGNAME} share/examples/groff/ share/examples/groff/chem/ share/examples/groff/chem/122/ @@ -205,7 +206,30 @@ share/examples/groff/grnexmpl.me share/examples/groff/grnexmpl.ps share/examples/groff/groff.css share/examples/groff/hdtbl/ +share/examples/groff/hdtbl/chess_board.ps +share/examples/groff/hdtbl/chess_board.roff +share/examples/groff/hdtbl/col_rowspan_colors.ps +share/examples/groff/hdtbl/col_rowspan_colors.roff +share/examples/groff/hdtbl/color_boxes.ps +share/examples/groff/hdtbl/color_boxes.roff +share/examples/groff/hdtbl/color_nested_tables.ps +share/examples/groff/hdtbl/color_nested_tables.roff +share/examples/groff/hdtbl/color_table_cells.ps +share/examples/groff/hdtbl/color_table_cells.roff +share/examples/groff/hdtbl/color_transitions.ps +share/examples/groff/hdtbl/color_transitions.roff +share/examples/groff/hdtbl/common.roff +share/examples/groff/hdtbl/fonts_n.ps +share/examples/groff/hdtbl/fonts_n.roff +share/examples/groff/hdtbl/fonts_x.ps +share/examples/groff/hdtbl/fonts_x.roff share/examples/groff/hdtbl/gnu.eps +share/examples/groff/hdtbl/mixed_pickles.ps +share/examples/groff/hdtbl/mixed_pickles.roff +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/mom/ share/examples/groff/mom/README.txt share/examples/groff/mom/elvis_syntax Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 2 Dec 2011 02:18:16 -0000 @@ -0,0 +1,39 @@ +$OpenBSD$ + ++----------------------------------------------------------------------- +| Running ${FULLPKGNAME} on OpenBSD ++----------------------------------------------------------------------- + +Even though roff is a general-purpose typesetting system, the OpenBSD +groff port is focussed on formatting ports(5) manuals that mandoc(1) +is unable to handle. To make groff output as similar as possible to +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 edit the respective paragraphs in the file + + ${LOCALBASE}/share/groff/1.21/tmac/troffrc + +to read like this: + +.do hpf hyphen.us +.do hpfa hyphenex.us + +.\"ad l +.\"de ad +.\". + + +To suit the taste of OpenBSD developers, two mdoc(7) formatting +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. + +To allow automated output comparisons with mandoc(1), the bullet +character \(bu has been changed to just "o" instead of a "+" +superimposed on top of an "o".
