introduce the new xetc set. ok deraadt@, miod@, krw@.

20 files changed, 59 insertions, 29 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index d1bcff1ca39..185b06fd821 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.340 2004/06/20 05:13:14 krw Exp $
+#	$OpenBSD: install.sub,v 1.341 2004/06/22 00:42:11 matthieu Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1740,8 +1740,8 @@ DEVSMADE=
 # the contents of the other sets, not the other way around.
 THESETS="bsd bsd.rd bsd.mp $MDSETS"
 DEFAULTSETS="bsd"
-for _set in base etc misc comp man game xbase xshare xfont xserv site ; do
-	[[ $MODE == upgrade && $_set == etc ]] && continue
+for _set in base etc misc comp man game xbase xetc xshare xfont xserv site ; do
+	[[ $MODE == upgrade && ( $_set == etc || $_set == xetc ) ]] && continue
 	THESETS="$THESETS ${_set}${VERSION}.tgz"
 	isin $_set xbase xshare xfont xserv site && continue
 	DEFAULTSETS="$DEFAULTSETS ${_set}${VERSION}.tgz"
diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index ba302f74562..66224e766e7 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.35 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.36 2004/06/22 00:42:11 matthieu Exp $
 TopPart
 
 OpenBSDfloppy
@@ -47,6 +47,8 @@ OpenBSDmisc(2155607,7413760)
 
 OpenBSDxbase(13890853,49162240)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(32509236,39485440)
 
 OpenBSDxserv(5499334,20715520)
diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer
index 92f1b8726f5..36a1426cfd8 100644
--- a/distrib/notes/alpha/xfer
+++ b/distrib/notes/alpha/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.26 2004/03/17 09:25:09 jmc Exp $
+dnl	$OpenBSD: xfer,v 1.27 2004/06/22 00:42:11 matthieu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
@@ -45,6 +45,6 @@ If you neither have a floppy drive nor a CD-ROM drive on your alpha:
 OpenBSDXferShortPrelude
 
 
-OpenBSDXferBareTape(xbase xfont xserv xshare)
+OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 
 OpenBSDXferFFS
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index 4226d264309..0756f2eae36 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.10 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.11 2004/06/22 00:42:11 matthieu Exp $
 TopPart
 
 dnl uncomment as stuff becomes available
@@ -57,6 +57,8 @@ OpenBSDmisc(2155649,7413760)
 
 OpenBSDxbase(11176888,37027840)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(32501778,39485440)
 
 OpenBSDxserv(8143225,22487040)
diff --git a/distrib/notes/amd64/xfer b/distrib/notes/amd64/xfer
index 3f37843a9c1..2411e2a887c 100644
--- a/distrib/notes/amd64/xfer
+++ b/distrib/notes/amd64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.5 2004/03/23 20:33:32 tom Exp $
+dnl	$OpenBSD: xfer,v 1.6 2004/06/22 00:42:11 matthieu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -42,7 +42,7 @@ Creating a PXE network bootable setup using OpenBSD or other Un*x-like system:
 OpenBSDXferShortPrelude
 
 
-OpenBSDXferBareTape(xbase xfont xlink xserv xshare)
+OpenBSDXferBareTape(xbase xetc xfont xlink xserv xshare)
 
 dnl OpenBSDXferNFS(noupgrade)
 dnl
diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents
index b61ae674be2..6158700a4e2 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.10 2004/06/07 20:04:34 mickey Exp $
+dnl	$OpenBSD: contents,v 1.11 2004/06/22 00:42:11 matthieu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -30,6 +30,8 @@ OpenBSDmisc(2154743,7413760)
 
 OpenBSDxbase(8688529,23316480)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(33473489,40878080)
 
 dnl Do not list xserv, on purpose. No X11 support yet.
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 8fe6dddd7dd..cd333995c4c 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.49 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.50 2004/06/22 00:42:11 matthieu Exp $
 TopPart
 
 OpenBSDfloppy
@@ -53,6 +53,8 @@ OpenBSDmisc(2155646,7413760)
 
 OpenBSDxbase(10999893,33935360)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(32497727,39485440)
 
 OpenBSDxserv(15762295,41287680)
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index a9d22e62dfa..d73fd769e7d 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.24 2004/03/23 20:33:32 tom Exp $
+dnl	$OpenBSD: xfer,v 1.25 2004/06/22 00:42:11 matthieu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -42,7 +42,7 @@ Creating a PXE network bootable setup using OpenBSD or other Un*x-like system:
 OpenBSDXferShortPrelude
 
 
-OpenBSDXferBareTape(xbase xfont xlink xserv xshare)
+OpenBSDXferBareTape(xbase xetc xfont xlink xserv xshare)
 
 dnl OpenBSDXferNFS
 dnl
diff --git a/distrib/notes/luna88k/contents b/distrib/notes/luna88k/contents
index a38aebf6b5a..a5f7a1af72e 100644
--- a/distrib/notes/luna88k/contents
+++ b/distrib/notes/luna88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.2 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.3 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -29,6 +29,8 @@ dnl Not there yet...
 dnl
 dnl OpenBSDxbase
 dnl
