Sync sets sizes with release bits.

19 files changed, 230 insertions, 226 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 8bf317546e4..9e69e26e49e 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.43 2007/08/30 04:21:15 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.44 2008/03/10 21:25:52 miod Exp $
 TopPart
 
 OpenBSDfloppy
@@ -32,26 +32,28 @@ OpenBSDcd
 
 OpenBSDfloppydesc(two,Each,s)
 
+dnl boot, bootxx, netboot
+dnl
 DistributionDescription(eleven)
 
-OpenBSDbase(48117490,154538091,shared)
+OpenBSDbase(54987391,168900724,shared)
 
-OpenBSDcomp(67425362,258238694,shared)
+OpenBSDcomp(95565572,338162732,shared)
 
-OpenBSDetc(1152535,3836966)
+OpenBSDetc(1217019,4015847)
 
-OpenBSDgame(2827128,6659779)
+OpenBSDgame(2846694,6596484)
 
-OpenBSDman(7152297,25591594)
+OpenBSDman(7710785,27896380)
 
-OpenBSDmisc(2276114,7482328)
+OpenBSDmisc(2306623,7714263)
 
-OpenBSDxbase(13342860,46152680)
+OpenBSDxbase(13320645,46203376)
 
-OpenBSDxetc(82930,309151)
+OpenBSDxetc(81768,308688)
 
-OpenBSDxfont(33234519,37547572)
+OpenBSDxfont(35581179,43728442)
 
-OpenBSDxserv(8933043,29055163)
+OpenBSDxserv(10975463,32974795)
 
-OpenBSDxshare(2078348,10999893)
+OpenBSDxshare(2743060,14575889)
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index 75dc794d532..6f97d5b09aa 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,18 +1,7 @@
-dnl	$OpenBSD: contents,v 1.20 2007/08/30 04:21:16 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.21 2008/03/10 21:25:52 miod Exp $
 TopPart
 
-dnl uncomment as stuff becomes available
-dnl
 OpenBSDfloppy
