15 files changed, 144 insertions, 142 deletions
diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 48b871f3148..ba302f74562 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.34 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.35 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDfloppy
@@ -33,22 +33,22 @@ OpenBSDfloppydesc(two,Each,s)
 
 DistributionDescription(ten)
 
-OpenBSDbase(38.8,119.1,shared)
+OpenBSDbase(40078017,127610880,shared)
 
-OpenBSDcomp(24.0,94.0,shared)
+OpenBSDcomp(25028757,100618240,shared)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1683165,7045120)
 
-OpenBSDgame(2.8,6.5)
+OpenBSDgame(2801300,6727680)
 
-OpenBSDman(6.7,23.7)
+OpenBSDman(6935301,26480640)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155607,7413760)
 
-OpenBSDxbase(14.1,48.0)
+OpenBSDxbase(13890853,49162240)
 
-OpenBSDxfont(32.5,36.0)
+OpenBSDxfont(32509236,39485440)
 
-OpenBSDxserv(5.5,20.6)
+OpenBSDxserv(5499334,20715520)
 
-OpenBSDxshare(1.7,8.4)
+OpenBSDxshare(1661186,9697280)
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index ee8cc2f85ad..4226d264309 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.9 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.10 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 dnl uncomment as stuff becomes available
@@ -43,22 +43,22 @@ dnl useful for the installation.
 
 DistributionDescription(ten)
 
-OpenBSDbase(35.3,103.9,shared)
+OpenBSDbase(36412569,110755840,shared)
 
-OpenBSDcomp(23.0,84.6,shared)
+OpenBSDcomp(25802362,94586880,shared)
 
-OpenBSDetc(1.6,6.3,noupgrade)
+OpenBSDetc(1683193,7045120,noupgrade)
 
-OpenBSDgame(2.7,6.2)
+OpenBSDgame(2677997,6266880)
 
-OpenBSDman(6.7,24.1)
+OpenBSDman(7213636,27535360)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155649,7413760)
 
-OpenBSDxbase(11.2,36.2)
+OpenBSDxbase(11176888,37027840)
 
-OpenBSDxfont(32.5,36.0)
+OpenBSDxfont(32501778,39485440)
 
-OpenBSDxserv(8.1,22.6)
+OpenBSDxserv(8143225,22487040)
 
-OpenBSDxshare(1.7,8.4)
+OpenBSDxshare(1659879,9687040)
diff --git a/distrib/notes/cats/contents b/distrib/notes/cats/contents
index 26b05034246..5b2d3bffce6 100644
--- a/distrib/notes/cats/contents
+++ b/distrib/notes/cats/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.4 2004/03/20 17:20:32 miod Exp $
+dnl	$OpenBSD: contents,v 1.5 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -11,14 +11,14 @@ dnl OpenBSDcd
 
 DistributionDescription(six)
 
-OpenBSDbase(39.7,104.5,shared)
+OpenBSDbase(40416878,111073280,shared)
 
-OpenBSDcomp(15.8,53.6,shared)
+OpenBSDcomp(17246804,61009920,shared)
 
-OpenBSDetc(1.6,6.4,noupgrade)
+OpenBSDetc(1688763,7065600,noupgrade)
 
-OpenBSDgame(2.6,6.0)
+OpenBSDgame(2647671,6103040)
 
-OpenBSDman(6.4,22.9)
+OpenBSDman(7214515,27535360)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155791,7413760)
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 9d359a52c27..fa32abde1f7 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.32 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.33 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -17,22 +17,22 @@ OpenBSDrd
 
 DistributionDescription(ten)
 
-OpenBSDbase(30.1,88.5,shared)
+OpenBSDbase(30113333,93214720,shared)
 
-OpenBSDcomp(15.6,47.2,shared)
+OpenBSDcomp(15623501,50995200,shared)
 
-OpenBSDetc(1.6,6.2)
+OpenBSDetc(1639637,6768640)
 
-OpenBSDgame(2.6,6.3)
+OpenBSDgame(2644934,6440960)
 
-OpenBSDman(6.4,22.8)
+OpenBSDman(6440419,24627200)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2154746,7413760)
 
-OpenBSDxbase(15.6,86.5)
+OpenBSDxbase(16871579,88238080)
 
