cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a patch to avoid permanent damage to the right margin

Browse Source 
when a man(7) input file contains two consecutive .TP lines.
This bugfix improves the formatting of unzip(1), for example.

While here, recognize 5.4 as an OpenBSD version in mdoc(7) files.

ok sthen@ dcoppa@ espie@
This commit is contained in:
schwarze 2013-07-13 07:38:59 +00:00
parent 85b14d2d7b
commit a7f1b9dfac
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/groff/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2013/05/24 14:10:01 zhuk Exp $
# $OpenBSD: Makefile,v 1.23 2013/07/13 07:38:59 schwarze Exp $
COMMENT = GNU troff typesetter
VERSION = 1.22.2
SUBST_VARS = VERSION
DISTNAME = groff-${VERSION}
REVISION = 0
REVISION = 1
CATEGORIES = textproc
DPB_PROPERTIES = parallel

22
textproc/groff/patches/patch-tmac_an-old_tmac
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-tmac_an-old_tmac,v 1.2 2013/03/30 23:10:05 schwarze Exp $
Keep traditional OpenBSD page headers (local change).
--- tmac/an-old.tmac.orig Sun Dec 30 08:40:29 2012
+++ tmac/an-old.tmac Tue Jan 1 15:29:42 2013
$OpenBSD: patch-tmac_an-old_tmac,v 1.3 2013/07/13 07:39:00 schwarze Exp $
chunk 1: Keep traditional OpenBSD page headers (local change).
chunk 2: Correct right margin after double .TP (submitted upstream).
--- tmac/an-old.tmac.orig Thu Feb 7 13:06:08 2013
+++ tmac/an-old.tmac Mon Jul 8 07:42:25 2013
@@ -145,18 +145,17 @@
. el .ds an-extra2 \"Sun Release 4.0
.
@ -31,3 +32,16 @@ Keep traditional OpenBSD page headers (local change).
. ds an-init
\\..
.
@@ -406,8 +405,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
..
.

11
textproc/groff/patches/patch-tmac_doc-common
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-tmac_doc-common,v 1.4 2013/03/30 23:10:05 schwarze Exp $
$OpenBSD: patch-tmac_doc-common,v 1.5 2013/07/13 07:39:00 schwarze Exp $
chunk 1: Keep traditional OpenBSD page headers (local change).
chunk 2: default value for the .Os macro (local change).
chunk 3: More OpenBSD release versions (to be submitted upstream).
chunk 4: Handle .Dd Mdocdate (local change).
chunk 5: 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 Mon Mar 4 08:48:33 2013
+++ tmac/doc-common Mon Jul 8 07:09:20 2013
@@ -231,17 +231,17 @@
.
.\" an alternative, more detailed scheme for naming the manual sections
@ -42,17 +42,18 @@ chunk 5: Do not use an ugly double dash in the NAME line (local change).
.
.
.\" NS doc-operating-system global string
@@ -517,6 +517,9 @@
@@ -517,6 +517,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 +735,9 @@
@@ -732,7 +736,9 @@
. ds doc-command-name
.
. ie \n[.$] \{\
@ -63,7 +64,7 @@ chunk 5: Do not use an ugly double dash in the NAME line (local change).
. ds doc-date-string \$1\~\$2 \$3
. el \{\
. ds doc-date-string "\*[doc-date-\n[mo]]
@@ -906,7 +911,7 @@
@@ -906,7 +912,7 @@
.\" NS width register `Nd' set above
.
.de Nd

6
textproc/groff/patches/patch-tmac_groff_mdoc_man
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-tmac_groff_mdoc_man,v 1.3 2013/03/30 23:10:05 schwarze Exp $
$OpenBSD: patch-tmac_groff_mdoc_man,v 1.4 2013/07/13 07:39:00 schwarze Exp $
More OpenBSD versions (to be submitted upstream).
--- tmac/groff_mdoc.man.orig Thu Feb 7 13:06:08 2013
+++ tmac/groff_mdoc.man Mon Mar 4 08:49:31 2013
+++ tmac/groff_mdoc.man Mon Jul 8 07:08:35 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.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