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

In the footers of manuals formatted with groff,

Browse Source 
do not print "OpenBSD 5.0" but "OpenBSD ports".
While here, remove some noise from the groff build log.
Bump the groff package.

Technically, this changes the contents of all packages that USE_GROFF,
but please refrain from bumping the world:  Having "OpenBSD 5.0" in
the footers of some ports manual until they are updated the next time,
or until the next libc bump if they aren't, is not a real problem.

string "OpenBSD ports" suggested and patch ok'ed by sthen@
This commit is contained in:
schwarze 2012-05-28 13:23:28 +00:00
parent 7f0fe91ad8
commit 54bbdb42f3
5 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/groff/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2012/02/26 22:28:34 schwarze Exp $
# $OpenBSD: Makefile,v 1.18 2012/05/28 13:23:28 schwarze Exp $
COMMENT = GNU troff typesetter
DISTNAME = groff-1.21
REVISION = 7
REVISION = 8
CATEGORIES = textproc
HOMEPAGE = http://www.gnu.org/software/groff/

39
textproc/groff/patches/patch-contrib_hdtbl_examples_common_roff
View File

@ -1,25 +1,32 @@
$OpenBSD: patch-contrib_hdtbl_examples_common_roff,v 1.1 2011/12/04 15:41:26 schwarze Exp $
Do not depend on bash (from upstream CVS).
$OpenBSD: patch-contrib_hdtbl_examples_common_roff,v 1.2 2012/05/28 13:23:28 schwarze Exp $
--- 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
+++ 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 bash -c "echo -n .ds *date\ ;date"
+. pso sh -c "echo -n .ds *date\ ;date"
. tm \\*[*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" \
.
@@ -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 bash -c "echo -n .nr *time 0+;date +%s"
+. pso sh -c "echo -n .nr *time 0+;date +%s"
. el \{\
-. 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
. \}
-. nr *time 0-\\n[*time]
-. tm elapsed time: \\n[*time] seconds
-. \}
..
.
.

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

@ -1,12 +1,12 @@
$OpenBSD: patch-tmac_doc-common,v 1.2 2011/12/04 15:41:26 schwarze Exp $
$OpenBSD: patch-tmac_doc-common,v 1.3 2012/05/28 13:23:28 schwarze Exp $
chunk 1: Keep traditional OpenBSD page headers (local change).
chunk 2+3: Sync with mandoc: more architectures (accepted upstream).
chunk 2+3: Sync with mandoc: more architectures (also in upstream CVS).
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
+++ tmac/doc-common Sun May 27 14:10:10 2012
@@ -231,17 +231,17 @@
.
.\" an alternative, more detailed scheme for naming the manual sections
@ -121,7 +121,7 @@ chunk 11: Do not use an ugly double dash in the NAME line (local change).
.\" NS override this in `mdoc.local', if necessary
.
-.ds doc-default-operating-system BSD
+.ds doc-default-operating-system OpenBSD\~5.0
+.ds doc-default-operating-system OpenBSD\~ports
.
.
.\" NS doc-operating-system global string
@ -142,16 +142,17 @@ chunk 11: Do not use an ugly double dash in the NAME line (local change).
.
.ds doc-operating-system-OpenBSD-2.0 2.0
.ds doc-operating-system-OpenBSD-2.1 2.1
@@ -487,6 +515,8 @@
@@ -487,6 +515,9 @@
.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-OpenBSD-5.1 5.1
.
.ds doc-operating-system-FreeBSD-1.0 1.0
.ds doc-operating-system-FreeBSD-1.1 1.1
@@ -543,6 +573,8 @@
@@ -543,6 +574,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
@ -160,7 +161,7 @@ chunk 11: Do not use an ugly double dash in the NAME line (local change).
.
.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 @@
@@ -563,6 +596,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
@ -177,7 +178,7 @@ chunk 11: Do not use an ugly double dash in the NAME line (local change).
.
.ds doc-operating-system-DragonFly-1.0 1.0
.ds doc-operating-system-DragonFly-1.1 1.1
@@ -581,6 +623,11 @@
@@ -581,6 +624,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
@ -189,7 +190,7 @@ chunk 11: Do not use an ugly double dash in the NAME line (local change).
.
.de Os
. ds doc-command-name
@@ -685,7 +732,9 @@
@@ -685,7 +733,9 @@
. ds doc-command-name
.
. ie \n[.$] \{\
@ -200,7 +201,7 @@ chunk 11: 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]]
@@ -859,7 +908,7 @@
@@ -859,7 +909,7 @@
.\" NS width register `Nd' set above
.
.de Nd

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

@ -1,9 +1,9 @@
$OpenBSD: patch-tmac_groff_mdoc_man,v 1.1 2011/12/04 15:41:26 schwarze Exp $
$OpenBSD: patch-tmac_groff_mdoc_man,v 1.2 2012/05/28 13:23:28 schwarze Exp $
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
+++ tmac/groff_mdoc.man Sun May 27 14:43:20 2012
@@ -769,13 +769,18 @@ By default, the following architecture keywords are de
.
\# we use `No' to avoid hyphenation
@ -49,7 +49,7 @@ chunk 3-5: Sync with mandoc: more libraries (accepted upstream).
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
+5.0, 5.1
.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

12
textproc/groff/pkg/README
View File

@ -1,11 +1,11 @@
$OpenBSD: README,v 1.1 2011/12/04 15:41:26 schwarze Exp $
$OpenBSD: README,v 1.2 2012/05/28 13:23:28 schwarze Exp $
+-----------------------------------------------------------------------
| 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)
groff port is focussed on formatting ports(7) 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.
@ -30,6 +30,14 @@ documents can adjust text to the right margin:
.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: