Module Name: src
Committed By: abs
Date: Tue Nov 2 22:02:42 UTC 2021
Modified Files:
src/distrib/alpha/rz25dist: Makefile
src/distrib/amiga/miniroot: install.md
src/distrib/sparc: install.md
src/distrib/syspkg/notes: NOTES PROPOSAL
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/alpha/rz25dist/Makefile
cvs rdiff -u -r1.33 -r1.34 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.24 -r1.25 src/distrib/sparc/install.md
cvs rdiff -u -r1.1.1.1 -r1.2 src/distrib/syspkg/notes/NOTES
cvs rdiff -u -r1.2 -r1.3 src/distrib/syspkg/notes/PROPOSAL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/rz25dist/Makefile
diff -u src/distrib/alpha/rz25dist/Makefile:1.31 src/distrib/alpha/rz25dist/Makefile:1.32
--- src/distrib/alpha/rz25dist/Makefile:1.31 Tue Aug 5 15:40:58 2014
+++ src/distrib/alpha/rz25dist/Makefile Tue Nov 2 22:02:42 2021
@@ -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 @@ diskimage.gz: mount-fs build-fs unmount-
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 @@ etc.tar.gz: mount-fs build-fs
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
Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.33 src/distrib/amiga/miniroot/install.md:1.34
--- src/distrib/amiga/miniroot/install.md:1.33 Sat Jun 26 00:28:19 2021
+++ src/distrib/amiga/miniroot/install.md Tue Nov 2 22:02:42 2021
@@ -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_aout_libs()
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
Index: src/distrib/sparc/install.md
diff -u src/distrib/sparc/install.md:1.24 src/distrib/sparc/install.md:1.25
--- src/distrib/sparc/install.md:1.24 Wed Apr 10 14:52:53 2019
+++ src/distrib/sparc/install.md Tue Nov 2 22:02:42 2021
@@ -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_aout_libs()
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
Index: src/distrib/syspkg/notes/NOTES
diff -u src/distrib/syspkg/notes/NOTES:1.1.1.1 src/distrib/syspkg/notes/NOTES:1.2
--- src/distrib/syspkg/notes/NOTES:1.1.1.1 Mon Jan 7 22:46:16 2002
+++ src/distrib/syspkg/notes/NOTES Tue Nov 2 22:02:42 2021
@@ -42,7 +42,7 @@ to this, I will put together a more conc
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 @@ to this, I will put together a more conc
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 $
Index: src/distrib/syspkg/notes/PROPOSAL
diff -u src/distrib/syspkg/notes/PROPOSAL:1.2 src/distrib/syspkg/notes/PROPOSAL:1.3
--- src/distrib/syspkg/notes/PROPOSAL:1.2 Sat Jan 17 05:30:01 2004
+++ src/distrib/syspkg/notes/PROPOSAL Tue Nov 2 22:02:42 2021
@@ -34,10 +34,10 @@ A. Working Plan
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 @@ A. Working Plan
/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 @@ A. Working Plan
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 @@ A. Working Plan
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 @@ A. Working Plan
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 $
