Tue Jun 23 06:28:02 2020 UTC ()
Pass the name of the compressor actually used for sets to groff and use
it in the content description (XXX need to adapt a few more copies in,
as of now, unaffected architectures)


(martin)
diff -r1.55 -r1.56 src/distrib/notes/Makefile.inc
diff -r1.21 -r1.22 src/distrib/notes/alpha/contents
diff -r1.10 -r1.11 src/distrib/notes/amd64/contents
diff -r1.180 -r1.181 src/distrib/notes/common/contents
diff -r1.7 -r1.8 src/distrib/notes/evbarm/contents
diff -r1.10 -r1.11 src/distrib/notes/sparc64/contents
cvs diff -r1.55 -r1.56 src/distrib/notes/Makefile.inc (expand / switch to unified diff)

--- src/distrib/notes/Makefile.inc 2020/06/16 00:45:56 1.55
+++ src/distrib/notes/Makefile.inc 2020/06/23 06:28:01 1.56
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.55 2020/06/16 00:45:56 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.56 2020/06/23 06:28:01 martin Exp $
2# 2#
3 3
4# Ross Harvey <ross@NetBSD.org> 4# Ross Harvey <ross@NetBSD.org>
5 5
6.include <bsd.own.mk> # So we get /etc/mk.conf vars. 6.include <bsd.own.mk> # So we get /etc/mk.conf vars.
7.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 7.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
8 8
9.if ${MKREPRO_TIMESTAMP:Uno} != "no" 9.if ${MKREPRO_TIMESTAMP:Uno} != "no"
10GROFF_TIMESTAMP=--timestamp=${MKREPRO_TIMESTAMP} 10GROFF_TIMESTAMP=--timestamp=${MKREPRO_TIMESTAMP}
11DATE_TIMESTAMP=-r ${MKREPRO_TIMESTAMP} 11DATE_TIMESTAMP=-r ${MKREPRO_TIMESTAMP}
12.endif 12.endif
13 13
14# Whether or not to regenerate tables of contents 14# Whether or not to regenerate tables of contents
@@ -26,28 +26,30 @@ TOCS= ${TARG}.PostScript.toc ${TARG}.ASC @@ -26,28 +26,30 @@ TOCS= ${TARG}.PostScript.toc ${TARG}.ASC
26SRCS= ${MAIN} ${COMMON}/macros \ 26SRCS= ${MAIN} ${COMMON}/macros \
27 whatis ${COMMON}/contents hardware xfer prep \ 27 whatis ${COMMON}/contents hardware xfer prep \
28 ${.CURDIR}/install ${COMMON}/postinstall upgrade \ 28 ${.CURDIR}/install ${COMMON}/postinstall upgrade \
29 ${COMMON}/legal.common ${COMMON}/netboot \ 29 ${COMMON}/legal.common ${COMMON}/netboot \
30 ${COMMON}/sysinst \ 30 ${COMMON}/sysinst \
31 ${.CURDIR}/../Makefile.inc ${MERGED_SRCS} 31 ${.CURDIR}/../Makefile.inc ${MERGED_SRCS}
32 32
33whatis: .OPTIONAL 33whatis: .OPTIONAL
34 34
35PRESET= ${GFLAGS} -U -dM=${M} -dV=${DISTRIBVER} -d.CURDIR=${.CURDIR} -r${M}=1 35PRESET= ${GFLAGS} -U -dM=${M} -dV=${DISTRIBVER} -d.CURDIR=${.CURDIR} -r${M}=1
36PRESET+= -rmajor=${DISTRIBVER:C/\..*$//} 36PRESET+= -rmajor=${DISTRIBVER:C/\..*$//}
37.if ${USE_XZ_SETS:Uno} == "yes" 37.if ${USE_XZ_SETS:Uno} == "yes"
38PRESET+= -dsetsuffix=tar.xz 38PRESET+= -dsetsuffix=tar.xz
 39PRESET+= -dcompressor=xz
39.else 40.else
40PRESET+= -dsetsuffix=tgz 41PRESET+= -dsetsuffix=tgz
 42PRESET+= -dcompressor=gzip
41.endif 43.endif
42.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes" 44.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
43PRESET+= -rFOR_RELEASE=1 45PRESET+= -rFOR_RELEASE=1
44.else 46.else
45PRESET+= -rFOR_RELEASE=0 47PRESET+= -rFOR_RELEASE=0
46.endif 48.endif
47.if (${DISTRIBVER:M*.99.*}) 49.if (${DISTRIBVER:M*.99.*})
48PRESET+= -rRELEASE_BRANCH=0 50PRESET+= -rRELEASE_BRANCH=0
49.elif (${DISTRIBVER:M*.[0-9]*}) 51.elif (${DISTRIBVER:M*.[0-9]*})
50PRESET+= -rRELEASE_BRANCH=1 52PRESET+= -rRELEASE_BRANCH=1
51PRESET+= -rminor=${DISTRIBVER:C/^[0-9]+\.([0-9])+.*$/\1/} 53PRESET+= -rminor=${DISTRIBVER:C/^[0-9]+\.([0-9])+.*$/\1/}
52nextmin!= expr ${DISTRIBVER:C/^[0-9]+\.([0-9])+.*$/\1/} + 1 54nextmin!= expr ${DISTRIBVER:C/^[0-9]+\.([0-9])+.*$/\1/} + 1
53.if exists(${.CURDIR}/../../../doc/CHANGES-${DISTRIBVER:C/\..*$//}.${nextmin}) 55.if exists(${.CURDIR}/../../../doc/CHANGES-${DISTRIBVER:C/\..*$//}.${nextmin})
cvs diff -r1.21 -r1.22 src/distrib/notes/alpha/contents (expand / switch to unified diff)

--- src/distrib/notes/alpha/contents 2020/06/22 12:03:46 1.21
+++ src/distrib/notes/alpha/contents 2020/06/23 06:28:02 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: contents,v 1.21 2020/06/22 12:03:46 maya Exp $ 1.\" $NetBSD: contents,v 1.22 2020/06/23 06:28:02 martin Exp $
2.\" 2.\"
3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. 3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -299,27 +299,29 @@ Configuration files for X which could be @@ -299,27 +299,29 @@ Configuration files for X which could be
299. 299.
300.It Sy xserver 300.It Sy xserver
301The X server. 301The X server.
302. 302.
303.tag) \" x sets 303.tag) \" x sets
304. 304.
305.\" ------------------------------------------------------------------ 305.\" ------------------------------------------------------------------
306. 306.
307. 307.
308.\" MI DISCUSSION OF BINARY SETS ------------------------------------- 308.\" MI DISCUSSION OF BINARY SETS -------------------------------------
309.\" XXX: should be in notes/common 309.\" XXX: should be in notes/common
310. 310.
311.Pp 311.Pp
312The \*M binary distribution sets are distributed as xzipped tar files 312The \*M binary distribution sets are distributed as tar files
 313compressed with
 314.Sy \*[compressor]
313named with the extension 315named with the extension
314.Sy .\*[setsuffix] , 316.Sy .\*[setsuffix] ,
315e.g. 317e.g.
316.Pa base.\*[setsuffix] . 318.Pa base.\*[setsuffix] .
317. 319.
318. 320.
319.Pp 321.Pp
320The instructions given for extracting the source sets work equally 322The instructions given for extracting the source sets work equally
321well for the binary sets, but it is worth noting that if you use that 323well for the binary sets, but it is worth noting that if you use that
322method, the filenames stored in the sets are relative and therefore 324method, the filenames stored in the sets are relative and therefore
323the files are extracted 325the files are extracted
324.Em below the current directory . 326.Em below the current directory .
325Therefore, if you want to extract the binaries into your system, i.e. 327Therefore, if you want to extract the binaries into your system, i.e.
cvs diff -r1.10 -r1.11 src/distrib/notes/amd64/contents (expand / switch to unified diff)

--- src/distrib/notes/amd64/contents 2020/06/22 12:03:47 1.10
+++ src/distrib/notes/amd64/contents 2020/06/23 06:28:02 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: contents,v 1.10 2020/06/22 12:03:47 maya Exp $ 1.\" $NetBSD: contents,v 1.11 2020/06/23 06:28:02 martin Exp $
2.\" 2.\"
3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. 3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -235,27 +235,29 @@ Configuration files for X which could be @@ -235,27 +235,29 @@ Configuration files for X which could be
235.It Sy xserver 235.It Sy xserver
236The X server. 236The X server.
237This includes the modular X.Org server. 237This includes the modular X.Org server.
238. 238.
239.tag) \" x sets 239.tag) \" x sets
240. 240.
241. 241.
242.\" ---------------------------- MI DISCUSSION OF BINARY SETS 242.\" ---------------------------- MI DISCUSSION OF BINARY SETS
243.\" 243.\"
244.\" XXX: should be in notes/common 244.\" XXX: should be in notes/common
245.\" 245.\"
246. 246.
247.Pp 247.Pp
248The \*M binary distribution sets are distributed as xzipped tar files 248The \*M binary distribution sets are distributed as tar files
 249compressed with
 250.Sy \*[compressor]
249named with the extension 251named with the extension
250.Sy .\*[setsuffix] 252.Sy .\*[setsuffix]
251.Pq e.g., Pa base.\*[setsuffix] . 253.Pq e.g., Pa base.\*[setsuffix] .
252. 254.
253. 255.
254.Pp 256.Pp
255The instructions given for extracting the source sets work equally 257The instructions given for extracting the source sets work equally
256well for the binary sets, but it is worth noting that if you use that 258well for the binary sets, but it is worth noting that if you use that
257method, the filenames stored in the sets are relative and therefore 259method, the filenames stored in the sets are relative and therefore
258the files are extracted 260the files are extracted
259.Em below the current directory . 261.Em below the current directory .
260Therefore, if you want to extract the binaries into your system, i.e., 262Therefore, if you want to extract the binaries into your system, i.e.,
261replace the system binaries with them, you have to run the 263replace the system binaries with them, you have to run the
cvs diff -r1.180 -r1.181 src/distrib/notes/common/contents (expand / switch to unified diff)

--- src/distrib/notes/common/contents 2019/11/24 11:15:33 1.180
+++ src/distrib/notes/common/contents 2020/06/23 06:28:02 1.181
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: contents,v 1.180 2019/11/24 11:15:33 martin Exp $ 1.\" $NetBSD: contents,v 1.181 2020/06/23 06:28:02 martin Exp $
2.\" 2.\"
3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. 3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -955,27 +955,29 @@ This includes the modular Xorg and Xvfb  @@ -955,27 +955,29 @@ This includes the modular Xorg and Xvfb
955This includes the X68k and Xprt 955This includes the X68k and Xprt
956servers with man pages and the runtime configuration file. 956servers with man pages and the runtime configuration file.
957.\} 957.\}
958. 958.
959.tag) \" x sets 959.tag) \" x sets
960. 960.
961.\} \" !\n[sun2] 961.\} \" !\n[sun2]
962. 962.
963. 963.
964.\" ---------------------------- MI DISCUSSION OF BINARY SETS 964.\" ---------------------------- MI DISCUSSION OF BINARY SETS
965. 965.
966. 966.
967.Pp 967.Pp
968The \*M binary distribution sets are distributed as gzipped tar files 968The \*M binary distribution sets are distributed as tar files
 969compressed with
 970.Sy \*[compressor]