-OpenBSDxfont(13.8,58.0)
+OpenBSDxfont(11982138,55439360)
 
-OpenBSDxserv(0.5,1.1)
+OpenBSDxserv(362914,778240)
 
-OpenBSDxshare(1.9,9.4)
+OpenBSDxshare(1662597,9697280)
diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents
index 0fe8038297b..8b79748b5b5 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.8 2004/06/03 07:12:45 mickey Exp $
+dnl	$OpenBSD: contents,v 1.9 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -16,23 +16,24 @@ dnl	installboot	The OpenBSD/MACHINE boot loader installation program
 
 DistributionDescription(nine)
 
-OpenBSDbase(37.7,103.1,shared)
+OpenBSDbase(39580390,108206080,shared)
 
-OpenBSDcomp(26.6,74.2,shared)
+OpenBSDcomp(24762610,77844480,shared)
 
-OpenBSDetc(1.5,6.6)
+OpenBSDetc(1644585,7024640)
 
-OpenBSDgame(2.6,5.9)
+OpenBSDgame(2761912,6256640)
 
-OpenBSDman(6.8,26.2)
+OpenBSDman(7202111,27484160)
 
-OpenBSDmisc(2.0,7.0)
+OpenBSDmisc(2154743,7413760)
 
-OpenBSDxbase(8.6,22.9)
+OpenBSDxbase(9109113,24064000)
 
-OpenBSDxfont(31.9,38.9)
+OpenBSDxfont(33472794,40878080)
 
 dnl Do not list xserv, on purpose. No X11 support yet.
-dnl OpenBSDxserv(6.3,15.0)
+dnl OpenBSDxserv(6682014,15800320)
 dnl
-OpenBSDxshare(1.5,9.2)
+OpenBSDxshare(1660954,9687040)
+
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index e56af2473e7..8fe6dddd7dd 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.48 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.49 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDfloppy
@@ -39,22 +39,22 @@ useful for the installation.
 
 DistributionDescription(ten)
 
-OpenBSDbase(31.0,89.1,shared)
+OpenBSDbase(31860090,96276480,shared)
 
-OpenBSDcomp(17.8,58.6,shared)
+OpenBSDcomp(18588662,63969280,shared)
 
-OpenBSDetc(1.6,6.4)
+OpenBSDetc(1684171,7055360)
 
-OpenBSDgame(2.6,6.0)
+OpenBSDgame(2597542,6133760)
 
-OpenBSDman(6.7,23.7)
+OpenBSDman(6934906,26480640)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155646,7413760)
 
-OpenBSDxbase(11.1,32.8)
+OpenBSDxbase(10999893,33935360)
 
-OpenBSDxfont(32.5,36.0)
+OpenBSDxfont(32497727,39485440)
 
-OpenBSDxserv(15.8,41.1)
+OpenBSDxserv(15762295,41287680)
 
-OpenBSDxshare(1.7,8.4)
+OpenBSDxshare(1658970,9687040)
diff --git a/distrib/notes/luna88k/contents b/distrib/notes/luna88k/contents
index ecd69bbfe17..a38aebf6b5a 100644
--- a/distrib/notes/luna88k/contents
+++ b/distrib/notes/luna88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.1 2004/05/16 21:52:22 miod Exp $
+dnl	$OpenBSD: contents,v 1.2 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -14,17 +14,17 @@ Media" for more information.
 
 DistributionDescription(six)
 
-OpenBSDbase(71.9,179.7)
+OpenBSDbase(75648555,185221120)
 
-OpenBSDcomp(13.0,40.1)
+OpenBSDcomp(13410389,43417600)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1641447,7014400)
 
-OpenBSDgame(6.7,14.8)
+OpenBSDgame(6996160,14929920)
 
-OpenBSDman(6.4,22.8)
+OpenBSDman(6457221,24709120)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2154858,7413760)
 dnl Not there yet...
 dnl
 dnl OpenBSDxbase
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 72b8781c31c..ce07a35d9dd 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.59 2004/05/16 21:52:20 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.60 2004/06/07 11:14:14 mickey Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -80,7 +80,8 @@ dnl                  - empty 2nd arg, for files where only compressed size
 dnl                    is known
 dnl
 define({:-showsize-:},{:-ifelse(X$1,X,,X$2,X,,X,X,{:-
-		 [ $1 MB gzipped, $2 MB uncompressed ]-:})-:})dnl
+		 [ eval($1/1024/1024).eval($1/1024*10/1024%10) MB gzipped, dnl
+eval($2/1024/1024).eval($2/1024*10/1024%10) MB uncompressed ]-:})-:})dnl
 dnl
 dnl
 dnl
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index f398a250244..b1a855b1cf8 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.42 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.43 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -18,25 +18,25 @@ OpenBSDdistsets
 
 DistributionDescription(ten)
 
