26 files changed, 0 insertions, 971 deletions
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
deleted file mode 100644
index 234a336db..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-keymapdir = $(xkb_base)/keymap/sgi_vndr
-
-dist_keymap_DATA = \
-be bg ca \
-ch cz de \
-dk dvorak \
-es fi \
-fr gb \
-hu it jp \
-no pl pt \
-ru se sk \
-th us
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/be b/xorg-server/xkbdata.src/keymap/sgi_vndr/be
deleted file mode 100644
index 9905f0ba6..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/be
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg b/xorg-server/xkbdata.src/keymap/sgi_vndr/bg
deleted file mode 100644
index a3cb08a22..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/bg
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "us(pc_universal)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols { 
-	include "us(pc102)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca b/xorg-server/xkbdata.src/keymap/sgi_vndr/ca
deleted file mode 100644
index 38f489657..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ca
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch b/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
deleted file mode 100644
index 6970a3679..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ch
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "de_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "de_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "de_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "de_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
-default xkb_keymap "fr_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "fr_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "fr_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "fr_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz b/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
deleted file mode 100644
index 6673b615b..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/cz
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/de b/xorg-server/xkbdata.src/keymap/sgi_vndr/de
deleted file mode 100644
index 1ad7fe7b0..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/de
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols {
-	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk b/xorg-server/xkbdata.src/keymap/sgi_vndr/dk
deleted file mode 100644
index 832f01da7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/dk
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak b/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak
deleted file mode 100644
index bd594b0eb..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/dvorak
+++ /dev/null
@@ -1,15 +0,0 @@
-// $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US b/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US
deleted file mode 100644
index 29f1666b7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/en_US
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy101" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indy101_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"			};
-};
-xkb_keymap "indy104" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc_universal)"	};
-    xkb_geometry	{ include "microsoft(natural)"	};
-};
-xkb_keymap "indy104_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
-    xkb_geometry	{ include "microsoft(natural)"			};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/es b/xorg-server/xkbdata.src/keymap/sgi_vndr/es
deleted file mode 100644
index f1aad9a7a..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/es
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi b/xorg-server/xkbdata.src/keymap/sgi_vndr/fi
deleted file mode 100644
index 67af07eb7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/fi
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr b/xorg-server/xkbdata.src/keymap/sgi_vndr/fr
deleted file mode 100644
index b6aea29de..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/fr
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb b/xorg-server/xkbdata.src/keymap/sgi_vndr/gb
deleted file mode 100644
index 6fa6d6515..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/gb
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu b/xorg-server/xkbdata.src/keymap/sgi_vndr/hu
deleted file mode 100644
index 3c256846e..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/hu
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/it b/xorg-server/xkbdata.src/keymap/sgi_vndr/it
deleted file mode 100644
index ed92227b7..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/it
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp b/xorg-server/xkbdata.src/keymap/sgi_vndr/jp
deleted file mode 100644
index 74ed4243c..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/jp
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};
-    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile b/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
deleted file mode 100644
index d2cb6083e..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1)
-endif
-
-DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sgi_vndr
-
-dist_keymap_DATA = \
-be bg ca \
-ch cz de \
-dk dvorak \
-es fi \
-fr gb \
-hu it jp \
-no pl pt \
-ru se sk \
-th us
-
-DATA_FILES=$(dist_keymap_DATA:%=$(DESTDIR)\%)
-
-include ..\..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/no b/xorg-server/xkbdata.src/keymap/sgi_vndr/no
deleted file mode 100644
index fd32c72c0..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/no
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl b/xorg-server/xkbdata.src/keymap/sgi_vndr/pl
deleted file mode 100644
index 3641a31ad..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/pl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt b/xorg-server/xkbdata.src/keymap/sgi_vndr/pt
deleted file mode 100644
index 3ec03471a..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/pt
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru b/xorg-server/xkbdata.src/keymap/sgi_vndr/ru
deleted file mode 100644
index fc514d87c..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/ru
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/se b/xorg-server/xkbdata.src/keymap/sgi_vndr/se
deleted file mode 100644
index 910a8cc89..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/se
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk b/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
deleted file mode 100644
index 09b6a2956..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/sk
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/th b/xorg-server/xkbdata.src/keymap/sgi_vndr/th
deleted file mode 100644
index aa03c8c11..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/th
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal)+th+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/us b/xorg-server/xkbdata.src/keymap/sgi_vndr/us
deleted file mode 100644
index 5850145ca..000000000
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/us
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indy101_euro" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indy_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101compose)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo101_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101euro)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};