969named with the extension 971named with the extension
970.Sy .\*[setsuffix] , 972.Sy .\*[setsuffix] ,
971e.g. 973e.g.
972.Pa base.\*[setsuffix] . 974.Pa base.\*[setsuffix] .
973. 975.
974. 976.
975.Pp 977.Pp
976The instructions given for extracting the source sets work equally 978The instructions given for extracting the source sets work equally
977well for the binary sets, but it is worth noting that if you use that 979well for the binary sets, but it is worth noting that if you use that
978method, the filenames stored in the sets are relative and therefore 980method, the filenames stored in the sets are relative and therefore
979the files are extracted 981the files are extracted
980.Em below the current directory . 982.Em below the current directory .
981Therefore, if you want to extract the binaries into your system, i.e. 983Therefore, if you want to extract the binaries into your system, i.e.
cvs diff -r1.7 -r1.8 src/distrib/notes/evbarm/contents (expand / switch to unified diff)

--- src/distrib/notes/evbarm/contents 2020/06/22 12:03:47 1.7
+++ src/distrib/notes/evbarm/contents 2020/06/23 06:28:02 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: contents,v 1.7 2020/06/22 12:03:47 maya Exp $ 1.\" $NetBSD: contents,v 1.8 2020/06/23 06:28:02 martin Exp $
2.\" 2.\"
3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. 3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -249,28 +249,30 @@ Configuration files for X which could be @@ -249,28 +249,30 @@ Configuration files for X which could be
249.It Sy xserver 249.It Sy xserver
250The X server. 250The X server.
251. 251.
252.tag) \" x sets 252.tag) \" x sets
253. 253.
254. 254.
255.\" ------------------------------------------------------------------ 255.\" ------------------------------------------------------------------
256. 256.
257. 257.
258.\" MI DISCUSSION OF BINARY SETS ------------------------------------- 258.\" MI DISCUSSION OF BINARY SETS -------------------------------------
259.\" XXX: should be in notes/common 259.\" XXX: should be in notes/common
260. 260.
261.Pp 261.Pp
262The \*M binary distribution sets are distributed as gzipped or xzipped 262The \*M binary distribution sets are distributed as tar files
263tar files named with the extension 263compressed with
 264.Sy \*[compressor]
 265named with the extension