-OpenBSDbase(30.1,88.5,shared)
+OpenBSDbase(30112721,93214720,shared)
 
-OpenBSDcomp(15.6,47.3,shared)
+OpenBSDcomp(15633129,51056640,shared)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1639119,6881280)
 
-OpenBSDgame(2.6,6.3)
+OpenBSDgame(2644875,6440960)
 
-OpenBSDman(6.4,22.8)
+OpenBSDman(6439419,24627200)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2154619,7413760)
 
-OpenBSDxbase(7.5,22.6)
+OpenBSDxbase(7458678,23470080)
 
-OpenBSDxfont(33.4,37.4)
+OpenBSDxfont(33474161,40878080)
 
-OpenBSDxserv(0.5,1.1)
+OpenBSDxserv(493768,1157120)
 
-OpenBSDxshare(1.7,8.5)
+OpenBSDxshare(1662639,9697280)
 
 The directory '../OSREV/MACHINE/utils' contains a number of utilities for the
 Mac OS to aid the installation and configuration of OpenBSD.  The files are
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 921bf8fbad5..23a586897c3 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.13 2004/03/20 17:20:32 miod Exp $
+dnl	$OpenBSD: contents,v 1.14 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -11,22 +11,22 @@ OpenBSDcd
 
 DistributionDescription(ten)
 
-OpenBSDbase(36.0,102.1,shared)
+OpenBSDbase(36007765,109465600,shared)
 
-OpenBSDcomp(21.1,70.0,shared)
+OpenBSDcomp(22084109,76011520,shared)
 
-OpenBSDetc(1.6,6.4)
+OpenBSDetc(1688276,7065600)
 
-OpenBSDgame(2.7,6.1)
+OpenBSDgame(2677306,6215680)
 
-OpenBSDman(6.7,23.7)
+OpenBSDman(6935078,26480640)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155617,7413760)
 
-OpenBSDxbase(11.2,34.2)
+OpenBSDxbase(11118410,35153920)
 
-OpenBSDxfont(33.5,37.5)
+OpenBSDxfont(33465161,40878080)
 
-OpenBSDxserv(8.9,25.5)
+OpenBSDxserv(8920740,25661440)
 
-OpenBSDxshare(1.7,8.4)
+OpenBSDxshare(1659567,9687040)
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 82bcd201e8f..b0f5eac7e55 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.24 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.25 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -25,20 +25,20 @@ Useful Media" for more information.
 
 DistributionDescription(nine)
 
-OpenBSDbase(30.1,88.7,shared)
+OpenBSDbase(30175243,93378560,shared)
 
-OpenBSDcomp(15.6,47.5,shared)
+OpenBSDcomp(15623790,51015680,shared)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1640383,6881280)
 
-OpenBSDgame(2.6,6.3)
+OpenBSDgame(2644852,6440960)
 
-OpenBSDman(6.4,22.9)
+OpenBSDman(6461657,24719360)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2154977,7413760)
 
-OpenBSDxbase(7.7,23.4)
+OpenBSDxbase(7721088,24268800)
 
-OpenBSDxfont(33.5,37.5)
+OpenBSDxfont(33472248,40878080)
 
-OpenBSDxshare(1.7,8.5)
+OpenBSDxshare(1662291,9697280)
diff --git a/distrib/notes/mvme88k/contents b/distrib/notes/mvme88k/contents
index 90685f43d56..ee9c07d1b82 100644
--- a/distrib/notes/mvme88k/contents
+++ b/distrib/notes/mvme88k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.9 2004/03/27 23:33:09 miod Exp $
+dnl	$OpenBSD: contents,v 1.10 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -25,17 +25,17 @@ Media" for more information.
 
 DistributionDescription(six)
 
