Why make things simple when you can make them overcomplicated, etc. Doh.

Much cleaner this way...

10 files changed, 26 insertions, 26 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index 9e2b9e07b89..5c092854260 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -19,9 +19,9 @@ OpenBSDfloppydesc
 
 DistributionDescription(ten)
 
-OpenBSDbase(shared,49.9M,133.6M)
+OpenBSDbase(49.9M,133.6M,shared)
 
-OpenBSDcomp(shared,18.0M,65.6M)
+OpenBSDcomp(18.0M,65.6M,shared)
 
 OpenBSDetc(160.6K,720.0K)
 
diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index fe759adcbce..17a84ac507a 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -30,9 +30,9 @@ Installation/upgrade miniroot file system:
 
 DistributionDescription(ten)
 
-OpenBSDbase(shared,19.3M,61.4M)
+OpenBSDbase(19.3M,61.4M,shared)
 
-OpenBSDcomp(shared,13.1M,30.6M)
+OpenBSDcomp(13.1M,30.6M,shared)
 
 OpenBSDetc(982.6K,3.3M)
 
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index c4417194b4c..228dacb77c8 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -17,9 +17,9 @@ OpenBSDrd
 
 DistributionDescription(ten)
 
-OpenBSDbase(shared,16.5M,49.6M)
+OpenBSDbase(16.5M,49.6M,shared)
 
-OpenBSDcomp(shared,10.6M,33.5M)
+OpenBSDcomp(10.6M,33.5M,shared)
 
 OpenBSDetc(162.4K,730.0K)
 
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index e01109edb32..17d8f320bc3 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -31,9 +31,9 @@ useful for the installation.
 
 DistributionDescription(eleven)
 
-OpenBSDbase(shared,17.4M,49.2M)
+OpenBSDbase(17.4M,49.2M,shared)
 
-OpenBSDcomp(shared,11.2M,34.7M)
+OpenBSDcomp(11.2M,34.7M,shared)
 
 OpenBSDetc(161.5K,730.0K)
 
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 2acd353a4d9..803aef555cf 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.16 2001/09/24 19:31:43 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.17 2001/09/24 20:13:22 miod Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -59,29 +59,29 @@ the "MACHINE" subdirectory of the OpenBSD OSREV distribution tree,
 and are as follows:-:})dnl
 dnl
 dnl
-dnl OpenBSDbase( compressed size, uncompressed size )
+dnl OpenBSDbase( compressed size, uncompressed size [, shared])
 dnl
 define({:-OpenBSDbase-:},
 {:-	base{:--:}OSrev	 The OpenBSD/MACHINE OSREV base binary distribution.  You
 		 MUST install this distribution set.  It contains the
 		 base OpenBSD utilities that are necessary for the
-		 system to run and be minimally functional.
-		 ifelse(X$1,Xshared,{:-It includes shared library support, and excludes
-		 everything described below.showsize($2,$3)-:},showsize($1,$2))-:})dnl
+		 system to run and be minimally functional.ifelse(X$3,Xshared,{:-
+		 It includes shared library support, and excludes
+		 everything described below.-:})showsize($1,$2)-:})dnl
 dnl
 dnl
-dnl OpenBSDcomp( compressed size, uncompressed size )
+dnl OpenBSDcomp( compressed size, uncompressed size [, shared])
 dnl
 define({:-OpenBSDcomp-:},
 {:-	comp{:--:}OSrev	 The OpenBSD/MACHINE Compiler tools.  All of the tools
 		 relating to C, C++, and FORTRAN (yes, there are two!) are
 		 supported.  This set includes the system {:-include-:} files
 		 (/usr/{:-include-:}), the linker, the compiler tool chain,
-		 and the various system libraries{:--:}ifelse(X$1,Xshared,{:- (except the shared
+		 and the various system libraries{:--:}ifelse(X$3,Xshared,{:- (except the shared
 		 libraries, which are included as part of the base set).-:},.)
 		 This set also includes the manual pages for all
 		 of the utilities it contains, as well as the system
-		 call and library manual pages.ifelse(X$1,Xshared,showsize($2,$3),showsize($1.$2))-:})dnl
+		 call and library manual pages.showsize($1,$2)-:})dnl
 dnl
 dnl
 dnl OpenBSDetc( compressed size, uncompressed size )
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 8ac4bbd03c5..db6859b5130 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -21,9 +21,9 @@ OpenBSDdistsets
 
 DistributionDescription(ten)
 
-OpenBSDbase(shared,16.0M,47.4M)
+OpenBSDbase(16.0M,47.4M,shared)
 
-OpenBSDcomp(shared,10.6M,33.6M)
+OpenBSDcomp(10.6M,33.6M,shared)
 
 OpenBSDetc(160.1K,690.0K)
 
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 5480c45688f..4404858b3a4 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -100,9 +100,9 @@ NOTES:
 
 DistributionDescription(ten)
 
-OpenBSDbase(shared,23.4M,70.8M)
+OpenBSDbase(23.4M,70.8M,shared)
 
-OpenBSDcomp(shared,19.7M,68.0M)
+OpenBSDcomp(19.7M,68.0M,shared)
 
 OpenBSDetc(1.0M,3.5M)
 
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 8e7da2b9bbb..171401b4215 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -24,9 +24,9 @@ Useful Media" for more information.
 
 DistributionDescription(nine)
 
-OpenBSDbase(shared,11.2M,33.9M)
+OpenBSDbase(11.2M,33.9M,shared)
 
-OpenBSDcomp(shared,7.0M,23.5M)
+OpenBSDcomp(7.0M,23.5M,shared)
 
 OpenBSDetc(92K,490K)
 
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index bc3d3606fb3..d09e052b133 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -56,9 +56,9 @@ Bootable installation images:
 
 DistributionDescription(ten)
 
-OpenBSDbase(shared,18.4M,56.4M)
+OpenBSDbase(18.4M,56.4M,shared)
 
-OpenBSDcomp(shared,12.1M,39.7M)
+OpenBSDcomp(12.1M,39.7M,shared)
 
 OpenBSDetc(165.2K,740.0K)
 
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 1a9ee525548..1eb6964e2e2 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -20,9 +20,9 @@ the OpenBSD System onto Useful Media" for instructions on either method.
 
 DistributionDescription(nine)
 
-OpenBSDbase(shared,21.1M,63.6M)
+OpenBSDbase(21.1M,63.6M,shared)
 
-OpenBSDcomp(shared,14.2M,42.0M)
+OpenBSDcomp(14.2M,42.0M,shared)
 
 OpenBSDetc(1.0M,3.2M)