-dnl
-dnl	floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
-dnl			this one features all the drivers not available
-dnl			in floppy{:--:}OSrev.fs, such as SCSI, RAID, Gigabit
-dnl			Ethernet, and such; see below.
-dnl
-dnl	floppyC{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
-dnl			this one features most of the cardbus and
-dnl			PCMCIA drivers; see below.
 
 	pxeboot		i386-specific second-stage PXE bootstrap (for
 			network installs); see below.
@@ -51,31 +40,31 @@ dnl		rawrite.exe, ntrw.exe, gzip.exe, and pfdisk.exe;
 dnl		see installation section, below.
 dnl
 dnl
-OpenBSDfloppydesc(,The)
+OpenBSDfloppydesc(single,The)
 dnl
 dnl In addition, the "tools/" directory contains some utilities that might be
 dnl useful for the installation.
 
 DistributionDescription(eleven)
 
-OpenBSDbase(44672069,138481711,shared)
+OpenBSDbase(48347476,148896227,shared)
 
-OpenBSDcomp(87031601,308801726,shared)
+OpenBSDcomp(91564208,321576408,shared)
 
-OpenBSDetc(1152568,3837470)
+OpenBSDetc(1217072,4016473)
 
-OpenBSDgame(2690128,6162995)
+OpenBSDgame(2702471,6162604)
 
-OpenBSDman(7432420,26645880)
+OpenBSDman(7710700,27896380)
 
-OpenBSDmisc(2276145,7482328)
+OpenBSDmisc(2306646,7714263)
 
-OpenBSDxbase(11686810,36200909)
+OpenBSDxbase(10929656,34574070)
 
-OpenBSDxetc(93321,363680)
+OpenBSDxetc(79031,299834)
 
-OpenBSDxfont(33234618,37547572)
+OpenBSDxfont(35580507,43728442)
 
-OpenBSDxserv(12009524,35230563)
+OpenBSDxserv(9384576,27980931)
 
-OpenBSDxshare(2078183,10998944)
+OpenBSDxshare(2742763,14575889)
diff --git a/distrib/notes/armish/contents b/distrib/notes/armish/contents
index 5d09f7644f0..44e978b9046 100644
--- a/distrib/notes/armish/contents
+++ b/distrib/notes/armish/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.2 2006/06/29 16:09:35 drahn Exp $
+dnl	$OpenBSD: contents,v 1.3 2008/03/10 21:25:52 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -11,22 +11,24 @@ dnl OpenBSDcd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(47220942,146546688,shared)
+OpenBSDbase(50124505,143459803,shared)
 
-OpenBSDcomp(77089010,225058816,shared)
+OpenBSDcomp(75671655,217695045,shared)
 
-OpenBSDetc(1158334,4775936)
+OpenBSDetc(1222335,4031359)
 
-OpenBSDgame(2647990,6273024)
+OpenBSDgame(2659689,5961132)
 
-OpenBSDman(7546451,30212096)
+OpenBSDman(7711361,27896382)
 
-OpenBSDmisc(2280496,7482328)
+OpenBSDmisc(2306700,7714263)
 
-dnl OpenBSDxbase(11562138,32391047)
+OpenBSDxbase(10713742,30428239)
 
-dnl OpenBSDxetc(91396,354879)
+OpenBSDxetc(76578,289622)
 
-dnl OpenBSDxfont(33236507,37547572)
+OpenBSDxfont(35583423,43728442)
 
-dnl OpenBSDxshare(2093518,11018844)
+OpenBSDxserv(7617540,21346440)
+
+OpenBSDxshare(2744606,14575889)
diff --git a/distrib/notes/aviion/contents b/distrib/notes/aviion/contents
index 19fb8e07823..2bef07e18d4 100644
--- a/distrib/notes/aviion/contents
+++ b/distrib/notes/aviion/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.1 2007/03/15 20:18:23 miod Exp $
+dnl	$OpenBSD: contents,v 1.2 2008/03/10 21:25:52 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -17,7 +17,6 @@ dnl	bootsd		The OpenBSD/MACHINE disk boot loader.
 dnl	bootst		The OpenBSD/MACHINE tape boot loader.
 	netboot		The OpenBSD/MACHINE Sun-compatible network boot
 			loader.
-dnl	stboot		A VID tape block.
 dnl	tftpboot	The OpenBSD/MACHINE tftp-compatible network boot
 dnl			loader.
 
@@ -28,14 +27,15 @@ dnl Media" for more information.
 
 DistributionDescription(six)
 
-OpenBSDbase(82256499,203198142)
+OpenBSDbase(87127369,214673707)
 
-OpenBSDcomp(39873329,141571234)
+OpenBSDcomp(38773889,137789701)
 
-OpenBSDetc(1152254,3995885)
+OpenBSDetc(1234685,3765812)
 
-OpenBSDgame(7097975,15193395)
+OpenBSDgame(7198035,15341026)
 
-OpenBSDman(6838594,24373480)
+OpenBSDman(7055148,25283996)
+
+OpenBSDmisc(2292816,7568192)
 
-OpenBSDmisc(2276390,7482328)
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index d67b6f0deb0..06c5526162a 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.38 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.39 2008/03/10 21:25:52 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -14,17 +14,17 @@ OpenBSDrd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(32931277,96383424,shared)
+OpenBSDbase(35424451,103167070,shared)
 
-OpenBSDcomp(16901671,52024994,shared)
+OpenBSDcomp(16443607,51652247,shared)
 
-OpenBSDetc(1154341,3844415)
+OpenBSDetc(1220413,4023047)
 
-OpenBSDgame(2640672,6304469)
+OpenBSDgame(2648340,6303982)
 
-OpenBSDman(6840879,24381625)
+OpenBSDman(7106337,25531170)
 
-OpenBSDmisc(2276428,7482328)
+OpenBSDmisc(2306852,7714263)
 
 OpenBSDxbase(8045988,23747800)
 
diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents
index aa00c73f4df..18e085cb6f8 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.17 2007/08/30 04:21:16 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.18 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -13,32 +13,29 @@ OpenBSDcd
 
 	lif{:--:}OSrev.fs	A LIF bootable miniroot image, suitable for network
 			boot.
-dnl
-dnl	installboot	The OpenBSD/MACHINE boot loader installation program
 
 	xxboot		The OpenBSD/MACHINE LIF boot block.
 
-DistributionDescription(ten)
+DistributionDescription(eleven)
 
-OpenBSDbase(43157731,115274066,shared)
+OpenBSDbase(46694889,124245316,shared)
 
-OpenBSDcomp(64790954,233458466,shared)
+OpenBSDcomp(67855227,241802856,shared)
 
-OpenBSDetc(1152890,4000167)
+OpenBSDetc(1216946,4015311)
 
-OpenBSDgame(2752846,6108407)
+OpenBSDgame(2764991,6110288)
 
-OpenBSDman(7433072,26646021)
+OpenBSDman(7710819,27896378)
 
-OpenBSDmisc(2276220,7482328)
+OpenBSDmisc(2306745,7714263)
 
-OpenBSDxbase(10235158,25504087)
+OpenBSDxbase(11666617,32606314)
 
-OpenBSDxetc(80703,294489)
+OpenBSDxetc(78891,294702)
 
-OpenBSDxfont(33235838,37547572)
+OpenBSDxfont(35581866,43728442)
 
-dnl Do not list xserv, on purpose. No real X11 server yet.
-dnl OpenBSDxserv(7280093,17870757)
-dnl
-OpenBSDxshare(2079311,10998944)
+OpenBSDxserv(3830680,9687558)
+
+OpenBSDxshare(2743527,14575867)
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index dbc10dcb38e..ae1f3b5fe0b 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.59 2007/08/30 04:21:16 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.60 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDfloppy
@@ -60,24 +60,24 @@ useful for the installation.
 
 DistributionDescription(eleven)
 
-OpenBSDbase(40472416,121819713,shared)
+OpenBSDbase(43882720,131245205,shared)
 
-OpenBSDcomp(75288624,214541615,shared)
+OpenBSDcomp(79425411,224429349,shared)
 
-OpenBSDetc(1153259,3840621)
+OpenBSDetc(1218746,4019611)
 
-OpenBSDgame(2599327,5964163)
+OpenBSDgame(2608954,5967996)
 
-OpenBSDman(7432199,26645878)
+OpenBSDman(7710689,27896378)
 
-OpenBSDmisc(2276167,7482328)
+OpenBSDmisc(2306662,7714263)
 
-OpenBSDxbase(10560678,29717767)
+OpenBSDxbase(9677800,27543056)
 
-OpenBSDxetc(90387,357790)
+OpenBSDxetc(76180,293890)
 
-OpenBSDxfont(33235184,37547572)
+OpenBSDxfont(35579536,43728442)
 
-OpenBSDxserv(19876622,50772950)
+OpenBSDxserv(8748320,24385407)
 
-OpenBSDxshare(2077586,10998944)
+OpenBSDxshare(2742793,14575889)
diff --git a/distrib/notes/landisk/contents b/distrib/notes/landisk/contents
index 544ad95ec5e..4d60b6da32f 100644
--- a/distrib/notes/landisk/contents
+++ b/distrib/notes/landisk/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.2 2007/02/28 22:30:05 miod Exp $
+dnl	$OpenBSD: contents,v 1.3 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 dnl can't use OpenBSDminiroot here - comment is inappropriate
@@ -17,22 +17,24 @@ dnl XXX describe boot, mbr, and xxboot. Or stop providing them?
 
 DistributionDescription(eleven)
 
-OpenBSDbase(87288058,179014870)
+OpenBSDbase(86428434,181933701)
 
-OpenBSDcomp(62336682,181123299)
+OpenBSDcomp(64499584,187918649)
 
-OpenBSDetc(1237410,4082221)
+OpenBSDetc(1216790,4014133)
 
-OpenBSDgame(7146289,13072218)
+OpenBSDgame(6908856,12851988)
 
-OpenBSDman(7644466,27595277)
+OpenBSDman(7712331,27896372)
 
-OpenBSDmisc(2292771,7568192)
+OpenBSDmisc(2306764,7714263)
 
-OpenBSDxbase(84782265,140201761)
+OpenBSDxbase(84833778,145797829)
 
-OpenBSDxetc(991594,1700766)
+OpenBSDxetc(1003988,1784996)
 
-OpenBSDxfont(33239414,37547572)
+OpenBSDxfont(35584612,43728442)
 
-OpenBSDxshare(2080226,10996662)
+OpenBSDxserv(7002,16352)
+
+OpenBSDxshare(2737812,14539940)
diff --git a/distrib/notes/luna88k/contents b/distrib/notes/luna88k/contents
index 64cf97858a7..f84d1aa9088 100644
--- a/distrib/notes/luna88k/contents
+++ b/distrib/notes/luna88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.6 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.7 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -12,27 +12,27 @@ They can also be used to configure an NFS server to support installation
 over the network. See the section "Getting the OpenBSD system onto Useful
 Media" for more information.
 
-DistributionDescription(ten)
+DistributionDescription(six)
 
-OpenBSDbase(82275426,203136564)
+OpenBSDbase(87218957,214769210)
 
-OpenBSDcomp(39864856,141513399)
+OpenBSDcomp(38886024,138194867)
 
-OpenBSDetc(1152425,3995805)
+OpenBSDetc(1239816,4085594)
 
-OpenBSDgame(7098734,15193395)
+OpenBSDgame(7192419,15337161)
 
-OpenBSDman(6839254,24374923)
-
-OpenBSDmisc(2276459,7482328)
-
-OpenBSDxbase(22,148531552)
-
-OpenBSDxetc(21,1903549)
-
-OpenBSDxfont(22,37547572)
+OpenBSDman(7057967,25342258)
 
+OpenBSDmisc(2293170,7569261)
+dnl 
+dnl OpenBSDxbase(22,148531552)
+dnl 
+dnl OpenBSDxetc(21,1903549)
+dnl 
+dnl OpenBSDxfont(22,37547572)
+dnl 
 dnl No X server yet...
 dnl OpenBSDxserv
 dnl
-OpenBSDxshare(23,11019768)
+dnl OpenBSDxshare(23,11019768)
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 80f735afff8..e6eb0be9f04 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.76 2007/11/04 01:35:49 krw Exp $
+dnl	$OpenBSD: m4.common,v 1.77 2008/03/10 21:25:52 miod Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -227,9 +227,9 @@ define({:-OpenBSDinstalliso-:},
 			or upgrade can be done without network connectivity.-:})dnl
 define({:-OpenBSDcd-:},
 {:-	cd{:--:}OSrev.iso	A miniroot filesystem image suitable to be used
-			as a bootable CD-ROM image, but will require the base and
-			X sets be found via another media or network; otherwise
-			similar to the bsd.rd image above.-:})dnl
+			as a bootable CD-ROM image, but will require the base
+			and X sets be found via another media or network;
+			otherwise similar to the bsd.rd image above.-:})dnl
 dnl
 dnl OpenBSDfloppydesc(number of floppies, Article, plural)
 dnl
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index cc083bf3b3e..393d41ad4d3 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.47 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.48 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -21,27 +21,27 @@ OpenBSDrd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(41309432,133646011,shared)
+OpenBSDbase(45036160,143539048,shared)
 
-OpenBSDcomp(48651487,170530519,shared)
+OpenBSDcomp(51483433,177978882,shared)
 
-OpenBSDetc(1152464,3995719)
+OpenBSDetc(1217297,4014461)
 
-OpenBSDgame(2640728,6304469)
+OpenBSDgame(2648392,6303982)
 
-OpenBSDman(6838762,24374783)
+OpenBSDman(7106560,25531462)
 
-OpenBSDmisc(2276281,7482328)
+OpenBSDmisc(2306871,7714263)
 
-OpenBSDxbase(6363142,18843291)
+OpenBSDxbase(6538027,19639118)
 
-OpenBSDxetc(65950,261163)
+OpenBSDxetc(77183,311536)
 
-OpenBSDxfont(33239846,37547572)
+OpenBSDxfont(35587249,43728442)
 
-OpenBSDxserv(493755,1145106)
+OpenBSDxserv(1877275,4474036)
 
-OpenBSDxshare(2095471,11019793)
+OpenBSDxshare(2746962,14576073)
 
 The directory '../OSREV/MACHINE/utils' contains the OpenBSD/MACHINE boot
 program, used to load the OpenBSD kernel. This program is distributed
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 255c7243b75..5c898435032 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.21 2007/08/30 04:21:16 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.22 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -12,27 +12,29 @@ OpenBSDinstalliso
 OpenBSDcd
 
 	ofwboot		The OpenBSD/MACHINE secondary boot loader.