-OpenBSDbase(71.9,179.7)
+OpenBSDbase(75826914,185835520)
 
-OpenBSDcomp(13.0,40.1)
+OpenBSDcomp(13168063,42987520)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1644995,7024640)
 
-OpenBSDgame(6.7,14.8)
+OpenBSDgame(7001058,14950400)
 
-OpenBSDman(6.4,22.8)
+OpenBSDman(6257312,24053760)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2154864,7413760)
 dnl Not there yet...
 dnl
 dnl OpenBSDxbase
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index e9c3a47ec59..2900d1a304c 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.48 2004/03/27 23:33:10 miod Exp $
+dnl	$OpenBSD: contents,v 1.49 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDminiroot
@@ -37,22 +37,22 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(ten)
 
-OpenBSDbase(32.3,93.3,shared)
+OpenBSDbase(33179793,100884480,shared)
 
-OpenBSDcomp(19.8,67.1,shared)
+OpenBSDcomp(20614008,72734720,shared)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1649932,6912000)
 
-OpenBSDgame(2.7,6.0)
+OpenBSDgame(2663185,6164480)
 
-OpenBSDman(6.7,23.7)
+OpenBSDman(6931205,26460160)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2154773,7413760)
 
-OpenBSDxbase(10.2,31.1)
+OpenBSDxbase(10232033,32071680)
 
-OpenBSDxfont(33.5,37.5)
+OpenBSDxfont(33471756,40878080)
 
-OpenBSDxserv(7.5,21.1)
+OpenBSDxserv(7477097,21278720)
 
-OpenBSDxshare(1.7,8.4)
+OpenBSDxshare(1661119,9687040)
diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 25e30085215..8dde2ca1b69 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.29 2004/03/27 23:33:10 miod Exp $
+dnl	$OpenBSD: contents,v 1.30 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDminiroot
@@ -50,22 +50,22 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(ten)
 
-OpenBSDbase(36.4,110.5,shared)
+OpenBSDbase(37339613,117821440,shared)
 
-OpenBSDcomp(24.8,90.1,shared)
+OpenBSDcomp(25805978,95846400,shared)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1688934,7065600)
 
-OpenBSDgame(2.8,6.4)
+OpenBSDgame(2754470,6533120)
 
-OpenBSDman(6.9,24.8)
+OpenBSDman(7213528,27535360)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155638,7413760)
 
-OpenBSDxbase(11.4,37.6)
+OpenBSDxbase(11276381,38400000)
 
-OpenBSDxfont(33.5,37.4)
+OpenBSDxfont(33473285,40878080)
 
-OpenBSDxserv(7.5,21.4)
+OpenBSDxserv(7443461,21370880)
 
-OpenBSDxshare(1.7,8.4)
+OpenBSDxshare(1660468,9687040)
diff --git a/distrib/notes/vax/contents b/distrib/notes/vax/contents
index 79a1fc3b007..d765e876719 100644
--- a/distrib/notes/vax/contents
+++ b/distrib/notes/vax/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.15 2004/03/27 23:33:10 miod Exp $
+dnl	$OpenBSD: contents,v 1.16 2004/06/07 11:14:15 mickey Exp $
 TopPart
 
 OpenBSDdistsets
@@ -16,20 +16,20 @@ OpenBSDfloppydesc(single,The)
 
 DistributionDescription(eight)
 
-OpenBSDbase(64.2,143.0)
+OpenBSDbase(65077662,149626880)
 
-OpenBSDcomp(14.0,40.1)
+OpenBSDcomp(14391747,44595200)
 
-OpenBSDetc(1.6,6.3)
+OpenBSDetc(1686957,7065600)
 
-OpenBSDgame(6.1,12.2)
+OpenBSDgame(6134916,12349440)
 
-OpenBSDman(6.4,22.9)
+OpenBSDman(6510801,24893440)
 
-OpenBSDmisc(2.2,7.2)
+OpenBSDmisc(2155736,7413760)
 
-OpenBSDxbase(65.8,110.0)
+OpenBSDxbase(66064672,110970880)
 dnl
-dnl OpenBSDxfont(32.3,35.9)
+dnl OpenBSDxfont(33473285,40878080)
 
-OpenBSDxshare(1.7,8.5)
+OpenBSDxshare(1688973,9728000)