+dnl OpenBSDxetc
+dnl
 dnl OpenBSDxshare
 dnl
 dnl OpenBSDxfont
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index ce07a35d9dd..841afcd3537 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.60 2004/06/07 11:14:14 mickey Exp $
+dnl	$OpenBSD: m4.common,v 1.61 2004/06/22 00:42:11 matthieu Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -169,7 +169,15 @@ dnl Describes xbaseXX.tgz.
 dnl
 define({:-OpenBSDxbase-:},
 {:-	xbase{:--:}OSrev  This set includes the base X distribution.  This includes
-		 programs, headers, libraries, and configuration files.showsize($1,$2)-:})dnl
+		 programs, headers and libraries.showsize($1,$2)-:})dnl
+dnl
+dnl
+dnl OpenBSDxetc( compressed size, uncompressed size )
+dnl Describes xetcXX.tgz.
+dnl
+define({:-OpenBSDxetc-:},
+{:-	xetc{:--:}OSrev	 This set includes the X window system configuration files
+		 that reside in /etc. It's the equivalent of etc{:--:}OSrev for X.showsize($1,$2)-:})dnl
 dnl
 dnl
 dnl OpenBSDxshare( compressed size, uncompressed size )
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 23a586897c3..9872e4c1c09 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.14 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.15 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -25,6 +25,8 @@ OpenBSDmisc(2155617,7413760)
 
 OpenBSDxbase(11118410,35153920)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(33465161,40878080)
 
 OpenBSDxserv(8920740,25661440)
diff --git a/distrib/notes/macppc/xfer b/distrib/notes/macppc/xfer
index 22e03479e87..c3201dc3c28 100644
--- a/distrib/notes/macppc/xfer
+++ b/distrib/notes/macppc/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.10 2004/03/17 09:25:09 jmc Exp $
+dnl	$OpenBSD: xfer,v 1.11 2004/06/22 00:42:12 matthieu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -19,6 +19,6 @@ Note: Once an OpenBSD partition exists, it is not possible to load the
 kernel (bsd.rd) from an HFS partition on that disk.
 
 
-OpenBSDXferBareTape(xbase xfont xserv xshare)
+OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 
 OpenBSDXferFFS
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index b0f5eac7e55..73bbbc58a12 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.25 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.26 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -39,6 +39,8 @@ OpenBSDmisc(2154977,7413760)
 
 OpenBSDxbase(7721088,24268800)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(33472248,40878080)
 
 OpenBSDxshare(1662291,9697280)
diff --git a/distrib/notes/mvme68k/xfer b/distrib/notes/mvme68k/xfer
index 9aa2cded643..8bf43080ee6 100644
--- a/distrib/notes/mvme68k/xfer
+++ b/distrib/notes/mvme68k/xfer
@@ -10,7 +10,7 @@ Installation is supported from several media types, including:
 OpenBSDXferPrelude
 
 
-OpenBSDXferBootTape(xbase xfont xshare,stboot obs=512,bootst obs=512,bsd.rd obs=8k conv=sync)
+OpenBSDXferBootTape(xbase xetc xfont xshare,stboot obs=512,bootst obs=512,bsd.rd obs=8k conv=sync)
 
 OpenBSDXferNFS
 
diff --git a/distrib/notes/mvme88k/contents b/distrib/notes/mvme88k/contents
index ee9c07d1b82..e73e43cfe32 100644
--- a/distrib/notes/mvme88k/contents
+++ b/distrib/notes/mvme88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.10 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.11 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -40,6 +40,8 @@ dnl Not there yet...
 dnl
 dnl OpenBSDxbase
 dnl
+dnl OpenBSDxetc
+dnl
 dnl OpenBSDxshare
 dnl
 dnl OpenBSDxfont
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 2900d1a304c..96981732073 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.49 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.50 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDminiroot
@@ -51,6 +51,8 @@ OpenBSDmisc(2154773,7413760)
 
 OpenBSDxbase(10232033,32071680)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(33471756,40878080)
 
 OpenBSDxserv(7477097,21278720)
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 18cff8a8b51..7248cc2ee23 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.39 2004/05/04 23:04:30 deraadt Exp $
+dnl	$OpenBSD: xfer,v 1.40 2004/06/22 00:42:12 matthieu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -138,6 +138,6 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 OpenBSDXferPrelude
 
 
-OpenBSDXferBootTape(xbase xfont xserv xshare,bsd.rd obs=8k conv=sync,boot obs=8k conv=sync)
+OpenBSDXferBootTape(xbase xetc xfont xserv xshare,bsd.rd obs=8k conv=sync,boot obs=8k conv=sync)
 
 OpenBSDXferFFS
diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 8dde2ca1b69..1217eb9b156 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.30 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.31 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDminiroot
@@ -64,6 +64,8 @@ OpenBSDmisc(2155638,7413760)
 
 OpenBSDxbase(11276381,38400000)
 
+OpenBSDxetc(500550,3020800)
+
 OpenBSDxfont(33473285,40878080)
 
 OpenBSDxserv(7443461,21370880)
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index a614b42378b..b869c8e6099 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.22 2004/05/04 23:04:30 deraadt Exp $
+dnl	$OpenBSD: xfer,v 1.23 2004/06/22 00:42:12 matthieu Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM (NOT supported if booting from floppy)
@@ -88,6 +88,6 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 OpenBSDXferPrelude
 
 
-OpenBSDXferBareTape(xbase xfont xserv xshare)
+OpenBSDXferBareTape(xbase xetc xfont xserv xshare)
 
 OpenBSDXferFFS
diff --git a/distrib/notes/vax/contents b/distrib/notes/vax/contents
index d765e876719..575ed0fe89d 100644
--- a/distrib/notes/vax/contents
+++ b/distrib/notes/vax/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.16 2004/06/07 11:14:15 mickey Exp $
+dnl	$OpenBSD: contents,v 1.17 2004/06/22 00:42:12 matthieu Exp $
 TopPart
 
 OpenBSDdistsets
@@ -29,6 +29,8 @@ OpenBSDman(6510801,24893440)
 OpenBSDmisc(2155736,7413760)
 
 OpenBSDxbase(66064672,110970880)
+
+OpenBSDxetc(500550,3020800)
 dnl
 dnl OpenBSDxfont(33473285,40878080)