+dnl
+dnl	bsd.tbxi
 
 DistributionDescription(eleven)
 
-OpenBSDbase(51813622,153334752,shared)
+OpenBSDbase(56910063,164264180,shared)
 
-OpenBSDcomp(93375771,245221926,shared)
+OpenBSDcomp(98847624,255348473,shared)
 
-OpenBSDetc(1156410,3852350)
+OpenBSDetc(1222181,4031284)
 
-OpenBSDgame(2740703,6230043)
+OpenBSDgame(2749879,6226456)
 
-OpenBSDman(7432423,26646025)
+OpenBSDman(7710862,27896382)
 
-OpenBSDmisc(2276145,7482328)
+OpenBSDmisc(2306611,7714263)
 
-OpenBSDxbase(11987243,33994174)
+OpenBSDxbase(11134588,32455021)
 
-OpenBSDxetc(95200,365042)
+OpenBSDxetc(80630,301140)
 
-OpenBSDxfont(33232301,37547572)
+OpenBSDxfont(35581491,43728442)
 
-OpenBSDxserv(11645601,32689810)
+OpenBSDxserv(8299743,23973793)
 
-OpenBSDxshare(2077668,10998944)
+OpenBSDxshare(2743002,14575889)
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index bc40ed9af47..c695d603f2a 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.30 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.31 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -23,24 +23,26 @@ They can also be used to configure an NFS server to support installation
 "over the network".  See the section "Getting the OpenBSD system onto
 Useful Media" for more information.
 
