Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove references to xcontrib and xmisc now that they've been merged 

into xbase.
This commit is contained in:
lukem 2004-01-17 05:30:01 +00:00
parent e6789de0c9
commit c434d47afe
28 changed files with 56 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/amiga/miniroot/install.md
View File

@ -1,4 +1,4 @@
# $NetBSD: install.md,v 1.22 2003/01/15 07:20:52 mhitch Exp $
# $NetBSD: install.md,v 1.23 2004/01/17 05:30:01 lukem Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#
# Machine-dependent install sets
MDSETS="kern-GENERIC xbase xcomp xcontrib xfont xmisc xserver"
MDSETS="kern-GENERIC xbase xcomp xfont xserver"
md_set_term() {
if [ ! -z "$TERM" ]; then

4
distrib/atari/miniroot/install.md
View File

@ -1,4 +1,4 @@
# $NetBSD: install.md,v 1.15 2001/08/16 19:14:40 tv Exp $
# $NetBSD: install.md,v 1.16 2004/01/17 05:30:01 lukem Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#
# Machine-dependent install sets
MDSETS="xbase xcomp xcontrib xfont xserver"
MDSETS="xbase xcomp xfont xserver"
md_set_term() {
if [ ! -z "$TERM" ]; then

19
distrib/notes/common/contents
View File

@ -1,4 +1,4 @@
.\" $NetBSD: contents,v 1.96 2003/12/15 16:10:58 martin Exp $
.\" $NetBSD: contents,v 1.97 2004/01/17 05:30:01 lukem Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -442,7 +442,7 @@ subdirectory
of the
.Nx \*V
distribution tree, and are as follows:
.(tag xcontrib
.(tag xserver
.
.It Sy base
The
@ -807,7 +807,7 @@ They are currently equivalent to XFree86 3.3.6.
Binary sets for the X Window System are distributed with
.Nx .
The sets are:
.(tag xcontrib
.(tag xserver
.
.It Sy xbase
The basic files needed for a complete X
@ -854,12 +854,6 @@ The extra libraries and include files needed to compile X source code.
.if \n[x86_64] .setsize -unknown- -unknown-
.showsize
.
.It Sy xcontrib
Programs that were contributed to X.
.\" Shareable within MACHINE_ARCH.
.\" Not MI, but close enough to the same size on all ports...
.showsize 1 1
.
.It Sy xfont
Fonts needed by X.
.\" MI, except for i386 and shark
@ -869,13 +863,6 @@ Fonts needed by X.
.if \n[shark] .setsize 6 8
.showsize
.
.It Sy xmisc
Miscellaneous X programs.
.\" MI
.\" Shareable within MACHINE_ARCH
.\" Not MI, but close enough to the same size on all ports...
.showsize 1 1
.
.if \n[acorn32] \{\
.It Sy xserver
The Xarm32VIDC and Xprt servers.

4
distrib/sparc/install.md
View File

@ -1,4 +1,4 @@
# $NetBSD: install.md,v 1.18 2002/05/07 12:27:26 pk Exp $
# $NetBSD: install.md,v 1.19 2004/01/17 05:30:01 lukem Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#
# Machine-dependent install sets
MDSETS="kern xbase xcomp xcontrib xfont xserver"
MDSETS="kern xbase xcomp xfont xserver"
if [ "$MODE" = upgrade ]; then
RELOCATED_FILES_13="${RELOCATED_FILES_13} /usr/sbin/installboot /usr/mdec/installboot"

3
distrib/syspkg/notes/PROPOSAL
View File

@ -36,7 +36,6 @@ A. Working Plan
text -- text processing tools
xbase -- general X11R6 binaries
xcomp -- X11R6 development items
xcontrib - random binaries from the X11R6 `contrib' tree
xfont -- X11R6 fonts
xserver -- X11R6 servers for various video hardware
@ -296,4 +295,4 @@ A. Working Plan
can continue unhindered while the new system is being implemented.
------------------------------------------------------------------------
$Id: PROPOSAL,v 1.1.1.1 2002/01/07 22:46:17 jwise Exp $
$Id: PROPOSAL,v 1.2 2004/01/17 05:30:01 lukem Exp $

4
distrib/utils/sysinst/arch/acorn26/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.9 2003/11/30 14:36:44 dsl Exp $ */
/* $NetBSD: md.h,v 1.10 2004/01/17 05:30:01 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -52,7 +52,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/acorn32/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.12 2003/11/30 14:36:44 dsl Exp $ */
/* $NetBSD: md.h,v 1.13 2004/01/17 05:30:01 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -52,7 +52,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/amd64/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.14 2003/10/18 14:17:00 fvdl Exp $ */
/* $NetBSD: md.h,v 1.15 2004/01/17 05:30:01 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -60,7 +60,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*
* x86_64 has the MD set kern first, because generic kernels are too
* big to fit on install floppies.

4
distrib/utils/sysinst/arch/amiga/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.11 2003/07/25 08:26:24 dsl Exp $ */
/* $NetBSD: md.h,v 1.12 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -56,7 +56,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/arc/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.8 2003/07/25 08:26:25 dsl Exp $ */
/* $NetBSD: md.h,v 1.9 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -59,7 +59,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/atari/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.13 2003/11/30 14:36:44 dsl Exp $ */
/* $NetBSD: md.h,v 1.14 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -62,7 +62,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xfont, xserver, misc, xcomp.
*/
#define SET_KERNEL_1_NAME "kern-BOOT"
#define SET_KERNEL_2_NAME "kern-HADES"

4
distrib/utils/sysinst/arch/bebox/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.11 2003/07/25 08:26:25 dsl Exp $ */
/* $NetBSD: md.h,v 1.12 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -53,7 +53,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/cats/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.8 2003/07/25 08:26:26 dsl Exp $ */
/* $NetBSD: md.h,v 1.9 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -48,7 +48,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/evbarm/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.9 2003/07/25 08:26:26 dsl Exp $ */
/* $NetBSD: md.h,v 1.10 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -48,7 +48,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-ADI_BRH"
#define SET_KERNEL_2_NAME "kern-INTEGRATOR"

4
distrib/utils/sysinst/arch/evbppc/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.6 2003/07/25 08:26:26 dsl Exp $ */
/* $NetBSD: md.h,v 1.7 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -53,7 +53,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/hp300/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.8 2003/11/30 14:36:44 dsl Exp $ */
/* $NetBSD: md.h,v 1.9 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -68,7 +68,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/hpcmips/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.21 2003/07/25 08:26:27 dsl Exp $ */
/* $NetBSD: md.h,v 1.22 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -58,7 +58,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
#define SET_KERNEL_2_NAME "kern-TX3912"

4
distrib/utils/sysinst/arch/i386/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.47 2003/07/27 20:25:07 dsl Exp $ */
/* $NetBSD: md.h,v 1.48 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -60,7 +60,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_GENERIC SET_KERNEL_1

4
distrib/utils/sysinst/arch/mvme68k/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.8 2003/11/30 14:36:45 dsl Exp $ */
/* $NetBSD: md.h,v 1.9 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -68,7 +68,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
#define MD_SETS_VALID (SET_KERNEL | SET_SYSTEM | (SET_X11 & ~SET_X11_SERVERS))

4
distrib/utils/sysinst/arch/pmax/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.27 2003/11/30 14:36:45 dsl Exp $ */
/* $NetBSD: md.h,v 1.28 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -67,7 +67,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/prep/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.9 2003/11/30 14:36:45 dsl Exp $ */
/* $NetBSD: md.h,v 1.10 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -66,7 +66,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*
* i386 has the MD set kern first, because generic kernels are too
* big to fit on install floppies. i386 does not yet include the x sets.

4
distrib/utils/sysinst/arch/sandpoint/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.7 2003/07/25 08:26:32 dsl Exp $ */
/* $NetBSD: md.h,v 1.8 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -53,7 +53,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/sgimips/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.15 2003/11/30 14:36:45 dsl Exp $ */
/* $NetBSD: md.h,v 1.16 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -74,7 +74,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC32_IP2x"
#define SET_KERNEL_2_NAME "kern-GENERIC32_IP3x"

4
distrib/utils/sysinst/arch/shark/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.9 2003/07/25 08:26:33 dsl Exp $ */
/* $NetBSD: md.h,v 1.10 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -48,7 +48,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"

4
distrib/utils/sysinst/arch/x68k/md.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.h,v 1.14 2003/11/30 14:36:46 dsl Exp $ */
/* $NetBSD: md.h,v 1.15 2004/01/17 05:30:02 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -68,7 +68,7 @@
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
* base, etc, comp, games, man, misc, text,
* xbase, xfont, xserver, xcontrib, xcomp.
* xbase, xcomp, xfont, xserver.
*
* x68k has the MD set kern first, because generic kernels are too
* big to fit on install floppies. i386 does not yet include the x sets.

6
distrib/utils/sysinst/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.108 2003/12/28 05:30:47 christos Exp $ */
/* $NetBSD: defs.h,v 1.109 2004/01/17 05:30:01 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -111,9 +111,7 @@ deconst(const void *p)
#define SET_X11_BASE 0x00100000u /* X11 base and clients */
#define SET_X11_FONTS 0x00200000u /* X11 fonts */
#define SET_X11_SERVERS 0x00400000u /* X11 servers */
#define SET_X_CONTRIB 0x00800000u /* X contrib clients */
#define SET_X11_PROG 0x01000000u /* X11 programming */
#define SET_X11_MISC 0x02000000u /* X11 miscelllaneous */
#define SET_X11_PROG 0x00800000u /* X11 programming */
#define SET_MD 0xf0000000u /* All machine dependant sets */
#define SET_MD_1 0x10000000u /* Machine dependant set */

6
distrib/utils/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.115 2003/11/30 14:36:44 dsl Exp $ */
/* $NetBSD: util.c,v 1.116 2004/01/17 05:30:01 lukem Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -88,11 +88,9 @@ distinfo dist_list[] = {
{"text", SET_TEXT_TOOLS, MSG_set_text_tools},
{NULL, SET_X11, MSG_set_X11},
{"xbase", SET_X11_BASE, MSG_set_X11_base},
{"xcomp", SET_X11_PROG, MSG_set_X11_prog},
{"xfont", SET_X11_FONTS, MSG_set_X11_fonts},
{"xserver", SET_X11_SERVERS, MSG_set_X11_servers},
{"xcontrib", SET_X_CONTRIB, MSG_set_X_contrib},
{"xcomp", SET_X11_PROG, MSG_set_X11_prog},
{"xmisc", SET_X11_MISC, MSG_set_X11_misc},
#ifdef SET_MD_1_NAME
{SET_MD_1_NAME, SET_MD_1, MSG_set_md_1},
#endif

4
distrib/vax/install.md
View File

@ -1,4 +1,4 @@
# $NetBSD: install.md,v 1.3 2002/11/18 12:39:56 lukem Exp $
# $NetBSD: install.md,v 1.4 2004/01/17 05:30:02 lukem Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#
# Machine-dependent install sets
MDSETS="kern xbase xcomp xcontrib xfont xserver"
MDSETS="kern xbase xcomp xfont xserver"
if [ "$MODE" = upgrade ]; then
RELOCATED_FILES_13="${RELOCATED_FILES_13} /usr/sbin/installboot /usr/mdec/installboot"