X and other apps need cpp to function; without the comp package cpp does

not function; this moves cpp and necessary files into base. ok deraadt@

13 files changed, 0 insertions, 37 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 6bdaf4d5c62..1c49d8d9dc5 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -70,8 +70,6 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/ieee
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/ieee/libgcc.a
@@ -110,7 +108,6 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/include/va-v850.h
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/include/varargs.h
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index 7efc091de8a..2380b46190e 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -83,8 +83,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC/libgcc.a
@@ -99,7 +97,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.arc b/distrib/sets/lists/comp/md.arc
index e0a763785c4..453c9e0c0e4 100644
--- a/distrib/sets/lists/comp/md.arc
+++ b/distrib/sets/lists/comp/md.arc
@@ -103,7 +103,6 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/cc1
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/cc1obj
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/cc1plus
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/cpp
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/f771
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/include/README
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/include/f2c.h
@@ -124,7 +123,6 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/libf2c.a
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/libgcc.a
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/libobjc.a
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.8.1/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libc_r_pic.a
 ./usr/lib/libcrypto_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index db2a70d6099..45dc6fbdbac 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -78,8 +78,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC/libgcc.a
@@ -94,7 +92,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 81231d87ecd..d289b6373ab 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -72,8 +72,6 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/fpic
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/fpic/libgcc.a
@@ -86,7 +84,6 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 11c68df1935..4d50beeb8a9 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -88,8 +88,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC/libgcc.a
@@ -104,7 +102,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index c6aa138645a..88e7f828cd0 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -81,8 +81,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC/libgcc.a
@@ -97,7 +95,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 637766bcde9..21df6bcda0e 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -61,7 +61,6 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cc1
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cc1obj
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cpp
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/f771
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/README
@@ -83,7 +82,6 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/libf2c.a
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/libgcc.a
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/libobjc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/specs
 ./usr/lib/gcrt0.o
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
diff --git a/distrib/sets/lists/comp/md.pmax b/distrib/sets/lists/comp/md.pmax
index d12cec69973..282839dd3fa 100644
--- a/distrib/sets/lists/comp/md.pmax
+++ b/distrib/sets/lists/comp/md.pmax
@@ -114,8 +114,6 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/include/README
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/include/exception
@@ -126,7 +124,6 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.powerpc b/distrib/sets/lists/comp/md.powerpc
index 23a9e86670d..7a97ee84672 100644
--- a/distrib/sets/lists/comp/md.powerpc
+++ b/distrib/sets/lists/comp/md.powerpc
@@ -69,8 +69,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/include/README
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/include/exception
@@ -83,7 +81,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/soft-float/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 416606f4918..6a02807b5b6 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -69,8 +69,6 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/fPIC
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/fPIC/libgcc.a
@@ -85,7 +83,6 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.sun3 b/distrib/sets/lists/comp/md.sun3
index 6878b686aea..a5908f86563 100644
--- a/distrib/sets/lists/comp/md.sun3
+++ b/distrib/sets/lists/comp/md.sun3
@@ -95,8 +95,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/fPIC/libgcc.a
@@ -111,7 +109,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index ccd32b7af51..c65ca920f53 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -67,8 +67,6 @@
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/cc1
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/cc1obj
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/cpp0
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/f771
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/include/README
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/include/exception
@@ -79,7 +77,6 @@
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/libgcc.a
-./usr/lib/gcc-lib/vax-unknown-openbsd2.8/2.95.3/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a