-DistributionDescription(ten)
+DistributionDescription(eleven)
 
-OpenBSDbase(41235056,133562744,shared)
+OpenBSDbase(45245543,144438257,shared)
 
-OpenBSDcomp(48648044,170497721,shared)
+OpenBSDcomp(51473029,177951159,shared)
 
-OpenBSDetc(1152689,3835768)
+OpenBSDetc(1217211,4014702)
 
-OpenBSDgame(2640660,6304469)
+OpenBSDgame(2648343,6303982)
 
-OpenBSDman(6839794,24380198)
+OpenBSDman(7111287,25546144)
 
-OpenBSDmisc(2276337,7482328)
+OpenBSDmisc(2306850,7714263)
 
-OpenBSDxbase(7800993,22896934)
+OpenBSDxbase(8703004,26380967)
 
-OpenBSDxetc(65881,261053)
+OpenBSDxetc(76766,310397)
 
-OpenBSDxfont(33239009,37547572)
+OpenBSDxfont(35585881,43728442)
 
-OpenBSDxshare(2094916,11019793)
+OpenBSDxserv(1157054,2810482)
+
+OpenBSDxshare(2746742,14575968)
diff --git a/distrib/notes/mvme88k/contents b/distrib/notes/mvme88k/contents
index bc87bff7b20..832ee04fdc1 100644
--- a/distrib/notes/mvme88k/contents
+++ b/distrib/notes/mvme88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.16 2007/11/09 18:15:21 miod Exp $
+dnl	$OpenBSD: contents,v 1.17 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -25,19 +25,19 @@ They can also be used to configure an NFS server to support installation
 over the network. See the section "Getting the OpenBSD system onto Useful
 Media" for more information.
 
-DistributionDescription(ten)
+DistributionDescription(eleven)
 
-OpenBSDbase(82256499,203198142)
+OpenBSDbase(89454142,221938256)
 
