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
--- Makefile12 Oct 2011 22:00:07 - 1.14
+++ Makefile2 Dec 2011 02:18:15 -
@@ -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 - 1.1
+++ patches/patch-Makefile_comm 2 Dec 2011 02:18:15 -
@@ -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_sub19 Mar 2011 16:48:53 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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.origSun 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_pick
