[src/trunk]: src/distrib Update some distrib X11R6 references to X11R7

[abs <abs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff76b8c5418f
branches:  trunk
changeset: 1024761:ff76b8c5418f
user:      abs <abs%NetBSD.org@localhost>
date:      Tue Nov 02 22:02:42 2021 +0000

description:
Update some distrib X11R6 references to X11R7

Some of these scripts and notes may no longer be relevant, but now
they are at least not relevant while referring to the current X
installation directory

diffstat:

 distrib/alpha/rz25dist/Makefile   |   6 +++---
 distrib/amiga/miniroot/install.md |   4 ++--
 distrib/sparc/install.md          |   4 ++--
 distrib/syspkg/notes/NOTES        |   4 ++--
 distrib/syspkg/notes/PROPOSAL     |  18 +++++++++---------
 5 files changed, 18 insertions(+), 18 deletions(-)

diffs (135 lines):

diff -r 7a397169a334 -r ff76b8c5418f distrib/alpha/rz25dist/Makefile
--- a/distrib/alpha/rz25dist/Makefile   Tue Nov 02 21:55:38 2021 +0000
+++ b/distrib/alpha/rz25dist/Makefile   Tue Nov 02 22:02:42 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile,v 1.32 2021/11/02 22:02:42 abs Exp $
 
 .include "../../../Makefile.inc"
 
@@ -82,7 +82,7 @@
 bin.tar.gz: mount-fs build-fs
        /bin/rm -f $@
        (cd ${DESTDIR} ; find . | grep -v '^./etc' | \
-           grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \
+           grep -v '^./usr/X11R7' | grep -v '^./netbsd' | \
            grep -v '^./boot' | pax -w -d | ${TOOL_GZIP_N} -9) > $@
 
 etc.tar.gz: mount-fs build-fs
@@ -91,7 +91,7 @@
 
 x11.tar.gz: mount-fs build-fs
        /bin/rm -f $@
-       (cd ${DESTDIR} ; find ./usr/X11R6 | pax -w -d | ${TOOL_GZIP_N} -9) > $@
+       (cd ${DESTDIR} ; find ./usr/X11R7 | pax -w -d | ${TOOL_GZIP_N} -9) > $@
 
 .endif
 
diff -r 7a397169a334 -r ff76b8c5418f distrib/amiga/miniroot/install.md
--- a/distrib/amiga/miniroot/install.md Tue Nov 02 21:55:38 2021 +0000
+++ b/distrib/amiga/miniroot/install.md Tue Nov 02 22:02:42 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.33 2021/06/26 00:28:19 tsutsui Exp $
+#      $NetBSD: install.md,v 1.34 2021/11/02 22:02:42 abs Exp $
 #
 #
 # Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -400,7 +400,7 @@
        md_mv_usr_lib $root || return 1
 
        # If X11 is installed, move the those libraries as well
-       xlibdir="/usr/X11R6/lib"
+       xlibdir="/usr/X11R7/lib"
        if [ -d $root/$xlibdir/. ]; then
                mkdir -p $root/emul/aout/$xlibdir || return 1
                md_mv_x_lib $root $xlibdir || return 1
diff -r 7a397169a334 -r ff76b8c5418f distrib/sparc/install.md
--- a/distrib/sparc/install.md  Tue Nov 02 21:55:38 2021 +0000
+++ b/distrib/sparc/install.md  Tue Nov 02 22:02:42 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.24 2019/04/10 14:52:53 christos Exp $
+#      $NetBSD: install.md,v 1.25 2021/11/02 22:02:42 abs Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -350,7 +350,7 @@
        md_mv_usr_lib $root || return 1
 
        # If X11 is installed, move the those libraries as well
-       xlibdir="/usr/X11R6/lib"
+       xlibdir="/usr/X11R7/lib"
        if [ -d $root/$xlibdir/. ]; then
                mkdir -p $root/emul/aout/$xlibdir || return 1
                md_mv_x_lib $root $xlibdir || return 1
diff -r 7a397169a334 -r ff76b8c5418f distrib/syspkg/notes/NOTES
--- a/distrib/syspkg/notes/NOTES        Tue Nov 02 21:55:38 2021 +0000
+++ b/distrib/syspkg/notes/NOTES        Tue Nov 02 22:02:42 2021 +0000
@@ -42,7 +42,7 @@
 
 2. Package Registration
 
-    Currently, packages are installed in /usr/pkg and /usr/X11R6,
+    Currently, packages are installed in /usr/pkg and /usr/X11R7,
     and all package registration is done by creating directories
     in /var/db/pkg.
 
@@ -108,4 +108,4 @@
     would also be easy for an admin to tell if a system had been
     upgraded by looking at pkg_info output.
 
-$Id: NOTES,v 1.1.1.1 2002/01/07 22:46:16 jwise Exp $
+$Id: NOTES,v 1.2 2021/11/02 22:02:42 abs Exp $
diff -r 7a397169a334 -r ff76b8c5418f distrib/syspkg/notes/PROPOSAL
--- a/distrib/syspkg/notes/PROPOSAL     Tue Nov 02 21:55:38 2021 +0000
+++ b/distrib/syspkg/notes/PROPOSAL     Tue Nov 02 22:02:42 2021 +0000
@@ -34,10 +34,10 @@
        misc    -- items not falling into other categories
        secr    -- items not exportable under US law
        text    -- text processing tools
-       xbase   -- general X11R6 binaries
-       xcomp   -- X11R6 development items
-       xfont   -- X11R6 fonts
-       xserver -- X11R6 servers for various video hardware
+       xbase   -- general X11R7 binaries
+       xcomp   -- X11R7 development items
+       xfont   -- X11R7 fonts
+       xserver -- X11R7 servers for various video hardware
 
   Users who wish to install part of a set need to either install
   the full set and then determine which files they need to remove,
@@ -129,7 +129,7 @@
   /usr/share from the network, and have all other filesystems local,
   or to share the entirety of /usr from the network, and maintain
   local root and /var hierarchies, possibly as a single filesystem.
-  Other commonly shared hierarchies include /usr/X11R6 and /usr/pkg.
+  Other commonly shared hierarchies include /usr/X11R7 and /usr/pkg.
 
   Two steps are necessary to support this type of sharing: the system
   must be able to check separate repositories for packages installed
@@ -142,9 +142,9 @@
   Friday, September 18, 1998.  These patches, which have not yet been
   committed cause third-party software packages installed in /usr/pkg
   to be registered in /usr/pkg/etc/pkg, and packages installed in
-  /usr/X11R6 to be registered in /usr/X11R6/etc/pkg.  This could be
+  /usr/X11R7 to be registered in /usr/X11R7/etc/pkg.  This could be
   extended easily to allow sharing of system package installations by
-  having the new system X11R6 packages also use /usr/X11R6/etc/pkg
+  having the new system X11R7 packages also use /usr/X11R7/etc/pkg
   for package registration, to have system packages installed in /usr
   use /usr/etc/pkg for package registration, and to have system
   packages installed in / and /var use /etc/pkg for package
@@ -157,7 +157,7 @@
   most easily addressed by careful consideration of package contents.
   A look through the contents of the current install sets suggests
   that relatively few packages will in fact need to install in more
-  than one of /, /usr, /usr/share and /usr/X11R6.  Were such packages
+  than one of /, /usr, /usr/share and /usr/X11R7.  Were such packages
   split into separate components, based on filesystem boundaries,
   users would easily be able to install only the parts which are local
   in their particular configuration.
@@ -295,4 +295,4 @@
   can continue unhindered while the new system is being implemented.
 
 ------------------------------------------------------------------------
-$Id: PROPOSAL,v 1.2 2004/01/17 05:30:01 lukem Exp $
+$Id: PROPOSAL,v 1.3 2021/11/02 22:02:42 abs Exp $