264.Sy .\*[setsuffix] , 266.Sy .\*[setsuffix] ,
265e.g. 267e.g.
266.Pa base.\*[setsuffix] . 268.Pa base.\*[setsuffix] .
267. 269.
268. 270.
269.Pp 271.Pp
270The instructions given for extracting the source sets work equally 272The instructions given for extracting the source sets work equally
271well for the binary sets, but it is worth noting that if you use that 273well for the binary sets, but it is worth noting that if you use that
272method, the filenames stored in the sets are relative and therefore 274method, the filenames stored in the sets are relative and therefore
273the files are extracted 275the files are extracted
274.Em below the current directory . 276.Em below the current directory .
275Therefore, if you want to extract the binaries into your system, i.e. 277Therefore, if you want to extract the binaries into your system, i.e.
276replace the system binaries with them, you have to run the 278replace the system binaries with them, you have to run the
cvs diff -r1.10 -r1.11 src/distrib/notes/sparc64/contents (expand / switch to unified diff)

--- src/distrib/notes/sparc64/contents 2020/06/22 12:03:47 1.10
+++ src/distrib/notes/sparc64/contents 2020/06/23 06:28:02 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: contents,v 1.10 2020/06/22 12:03:47 maya Exp $ 1.\" $NetBSD: contents,v 1.11 2020/06/23 06:28:02 martin Exp $
2.\" 2.\"
3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc. 3.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" Redistribution and use in source and binary forms, with or without 6.\" Redistribution and use in source and binary forms, with or without
7.\" modification, are permitted provided that the following conditions 7.\" modification, are permitted provided that the following conditions
8.\" are met: 8.\" are met:
9.\" 1. Redistributions of source code must retain the above copyright 9.\" 1. Redistributions of source code must retain the above copyright
10.\" notice, this list of conditions and the following disclaimer. 10.\" notice, this list of conditions and the following disclaimer.
11.\" 2. Redistributions in binary form must reproduce the above copyright 11.\" 2. Redistributions in binary form must reproduce the above copyright
12.\" notice, this list of conditions and the following disclaimer in the 12.\" notice, this list of conditions and the following disclaimer in the
13.\" documentation and/or other materials provided with the distribution. 13.\" documentation and/or other materials provided with the distribution.
14.\" 14.\"
@@ -285,27 +285,29 @@ Configuration files for X which could be @@ -285,27 +285,29 @@ Configuration files for X which could be
285The X server. 285The X server.
286This includes the modular Xorg and Xvfb servers. 286This includes the modular Xorg and Xvfb servers.
287. 287.
288.tag) \" x sets 288.tag) \" x sets
289. 289.
290. 290.
291.\" ------------------------------------------------------------------ 291.\" ------------------------------------------------------------------
292. 292.
293. 293.
294.\" MI DISCUSSION OF BINARY SETS ------------------------------------- 294.\" MI DISCUSSION OF BINARY SETS -------------------------------------
295.\" XXX: should be in notes/common 295.\" XXX: should be in notes/common
296. 296.
297.Pp 297.Pp
298The \*M binary distribution sets are distributed as xzipped tar files 298The \*M binary distribution sets are distributed as tar files
 299compressed with
 300.Sy \*[compressor]
299named with the extension 301named with the extension
300.Sy .\*[setsuffix] , 302.Sy .\*[setsuffix] ,
301e.g., 303e.g.,
302.Pa base.\*[setsuffix] . 304.Pa base.\*[setsuffix] .
303. 305.
304. 306.
305.Pp 307.Pp
306The instructions given for extracting the source sets work equally 308The instructions given for extracting the source sets work equally
307well for the binary sets, but it is worth noting that if you use that 309well for the binary sets, but it is worth noting that if you use that
308method, the filenames stored in the sets are relative and therefore 310method, the filenames stored in the sets are relative and therefore
309the files are extracted 311the files are extracted
310.Em below the current directory . 312.Em below the current directory .
311Therefore, if you want to extract the binaries into your system, i.e., 313Therefore, if you want to extract the binaries into your system, i.e.,