-OpenBSDcomp(39873329,141571234)
+OpenBSDcomp(39390389,140034649)
 
-OpenBSDetc(1152254,3995885)
+OpenBSDetc(1217416,3851348)
 
-OpenBSDgame(7097975,15193395)
+OpenBSDgame(7217362,15369036)
 
-OpenBSDman(6838594,24373480)
+OpenBSDman(7113824,25546579)
 
-OpenBSDmisc(2276390,7482328)
+OpenBSDmisc(2307418,7714263)
 
 OpenBSDxbase(78652465,148531552)
 
@@ -45,4 +45,6 @@ OpenBSDxetc(949806,1903549)
 
 OpenBSDxfont(33239585,37547572)
 
+OpenBSDxserv(,)
+
 OpenBSDxshare(2095800,11019768)
diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index b38385c612b..0409d1cdca5 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.6 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.7 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -9,24 +9,26 @@ OpenBSDrd
 
 OpenBSDcd
 
-DistributionDescription(ten)
+DistributionDescription(eleven)
 
-OpenBSDbase(47314513,160975205,shared)
+OpenBSDbase(51021070,172072808,shared)
 
-OpenBSDcomp(64261430,230223658,shared)
+OpenBSDcomp(66933792,235897016,shared)
 
-OpenBSDetc(1152979,3838652)
+OpenBSDetc(1218235,4018044)
 
-OpenBSDgame(2789123,6676091)
+OpenBSDgame(2800914,6674836)
 
-OpenBSDman(7431181,26640655)
+OpenBSDman(7710777,27896814)
 
-OpenBSDmisc(2276178,7482328)
+OpenBSDmisc(2306696,7714263)
 
-OpenBSDxbase(12294153,42705290)
+OpenBSDxbase(8961850,30628712)
 
-OpenBSDxetc(69194,259956)
+OpenBSDxetc(79860,309174)
 
-OpenBSDxfont(33235568,37547572)
+OpenBSDxfont(35584472,43728442)
 
-OpenBSDxshare(2079214,10998944)
+OpenBSDxserv(4575559,15151497)
+
+OpenBSDxshare(2745052,14575889)
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 9b27099bafc..e8cf72bff3f 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.56 2007/08/30 04:21:16 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.57 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -39,24 +39,24 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(eleven)
 
-OpenBSDbase(38001205,112346864,shared)
+OpenBSDbase(41308903,121322118,shared)
 
-OpenBSDcomp(60081480,228010836,shared)
+OpenBSDcomp(63260167,236522182,shared)
 
-OpenBSDetc(1157126,3856946)
+OpenBSDetc(1223052,4035889)
 
-OpenBSDgame(2666780,6041379)
+OpenBSDgame(2677934,6032588)
 
-OpenBSDman(7153162,25591451)
+OpenBSDman(7436835,26822328)
 
-OpenBSDmisc(2276257,7482328)
+OpenBSDmisc(2306723,7714263)
 
-OpenBSDxbase(10665938,31573508)
+OpenBSDxbase(9983245,30079166)
 
-OpenBSDxetc(91390,359735)
+OpenBSDxetc(77085,295566)
 
-OpenBSDxfont(33236887,37547572)
+OpenBSDxfont(35584459,43728442)
 
-OpenBSDxserv(9788947,28671949)
+OpenBSDxserv(7145463,21227449)
 
-OpenBSDxshare(2080290,10999893)
+OpenBSDxshare(2745602,14575990)
diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 3fadcf94f2a..639789492c2 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.39 2007/10/17 21:32:18 deraadt Exp $
+dnl	$OpenBSD: contents,v 1.40 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDminiroot
@@ -48,24 +48,24 @@ OpenBSDfloppydesc(two,Each,s)
 
 DistributionDescription(eleven)
 
-OpenBSDbase(44909566,144394968,shared)
+OpenBSDbase(48602987,155080437,shared)
 
-OpenBSDcomp(88440844,306585964,shared)
+OpenBSDcomp(93119264,318117239,shared)
 
-OpenBSDetc(1156911,3856970)
+OpenBSDetc(1222857,4036182)
 
