Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/distrib/notes Pull up following revision(s) (requested by...



details:   https://anonhg.NetBSD.org/src/rev/006760495dd3
branches:  netbsd-9
changeset: 963342:006760495dd3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Nov 27 13:36:55 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #489):
        distrib/notes/Makefile.inc: revision 1.46
        distrib/notes/common/postinstall: revision 1.86
        distrib/notes/sparc64/prep: revision 1.16
        distrib/notes/common/netboot: revision 1.38
        distrib/notes/common/main: revision 1.555
        distrib/notes/common/main: revision 1.556
        distrib/notes/common/main: revision 1.557
        distrib/notes/common/macros: revision 1.44
        distrib/notes/common/sysinst: revision 1.110
        distrib/notes/sparc/prep: revision 1.28
        distrib/notes/sparc/prep: revision 1.29
        distrib/notes/common/list-portmasters.pl: file removal
Remove list-portmasters.pl script.
We dropped that list from "main" some time ago.
Quote long .Ss2 title to avoid troff's limitation.
Troff is limited to 9 macro parameters and this title is 10 words, so
we lose the last word here when we pass arguments around.  We have
more titles like that but for now I wanted to commit only one just to
flag the problem.
More cleanup:
 - simplify TOC handling and remove arg limit (from uwe)
 - use Lk with explicit anchor text in some places
 - do not allow official release builds when we can not derive the
   proper date from the buildid
Add "Oxford comma"
Improve heading a bit.  While here, use quotes to group some of the
words to avoid the 9-arg limitation of .Ss

diffstat:

 distrib/notes/Makefile.inc               |  11 ++-
 distrib/notes/common/list-portmasters.pl |  89 --------------------------------
 distrib/notes/common/macros              |  10 +-
 distrib/notes/common/main                |  57 ++++++++-----------
 distrib/notes/common/netboot             |  11 +--
 distrib/notes/common/postinstall         |  10 +--
 distrib/notes/common/sysinst             |   9 +-
 distrib/notes/sparc/prep                 |   8 +-
 distrib/notes/sparc64/prep               |   6 +-
 9 files changed, 56 insertions(+), 155 deletions(-)

diffs (truncated from 441 to 300 lines):

diff -r 26ce66b069e8 -r 006760495dd3 distrib/notes/Makefile.inc
--- a/distrib/notes/Makefile.inc        Wed Nov 27 11:22:13 2019 +0000
+++ b/distrib/notes/Makefile.inc        Wed Nov 27 13:36:55 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.43.18.2 2019/11/25 05:50:15 msaitoh Exp $
+#      $NetBSD: Makefile.inc,v 1.43.18.3 2019/11/27 13:36:55 msaitoh Exp $
 #
 
 # Ross Harvey <ross%NetBSD.org@localhost>
@@ -51,8 +51,12 @@
 .if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
 curdate!=      env LANG="C" date -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
 .else
+.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
+.error "No release date could be derived from BUILDID"
+.else
 curdate!=      env LANG="C" date "+%b %d, %Y"
 .endif
+.endif
 PRESET+=       -dcur_date="${curdate}"
 
 POST_PLAIN= -P-b -P-u -P-o
@@ -103,8 +107,7 @@
 # space taken by the TOC itself.
 #
 
-TOCPROC=          2>&1 >/dev/null |\
-           ${TOOL_SED} -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+TOCPROC=          2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
 
 ${TARG}.PostScript.toc: ${SRCS}
        ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
@@ -121,8 +124,6 @@
 ${TARG}.HTML.toc: ${SRCS}
        ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
        mv -f $@.tmp $@
-       ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
-       mv -f $@.tmp $@
 
 ${TARG}.more.toc: ${SRCS}
        ${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
diff -r 26ce66b069e8 -r 006760495dd3 distrib/notes/common/list-portmasters.pl
--- a/distrib/notes/common/list-portmasters.pl  Wed Nov 27 11:22:13 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-#!/usr/bin/env perl
-#
-# Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Hubert Feyrer <hubert%feyrer.de@localhost>.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-#
-# Usage:
-# 1) lynx -dump http://www.netbsd.org/people/port-maintainers.html \
-#    | perl list-portmasters.pl
-#    >x
-# 2) Sort: sort +1 x >xx ; mv xx x
-# 3) merge "x" into src/distrib/notes/common/main's "portmasters" section
-#
-# Note:  If the *second* portmaster of a port has a link as part of the
-#        Name field, it will cause this script to error out.
-
-while(<>) {
-    chomp;
-    last if /Port.*Name.*E-mail.*Address/;
-}
-
-while(<>) {
-    chomp;
-    s/^\s*//;
-    s/\s*$//;
-    @a = split(/\s+/);
-
-    $port=shift(@a);
-    $email=pop(@a);
-    $name="@a";
-
-    if ($port && $port !~ /\[\d+\]/) {
-       # Port name is wrong - probably because of dual portmasters.
-       # Fix it up.
-       $name = "$port $name";
-
-       $port = $last_port;
-    }
-
-    # valid data is now in $last_*,
-    # $* is saved for possible further processing
-    
-    $last_port=~s,\s*\[\d+\],,;
-    $last_name=~s,\s*\[\d+\],,;
-    $last_email=~s,\s*\[\d+\],,;
-    $last_email=~s,\<,,;
-    $last_email=~s,\>,,;
-
-    $last_name=~s,ø,\\(/o,g;           # Søren => S\(/oren
-    
-    # output
-    print ".It ";
-    printf("Ta %-30s", $last_name);
-    print " ";
-    printf("Ta Mt %20s", $last_email);
-    print " ";
-    printf("Ta Sy %s", $last_port);
-    print "\n";
-
-    $last_port=$port;
-    $last_email=$email;
-    $last_name=$name;
-
-    last if $name=~/______________/;
-}
diff -r 26ce66b069e8 -r 006760495dd3 distrib/notes/common/macros
--- a/distrib/notes/common/macros       Wed Nov 27 11:22:13 2019 +0000
+++ b/distrib/notes/common/macros       Wed Nov 27 13:36:55 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: macros,v 1.43 2018/01/24 09:04:41 skrll Exp $
+.\"    $NetBSD: macros,v 1.43.6.1 2019/11/27 13:36:55 msaitoh Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -312,13 +312,13 @@
 .if dTOC \{
 .rn Ss Ss-toc
 .de Ss
-.Ss-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 0 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss-toc \\$@
+.tm .Ti 0 \\n% "\\$*"
 ..
 .rn Ss2 Ss2-toc
 .de Ss2
-.Ss2-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 1 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss2-toc \\$@
+.tm .Ti 1 \\n% "\\$*"
 ..
 .\}
 .de Te
diff -r 26ce66b069e8 -r 006760495dd3 distrib/notes/common/main
--- a/distrib/notes/common/main Wed Nov 27 11:22:13 2019 +0000
+++ b/distrib/notes/common/main Wed Nov 27 13:36:55 2019 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: main,v 1.551.2.2 2019/11/25 05:50:16 msaitoh Exp $
+.\"    $NetBSD: main,v 1.551.2.3 2019/11/27 13:36:55 msaitoh Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -145,8 +145,7 @@
 directory.
 Check the list of
 .Nx
-mirrors at
-.Lk https://www.NetBSD.org/mirrors
+.Lk https://www.NetBSD.org/mirrors mirrors
 for details.
 .Pp
 Option 2: bootable CD-ROM images from
@@ -275,12 +274,10 @@
 .Pa /dev/rsd0d
 with the appropriate device for your system:
 .Dl # Ic "dd if=NetBSD-\*V-\*M-install.img of=/dev/rsd0d bs=32k"
-On Windows, you will need to use a program such as Win32 Disk Imager,
-which can be found at
-.Lk http://sourceforge.net/projects/win32diskimager/
+On Windows, you will need to use a program such as
+.Lk http://sourceforge.net/projects/win32diskimager/ "Win32 Disk Imager" ,
 or
-Rawrite32 which can be found at
-.Lk https://www.NetBSD.org/~martin/rawrite32 .
+.Lk https://www.NetBSD.org/~martin/rawrite32 Rawrite32 .
 .if \n[amd64]:\n[i386] \{\
 If you have problems writing a raw image to a floppy,
 the
@@ -330,8 +327,7 @@
 .It
 Determine your machine's model, quirks, and Open Firmware version from the
 .Nx*M
-Model Support webpage.
-.Lk https://www.NetBSD.org/ports/macppc/models.html
+.Lk https://www.NetBSD.org/ports/macppc/models.html "Model Support webpage" .
 .Pp
 At present,
 .Nx*M
@@ -495,9 +491,8 @@
 source form.
 Please see the
 .Nx
-website at
-.Lk https://www.NetBSD.org/
-for information on them.)
+.Lk https://www.NetBSD.org/ website
+for information on them.
 .Pp
 .Nx
 is a completely integrated system.
@@ -517,8 +512,10 @@
 .Nx
 would not exist.
 .
-.if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 8.0 and 9.0 Releases
+.ie \n[RELEASE_BRANCH] .Ss Changes Between The NetBSD \n[oldvers] \
+and \n[major] Releases
+.el .Ss Changes Between The NetBSD \n[oldvers] and \
+\n[major] Releases, and newer
 .Pp
 The
 .Nx
@@ -535,35 +532,31 @@
 \*V release.
 .ie \n[RELEASE_BRANCH] \{\
 The complete list of changes can be found in the following files:
-.(tag
-.It Li CHANGES
-.Lk \*[RELEASE_URL]/CHANGES
+.br
+.Lk "\*[RELEASE_URL]/CHANGES" CHANGES
 .de showdotchanges
 .  nr ominor (\\$1-1)
 .  if \\n[ominor] .showdotchanges \\n[ominor]
 .  nr ominor (\\$1-1)
-.  It Li CHANGES-\\n[major].\\$1
-.  Lk \*[RELEASE_URL]/CHANGES-\n[major].\\$1
+.  br
+.  Lk "\*[RELEASE_URL]/CHANGES-\n[major].\\$1" "CHANGES-\\n[major].\\$1"
 ..
 .showdotchanges \n[minor]
 .if (\n[nextminor] > \n[minor]) \{\
-.  It Li CHANGES-\\n[major].\n[nextminor]
-.  Lk \*[RELEASE_URL]/CHANGES-\n[major].\n[nextminor]
+.  br
+.  Lk "\*[RELEASE_URL]/CHANGES-\n[major].\n[nextminor]" "CHANGES-\\n[major].\n[nextminor]"
 .\}
-.tag)
+.br
 files in the top level directory of the NetBSD \n[major].\n[minor] release tree.
 .Pp
-.\" fill in with changes.mdoc
 .
 .\} \" \n[RELEASE_BRANCH]
 .el \{\
 The complete list of changes can be found in the following files:
-.(tag
-.It Li CHANGES
-.Lk \*[RELEASE_URL]/CHANGES
-.It Li CHANGES.prev
-.Lk \*[RELEASE_URL]/CHANGES.prev
-.tag)
+.br
+.Lk \*[RELEASE_URL]/CHANGES CHANGES
+.br
+.Lk \*[RELEASE_URL]/CHANGES.prev CHANGES.prev
 .\} \" !\n[RELEASE_BRANCH]
 .
 .Ss "Features to be removed in a later release"
@@ -603,7 +596,7 @@
 .Pp
 .
 Refer to
-.Lk https://www.NetBSD.org/mirrors/
+.Lk https://www.NetBSD.org/mirrors/ mirrors
 .br_ne 10P
 .
 .Ss "NetBSD \*V Release Contents
@@ -629,7 +622,7 @@
 .  It Li CHANGES-\\n[major].\\$1
 Changes between the \n[major].\\n[ominor] and the \n[major].\\$1 release.
 ..
-.showdotchanges \n[minor]
+.if \n[minor] .showdotchanges \n[minor]
 .if (\n[nextminor] > \n[minor]) \{\
 .It Li CHANGES-\\n[major].\n[nextminor]
 Changes after the release of \n[major].\n[minor].
diff -r 26ce66b069e8 -r 006760495dd3 distrib/notes/common/netboot
--- a/distrib/notes/common/netboot      Wed Nov 27 11:22:13 2019 +0000
+++ b/distrib/notes/common/netboot      Wed Nov 27 13:36:55 2019 +0000
@@ -1,4 +1,4 @@



Home | Main Index | Thread Index | Old Index