-OpenBSDgame(2755997,6399683)
+OpenBSDgame(2767229,6401076)
 
-OpenBSDman(7432762,26646027)
+OpenBSDman(7711044,27896384)
 
-OpenBSDmisc(2276149,7482328)
+OpenBSDmisc(2306680,7714263)
 
-OpenBSDxbase(11756286,38003560)
+OpenBSDxbase(11168250,36901412)
 
-OpenBSDxetc(92510,366908)
+OpenBSDxetc(78157,302998)
 
-OpenBSDxfont(33234685,37547572)
+OpenBSDxfont(35581477,43728442)
 
-OpenBSDxserv(11302913,34779102)
+OpenBSDxserv(8243166,25786067)
 
-OpenBSDxshare(2078639,10998944)
+OpenBSDxshare(2743958,14575889)
diff --git a/distrib/notes/vax/contents b/distrib/notes/vax/contents
index 93393f53b2a..5d446d3f6fc 100644
--- a/distrib/notes/vax/contents
+++ b/distrib/notes/vax/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.22 2006/08/14 13:23:19 miod Exp $
+dnl	$OpenBSD: contents,v 1.23 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -7,6 +7,10 @@ OpenBSDbsd
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
+OpenBSDcd
+
 OpenBSDfloppy
 
 	boot.mop	MOP-bootable image (for network installs);
@@ -16,24 +20,24 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(eleven)
 
-OpenBSDbase(69716441,156575827)
+OpenBSDbase(75795996,172239145)
 
-OpenBSDcomp(37452479,130501943)
+OpenBSDcomp(37186502,129837863)
 
-OpenBSDetc(1154526,3852070)
+OpenBSDetc(1221512,4031702)
 
-OpenBSDgame(6180089,12153759)
+OpenBSDgame(6257668,12284344)
 
-OpenBSDman(6839547,24381730)
+OpenBSDman(7110483,25546574)
 
-OpenBSDmisc(2276221,7482328)
+OpenBSDmisc(2306775,7714263)
 
-OpenBSDxbase(69721488,117582012)
+OpenBSDxbase(73092997,130750862)
 
-OpenBSDxetc(840022,1522621)
+OpenBSDxetc(862433,1584883)
 
-OpenBSDxfont(33236408,40970240)
+OpenBSDxfont(35583755,43728442)
 
-OpenBSDxserv(9333481,25999360)
+OpenBSDxserv(3373694,9419336)
 
-OpenBSDxshare(2079764,10999893)
+OpenBSDxshare(2745069,14575968)
diff --git a/distrib/notes/zaurus/contents b/distrib/notes/zaurus/contents
index 4c840494456..010c46ead70 100644
--- a/distrib/notes/zaurus/contents
+++ b/distrib/notes/zaurus/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.5 2006/02/28 20:42:36 miod Exp $
+dnl	$OpenBSD: contents,v 1.6 2008/03/10 21:25:53 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -21,24 +21,24 @@ dnl OpenBSDcd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(42301373,111489264,shared)
+OpenBSDbase(45352967,119413217,shared)
 
-OpenBSDcomp(19539264,64551886,shared)
+OpenBSDcomp(19044958,64041678,shared)
 
-OpenBSDetc(1157847,4016866)
+OpenBSDetc(1222023,3868096)
 
-OpenBSDgame(2648041,5961535)
+OpenBSDgame(2659820,5961132)
 
-OpenBSDman(7433890,26645882)
+OpenBSDman(7712481,27896820)
 
-OpenBSDmisc(2276307,7482328)
+OpenBSDmisc(2306754,7714263)
 
-OpenBSDxbase(11562138,32391047)
+OpenBSDxbase(10713844,30425249)
 
-OpenBSDxetc(91396,354879)
+OpenBSDxetc(77018,290925)
 
-OpenBSDxfont(33236507,37547572)
+OpenBSDxfont(35584445,43728442)
 
-OpenBSDxserv(10289241,28143435)
+OpenBSDxserv(7617529,21346432)
 
-OpenBSDxshare(2093518,11018844)
+OpenBSDxshare(2745145,14575889)