Merge remote-tracking branch 'illumos/master' into gcc/upgrade

Conflicts:
	usr/src/common/dis/i386/dis_tables.c

46 files changed, 115 insertions, 3370 deletions

diff --git a/usr/src/lib/libdtrace/common/dt_cc.c b/usr/src/lib/libdtrace/common/dt_cc.c
index e1b794edbf..60eb152e0a 100644
--- a/usr/src/lib/libdtrace/common/dt_cc.c
+++ b/usr/src/lib/libdtrace/common/dt_cc.c
@@ -684,7 +684,8 @@ dt_action_tracemem(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
 	dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
 
 	dt_node_t *addr = dnp->dn_args;
-	dt_node_t *size = dnp->dn_args->dn_list;
+	dt_node_t *max = dnp->dn_args->dn_list;
+	dt_node_t *size;
 
 	char n[DT_TYPE_NAMELEN];
 
@@ -696,17 +697,37 @@ dt_action_tracemem(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
 		    dt_node_type_name(addr, n, sizeof (n)));
 	}
 
-	if (dt_node_is_posconst(size) == 0) {
-		dnerror(size, D_TRACEMEM_SIZE, "tracemem( ) argument #2 must "
+	if (dt_node_is_posconst(max) == 0) {
+		dnerror(max, D_TRACEMEM_SIZE, "tracemem( ) argument #2 must "
 		    "be a non-zero positive integral constant expression\n");
 	}
 
+	if ((size = max->dn_list) != NULL) {
+		if (size->dn_list != NULL) {
+			dnerror(size, D_TRACEMEM_ARGS, "tracemem ( ) prototype "
+			    "mismatch: expected at most 3 args\n");
+		}
+
+		if (!dt_node_is_scalar(size)) {
+			dnerror(size, D_TRACEMEM_DYNSIZE, "tracemem ( ) "
+			    "dynamic size (argument #3) must be of "
+			    "scalar type\n");
+		}
+
+		dt_cg(yypcb, size);
+		ap->dtad_difo = dt_as(yypcb);
+		ap->dtad_difo->dtdo_rtype = dt_int_rtype;
+		ap->dtad_kind = DTRACEACT_TRACEMEM_DYNSIZE;
+
+		ap = dt_stmt_action(dtp, sdp);
+	}
+
 	dt_cg(yypcb, addr);
 	ap->dtad_difo = dt_as(yypcb);
-	ap->dtad_kind = DTRACEACT_DIFEXPR;
+	ap->dtad_kind = DTRACEACT_TRACEMEM;
 
 	ap->dtad_difo->dtdo_rtype.dtdt_flags |= DIF_TF_BYREF;
-	ap->dtad_difo->dtdo_rtype.dtdt_size = size->dn_value;
+	ap->dtad_difo->dtdo_rtype.dtdt_size = max->dn_value;
 }
 
 static void
diff --git a/usr/src/lib/libdtrace/common/dt_consume.c b/usr/src/lib/libdtrace/common/dt_consume.c
index b8eb7cc344..2635cb5e4a 100644
--- a/usr/src/lib/libdtrace/common/dt_consume.c
+++ b/usr/src/lib/libdtrace/common/dt_consume.c
@@ -827,7 +827,7 @@ dt_print_stddev(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
 /*ARGSUSED*/
 int
 dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
-    size_t nbytes, int width, int quiet)
+    size_t nbytes, int width, int quiet, int forceraw)
 {
 	/*
 	 * If the byte stream is a series of printable characters, followed by
@@ -840,6 +840,9 @@ dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
 	if (nbytes == 0)
 		return (0);
 
+	if (forceraw)
+		goto raw;
+
 	if (dtp->dt_options[DTRACEOPT_RAWBYTES] != DTRACEOPT_UNSET)
 		goto raw;
 
@@ -1550,7 +1553,7 @@ dt_print_datum(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
 		    (uint32_t)normal);
 		break;
 	default:
-		err = dt_print_bytes(dtp, fp, addr, size, 50, 0);
+		err = dt_print_bytes(dtp, fp, addr, size, 50, 0, 0);
 		break;
 	}
 
@@ -1705,6 +1708,7 @@ dt_consume_cpu(dtrace_hdl_t *dtp, FILE *fp, int cpu, dtrace_bufdesc_t *buf,
 	int quiet = (dtp->dt_options[DTRACEOPT_QUIET] != DTRACEOPT_UNSET);
 	int rval, i, n;
 	dtrace_epid_t last = DTRACE_EPIDNONE;
+	uint64_t tracememsize = 0;
 	dtrace_probedata_t data;
 	uint64_t drops;
 	caddr_t addr;
@@ -1873,6 +1877,12 @@ again:
 				}
 			}
 
+			if (act == DTRACEACT_TRACEMEM_DYNSIZE &&
+			    rec->dtrd_size == sizeof (uint64_t)) {
+				tracememsize = *((unsigned long long *)addr);
+				continue;
+			}
+
 			rval = (*rfunc)(&data, rec, arg);
 
 			if (rval == DTRACE_CONSUME_NEXT)
@@ -2032,6 +2042,23 @@ nofmt:
 				goto nextrec;
 			}
 
+			if (act == DTRACEACT_TRACEMEM) {
+				if (tracememsize == 0 ||
+				    tracememsize > rec->dtrd_size) {
+					tracememsize = rec->dtrd_size;
+				}
+
+				n = dt_print_bytes(dtp, fp, addr,
+				    tracememsize, 33, quiet, 1);
+
+				tracememsize = 0;
+
+				if (n < 0)
+					return (-1);
+
+				goto nextrec;
+			}
+
 			switch (rec->dtrd_size) {
 			case sizeof (uint64_t):
 				n = dt_printf(dtp, fp,
@@ -2055,7 +2082,7 @@ nofmt:
 				break;
 			default:
 				n = dt_print_bytes(dtp, fp, addr,
-				    rec->dtrd_size, 33, quiet);
+				    rec->dtrd_size, 33, quiet, 0);
 				break;
 			}
 
diff --git a/usr/src/lib/libdtrace/common/dt_errtags.h b/usr/src/lib/libdtrace/common/dt_errtags.h
index ed5d619de0..106ee1847e 100644
--- a/usr/src/lib/libdtrace/common/dt_errtags.h
+++ b/usr/src/lib/libdtrace/common/dt_errtags.h
@@ -191,6 +191,8 @@ typedef enum {
 	D_TRACE_DYN,			/* trace() argument has dynamic type */
 	D_TRACEMEM_ADDR,		/* tracemem() address bad type */
 	D_TRACEMEM_SIZE,		/* tracemem() size bad type */
+	D_TRACEMEM_ARGS,		/* tracemem() illegal number of args */
+	D_TRACEMEM_DYNSIZE,		/* tracemem() dynamic size bad type */
 	D_STACK_PROTO,			/* stack() prototype mismatch */
 	D_STACK_SIZE,			/* stack() size argument bad type */
 	D_USTACK_FRAMES,		/* ustack() frames arg bad type */
diff --git a/usr/src/lib/libdtrace/common/dt_open.c b/usr/src/lib/libdtrace/common/dt_open.c
index d5259c9a2e..211ff67276 100644
--- a/usr/src/lib/libdtrace/common/dt_open.c
+++ b/usr/src/lib/libdtrace/common/dt_open.c
@@ -105,8 +105,11 @@
 #define	DT_VERS_1_6_2	DT_VERSION_NUMBER(1, 6, 2)
 #define	DT_VERS_1_6_3	DT_VERSION_NUMBER(1, 6, 3)
 #define	DT_VERS_1_7	DT_VERSION_NUMBER(1, 7, 0)
-#define	DT_VERS_LATEST	DT_VERS_1_7
-#define	DT_VERS_STRING	"Sun D 1.7"
+#define	DT_VERS_1_7_1	DT_VERSION_NUMBER(1, 7, 1)
+#define	DT_VERS_1_8	DT_VERSION_NUMBER(1, 8, 0)
+#define	DT_VERS_1_8_1	DT_VERSION_NUMBER(1, 8, 1)
+#define	DT_VERS_LATEST	DT_VERS_1_8_1
+#define	DT_VERS_STRING	"Sun D 1.8.1"
 
 const dt_version_t _dtrace_versions[] = {
 	DT_VERS_1_0,	/* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */
@@ -123,6 +126,9 @@ const dt_version_t _dtrace_versions[] = {
 	DT_VERS_1_6_2,	/* D API 1.6.2 */
 	DT_VERS_1_6_3,	/* D API 1.6.3 */
 	DT_VERS_1_7,	/* D API 1.7 */
+	DT_VERS_1_7_1,	/* D API 1.7.1 */
+	DT_VERS_1_8,	/* D API 1.8 */
+	DT_VERS_1_8_1,	/* D API 1.8.1 */
 	0
 };
 
@@ -253,7 +259,7 @@ static const dt_ident_t _dtrace_globals[] = {
 { "jstack", DT_IDENT_ACTFUNC, 0, DT_ACT_JSTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "stack(...)" },
 { "lltostr", DT_IDENT_FUNC, 0, DIF_SUBR_LLTOSTR, DT_ATTR_STABCMN, DT_VERS_1_0,
-	&dt_idops_func, "string(int64_t)" },
+	&dt_idops_func, "string(int64_t, [int])" },
 { "llquantize", DT_IDENT_AGGFUNC, 0, DTRACEAGG_LLQUANTIZE, DT_ATTR_STABCMN,
 	DT_VERS_1_7, &dt_idops_func,
 	"void(@, int32_t, int32_t, int32_t, int32_t, ...)" },
@@ -377,11 +383,15 @@ static const dt_ident_t _dtrace_globals[] = {
 { "timestamp", DT_IDENT_SCALAR, 0, DIF_VAR_TIMESTAMP,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uint64_t" },
+{ "tolower", DT_IDENT_FUNC, 0, DIF_SUBR_TOLOWER, DT_ATTR_STABCMN, DT_VERS_1_8,
+	&dt_idops_func, "string(const char *)" },
+{ "toupper", DT_IDENT_FUNC, 0, DIF_SUBR_TOUPPER, DT_ATTR_STABCMN, DT_VERS_1_8,
+	&dt_idops_func, "string(const char *)" },
 { "trace", DT_IDENT_ACTFUNC, 0, DT_ACT_TRACE, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "void(@)" },
 { "tracemem", DT_IDENT_ACTFUNC, 0, DT_ACT_TRACEMEM,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
-	&dt_idops_func, "void(@, size_t)" },
+	&dt_idops_func, "void(@, size_t, ...)" },
 { "trunc", DT_IDENT_ACTFUNC, 0, DT_ACT_TRUNC, DT_ATTR_STABCMN,
 	DT_VERS_1_0, &dt_idops_func, "void(...)" },
 { "uaddr", DT_IDENT_ACTFUNC, 0, DT_ACT_UADDR, DT_ATTR_STABCMN,
diff --git a/usr/src/lib/libdtrace/common/dt_options.c b/usr/src/lib/libdtrace/common/dt_options.c
index 5353bfae52..426f8cb73c 100644
--- a/usr/src/lib/libdtrace/common/dt_options.c
+++ b/usr/src/lib/libdtrace/common/dt_options.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/resource.h>
 #include <sys/mman.h>
 #include <sys/types.h>
@@ -837,30 +835,6 @@ dt_options_load(dtrace_hdl_t *dtp)
 	return (0);
 }
 
-/*ARGSUSED*/
-static int
-dt_opt_preallocate(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
-{
-	dtrace_optval_t size;
-	void *p;
-
-	if (arg == NULL || dt_optval_parse(arg, &size) != 0)
-		return (dt_set_errno(dtp, EDT_BADOPTVAL));
-
-	if (size > SIZE_MAX)
-		size = SIZE_MAX;
-
-	if ((p = dt_zalloc(dtp, size)) == NULL) {
-		do {
-			size /= 2;
-		} while ((p = dt_zalloc(dtp, size)) == NULL);
-	}
-
-	dt_free(dtp, p);
-
-	return (0);
-}
-
 typedef struct dt_option {
 	const char *o_name;
 	int (*o_func)(dtrace_hdl_t *, const char *, uintptr_t);
@@ -899,7 +873,6 @@ static const dt_option_t _dtrace_ctoptions[] = {
 	{ "linktype", dt_opt_linktype },
 	{ "nolibs", dt_opt_cflags, DTRACE_C_NOLIBS },
 	{ "pgmax", dt_opt_pgmax },
-	{ "preallocate", dt_opt_preallocate },
 	{ "pspec", dt_opt_cflags, DTRACE_C_PSPEC },
 	{ "stdc", dt_opt_stdc },
 	{ "strip", dt_opt_dflags, DTRACE_D_STRIP },
diff --git a/usr/src/lib/libdtrace/common/dt_parser.c b/usr/src/lib/libdtrace/common/dt_parser.c
index 6ad30a9ac5..05715894a7 100644
--- a/usr/src/lib/libdtrace/common/dt_parser.c
+++ b/usr/src/lib/libdtrace/common/dt_parser.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Joyent Inc. All rights reserved.
  */
 
 /*
@@ -719,12 +720,19 @@ dt_node_type_name(const dt_node_t *dnp, char *buf, size_t len)
 size_t
 dt_node_type_size(const dt_node_t *dnp)
 {
+	ctf_id_t base;
+
 	if (dnp->dn_kind == DT_NODE_STRING)
 		return (strlen(dnp->dn_string) + 1);
 
 	if (dt_node_is_dynamic(dnp) && dnp->dn_ident != NULL)
 		return (dt_ident_size(dnp->dn_ident));
 
+	base = ctf_type_resolve(dnp->dn_ctfp, dnp->dn_type);
+
+	if (ctf_type_kind(dnp->dn_ctfp, base) == CTF_K_FORWARD)
+		return (0);
+
 	return (ctf_type_size(dnp->dn_ctfp, dnp->dn_type));
 }
 
diff --git a/usr/src/lib/libdtrace_jni/common/dtj_consume.c b/usr/src/lib/libdtrace_jni/common/dtj_consume.c
index 7b168fd927..78f6474522 100644
--- a/usr/src/lib/libdtrace_jni/common/dtj_consume.c
+++ b/usr/src/lib/libdtrace_jni/common/dtj_consume.c
@@ -731,6 +731,7 @@ dtj_chewrec(const dtrace_probedata_t *data, const dtrace_recdesc_t *rec,
 
 	switch (act) {
 	case DTRACEACT_DIFEXPR:
+	case DTRACEACT_TRACEMEM:
 		if (rec->dtrd_size == 0) {
 			/*
 			 * The current record is not a D action, but a program
@@ -1075,6 +1076,7 @@ dtj_bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
 
 	switch (act) {
 	case DTRACEACT_DIFEXPR:
+	case DTRACEACT_TRACEMEM:
 		/* trace() action */
 		break;
 	case DTRACEACT_PRINTF:
diff --git a/usr/src/lib/librpcsvc/common/bindresvport.c b/usr/src/lib/librpcsvc/common/bindresvport.c
index 69bf6bf4b9..d8e9a098e5 100644
--- a/usr/src/lib/librpcsvc/common/bindresvport.c
+++ b/usr/src/lib/librpcsvc/common/bindresvport.c
@@ -18,10 +18,11 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- */
-/*
+ *
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
@@ -32,8 +33,6 @@
  * under license from the Regents of the University of California.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * XXX This routine should be changed to use
  * ND_CHECK_RESERVED_PORT and ND_SET_RESERVED_PORT
@@ -85,7 +84,7 @@ __clnt_bindresvport(cl)
 		return (-1);
 	if ((nconf->nc_semantics != NC_TPI_CLTS) ||
 		(strcmp(nconf->nc_protofmly, NC_INET) &&
-		strcmp(nconf->nc_protofmly, NC_INET)) ||
+		strcmp(nconf->nc_protofmly, NC_INET6)) ||
 		strcmp(nconf->nc_proto, NC_UDP)) {
 		freenetconfigent(nconf);
 		return (0);	/* not udp - don't need resv port */
@@ -159,7 +158,10 @@ __clnt_bindresvport(cl)
 	port = (getpid() % NPORTS) + STARTPORT;
 
 	for (i = 0; i < NPORTS; i++) {
-		sin->sin_port = htons(port++);
+		if (ipv6_fl == TRUE)
+			sin6->sin6_port = htons(port++);
+		else
+			sin->sin_port = htons(port++);
 		if (port > ENDPORT)
 			port = STARTPORT;
 		/*
diff --git a/usr/src/lib/libumem/common/umem_update_thread.c b/usr/src/lib/libumem/common/umem_update_thread.c
index f9a6615f5a..5b393cfb13 100644
--- a/usr/src/lib/libumem/common/umem_update_thread.c
+++ b/usr/src/lib/libumem/common/umem_update_thread.c
@@ -27,6 +27,8 @@
 #include "umem_base.h"
 #include "vmem_base.h"
 
+#include <sys/ccompile.h>
+
 #include <signal.h>
 
 /*ARGSUSED*/
diff --git a/usr/src/lib/libxcurses/src/terminfo/Makefile b/usr/src/lib/libxcurses/src/terminfo/Makefile
deleted file mode 100644
index 3a2863c6c8..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libxcurses/src/terminfo/Makefile
-#
-
-all:
-	@echo these terminfo entries are not currently used by Solaris
-	@echo use entries in usr/src/cmd/terminfo
diff --git a/usr/src/lib/libxcurses/src/terminfo/adds b/usr/src/lib/libxcurses/src/terminfo/adds
deleted file mode 100644
index b97bf2d8a1..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/adds
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# adds: ADDS
-#
-# Regent: lowest common denominator, works on all regents.
-regent|adds regent series,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, clear=^L,
-	cup=^K%p1%' '%+%c^P%p1%{10}%/%{16}%*%p1%{10}%m%+%c,
-	cols#80, home=^A, lines#24, ll=^A^Z, cuf1=^F, cuu1=^Z,
-# Regent 100 has a bug where if computer sends escape when user is holding
-# down shift key it gets confused, so we avoid escape.
-regent100|adds regent 100,
-	cup=^K%p1%' '%+%c^P%p1%{10}%/%{16}%*%p1%{10}%m%+%c,
-	kf1=^B1\r, kf2=^B2\r, kf3=^B3\r, kf4=^B4\r,
-	kf5=^B5\r, kf6=^B6\r, kf7=^B7\r, kf8=^B8\r,
-	khome=^A, kcub1=^U, kcuf1=^F, kcuu1=^Z, kcud1=^J, use=regent,
-# Regent 20, untested
-regent20|adds regent 20,
-	ed=\Ek, el=\EK, cup=\EY%p1%' '%+%c%p2%' '%+%c, use=regent,
-regent25|adds regent 25,
-	kf0=^B0\r, kf1=^B1\r, kf2=^B2\r, kf3=^B3\r, kf4=^B4\r,
-	kf5=^B5\r, kf6=^B6\r, kf7=^B7\r, kf8=^B8\r, kf9=^B9\r,
-	khome=^A, kcub1=^U, kcuf1=^F, kcuu1=^Z, kcud1=^J, use=regent20,
-# Regent 40: untested
-regent40|adds regent 40,
-	il1=\EM, dl1=\El, is2=\EB, rmso=\E0@, smso=\E0P,
-	rmul=\E0@, smul=\E0`, flash=\ED\Ed, use=regent25,
-# If you have standout problem with regent 200, try smso=\ER\EOP,rmso=\E0@\EV,
-regent60|regent200|adds Regent 60,
-	dch1=\EE, rmir=\EF, smir=\EF, is2=\EV\EB, use=regent40,
-regent60na|regent 60 w/no arrow keys,
-	kcub1@, kcuf1@, kcuu1@, kcud1@, use=regent60,
-# Note: if return acts weird on a980, check internal switch #2
-# on the top chip on the CONTROL pad board.
-a980|adds consul 980,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\E^N$<13>, am, cub1=^H,
-	clear=^L$<1>^K@, cup=^K%p1%'@'%+%c\E^E%p1%2d, cols#80, dl1=\E^O$<13>,
-	kf0=\E0, kf1=\E1, kf2=\E2, kf3=\E3, kf4=\E4,
-	kf5=\E5, kf6=\E6, kf7=\E7, kf8=\E8, kf9=\E9,
-	lines#24, cuf1=\E^E01, smso=^Y^^^N, rmso=^O, cuu1=$<9>,
-# From Onyx:edward  Thu Jul  9 09:27:33 1981
-viewpoint|addsviewpoint|adds viewpoint,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, lines#24, cols#80,
-	cup=\EY%p1%' '%+%c%p2%' '%+%c, ed=\Ek, el=\EK, cuf1=^F,
-	cuu1=^Z, clear=^L, ll=^A, kcub1=^U, kcuf1=^F, kcud1=^J, kcuu1=^Z, khome=^A,
-	smso=^N, rmso=^O, smul=^N, rmul=^O, is2=^O\E0`, cvvis=^O\E0P, cnorm=^O\E0`,
diff --git a/usr/src/lib/libxcurses/src/terminfo/annarbor b/usr/src/lib/libxcurses/src/terminfo/annarbor
deleted file mode 100644
index 0ff0619b5e..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/annarbor
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# annarbor: ANN ARBOR
-#
-aa|annarbor|4080|ann arbor 4080,
-	cr=^M, cud1=^J, ind=^J, bel=^G, tbc=^\^P^P, hts=^]^P1,
-	cup=^O%p2%{10}%/%{16}%*%p2%{10}%m%+%c%p1%?%p1%{19}%>%t%{12}%+%;%'@'%+%c,
-	cols#80, lines#40, cub1=^H, clear=^L$<2>, cuu1=^N, cuf1=^_,
-	home=^K, am, kbs=^^, kcud1=^J, kcuu1=^N, kcub1=^H, kcuf1=^_, khome=^K,
-# From cbosg!chico!randvax!day Aug 1981
-# alias aaa 'setenv TERM aaa-\!^; tset -e^H -Q; alias clr echo "^[\[2J^[\[H"'
-# Be sure to change ^[ to escape in above alias.  Needs function keys added.
-# The ann arbor ambassador entries are merged from Mike O'Brien@Rand
-# and Howard Katseff at Bell Labs, and are not thoroughly tested.
-# Highly modified 6/22 by Mike O'Brien.
-# split out into several for the various screen sizes by dave-yost@rand
-# Many changes by Mark Horton 3/82
-aaa-unk|ann arbor ambassador (internal - don't use this directly),
-	am, km, mir, xon, cols#80, it#8,
-	cr=^M, ht=^I, cbt=\E[Z, bel=^G, ind=^J, ri=\EM,
-	cuu1=\E[A, cuf1=\E[C, cud1=^J, cub1=^H,
-	cuu=\E[%p1%dA, cuf=\E[%p1%dC, cud=\E[%p1%dB, cub=\E[%p1%dD,
-	ed=\E[J, el=\E[K$<5>, clear=\E[H\E[J$<156>,
-	home=\E[H, cup=\E[%i%p1%d;%p2%dH,
-	hpa=\E[%p1%{1}%+%d`, vpa=\E[%p1%{1}%+%dd,
-	dl=\E[%p1%dM,  dl1=\E[M,  il=\E[%p1%dL$<3*>,  il1=\E[L$<3>,
-	dch=\E[%p1%dP, dch1=\E[P, .ich=\E[%p1%d@$<4*>, .ich1=\E[@$<4>,
-	smir=\E[>4h, rmir=\E[>4l,
-	smul=\E[4m, rmul=\E[m, smso=\E[1m, rmso=\E[m,
-	bold=\E[1m, rev=\E[7m, blink=\E[5m, invis=\E[8m, sgr0=\E[0m,
-	sgr=\E[%?%p1%t1;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
-	kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, khome=\E[H, kbs=^H,
-	kich1=\E[@, krmir=\E6,  kil1=\E[L,  kclr=\E[J,  kdch1=\E[P, kdl1=\E[M,
-	kf1=\EOA, kf2=\EOB, kf3=\EOC, kf4=\EOD, kf5=\EOE,
-	kf6=\EOF, kf7=\EOG, kf8=\EOH, kf9=\EOI, kf10=\EOJ,
-	rep=%p1%c\E[%p2%{1}%-%db,  sc=\E7, rc=\E8,
-	flash=\E7\E[H\E[4m\E9$<20>\E[m\E9\E8,
-	is1=\E[m\E7\E[H\E9\E8, is3=\E[1Q\E[>20;30l,
-	smm=\E[>52h, rmm=\E[>52l,
-	.mc0=\E[0i, .mc5=\E[v, .mc4=^C,
-aaa-unk-stat|Ann Arbor Ambassadors with status lines,
-	tsl=\E[>51h\E[1;%p1%dH\E[2K, fsl=\E[>51l, hs, eslok,
-	.dsl=\E7\E[60;0;0;30p\E[60;1H\E[K\E[H\E8,
-aaa-unk-rv|Ann Arbor Ambassadors in reverse-video mode,
-	bold=\E[1;7m, rev=\E[m, blink=\E[5;7m, invis=\E[7;8m, sgr0=\E[7m,
-	rmul=\E[7m, smul=\E[4;7m, rmso=\E[7m, smso=\E[m, rs1=\E[H\E[7m\E[J,
-	sgr=\E[%?%p1%!%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
-	flash=\E7\E[H\E[7;4m\E9$<20>\E[7m\E9\E8,
-	is1=\E[7m\E7\E[H\E9\E8,
-aaa-18|ann arbor ambassador/18 lines,
-	smcup=\E[18;0;0;18p, rmcup=\E[60;0;0;18p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;18p\E8, lines#18, use=aaa-unk,
-aaa-18-rv|ann arbor ambassador/18 lines+reverse video,
-	 use=aaa-unk-rv, use=aaa-18,
-aaa-20|ann arbor ambassador/20 lines,
-	smcup=\E[20;0;0;20p, rmcup=\E[60;0;0;20p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;20p\E8, lines#20, use=aaa-unk,
-aaa-20-rv|ann arbor ambassador/20 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-20,
-aaa-22|ann arbor ambassador/22 lines,
-	smcup=\E[22;0;0;22p, rmcup=\E[60;0;0;22p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;22p\E8, lines#22, use=aaa-unk,
-aaa-22-rv|ann arbor ambassador/22 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-22,
-aaa-24|ann arbor ambassador/24 lines,
-	smcup=\E[24;0;0;24p, rmcup=\E[60;0;0;24p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;24p\E8, lines#24, use=aaa-unk,
-aaa-24-rv|ann arbor ambassador/24 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-24,
-aaa-26|ann arbor ambassador/26 lines,
-	smcup=\E[26;0;0;26p, rmcup=\E[60;0;0;26p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;26p\E8, lines#26, use=aaa-unk,
-aaa-26-rv|ann arbor ambassador/26 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-26,
-aaa-28|ann arbor ambassador/28 lines,
-	smcup=\E[28;0;0;28p, rmcup=\E[60;0;0;28p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;28p\E8, lines#28, use=aaa-unk,
-aaa-28-rv|ann arbor ambassador/28 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-28,
-aaa-29|ann arbor ambassador/29 lines plus status line,
-	smcup=\E[30;1;0;30p,
-	rmcup=\E[60;1;0;30p\E[60;1H\E[K,
-	is2=\E7\E[H\E[K\E[60;1;0;30p\E8\E[>51h\E[H\E[>51l, lines#29,
-	use=aaa-unk-stat, use=aaa-unk,
-aaa-29-rv|ann arbor ambassador/29 lines+status line+reverse video,
-	use=aaa-unk-rv, use=aaa-29,
-aaa-30|ambassador|ann arbor ambassador/30 lines,
-	smcup=\E[30;0;0;30p, rmcup=\E[60;0;0;30p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;30p\E8, lines#30, use=aaa-unk,
-aaa-30-rv|ann arbor ambassador/30 lines in reverse video,
-	use=aaa-unk-rv, use=aaa-30,
-aaa-36|ann arbor ambassador/36 lines,
-	smcup=\E[36;0;0;36p, rmcup=\E[60;0;0;36p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;36p\E8, lines#36, use=aaa-unk,
-aaa-36-rv|ann arbor ambassador/36 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-36,
-aaa-40|ann arbor ambassador/40 lines,
-	smcup=\E[40;0;0;40p, rmcup=\E[60;0;0;40p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;40p\E8, lines#40, use=aaa-unk,
-aaa-40-rv|ann arbor ambassador/40 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-40,
-aaa-47|ann arbor ambassador/48 lines+status line,
-	smcup=\E[48;1;0;48p,
-	rmcup=\E[60;1;0;48p\E[60;1H\E[K,
-	is2=\E7\E[H\E[K\E[60;1;0;48p\E8\E[>51h\E[H\E[>51l, lines#47,
-	use=aaa-unk-stat, use=aaa-unk,
-aaa-47-rv|ann arbor ambassador/48 lines+status line+reverse video,
-	use=aaa-unk-rv, use=aaa-47,
-aaa|ambas|aaa-48|ann arbor ambassador/48 lines,
-	smcup=\E[48;0;0;48p, rmcup=\E[60;0;0;48p\E[60;1H\E[K,
-	is2=\E7\E[60;0;0;48p\E8, lines#48, use=aaa-unk,
-aaa-rv|aaa-48-rv|ann arbor ambassador/48 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-48,
-aaa-59|ann arbor ambassador/59 lines plus status line,
-	is2=\E7\E[H\E[K\E[60;1;0;60p\E8\E[>51h\E[H\E[>51l, lines#59,
-	use=aaa-unk-stat, use=aaa-unk,
-aaa-59-rv|ann arbor ambassador/59 lines+status line+reverse video,
-	use=aaa-unk-rv, use=aaa-59,
-aaa-60|ann arbor ambassador/60 lines,
-	is2=\E7\E[60;0;0;60p\E[1Q\E[m\E[>20;30l\E8, lines#60, use=aaa-unk,
-aaa-60-rv|ann arbor ambassador/60 lines+reverse video,
-	use=aaa-unk-rv, use=aaa-60,
-aaa-db|aaa-30-db|ann arbor ambassador 30 lines/destructive backspace,
-	cub1=\E[D, is3=\E[1Q\E[m\E[>20l\E[>30h, use=aaa-30,
diff --git a/usr/src/lib/libxcurses/src/terminfo/ansi b/usr/src/lib/libxcurses/src/terminfo/ansi
deleted file mode 100644
index 2527208f61..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/ansi
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	ansi		<< TERMINFO Database >>
-#
-#	Vanilla ANSI terminal.  This definition basically describes 
-#	every thing possible on an ANSI terminal.  It assumes padding
-#	is zero and xon/xoff enabled.  Also numeric keypad mode is
-#	selected.
-#
-#	To commemt out individual selections, prefix the capability with
-#	a period (.), eg smam=\Ex is enabled while  .smam=\Ex is disabled. 
-#
-ansi|vanilla ansi terminal,
-#  Auto margins, auto left margin, Xon/xoff enabled,  safe move in standout 
-	am, xon, msgr, xenl,
-#  Screen size, standard characters
-	lines#24, cols#80, bel=^G, ht=^I, cr=^M,
-#  Reset, attrs off, normal cursor mode, keypad numeric mode, line wrap on
-	is2=\E[0m\E[?1l\E>\E[?7h, 
-#  Reset, attrs off
-	rs2=\Ec\E[0m,
-#  Turn on/off automatic margins
-	smam=\E[?7h, rmam=\E[?7l,
-#  Turn on/off "keypad-transmit" mode (application mode)
-	.smkx=\E[?1h\E=, .rmkx=\E[?1l>\E>, 
-#  Normal numeric kepad mode
-	kbs=^H, kcuu1=\E[A, kcud1=\E[B, kcuf1=\E[C, kcub1=\E[D, khome=\E[H, 
-#  Clear screen, erase to end of display
-	clear=\E[H\E[2J, ed=\E[J,
-#  Clear to beginning of line, clear to end of line
-	el1=\E[1K, el=\E[K,  
-#  Cursor absolute addressing, home cursor
-	cup=\E[%i%p1%d;%p2%dH, home=\E[H, 
-#  Cursor relative down, back, forward, and up by one
-	cud1=\E[B, cub1=\E[D, cuf1=\E[C, cuu1=\E[A,
-#  Scroll text up one, up n lines; scroll down one, down n lines
-	ind=\ED, indn=\E[%p1%dS, ri=\EM, rin=\E[%p1%dT,
-#  Save and restore cursor
-	sc=\E7,  rc=\E8,
-#  Delete one, delete n characters
-	dch1=\E[P, dch=\E[%p1%dP,
-#  Insert one, insert n lines; delete one, delete n lines
-	il1=\E[L, il=\E[%p1%dL, dl1=\E[M, dl=\E[%p1%dM,
-#  Start and finish insert mode
-	smir=\E[4h, rmir=\E[4l,
-#  Change scroll region
-	.csr=\E[%i%p1%d;%p2%dr,
-#  Set tab in current column, clear all tabs
-	hts=\EH, tbc=\E[3g,
-#  Turn on/off standout
-	smso=\E[7m, rmso=\E[m,
-#  Turn on/off underline
-	smul=\E[4m, rmul=\E[m, 
-#  Turn on blink, bold, reverse
-	blink=\E[5m, bold=\E[1m, rev=\E[7m, 
-#  Set attribute combinations
-	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m,
-#  Turn off all attributes
-	sgr0=\E[0m, 
-#  Flash by flipping background to white then black
-	flash=\E[?5h\E[?5l,
-
-ansi-tiny|Minimum ANSI terminal definition,
-#
-# The following is the minimum required by MKS Curses for use
-# with MKS Vi and MKS More.
-#
-	am,
-	lines#24,
-	cols#80,
-	el=\E[K,  
-	cup=\E[%i%p1%d;%p2%dH,
-	il1=\E[L, 
-	dl1=\E[M,
-#
-# The following is also required for traditional Vi.
-#
-	cr=\r,
-	home=\E[H, 
-	clear=\E[H\E[2J$<50>, 
-	ind=\ED, 
-	ri=\EM,
diff --git a/usr/src/lib/libxcurses/src/terminfo/beehive b/usr/src/lib/libxcurses/src/terminfo/beehive
deleted file mode 100644
index 9e98611863..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/beehive
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# beehive: BEEHIVE
-#
-# Reports are that most of these Beehive entries (except superbee) have not been
-# tested and do not work right.  rmso is a trouble spot.  Be warned.
-# set tab is ^F, clear (one) tab is ^V, no way to clear all tabs.
-# Superbee - f1=escape, f2=^C.
-# Note: there are at least 3 kinds of superbees in the world.  The sb1
-# holds onto escapes and botches ^C's.  The sb2 is the best of the 3.
-# The sb3 puts garbage on the bottom of the screen when you scroll with
-# the switch in the back set to CRLF instead of AEP.  This description
-# is tested on the sb2 but should work on all with either switch setting.
-# The f1/f2 business is for the sb1 and the xsb can be taken out for
-# the other two if you want to try to hit that tiny escape key.
-# This description is tricky: being able to use cup depends on there being
-# 2048 bytes of memory and the hairy ind string.
-# Now that we have separate ind and cud1, I imagine this could be improved.
-sb1|superbee|superb|beehive super bee,
-	tbc=\E3, hts=\E1, is2=\EE, cud1=^J,
-	cr=^M$<10>, ind=\n$<3>\n$<3>\EA\EK$<3>\ET\ET, bel=^G,
-	am, cub1=^H, ed=\EJ$<3>, el=\EK$<3>,
-	clear=\EH\EJ$<3>, cols#80, cup=\EF%p2%3d%p1%3d, cr=\r$<1000>,
-	lm#25, da, db, xsb, dch1=\EP$<3>, dl1=\EM$<100>,
-	smso=\E_1, rmso=\E_0, lines#25,
-	cuf1=\EC, ht=^I, cuu1=\EA, home=\EH, cnorm=\n,
-	kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es, kf5=\Et, kf6=\Eu, kf7=\Ev, kf8=\Ew,
-	kcud1=\EB, khome=\EH, kcub1=\ED, kcuf1=\EC, kcuu1=\EA,
-# This loses on lines > 80 chars long, use at your own risk
-superbeeic|super bee with insert char,
-	ich1=, smir=\EQ, rmir=\ER, use=superbee,
-sb2|sb3|fixed superbee,
-	xsb@, use=superbee,
-# good grief - does this entry make xmc when it doesn't have to?
-# look at those spaces in rmso/smso.  Seems strange to me.
-# However, not having one to test changes on, I'll just leave it be...
-bh3m|beehiveIIIm,
-	if=/usr/lib/tabset/beehive,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	il1=^S$<160>, am, cub1=^H, ed=^R, el=^P, clear=^E^R,
-	cols#80, dl1=^Q$<350>, home=^E, lines#20, ll=^E^K,
-	cuf1=^L, ht=^I, rmso= ^_, smso=^] , cuu1=^K,
-microb|microbee|micro bee series,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	ed=\EJ, el=\EK, clear=\EE, cols#80, cup=\EF%p1%' '%+%c%p2%' '%+%c,
-	kf1=\Ep, kf2=\Eq, kf3=\Er, kf4=\Es,
-	kf5=\Et, kf6=\Eu, kf7=\Ev, kf8=\Ew, kf9=\Ex,
-	kcud1=\EB, khome=\EH, kcub1=\ED, kcuf1=\EC, kcuu1=\EA,
-	lines#24, cuf1=\EC, ht=^I, cuu1=\EA,
-	rmso=\Ed@ , smso= \EdP, rmul=\Ed@, smul=\Ed`,
diff --git a/usr/src/lib/libxcurses/src/terminfo/cdc b/usr/src/lib/libxcurses/src/terminfo/cdc
deleted file mode 100644
index 02c1232da7..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/cdc
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cdc: CONTROL DATA
-#
-cdc456|cdc,
-	cr=^M, cud1=^J, ind=^J, bel=^G, lines#24, cols#80, clear=^Y^X,
-	cuf1=^L, cuu1=^Z, cub1=^H, cup=\E1%p1%' '%+%c%p2%' '%+%c, home=^Y,
-	il1=\E\114, dl1=\E\112, el=^V, ed=^X, am,
-cdc456tst,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	lines#24, cols#80, clear=^y^x, cub1=^H, cup=\E1%p1%' '%+%c%p2%' '%+%c, am,
diff --git a/usr/src/lib/libxcurses/src/terminfo/concept b/usr/src/lib/libxcurses/src/terminfo/concept
deleted file mode 100644
index f49c41e82e..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/concept
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# concept: (HUMAN DESIGNED SYSTEMS)
-#
-# From vax135!hpk  Sat Jun 27 07:41:20 1981
-# Extensive changes to c108 by arpavax:eric Feb 1982
-#
-# There seem to be a number of different versions of the C108 PROMS
-# (with bug fixes in its Z-80 program).
-# The first one that we had would lock out the keyboard of you
-# sent lots of short lines (like /usr/dict/words) at 9600 baud.
-# Try that on your C108 and see if it sends a ^S when you type it.
-# If so, you have an old version of the PROMs.
-# The old one also messed up running in with a 132-character line-length.
-# You should configure the C108 to send ^S/^Q before running this.
-# It is much faster (at 9600 baud) than the c100 because the delays
-# are not fixed.
-# Old cursor addressing that didn't understand > 95:
-#	cup=\Ea%p1%' '%+%c%p2%' '%+%c,
-c108|c108-8p|concept108-8p|concept 108 w/8 pages,
-	rmcup=\Ev  ^B p\Ep\r\n, use=c108-4p, 
-c108-4p|concept108-4p|concept 108 w/4 pages,
-	cr=^M, cud1=^J, ind=^J, bel=^G, 
-	is2=\EU\E F\Ef\E7\E5\E8\El\ENH\EK\E\200\Eo&\200\Eo\47\E\E!,
-	smcup=\EU\Ev  8p\Ep\r, rmcup=\Ev  ^A p\Ep\r\n,
-	il1=\E^R, cub1=^H, ed=\E^C, el=\E^S, clear=\E?\E^E, cols#80,
-	cup=\Ea%p1%?%p1%{95}%>%t^A%c%{96}%-%;%' '%+%c%p2%?%p2%{95}%>%t^A%c%{96}%-%;%' '%+%c,
-	dch1=\E^A, dl1=\E^B, rmir=\E\200, eo, smir=\E^P, lines#24, mir,
-	cuf1=\E=, kbs=^h, ul, cuu1=\E;, db, smul=\EG, rmul=\Eg,
-	cvvis=\EW, cnorm=\Ew, in, am, xenl, flash=\Ek$<50>\EK,
-	smkx=\EX, rmkx=\Ex, kcuu1=\E;,
-	kcud1=\E<, kcub1=\E>, kcuf1=\E=, khome=\E?,
-	kf1=\E5, kf2=\E6, kf3=\E7, kf4=\E8, kf5=\E9, kf6=\E:,
-	smso=\ED, rmso=\Ed, dim=\EE, bold=\ED, rev=\ED, sgr0=\Ee\Ed\Eg\Ec,
-c108-rv-8p|concept 108 w/8 pages in reverse video,
-	smcup=\EU\Ev  8p\Ep\r, rmcup=\Ev  ^B p\Ep\r\n, use=c108-rv-4p, 
-c108-rv-4p|concept 108 w/4 pages in reverse video,
-	flash=\EK\200\200\200\200\200\200\200\200\200\200\200\200\200\200\Ek,
-	is2=\EU\E F\Ef\E7\E5\E8\El\ENH\Ek\E\200\Eo&\200\Eo\47\E\E!,
-	use=c108-4p, 
-c108-na|c108-na-8p|concept 108 w/8 pages no arrows,
-	smkx@, rmkx@, kf7=\E;, kf8=\E<, kf9=\E=, use=c108-8p,
-c108-rv-na|c108-rv-na-8p|concept 108 w/8 pages no arrows in rev video,
-	smkx@, rmkx@, kf7=\E;, kf8=\E<, kf9=\E=, use=c108-rv-8p,
-# this needs new frotz in the cup capability for 2-char addrs when > 95....
-c108-w|c108-w-8p|concept 108 w/8 pages in wide mode,
-	is2=\EU\E F\Ef\E7\E5\E8\El\ENH\EK\E\200\Eo&\200\Eo\47\E\E",
-	smcup=\EU\Ev  8^AD\Ep\r, rmcup=\Ev  ^A0^AD\Ep\r\n,
-	cup=\Ea%p1%?%p1%{95}%>%t^A%c%{96}%-%;%' '%+%c%p2%?%p2%{95}%>%t^A%c%{96}%-%;%' '%+%c,
-	cols#132, use=c108-8p,
-# Concepts have only window relative cursor addressing, not screen relative.
-# To get it to work right here, smcup/rmcup (which were invented for the
-# concept) lock you into a one page window for screen style programs.
-# To get out of the one page window, we use a clever trick:
-# we set the window size to zero ("\Ev    " in rmcup) which the terminal
-# recognizes as an error and resets the window to all of memory.
-# This trick works on c100 but does not on c108, sigh.
-#
-# Some tty drivers use cr3 for concept, others use nl3, hence the delays on
-# cr and ind below.  This padding is only needed at 9600 baud.
-# One or the other is commented out depending on local conventions.
-# 2 nulls padding on rmcup isn't always enough.  6 works fine.  Maybe less
-# than 6 but more than 2 will work.
-concept100|c100|concept|c104|c100-4p|concept 100,
-	is2=\EU\Ef\E7\E5\E8\El\ENH\EK\E\200\Eo&\200\Eo\47\E,
-	cr=$<9>^M, ind=^J,
-#	cr=^M, ind=^J$<9>,
-	bel=^G, cud1=^J, smcup=\EU\Ev  8p\Ep\r, rmcup=\Ev    $<6>\Ep\r\n,
-	il1=\E^R$<3*>, am, cub1=^H, ed=\E^C$<16*>, el=\E^U$<16>, clear=^L$<2*>,
-	cup=\Ea%p1%' '%+%c%p2%' '%+%c, cols#80, dch1=\E^A$<16*>, dl1=\E^B$<3*>,
-	rmir=\E\200, eo, smir=\E^P, in, ip=$<16*>, lines#24, mir, cuf1=\E=,
-	ht=\t$<8>, kbs=^h, ul, cuu1=\E;, db, smul=\EG, rmul=\Eg,
-	xenl, cvvis=\EW, cnorm=\Ew, flash=\Ek$<20>\EK,
-	pb#9600, vt#8,
-	smul=\EG, rmul=\Eg, smso=\EE\ED, rmso=\Ed\Ee,
-	dim=\EE, rev=\ED, blink=\EC, prot=\EI, invis=\EH, sgr0=\EN\200,
-	rep=\Er%p1%c%p2%' '%+%c$<.2*>, smkx=\EX, rmkx=\Ex,
-	kcuu1=\E;, kcud1=\E<, kcub1=\E>, kcuf1=\E=, khome=\E?,
-	kf1=\E5, kf2=\E6, kf3=\E7,
-c100-rvpp|c100-rv4ppp|c100 with printer port,
-	is2=\EU\Ef\E7\E5\E8\El\ENH\Ek\E\200\Eo&\200\Eo!\200\EQ"\EY(^W\Eo\47\E,
-	use=c100-rv,
-c100-rvna|c100-rv4pna|c100 with no arrows,
-	smkx@, rmkx@, use=c100-rv,
-c100-rv|c100-rv4p|concept100-rv|c100 rev video,
-	is2=\EU\Ef\E7\E5\E8\El\ENH\Ek\E\200\Eo&\200\Eo\47\E,
-	flash=\EK$<20>\Ek, cvvis@, cnorm@, smso=\EE, rmso=\Ee, use=c100,
diff --git a/usr/src/lib/libxcurses/src/terminfo/datamedia b/usr/src/lib/libxcurses/src/terminfo/datamedia
deleted file mode 100644
index 9aa66e9b66..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/datamedia
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
-# All Rights Reserved
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# datamedia: DATAMEDIA
-#
-dm1520|dm1521|1521|1520|datamedia 1520,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, ed=^K, el=^], clear=^L,
-	cup=^^%p2%' '%+%c%p1%' '%+%c, cols#80, home=^Y,
-	kcuu1=^_, kcud1=^J, kcub1=^H, kcuf1=^\, khome=^Y,
-	lines#24, cuf1=^\, cuu1=^_, xenl, ht=^I, 
-dm2500|datamedia2500|2500|datamedia 2500,
-	cud1=^J, ind=^J, bel=^G, il1=^P\n^X^]^X^]$<15>, cub1=^H, el=^W,
-	clear=^^^^\177, cup=^L%p2%'`'%^%c%p1%'`'%^%c, cols#80,
-	dch1=^P\b^X^]$<10*>,
-	dl1=^P^Z^X^]$<10*>, smdc=^P, rmdc=^X^], rmir=\377\377^X^]$<10>, home=^B,
-	ich1=^P^\^X^]$<10*>, smir=^P, lines#24, cuf1=^\,
-	pad=\377, smso=^N, rmso=^X^], cuu1=^Z,
-dm3025|datamedia 3025a,
-	is2=\EQ\EU\EV, cr=^M, cud1=^J, ind=^J, bel=^G,
-	il1=\EP\n\EQ$<130>, cub1=^H, ed=\EJ$<2>, el=\EK, clear=\EM$<2>,
-	cup=\EY%p2%' '%+%c%p1%' '%+%c, cols#80, dch1=\b$<6>,
-	dl1=\EP\EA\EQ$<130>, smdc=\EP, rmdc=\EQ, rmir=\EQ, home=\EH,
-	smir=\EP, ip=, lines#24, cuf1=\EC, ht=^I, 
-	smso=\EOA, rmso=\EO@, cuu1=\EA,
-3045|dm3045|datamedia 3045a,
-	is2=\EU\EV, cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	ed=\EJ$<2>, el=\EK, clear=\EM$<2>, cup=\EY%p2%' '%+%c%p1%' '%+%c,
-	cols#80, dch1=\EB$<6>, smdc=, rmdc=, rmir=\EP, home=\EH,
-	ich1=, smir=\EP, ip=$<6>,
-	kf0=\Ey\r, kf1=\Ep\r, kf2=\Eq\r, kf3=\Er\r, kf4=\Es\r,
-	kf5=\Et\r, kf6=\Eu\r, kf7=\Ev\r, kf8=\Ew\r, kf9=\Ex\r,
-	khome=\EH, kcuu1=\EA, kcuf1=\EC, lines#24, cuf1=\EC, pad=\177, ht=^I,
-	eo, ul, cuu1=\EA, xenl,
-# dt80/1 is2 a vt100 lookalike, but it doesn't seem to need any padding.
-dt80|dmdt80|dm80|datamedia dt80/1,
-	cr=^M, cud1=^J, ind=^J, bel=^G, ed=\E[J, el=\E[K, clear=\E[2J\E[H,
-	cup=\E[%i%p1%d;%p2%dH, home=\E[H, cuf1=\E[C, ri=\EM,
-	smso=\E[7m, rmso=\E[m, cuu1=\E[A, smul=\E[4m, rmul=\E[m, use=vt100,
-# except in 132 column mode, where it needs a little padding.
-# This is2 still less padding than the vt100, and you can always turn on
-# the ^S/^Q handshaking, smso you can use vt100 flavors for things like
-# reverse video.
-dt80-w|dmdt80-w|dm80-w|datamedia dt80/1 in 132 char mode,
-	cr=^M, cud1=^J, ind=^J, bel=^G, ed=\E[0J$<20>, cols#132, el=\E[0K$<20>,
-	cup=\E[%i%p1%d;%p2%dH$<5>, clear=\E[H\E[2J$<50>, cuu1=\E[A$<5>, use=dmdt80,
diff --git a/usr/src/lib/libxcurses/src/terminfo/dec b/usr/src/lib/libxcurses/src/terminfo/dec
deleted file mode 100644
index ce5770f9d6..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/dec
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# dec: DEC (DIGITAL EQUIPMENT CORPORATION)
-#
-# Note that xenl glitch in vt100 is not quite the same as concept,
-# since the cursor is left in a different position while in the
-# weird state (concept at beginning of next line, vt100 at end
-# of this line) so all versions of vi before 3.7 don't handle
-# xenl right on vt100.
-# I assume you have smooth scroll off or are at a slow enough baud
-# rate that it doesn't matter (1200? or less).  Also this assumes
-# that you set auto-nl to "on", if you set it off use vt100-nam below.
-#
-# Since there are two things here called vt100, the installer can make
-# a local decision to make either one standard "vt100" by including
-# it in the list of terminals in reorder, since the first vt100 in
-# /etc/terminfo is the one that it will find.  The choice is between
-# nam (no automatic margins) and am (automatic margins), as determined
-# by the wrapline switch (group 3 #2).  I presonally recommend turning
-# on the bit and using vt100-am, since having stuff hammer on the right
-# margin is sort of hard to read.  However, the xenl glitch does not occur
-# if you turn the bit off.
-#
-# I am unsure about the padding requirements listed here.  I have heard
-# a claim that the vt100 needs no padding.  It's possible that it needs
-# padding only if the xon/xoff switch is off.  For UNIX, this switch
-# should probably be on.
-#
-# The vt100 uses rs2 and rf rather than is2/tbc/hts because the tab settings
-# are in non-volatile memory and don't need to be reset upon login.
-# Also setting the number of columns glitches the screen annoyingly.
-# You can type "reset" to get them set.
-vt100-mc|vt100 without advanced video option,
-	sgr@, smso=\E[7m , rmso=\E[m , xmc#1,
-	smul@, rmul@, bold@, rev@, blink@, sgr0@, use=vt100,
-vt100|vt100-am|dec vt100,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#24,
-	clear=\E[;H\E[2J$<50>, cub1=^H, am, cup=\E[%i%p1%d;%p2%dH$<5>,
-	cuf1=\E[C$<2>, cuu1=\E[A$<2>, el=\E[K$<3>, ed=\E[J$<50>,
-	smso=\E[7m$<2>, rmso=\E[m$<2>, smul=\E[4m$<2>, rmul=\E[m$<2>,
-	bold=\E[1m$<2>, rev=\E[7m$<2>, blink=\E[5m$<2>, sgr0=\E[m$<2>,
-	sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
-	rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, smkx=\E[?1h\E=, rmkx=\E[?1l\E>,
-	rf=/usr/lib/tabset/vt100, home=\E[H, khome=\E[H,
-	kcuu1=\EOA, kcud1=\EOB, kcuf1=\EOC, kcub1=\EOD, kbs=^H,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, ht=^I, ri=\EM$<5>,
-	vt#3, xenl, xon, sc=\E7, rc=\E8, csr=\E[%i%p1%d;%p2%dr,
-vt100-nam|vt100 w/no am,
-	am@, xenl@, use=vt100-am,
-vt100-23|vt100 for use with sysline,
-	lines#23, is2=\E[1;23r\E[23;1H,
-	hs, eslok, tsl=\E7\E[24;%p1%dH\E[1K, fsl=\E8, use=vt100-am,
-gt42|dec gt42,
-	cr=^M, cud1=^J, bel=^G,
-	cub1=^H, cols#72, lines#40, os,
-vt132|vt132,
-	il1=\E[L$<99>, dl1=\E[M$<99>, ip=$<7>, dch1=\E[P$<7>, rmir=\E[4l,
-	smir=\E[4h, xenl, ind=^J$<30>, use=vt100,
-gt40|dec gt40,
-	cr=^M, cud1=^J, bel=^G,
-	cub1=^H, cols#72, lines#30, os,
-vt50|dec vt50,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, ed=\EJ, el=\EK, clear=\EH\EJ,
-	cols#80, lines#12, cuf1=\EC, ht=^I, cuu1=\EA,
-dw1|decwriter I,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	cub1=^H, cols#72, hc, os,
-vt50h|dec vt50h,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, ed=\EJ, el=\EK,
-	clear=\EH\EJ, cup=\EY%p1%' '%+%c%p2%' '%+%c, cols#80, lines#12,
-	cuf1=\EC, ht=^I, ri=\EI, cuu1=\EA,
-vt100-s|dec vt100 132 cols 14 lines (w/o advanced video option),
-	lines#14, use=vt100-w,
-vt100-w|vt100-w-am|dec vt100 132 cols (w/advanced video),
-	cols#132, lines#24, rs2=\E>\E[?3h\E[?4l\E[?5l\E[?8h, use=vt100-am,
-vt100-w-nam|dec vt100 132 cols (w/advanced video),
-	cols#132, lines#24, rs2=\E>\E[?3h\E[?4l\E[?5l\E[?8h, vt@, use=vt100-nam,
-vt52|dec vt52,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, ed=\EJ, el=\EK,
-	clear=\EH\EJ, cup=\EY%p1%' '%+%c%p2%' '%+%c, cols#80, lines#24,
-	cuf1=\EC, ht=^I, ri=\EI, cuu1=\EA,
-	kcuu1=\EA, kcud1=\EB, kcuf1=\EC, kcub1=\ED, kbs=^H,
-# The dw3 (and dw4?) supposedly have some fancy stuff, like settable tabs
-# and column addressing.  But I don't know the details, and nobody seems
-# to use them except for consoles so it has never really mattered.
-dw2|dw3|decwriter|dw|decwriter II,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	kbs=^h, cub1=^H, cols#132, hc, os,
-# From cbosg!ucbvax!G:tut Thu Sep 24 22:10:46 1981
-dw4|decwriter IV,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, cols#132, hc, os, am,
-	ht=^I, is2=\Ec, kf0=\EOP, kf1=\EOQ, kf2=\EOR, kf3=\EOS, kbs=^H,
diff --git a/usr/src/lib/libxcurses/src/terminfo/diablo b/usr/src/lib/libxcurses/src/terminfo/diablo
deleted file mode 100644
index e0d93c6f80..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/diablo
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# diablo: DAISY WHEEL PRINTERS
-#
-# The A manufacturer represents Diablo, DTC, Xerox, Qume, and other Daisy
-# wheel terminals until such time as terminfo distinguishes between them
-# enough to justify separate codes.
-1620|1640|450|diablo 1620,
-	cr=^M, cud1=^J, ind=^J, bel=^G, tbc=\E2, hts=\E1, hpa=\E\t%i%p1%c, kbs=^H,
-	cub1=^H, cols#132, ff=^L, hc, hu=\EU, hd=\ED, os, ht=^I, cuu1=\E\n,
-1620-m8|1640-m8|diablo 1620 w/8 column left margin,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#124, is2=\r        \E9, use=1620,
-# DTC 382 with VDU.  Has no ed so we fake it with el.  Standout works but
-# won't go away without dynamite.  The terminal has tabs, but I'm getting
-# tired of fighting the braindamage.  If no tab is set or the terminal's
-# in a bad mood, it glitches the screen around all of memory.  Note that
-# return puts a blank ("a return character") in the space the cursor was
-# at, so we use ^P return (and thus ^P newline for newline).  Note also
-# that if you turn off tabs and let Unix expand tabs, curses won't work
-# (current version) because it doesn't turn off this bit, and cursor
-# addressing sends a tab for row/column 9.  What a losing terminal!  I
-# have been unable to get tabs set in all 96 lines - it always leaves at
-# least one line with no tabs in it, and once you tab through that line,
-# it completely weirds out.
-dtc|mc0|dtc382|382,
-	.if=/usr/lib/tabset/dtcvdu,
-	bel=^G, cud1=^J, ind=^J, il1=^P^Z, am, cub1=^H,
-	cols#80, el=^P^U, clear=^P^]$<20>, cup=^P^Q%p2%c%p1%c, dch1=^X,
-	dl1=^P^S, rmir=^Pi, home=^P^R, smir=^PI, cnorm=^Pb, cvvis=^PB, pad=\177,
-	rmcup=^P^]$<20>, lines#24, cuf1=^PR, .rmso=^P \200, .smso=^P \002^PF,
-	smul=^P \020, rmul=^P \200, cuu1=^P^L, xhp, lm#96,
-	da, db, cr=^P^M, ed=^P^U^P^S^P^S,
-dtc300s|300|300s|dtc 300s,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G,
-	kbs=^h, cub1=^H, cols#132, ff=^L, hc, hu=\EH, hd=\Eh, os, ht=^I, cuu1=^Z,
-gsi,
-	cub1=^H, cols#132, hc, hd=\Eh, hu=\EH, os, ht=^I, cuu1=^Z,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-aj830|aj832|aj|anderson jacobson,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	cub1=^H, hc, hd=\E9, hu=\E8, os, cuu1=\E7,
-# From cbosg!ucbvax!pur-ee!cincy!chris Thu Aug 20 09:09:18 1981
-# This is incomplete, but it's a start.
-5520|nec|spinwriter|nec 5520,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G,
-	kbs=^h, cub1=^H, cols#132, ff=^L, hc, hu=\E]s\E9\E]W, hd=\E]s\n\E]W,
-	os, ht=^I, cuu1=\E9,
-qume5|qume|Qume Sprint 5,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G,
-	kbs=^h, cub1=^H, cols#80, ff=^L, hc, hu=\EH, hd=\Eh, os, ht=^I, cuu1=^Z,
-# I suspect the xerox1720 is the same as the diablo 1620.
-x1720|x1700|1700|x1750|xerox 1720,
-	cols#132, cub1=^H, ff=^L, hc, os, ht=^I, 
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	tbc=\E2, hts=\E1,
diff --git a/usr/src/lib/libxcurses/src/terminfo/general b/usr/src/lib/libxcurses/src/terminfo/general
deleted file mode 100644
index 4d04bc7513..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/general
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# general: GENERAL TERMINAL (formerly INFOTON)
-#
-# Infoton is now called General Terminal Corp.
-# gt100 sounds like something DEC would come out with.  Lets hope they don't.
-i100|gt100|gt100a|General Terminal 100A (formerly Infoton 100),
-	cr=^M, cud1=^J, ind=^J, bel=^G, clear=^L, ed=\EJ, el=\EK,
-	lines#24, cols#80, il1=\EL, dl1=\EM, cuu1=\EA, cuf1=\EC,
-	home=\EH, cup=\Ef%p2%' '%+%c%p1%' '%+%c,
-	flash=\Eb\Ea, am, cub1=^H, smso=\Eb, rmso=\Ea,
-# Looks like an ANSI terminal, but what a kludge for dch1!  I bet smdc/rmdc
-# could be used even if the terminal is really that braindamaged.
-# But you would think being ANSI they would do \E[P right.  Hmm.
-i400|400|infoton 400,
-	cr=^M, cud1=^J, ind=^J, bel=^G, if=/usr/lib/tabset/infoton_tabs,
-	il1=\E[L, am, cub1=^H, el=\E[N, clear=\E[2J, cup=\E[%i%p1%3d;%p2%3dH,
-	cols#80, dl1=\E[M, lines#25, cuf1=\E[C, cuu1=\E[A,
-	smir=\E[4h\E[2Q, rmir=\E[4l\E[0Q, dch1=\E[4h\E[2Q\E[P\E[4l\E[0Q,
-addrinfo,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	lines#24, cols#80, clear=^L, home=^H, cuf1=^Y, ed=^K,
-	cuu1=^\, am, cub1=^Z, cup=\037%i%p1%{1}%-%c%p2%{1}%-%c, ll=^H^\,
-# No, I don't know what this is.  But KAS happens to be Kurt Shoens initials.
-infotonKAS,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^Z,
-	ed=^K, clear=^L, cols#80, lines#24, cuf1=^Y, cuu1=^\, ll=^H^\,
diff --git a/usr/src/lib/libxcurses/src/terminfo/hazeltine b/usr/src/lib/libxcurses/src/terminfo/hazeltine
deleted file mode 100644
index 1461a3841f..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/hazeltine
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# hazeltine: HAZELTINE
-#
-# Since cuf1 is blank, when you want to erase something you
-# are out of luck.  You will have to do ^L's a lot to
-# redraw the screen.  h1000 is untested.  It doesn't work in
-# vi - this terminal is too dumb for even vi.  (The code is
-# there but it isn't debugged for this case.)
-h1000|hazeltine 1000,
-	cub1=^H, home=^K, clear=^L, cuf1= , cols#80, lines#12, cr=^M, cud1=^J, ind=^J, bel=^G,
-# Note: the h1552 appears to be the first Hazeltine terminal which
-# is not braindamaged.  It has tildes and backprimes and everything!
-# Be sure the auto lf/cr switch is set to cr.
-h1552|hazeltine 1552,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EE, dl1=\EO,
-	kf1=\EP, lf1=blue, kf2=\EQ, lf2=red, kf3=\ER, lf3=green, use=vt52,
-h1552rv|hazeltine 1552 reverse video,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	smso=\ES, rmso=\ET, use=h1552,
-# From cbosg!ucbvax!pur-ee!cincy!chris Thu Aug 20 09:09:18 1981
-h1420|hazeltine 1420,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, am, lines#24, cols#80,
-	il1=\E^Z, dl1=\E^S, ed=\E^X, clear=\E\034, cuu1=\E^L,
-	cuf1=^P, el=\E^O, ht=^N, cup=\E^Q%p2%c%p1%' '%+%c, smso=\E\037, rmso=\E^Y,
-h1500|hazeltine 1500,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=~^Z$<40>, am,
-	cub1=^H, ed=~^X$<10>, el=~^O, clear=~^\, cup=~^Q%p2%c%p1%c, cols#80,
-	dl1=~^S$<40>, cud1=~^K, lines#24, cuf1=^P, .rmso=~^_, .smso=~^Y, cuu1=~^L,
-# h1510 assumed to be in sane escape mode.  Else use h1500.
-h1510|hazeltine 1510,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	il1=\E^Z, am, cub1=^H, ed=\E^X, el=\E^O, clear=\E^\, cup=\E^Q%p2%c%p1%c, cols#80,
-	dl1=\E^S, cud1=\E^K, lines#24, cuf1=^P, .rmso=\E^_, .smso=\E^Y, cuu1=\E^L,
-h1520|hazeltine 1520,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=~^Z, am, cub1=^H,
-	ed=~^X, el=~^O, clear=~\034, cup=~^Q%p2%c%p1%c$<1>, cols#80,
-	dl1=~^S, cud1=~^K, hz, lines#24, cuf1=^P, rmso=~^Y, smso=~\037, cuu1=~^L, home=~^R,
-# Note: h2000 won't work well because of a clash between upper case and ~'s.
-h2000|hazeltine 2000,
-	cud1=^J, ind=^J, bel=^G,
-	il1=~^z$<6>, am, cub1=^H, clear=~^\$<6>, cup=~^q%p2%c%p1%c, cols#74,
-	dl1=~^s$<6>, home=~^r, lines#27, pad=\177,
diff --git a/usr/src/lib/libxcurses/src/terminfo/header b/usr/src/lib/libxcurses/src/terminfo/header
deleted file mode 100644
index 4f2ef6a7b9..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/header
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 1996 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# ------------------------
-#
-#	Terminfo source file
-#	Mark Horton, U.C. Berkeley, Bell Telephone Laboratories
-#
-# This file describes capabilities of various terminals, as needed by
-# software such as screen editors.  It does not attempt to describe
-# printing terminals very well, nor graphics terminals.  Someday.
-# See terminfo(5) in the Unix Programmers Manual for documentation.
-#
-# Conventions: First entry is two chars, first char is manufacturer,
-# second char is canonical name for model or mode.
-# Third entry is the one the editor will print with "set" command.
-# Last entry is verbose description.
-# Others are mnemonic synonyms for the terminal.
-#
-# Terminal naming conventions:
-# Terminal names look like <manufacturer> <model> - <modes/options>
-# Certain abbreviations (e.g. c100 for concept100) are also allowed
-# for upward compatibility.  The part to the left of the dash, if a
-# dash is present, describes the particular hardware of the terminal.
-# The part to the right can be used for flags indicating special ROM's,
-# extra memory, particular terminal modes, or user preferences.
-# All names are always in lower case, for consistency in typing.
-# Because of file naming restrictions, terminal names should not contain
-# period or slash, in fact, entirely alphanumeric characters plus dash are
-# highly recommended.  These restrictions do not apply to the verbose name.
-#
-# The following are conventionally used flags:
-#	rv	Terminal in reverse video mode (black on white)
-#	2p	Has two pages of memory.  Likewise 4p, 8p, etc.
-#	w	Wide - in 132 column mode.
-#	pp	Has a printer port which is used.
-#	na	No arrow keys - terminfo ignores arrow keys which are
-#		actually there on the terminal, so the user can use
-#		the arrow keys locally.
-#  
-# There are some cases where the same name is used for two different
-# terminals, e.g. "teleray" or "2621" or "vt100".  In these cases,
-# if a site has one of these, they should choose a local default and
-# bring that terminal to the front in the reorder script.  This works
-# because tgetent picks the first match in /etc/terminfo.
-# The list of names intentionally duplicated is:
-# 2621, c108, dtc, hp2621, teleray, tvi, vt100.
-#
-# If you absolutely MUST check for a specific terminal (this is discouraged)
-# check for the 2nd entry (the canonical form) since all other codes are
-# subject to change.  The two letter codes are there for version 6 and are
-# EXTREMELY subject to change, or even to go away if version 6 becomes for
-# all practical purposes obsolete.  We would much rather put in special
-# capabilities to describe your terminal rather than having you key on the
-# name.
-#
-#  Special manufacturer codes:
-#	A: hardcopy daisy wheel terminals
-#	M: Misc. (with only a few terminals)
-#  	q: Homemade
-#  	s: special (dialup, etc.)
-#  
-# Comments in this file begin with # - they cannot appear in the middle
-# of a terminfo entry.  Individual entries are commented out by
-# placing a period between the colon and the capability name.
-#
-#  This file is to be installed with an editor script (reorder)
-#  that moves the most common terminals to the front of the file.
-#  If the source is not available, it can be constructed by sorting
-#  the above entries by the 2 char initial code.
diff --git a/usr/src/lib/libxcurses/src/terminfo/heath b/usr/src/lib/libxcurses/src/terminfo/heath
deleted file mode 100644
index a3fcb61540..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/heath
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# heath: HEATHKIT (ZENITH)
-#
-h19-a|heath-ansi|heathkit-a|heathkit h19 ansi mode,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\E[1L$<1*>, am, cub1=^H, ed=\E[J,
-	el=\E[K, clear=\E[2J, cup=\E[%i%p1%2d;%p2%2dH, cols#80,
-	dch1=\E[1P, dl1=\E[1M$<1*>, cud1=\E[1B,
-	rmir=\E[4l, home=\E[H, smir=\E[4h, lines#24, mir,
-	cuf1=\E[1C, rmacs=\E[10m, smacs=\E[11m, msgr, ht=^I, 
-	rmso=\E[0m, smso=\E[7m, cuu1=\E[1A, cvvis=\E[>4h, cnorm=\E[>4l,
-	kbs=^h, kcuu1=\E[1A, kcud1=\E[1B, kcub1=\E[1D, kcuf1=\E[1C,
-	khome=\E[H,
-	kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, lf6=blue,
-	lf7=red, lf8=white, kf6=\EOP, kf7=\EOQ, kf8=\EOR,
-	ri=\EM, is2=\E<\E[>1;2;3;4;5;6;7;8;9l\E[0m\E[11m\E[?7h,
-h19-bs|heathkit w/keypad shifted,
-	smkx=\Et, rmkx=\Eu, use=h19-b,
-h19-smul|heathkit w/keypad shifted/underscore cursor,
-	smkx=\Et, rmkx=\Eu, use=h19-u,
-h19|heath|h19-b|heathkit|heath-19|z19|zenith|heathkit h19,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EL$<1*>, am, cub1=^H,
-	ed=\EJ, el=\EK, clear=\EE, cup=\EY%p1%' '%+%c%p2%' '%+%c, cols#80,
-	dch1=\EN, dl1=\EM$<1*>, cud1=\EB, rmir=\EO, home=\EH, smir=\E@,
-	lines#24, mir, cuf1=\EC, rmacs=\EF, smacs=\EG, msgr, ht=^I, 
-	ri=\EI, rmso=\Eq, smso=\Ep, cuu1=\EA, cvvis=\Ex4, cnorm=\Ey4,
-	kbs=^h, kcuu1=\EA, kcud1=\EB, kcub1=\ED, kcuf1=\EC, khome=\EH,
-	kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW,
-	lf6=blue, lf7=red, lf8=white, kf6=\EP, kf7=\EQ, kf8=\ER,
-	hs, eslok, tsl=\Ej\Ex5\EY8%p1%' '%+%c\Eo\Eo, fsl=\Ek\Ey5,
-h19-u|heathkit with underscore cursor,
-	cvvis@, cnorm@, use=h19-b,
-# This still doesn't work right - something funny is going on with return
-# and linefeed in the reach program.
-reach|h89|h89 running reach,
-	cr@, cud1=\EB, is2=\Ey3\Ev, use=h19-b,
diff --git a/usr/src/lib/libxcurses/src/terminfo/homebrew b/usr/src/lib/libxcurses/src/terminfo/homebrew
deleted file mode 100644
index e3897686b1..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/homebrew
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# homebrew: HOME MADE TERMINALS
-#
-bc|bill croft homebrew,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	cup=\E=%p1%' '%+%c%p2%' '%+%c, clear=^Z, cols#96, home=^^, lines#72,
-	cuf1=^L, cuu1=^K, flash=,
-nucterm|rayterm|nuc|NUC homebrew,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, clear=^L$<1>,
-	lines#24, cols#80, cuf1=^C, cuu1=^N, home=^B, ll=^K, el=^A, ed=^E,
-carlock|klc,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=^E, am, el=^U, clear=^Z$<100>,
-	cup=\E=%p1%' '%+%c%p2%' '%+%c, cols#80, dch1=\177, dl1=^D, ed=,
-	rmir=^T, home=^^, smir=^T, lines#24, cuf1=^L, rmso=^V, smso=^V,
-	cuu1=^K, flash=\EV\EV,
-ex3000,
-	cr=^M, cud1=^J, ind=^J, bel=^G, lines#24, cols#80, home=^Q,
-exidy|exidy2500|exidy sorcerer rmacs dm2500,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=^P^J^X, am, cub1=^H,
-	el=^W, clear=^^, cup=^L%p2%'`'%^%c%p1%'`'%^%c, cols#64,
-	dch1=\b, dl1=^P^Z^X, smdc=^P, ed=^X, rmir=^X, home=^B, ich1=^\,
-	smir=^P, lines#30, cuf1=^\, ht=^I, smso=^N, rmso=^X, cuu1=^Z,
-# This came from the comp ctr who got it from some user.  Smart indeed!
-sexidy|exidy smart,
-	cr=^M, cud1=^J, ind=^J, bel=^G, lines#24, cols#64, clear=^L, home=^Q,
-	cuf1=^S, cuu1=^W, cub1=^H, cub1=^A, kcud1=^S,
-# netx and xitex are almost identical, except for the padding
-# on clear screen.  Hmm.
-netx|netronics,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, ed=^F^E$<2000>, el=^E$<1600>,
-	clear=^L$<466>, cup=\E=%p1%'@'%+%c%p2%'@'%+%c, cols#64, home=^D,
-	lines#16, cuf1=\E+@A, pad=\200, ri=\E=@@^K, cuu1=^K,
-xitex|xitex sct-100,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, ed=^F^E$<2000>, el=^E$<1600>,
-	clear=^L$<400>, cup=\E=%p1%'@'%+%c%p2%'@'%+%c, cols#64, home=^D,
-	lines#16, cuf1=\E+@A, pad=\200, ri=\E=@@^K, cuu1=^K,
-ubell|ubellchar,
-	if=/usr/lib/tabset/ubell,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, ht=^I, el=\Ed,
-	clear=^Z, cup=\E=%p1%' '%+%c%p2%' '%+%c, cols#80, lines#24, cuf1=^L,
-	cuu1=^K, home=^^,
-ttywilliams,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#12,
-	cub1=^Y, cud1=^K, cuu1=^Z, clear=^^, el=^_, am, home=^], cuf1=^X,
diff --git a/usr/src/lib/libxcurses/src/terminfo/hp b/usr/src/lib/libxcurses/src/terminfo/hp
deleted file mode 100644
index 698d4c7f34..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/hp
+++ /dev/null
@@ -1,153 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# hp: HEWLETT PACKARD
-#
-# Note: no "home" on HP's since that homes to top of memory, not screen.
-# Due to severe 2621 braindamage, the only way to get the arrow keys to
-# transmit anything at all is to turn on the function key labels
-# (f1-f8) with smkx, and even then the poor user has to hold down shift!
-# The default 2621 turns off the labels except when it has to to enable
-# the function keys.  If your installation prefers labels on all the time,
-# or off all the time (at the "expense" of the function keys) move the
-# 2621-nl or 2621-wl labels to the front using reorder.
-# Note: there are newer ROM's for 2621's that allow you to set strap A
-# so the regular arrow keys xmit \EA, etc, as with the 2645.  However,
-# even with this strap set, the terminal stops xmitting if you reset it,
-# until you unset and reset the strap!  Since there is no way to set/unset
-# the strap with an escape sequence, we don't use it in the default.
-# If you like, you can use 2621-ba (braindamaged arrow keys).
-hp2621-ba|2621-ba|2621 w/new rom and strap A set,
-	smkx@, rmkx@,
-	kcuu1=\EA, kcud1=\EB, kcub1=\ED, kcuf1=\EC, khome=\Eh, use=hp2621,
-# 2621 with labels on all the time - normal outside vi, function inside vi.
-hp2621-wl|2621-wl|hp 2621 w/labels,
-	is2=\E&jA\r, rmkx=\E&jA, use=hp2621-fl,
-# 2621 with function labels.  Most of the time they are off,
-# but inside vi, the function key labels appear.  You have to
-# hold down shift to get them to xmit.
-hp2621-fl|2621|hp2621|hp2621a|hp2621p|2621a|2621p|2621-fl|2621A|2621P|hp 2621,
-	is2=\E&j@\r, cbt=\Ei, cup=\E&a%p2%dc%p1%dY,
-	dch1=\EP$<2>, ip=$<2>, pb#19200,
-	smso=\E&dD, rmso=\E&d@, smul=\E&dD, rmul=\E&d@, sgr0=\E&d@, xhp@,
-	khome=\Ep\r, kcuu1=\Et\r, kcub1=\Eu\r, kcuf1=\Ev\r, kcud1=\Ew\r,
-	kf1=\Ep\r, kf2=\Eq\r, kf3=\Er\r, kf4=\Es\r, kf5=\Et\r, kf6=\Eu\r,
-	kf7=\Ev\r, kf8=\Ew\r, smkx=\E&jB, rmkx=\E&j@, ht=^I$<2>, xon, use=hp,
-# 2621k45: untested
-2621k45|hp2621k45|k45|hp 2621 with 45 keyboard,
-	kbs=^H, kcuu1=\EA, kcud1=\EB, kcub1=\ED, kcuf1=\EC, khome=\Eh,
-	smkx=\E&s1A, rmkx=\E&s0A, use=2621,
-# This terminal should be used at 4800 baud or less.  It needs padding for
-# plain characters at 9600, I guessed at an appropriate cr delay.
-# It really wants ^E/^F handshaking, but that doesn't work well even if
-# you write software to support it.
-2645|hp2645|hp45|hp 264x series,
-	dim=\E&dH, rev=\E&dB, smul=\E&dD, blink=\E&dA, sgr0=\E&d@,
-	sgr=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%?%p5%t%'H'%|%;%?%p6%t%'B'%|%;%c,
-	kcuu1=\EA, kcud1=\EB, kcub1=\ED, kcuf1=\EC, khome=\Eh,
-	smkx=\E&s1A, rmkx=\E&s0A, knp=\EU, kpp=\EV, kri=\ET, kind=\ES,
-	kil1=\EL, kdl1=\EM, kich1=\EQ, kdch1=\EP,
-	kel=\EK, ked=\EJ, krmir=\ER, pb#9600, cr=^M$<20>, use=hp,
-hp|hewlett-packard,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EL, am, cub1=^H,
-	ed=\EJ, el=\EK, hpa=\E&a%p1%dC, clear=\EH\EJ,
-	cup=\E&a%p2%dc%p1%dY$<6>, cols#80, vpa=\E&a%p1%dY, lm#0, da, db,
-	dch1=\EP, dl1=\EM, rmir=\ER, smir=\EQ, kbs=^H, lines#24, mir,
-	cuf1=\EC, ht=^I, rmso=\E&d@, smso=\E&dJ,
-	smul=\E&dD, rmul=\E&d@, cuu1=\EA, xhp, vt#6,
-hp-0|hewlett-packard for testing of curses and the like,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cuf1=\EC,
-	cub1=^H, clear=\EH\EJ, home=\E&a0c0Y, cols#80, lines#24,
-hp-1,
-	ht=^I, cuu1=\EA, use=hp-0,
-hp-2,
-	cup=\E&a%p2%dc%p1%dY$<6>, use=hp-1,
-hp-3,
-	ed=\EJ, el=\EK, use=hp-2,
-# This entry does not use any of the fancy windowing stuff of the 2626.
-# Indeed, terminfo does not yet handle such stuff.  Since changing any window
-# clears memory, it is probably not possible to use this for screen opt.
-# ed is incredibly slow most of the time - I am guessing at the exact padding.
-# Since the terminal uses xoff/xon this is intended only for cost computation,
-# so that the terminal will prefer el or even dl1 which is probably faster!
-hp2626|hp2626a|hp2626p|2626|2626a|2626p|2626A|2626P|hp 2626,
-	dch1=\EP$<2>, ip=$<2>, rmso=\E&d@, smso=\E&dB, ed=\EJ$<500>,
-	rev=\E&dB, smul=\E&dD, blink=\E&dA, invis=\E&dS, sgr0=\E&d@,
-	rmul=\E&d@,
-	sgr=\E&d%'@'%?%p1%t%'B'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%c,
-	khome=\Eh, kcuu1=\EA, kcub1=\ED, kcuf1=\EC, kcud1=\EB,
-	smkx=\E&s1A, rmkx=\E&s0A, knp=\EU, kpp=\EV, kri=\ET,
-	kind=\ES, kil1=\EL, kdl1=\EM, kich1=\EQ, kdch1=\EP,
-	kel=\EK, ked=\EJ, krmir=\ER,
-	ind=\ES, ht=^I$<2>, xhp, use=2621,
-# This entry is for sysline.  It allocates a 23 line window with a 115 line
-# workspace for regular use, and a 1 line window for the status line.
-# This assumes port 2 is being used.
-# Turn off horizontal line, Create ws #1 with 115 lines,
-# Create ws #2 with 1 line, Create window #1 lines 1-23,
-# Create window #2 lines 24-24, Attach cursor to workspace #1.
-# Note that this clears the tabs so it must be done by tset before
-# it sets the tabs.
-2626-23|hp 2626 using only 23 lines,
-	tsl=\E&w7f2p2I\E&w4f2I\r\EK\E&a%p1%dC,
-	fsl=\E&d@\E&w7f2p1I\E&w4f1I, eslok, hs,
-	is1=\E&q3t0{0H \E&w0f115n1I \E&w0f1n2I
-	\E&w2f1i0d0u22l0S \E&w2f2i0d23u23l0S \E&w7f2p1I \r,
-	lines#23, use=2626,
-# Force terminal back to 24 lines after being 23.
-2626-24|hp 2626 using all 24 lines,
-	is1=\E&q3t0{0H \E&w0f118n1I \E&w0f1n2I
-	\E&w2f1i0d0u23l0S \E&w3f2I \E&w7f2p1I \r,
-	use=2626,
-# Various entries useful for small windows on 2626.
-2626-12,
-	lines#12, use=2626,
-2626-12x40,
-	cols#40, lines#12, use=2626,
-2626-x40,
-	cols#40, use=2626,
-2626-11,
-	lines#11, use=2626-23,
-# cD is a pain - but it only screws up at 9600 baud.
-# You should use this terminal at 4800 baud or less.
-hp2648|hp2648a|2648a|2648A|2648|HP 2648a graphics terminal,
-	clear=\EH\EJ$<50>, cup=\E&a%p2%dc%p1%dY$<20>,
-	dch1=\EP$<7>, ip=$<5>, use=2645,
-# 2640a doesn't have the Y cursor addressing feature, and C is memory relative
-# instead of screen relative, as we need.
-2640|hp2640a|2640a|hp 2640a,
-	cup@, smkx@, rmkx@, use=2645,
-2640b|hp2640b|2644a|hp2644a|hp 264x series,
-	smkx@, rmkx@, use=2645,
-# 2621 using all 48 lines of memory, only 24 visible at any time.  Untested.
-2621-48|48 line 2621,
-	lines#48, home=\EH, cup=\E&a%p2%dc%p1%dR, use=2621,
-# 2621 with no labels ever.  Also prevents vi delays on escape.
-hp2621-nl|2621-nl|hp 2621 with no labels,
-	smkx@, rmkx@, khome@, kcuu1@, kcub1@, kcuf1@, kcud1@, use=hp2621-fl,
-# Needed for UCB ARPAVAX console, since lsi-11 expands tabs (wrong).
-hp2621-nt|2621-nt|hp 2621 w/no tabs,
-	ht@, use=hp2621,
diff --git a/usr/src/lib/libxcurses/src/terminfo/hp2392a b/usr/src/lib/libxcurses/src/terminfo/hp2392a
deleted file mode 100644
index 52168f739d..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/hp2392a
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-2392|hp2392|hp2392a|HP 2392a Terminal,
-#
-#  Terminal initialization.  
-#
-#  Make sure that we're in character mode, no auto line feed, disable
-#  system function key labels, and set tab-stops.  See "tput init".
-#
-	is2=\E&k0B\E&k0A\E&j@,
-	if=/usr/lib/tabset/hptabs,
-
-	.msgr,
-	am,
-	km,
-	da,
-	db,
-	.mir,
-	cols#80,
-	lines#24,
-	lm#0,
-	vt#6,
-#
-#  Margins.
-#
-	smgl=\E4,
-	smgr=\E5,
-	mgc=\E9,
-#
-#  Tabs.
-#
-#  The use of ht and cbt is not recommend, unless it is possible to guarantee
-#  that tab-stops are set correctly, since there are no hardware tabs.  On an 
-#  hp2392a terminal if there are no tab-stops, then <tab> behaves like a 
-#  <newline>.
-#
-	.cbt=\Ei,
-	.ht=\t,
-	tbc=\E3,
-	hts=\E1,
-
-	bel=\a,
-	cr=\r,
-#
-#  Cursor motion.
-#
-#  Use screen relative cursor motion; not absolute or memory relative.
-#
-	hpa=\E&a%p1%dC,
-	vpa=\E&a%p1%dY,
-	smcup=\E&s1A,
-	cup=\E&a%p2%dc%p1%dY,
-	rmcup=\E&s0A,
-	cud1=\EB,
-	cub1=\b,
-	cuf1=\EC,
-	cuu1=\EA,
-	ind=\n,
-#
-#  home and ll position the cursor at the top and bottom of display memory 
-#  rather than just the screen.  This means we can't use them.
-#
-	.home=\Eh,
-	.ll=\EF,
-#
-#  Edit operations.
-#
-	clear=\E&a0c0Y\EJ,
-	dch1=\EP,
-	dl1=\EM,
-	el=\EK,
-	ed=\EJ,
-	il1=\EL,
-	smir=\EQ,
-	rmir=\ER,
-	ip=$<2>,
-#
-#  Attributes.
-#
-#  Standout 	= dim inverse
-#
-	xhp,
-	blink=\E&dA,
-	dim=\E&dH,
-	rev=\E&dB,
-	smso=\E&dJ,
-	smul=\E&dD,
-	rmso=\E&d@,
-	rmul=\E&d@,
-	sgr=\E&d%'@'%?%p1%t%'J'%|%;%?%p2%t%'D'%|%;%?%p3%t%'B'%|%;%?%p4%t%'A'%|%;%?%p5%t%'H'%|%;%c%p9%t^N%e^O%;,
-	sgr0=\E&d@,
-#
-#  Keys.
-#
-#  NOTE if the user changes the function key transmit sequences on the
-#  terminal from the default values expected for kf1 to kf8 (see below), 
-#  then the function keys will never be recognised and mapped to their
-#  respective KEY_F(1) to KEY_F(8) constants in Curses (and Vi). 
-#
-	kbs=\b,
-	kcud1=\EB,
-	khome=\Eh,
-	kll=\EF,
-	kcub1=\ED,
-	kcuf1=\EC,
-	kcuu1=\EA,
-	kcbt=\Ei,
-	knp=\EU,
-	kpp=\EV,
-	kdl1=\EM,
-	kdch1=\EP,
-	kil1=\EL,
-	kich1=\EQ,
-	kclr=\EJ,
-	kel=\EK,
-	kf1=\Ep,
-	kf2=\Eq,
-	kf3=\Er,
-	kf4=\Es,
-	kf5=\Et,
-	kf6=\Eu,
-	kf7=\Ev,
-	kf8=\Ew,
-
diff --git a/usr/src/lib/libxcurses/src/terminfo/ibm b/usr/src/lib/libxcurses/src/terminfo/ibm
deleted file mode 100644
index 4839fa4013..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/ibm
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# ibm: IBM, INTERACTIVE SYSTEMS, and INTECOLOR
-#
-# Some of these should go in the misc category, IBM, ISC, and intecolor can't
-# all have I.  I will wait to see who comes out with more terminals.
-# These compucolors appear similar, but they at least have different
-# sized screens.  I don't know what's going on here.
-# There is further confusion since intecolor seems to call themselves isc too.
-8001|isc8001|compucolor|intecolor,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EU, am, cub1=^Z,
-	clear=^L$<3*>, cup=^C%p2%c%p1%c, cols#80, rmdc=\EQ, smdc=\EQ, ed=\EF,
-	dch1=\177, dl1=\EV, rmir=\EF, smir=\EQ, lines#40, cuf1=^Y$<1>,
-	ht=\t$<8>, cuu1=^\, home=^H$<1>,
-compucolor2|compucolorii,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	ht=^I, am, cup=^C%p2%c%p1%c, cub1=^Z, lines#32, cols#64,
-	clear=^L, home=^H, cuf1=^Y, cuu1=^\,
-# From cithep!eric  Wed Sep 16 08:06:44 1981
-intext|Interactive Systems Corporation modified owl 1200,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\020$<5.5*>, am, cub1=^_,
-	cub1=^H, cbt=^Y, ed=\026J$<5.5*>, el=^K\160^R,
-	clear=\014$<132>, cup=\017%p1%' '%+%c%p2%' '%+%c, cols#80,
-	dch1=\022$<5.5*>, dl1=\021$<5.5*>, rmir=\026\074,
-	smir=\026\073, ip=$<5.5*>, lines#24, cuf1=\036, ht=^I, 
-	cuu1=\034, rmso=^V# , xmc#1, smso=^V$\054,
-	kcub1=^_, kcud1=^J, kcuf1=^^, kcuu1=\034, kbs=^H, khome=^Z,
-	kf1=^VA\r, kf2=^VB\r, kf3=^VC\r, kf4=^VD\r, kf5=^VE\r,
-	kf6=^VF\r, kf7=^VG\r, kf8=^VH\r, kf9=^VI\r, kf0=^VJ\r,
-ibm|ibm3101|3101|i3101|IBM 3101-10,
-	.if=/usr/lib/tabset/3101,
-	cr=^M, cud1=^J, ind=^J, bel=^G, tbc=\EH, hts=\E0, am, cub1=^H,
-	clear=\EK, lines#24, cols#80, cuf1=\EC, cuu1=\EA, ed=\EJ, el=\EI,
-	kcud1=\EB, kcub1=\ED, kcuf1=\EC, kcuu1=\EA,
-	home=\EH, cup=\EY%p1%' '%+%c%p2%' '%+%c, ht=^I, 
diff --git a/usr/src/lib/libxcurses/src/terminfo/kimtron b/usr/src/lib/libxcurses/src/terminfo/kimtron
deleted file mode 100644
index 7196b4e7cd..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/kimtron
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# Kimtron KT-7 with VT-100 emulation ROMs.
-# This is a hack of the VC2100 VT-100 emulation.
-#
-kt7|kt7io|Kimtron KT-7,
-	cols#80, lines#24, am, bw, xon,
-	cr=^M, bel=^G,
-# Status line
-	hs, dsl=\E[0;0z
-# Cursor one position
-	cuu1=\E[A, cud1=^J, cuf1=\E[C, cub1=^H,
-# Cursor multiple positions
-	cuu=\E[%p1%dA, cud=\E[%p1%dB, cuf=\E[%p1%dC, cub=\E[%p1%dD,
-# Cursor position
-	cup=\E[%i%p1%d;%p2%dH, home=\E[H,
-# Scrolling Region
-	csr=\E[%p1%d;%p2%dr, sc=\E7, rc=\E8,
-# Scroll down and up
-	ind=^J, ri=\EM,
-# Area Clears - contrary to documentation, \E2J doesn't home the cursor!
-	el=\E[K, ed=\E[J, clear=\E[H\E[2J,
-# Attributes
-	bold=\E[1m, rev=\E[7m, blink=\E[5m, invis=\E[3m, sgr0=\E[m,
-	smul=\E[4m, rmul=\E[m, smso=\E[4;7m, rmso=\E[m, msgr,
-	sgr=\E[0;%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;2m,
-#	flash=\E[?5h\E[?5l,	needs some kind of delay in the middle
-# Tabs
-	ht=^I, tbc=\E[3g, hts=\EH, it#8,
-# Screen editing
-	il1=\E[L, dl1=\E[M, ich1=\E[@, dch1=\E[P, smir=\E[4h, rmir=\E[4l,
-	il=\E[%p1%dL, dl=\E[%p1%dM, ich=\E[%p1%d@, dch=\E[%p1%dP,
-# Keypad
-	kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, khome=\E[H, kbs=^H,
-	kf1=\Ef1, kf2=\Ef2, kf3=\Ef3, kf4=\Ef4, kf5=\Ef5,
-	kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kf10=\Ef0,
-	kf11=\EF1, kf12=\EF2, kf13=\EF3, kf14=\EF4, kf15=\EF5,
-	kf16=\EF6, kf17=\EF7, kf18=\EF8, kf19=\EF9, kf20=\EF0,
-	kdl1=\E[M, kil1=\EOQ, kich1=\EOP, kdch1=\E[P,
-	kclr=^L,
-	pfkey=\E[?%p1%dh/%p2%s/,
-# Initialization
-	is1=\E<\017\E[0m\E[?7h\E[?1l\E[?11k\E[?10k\E>,
-	rs1=\E[0m\Ec,
-# Applications dependent for 10 - initialize US keys as function keys
-	is2=\E|11\Ef1^Y\E|21\Ef2^Y\E|31\Ef3^Y\E|41\Ef4^Y\E|51\Ef5^Y\E|61\Ef6^Y\E|71\Ef7^Y\E|81\Ef8^Y\E|91\Ef9^Y\E|01\Ef0^Y,
-
-kt7new|Kimtron KT-7 with stupid eat newline,
-	am@,
-	xenl,
-	use=kt7,
diff --git a/usr/src/lib/libxcurses/src/terminfo/lsi b/usr/src/lib/libxcurses/src/terminfo/lsi
deleted file mode 100644
index 28e9485947..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/lsi
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996, by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lsi: LEAR SIEGLER (ADM)
-#
-# If the adm31 gives you trouble with standout mode, check the DIP switch
-# in position 6, bank @c11, 25% from back end of pad.  Should be OFF.
-# If there is no such switch, you have an old adm31 and must use oadm31
-adm31|31|lsi adm31,
-	is2=\Eu\E0, cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EE, am, cub1=^H,
-	el=\ET, cup=\E=%p1%' '%+%c%p2%' '%+%c, clear=\E*, ed=\EY, cols#80,
-	dch1=\EW, dl1=\ER, rmir=\Er, home=^^, smir=\Eq,
-	kf0=^A0\r, kf1=^A1\r, kf2=^A2\r, kf3=^A3\r, kf4=^A4\r,
-	kf5=^A5\r, kf6=^A6\r, kf7=^A7\r, kf8=^A8\r, kf9=^A9\r,
-	kcud1=^J, kcub1=^H, kcuf1=^L, kcuu1=^K,
-	lines#24, mir, cuf1=^L,
-	rmso=\EG0, smso=\EG1, cuu1=^K, smul=\EG1, rmul=\EG0,
-adm2|lsi adm2,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EE, am, cub1=^H, ed=\EY, el=\ET,
-	clear=\E;, cup=\E=%p1%' '%+%c%p2%' '%+%c, cols#80, dch1=\EW, dl1=\ER,
-	home=^^, ich1=\EQ, kcud1=^J, khome=^^, kcub1=^H, kcuf1=^L, kcuu1=^K,
-	lines#24, cuf1=^L, cuu1=^K,
-adm3|lsi adm3,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	am, cub1=^H, clear=^Z, lines#24, cols#80,
-adm42|42|lsi adm42,
-	cvvis=\EC\E3 \E3(, cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EE$<270>,
-	am, cub1=^H, ed=\EY, el=\ET, clear=\E;, cup=\E=%p1%' '%+%c%p2%' '%+%c,
-	cols#80, dch1=\EW, dl1=\ER, rmir=\Er, smir=\Eq, ip=$<6*>, lines#24,
-	cbt=\EI, cuf1=^L, rmso=\EG0, smso=\EG4, ht=\t, cuu1=^k,
-	pad=\177,
-adm5|lsi adm5,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	ed=\EY, el=\ET, cud1=^J, kbs=^H, khome=^^,
-	rmso=\EG, xmc#1, smso=\EG, use=adm3aplus,
-adm3a|3a|lsi adm3a,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	cup=\E=%p1%' '%+%c%p2%' '%+%c, clear=^Z$<1>,
-	cols#80, home=^^, lines#24, cuf1=^L, cuu1=^K,
-#
-#  MPE/IX has trouble with files that have '+' in the name.
-# adm3a+|3a+|adm3aplus|lsi adm3a+,
-#
-adm3aplus|lsi adm3a+,
-	kcub1=^H, kcud1=^J, kcuu1=^K, kcuf1=^L, use=adm3a,
-oadm31|o31|old adm31,
-	smso=\EG4, smul@, rmul@, use=adm31,
diff --git a/usr/src/lib/libxcurses/src/terminfo/microterm b/usr/src/lib/libxcurses/src/terminfo/microterm
deleted file mode 100644
index 63cad360fe..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/microterm
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# microterm: MICROTERM
-#
-microterm|act4|microterm act iv,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, ed=^_, el=^^, clear=^L,
-	cup=^T%p1%c%p2%c, cols#80, lines#24, cuf1=^X, cuu1=^Z, home=^],
-# The padding on cuf1 for act5 and mime is a guess and not final.
-# The act5 has hardware tabs, but in cols 8, 16, 24, 32, 41 (!), 49, ...
-microterm5|act5|microterm act v,
-	uc=\EA, ri=\EH$<3>, kcuu1=^Z, kcud1=^K, kcub1=^H, kcuf1=^X, use=act4,
-# Act V in split screen mode.  act5s is not tested and said not to work.
-# Could have been because of the funny tabs - it might work now.
-act5s|skinny act5,
-	smcup=\EP, rmcup=\EQ, lines#48, cols#39, use=act5,
-# These mime1 entries refer to the Microterm Mime I or Mime II.
-# The default mime is assumed to be in enhanced act iv mode.
-# There is a ^Q in is2 to unwedge any lines that wedge on ^S.
-mime|mime1|mime2|mimei|mimeii|microterm mime1,
-	cup=^T%p1%{24}%+%c%p2%?%p2%{32}%>%t%{48}%+%;%{80}%+%c, cols#80,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=^A$<80>, am, cub1=^H,
-	ed=^_, el=^^, clear=\035^C, dl1=^W$<80>, ht=^I, lines#24,
-	cuf1=^X, uc=^U, cuu1=^z, home=\035, cud1=^K, is2=\E^S^Q,
-	kcuu1=^Z, kcud1=^K, kcub1=^H, kcuf1=^X, ri=^R$<3>, vt#9,
-mime-3a|mime-adm3a|mime1 emulating adm3a,
-	am@, kcuu1=^Z, kcud1=^K, kcub1=^H, kcuf1=^X, use=adm3a,
-mime-3ax|mime-adm3ax|mime1 emulating enhanced adm3a,
-	il1=^A$<80>, dl1=^W$<80>, ht=^I$<3>, el=^X, ed=^_, use=mime-3a,
-# Mimes using brightness for standout.  Half bright is very dim unless
-# you turn up the brightness so far that lines show up on the screen.
-mime-fb|full bright mime1,
-	smso=^Y, rmso=^S, is2=^S\E^Q, use=mime,
-mime-hb|half bright mime1,
-	smso=^S, rmso=^Y, is2=^Y\E, use=mime,
-# These entries (for mime 2a) put the terminal in low intensity mode
-# since high intensity mode is so obnoxious.
-# This is the preferred mode (but ^X can't be used as a kill character (?))
-mime2a|mime2a-v|microterm mime2a (emulating an enhanced vt52),
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=^A$<20*>, cub1=^H, ed=\EQ$<20*>,
-	cols#80, el=\EP, clear=\EL, cup=\EY%p1%' '%+%c%p2%' '%+%c, is2=^Y,
-	dch1=^N, dl1=^W$<20*>, ip=$<2>, rmir=^Z, home=\EH, smir=^O, cuu1=\EA,
-	ri=\EA, kcud1=\EB, kcub1=\ED, kcuf1=\EC, kcuu1=\EA, lines#24,
-	cuf1=\EC, ht=^I, rmso=\E9, smso=\E8, smul=\E4, rmul=\E5,
-mime2a-s|microterm mime2a (emulating an enhanced soroc iq120),
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=^A$<20*>, am, cub1=^H, ed=\EJ$<20*>,
-	el=\EK, clear=\EL, cup=\E=%p1%' '%+%c%p2%' '%+%c, cols#80, dch1=\ED,
-	dl1=^W$<20*>, kcub1=^H, kcuf1=^L, kcuu1=^K, kcud1=^J, home=^^, is2=\E),
-	ri=\EI, smir=\EE, rmir=^Z, ip=$<2>, lines#24, cuf1=^L, cuu1=\EI,
-	smso=\E:, rmso=\E;, smul=\E6, rmul=\E7,
diff --git a/usr/src/lib/libxcurses/src/terminfo/misc b/usr/src/lib/libxcurses/src/terminfo/misc
deleted file mode 100644
index d611245326..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/misc
+++ /dev/null
@@ -1,254 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# misc: MISCELLANEOUS TERMINALS
-#
-# ----------------------------------------------------------------
-#
-# BB&N BitGraph
-# The function keys kf0-kf9 are the codes generated by the keypad keys 0-9
-# NOTE that this means that PF1-PF4 are not represented here at all.
-bg|bitg|bitgraph|BBN BitGraph,
-	msgr, xon, cols#85, lines#64,
-	bel=^G, cr=^M, tbc=\E[g, clear=\E[H\E[J, el=\E[K, ed=\E[J,
-	cup=\E[%i%p1%d;%p2%dH, home=\E[H,
-	cub=\E[%p1%dD, cub1=\E[D, cuf=\E[%p1%dC, cuf1=\E[C,
-	cud=\E[%p1%dB, cud1=\E[B, cuu=\E[%p1%dA, cuu1=\E[A,
-	dl=\E[%p1%dM, dl1=\E[M, il=\E[%p1%dL, il1=\E[L,
-#	dch=\E[%p1%dP, dch1=\E[P, ich=\E[%p1%d@, ich1=\E[@,
-	smso=\E[4m, rmso=\E[m, smul=\E[4m, rmul=\E[m,
-	bold=\E[m, rev=\E[7m, sgr0=\E[m,
-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
-	is2=\E:e\E[m\E(B^O\E[1;64r\E[H\E[J\E[20l\E[?1;6l\E[?5;7;50;52h\E=,
-	kbs=^H, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, kcuu1=\E[A,
-	kf0=\EOp, kf1=\EOq, kf2=\EOr, kf3=\EOs, kf4=\EOt,
-	kf5=\EOu, kf6=\EOv, kf7=\EOw, kf8=\EOx, kf9=\EOy,
-	sc=\E7, rc=\E8, ind=\ED, ri=\EM, nel=\EE,
-	hts=\EH, ht=^I,
-#
-# Vanilla ANSI terminal.  This is assumed to implement all the normal
-# ANSI stuff with no extensions.  It assumes insert/delete line/char
-# is there, so it won't work with vt100 clones.  It assumes video
-# attributes for bold, blink, underline, and reverse, which won't
-# matter much if the terminal can't do some of those.  Padding is
-# assumed to be zero, which shouldn't hurt since xon/xoff is assumed.
-# This entry is based on the Ann Arbor Ambassador.
-ansi|generic ansi standard terminal,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\E[L, am, cub1=^H, ed=\E[J,
-	el=\E[K, clear=\E[H\E[J, cup=\E[%i%p1%d;%p2%dH, cols#80, lines#24,
-	dch1=\E[P, dl1=\E[M, home=\E[H,
-	ich=\E[%p1%d@, ich1=\E[@, smir=\E6, rmir=\E6,
-	bold=\E[1m, rev=\E[7m, blink=\E[5m, invis=\E[8m, sgr0=\E[0m,
-	sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
-	kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, khome=\E[H, kbs=^H,
-	cuf1=\E[C, ht=^I, cuu1=\E[A, xon, rep=%p1%c\E[%p2%{1}%-%db,
-	rmul=\E[m, smul=\E[4m, rmso=\E[m, smso=\E[7m,
-# The tab 132 uses xon/xoff, so no padding needed.
-# smkx/rmkx have nothing to do with arrow keys.
-# is2 sets 80 col mode, normal video, autowrap on (for am).
-# Seems to be no way to get rid of status line.
-tab132|tab|tab 132/15,
-	is2=\E[?7h\E[?3l\E[?5l, smkx@, rmkx@, cr=^M, cud1=^J, ind=^J,
-	bel=^G, lm#96, da, db, il1=\E[L, dl1=\E[M, dch1=\E[P,
-	rmir=\E[4l, smir=\E[4h, cup=\E[%i%p1%d;%p2%dH,
-	kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, use=vt100,
-tab132w,
-	cols#132, is2=\E[?7h\E[?3h\E[?5l, use=tab132,
-tab132rv,
-	is2=\E[?7h\E[?3l\E[?5h, use=tab132,
-tab132wrv,
-	is2=\E[?7h\E[?3h\E[?5h, use=tab132w,
-# This used to say "de#001202" which presumably refers to the stty bits
-# that need to be set for some version of Unix.  We need the real delay
-# requirements here.
-mw2|Multiwriter 2,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#132, hc, os,
-trs80|trs-80|Radio Shack TRS-80 model I,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	am, cub1=^H, cols#64, lines#16,
-# I think the direct is supposed to be vt100 compatible, so all this
-# should probably be replaced by a use=vt100, but I can't test it.
-d800|direct|direct800|Direct 800/A,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#24, am,
-	clear=\E[1;1H\E[2J, cub1=^H, cup=\E[%i%p1%d;%p2%dH,
-	cuf1=\E[C, cuu1=\E[A, el=\E[K, ed=\E[J, smso=\E[7m, rmso=\E[0m,
-	smul=\E[4m, rmul=\E[0m, xhp, cvvis=\E[>12l, cnorm=\E[>12h,
-	ind=\ED, ri=\EM, da, db, rmacs=\E[1m, smacs=\E[0m, msgr, ht=^I, 
-	kcub1=\E[D, kcuf1=\E[C, kcuu1=\E[A, kcud1=\E[B,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
-vc404|volker-craig 404,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, ed=^W$<40>, el=^V$<20>,
-	clear=^X$<40>, cup=^P%p1%' '%+%c%p2%' '%+%c, cols#80, home=^Y$<40>,
-	kcud1=^J, kcub1=^H, kcuf1=^U, kcuu1=^Z, lines#24, cuf1=^U, cuu1=^Z,
-vc404s|volker-craig 404 w/standout mode,
-	cr=^M, cud1=^J, ind=^J, bel=^G, rmso=^O, smso=^N, use=vc404,
-vc404na|volker-craig 404 w/no arrow keys,
-	kcuf1@, kcuu1@, use=vc404,
-vc404sna|volker-craig 404 w/standout mode and no arrow keys,
-	rmso=^O, smso=^N, use=vc404na,
-# missing in vc303a and vc303 descriptions:  they scroll 2 lines at a time
-# every other linefeed.
-vc303a|vc403a|volker-craig 303a,
-	cr=^M, cud1=^J, bel=^G, am, cub1=^H, el=^V$<20>, clear=^X$<40>,
-	cols#80, home=^Y$<40>, kcud1=^J, kcub1=^H, kcuf1=^U,
-	kcuu1=^Z, lines#24, ll=^P^@W, cuf1=^U, cuu1=^Z,
-vc303|vc103|vc203|volker-craig 303,
-	cr=^M, cud1=^J, bel=^G, am, cub1=^H, clear=^L$<40>, cols#80,
-	home=^K$<40>, kcud1=^J, kcub1=^H, kcuf1=^I, kcuu1=^N, lines#24,
-	ll=^O$<1>W, cuf1=^I, cuu1=^N,
-# From cbosg!ucbvax!SRC:george Fri Sep 11 22:38:32 1981
-ampex|d80|dialogue|dialogue80|ampex dialogue 80,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G,
-	is2=\EA, smul=\El, rmul=\Em,
-	am, cub1=^H, ht=^I, clear=\E*$<75>, cup=\E=%p1%' '%+%c%p2%' '%+%c,
-	il1=\EE$<5*>, cbt=\EI, ich1=\EQ, dl1=\ER$<5*>, dch1=\EW,
-	el=\Et, ed=\Ey, smso=\Ej, rmso=\Ek, lines#24, cols#80, cuf1=^L, cuu1=^K,
-d132|datagraphix|datagraphix 132a,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	cols#80, lines#30, clear=^l, home=\Et, da, db, ind=\Ev, ri=\Ew,
-	cuu1=\Ek, cuf1=\El, cvvis=\Ex, cnorm=\Em\En,
-	il1=\E3, ich1=\E5, dch1=\E6, in, ich1=\E5,
-soroc|Soroc 120,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	ed=\EY, el=\ET, clear=\E*$<2>,
-	kcub1=^H, kcuu1=^K, kcuf1=^L, kcud1=^J, use=adm3a,
-# tec is2 untested, and taken from CB/Unix virtual terminal driver.
-# Upper case terminal, uses lower case for control sequences!!!
-# The driver shows the C ~ operator used on CM coordinates.
-tec400|tec scope,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cup=l%p2%~%c%p1%~%c,
-	cuu1=x, cud1=h, cuf1=g, cub1=w, home=i, smso={, rmso=|,
-	xmc#1, clear=f, il1=e, dl1=u, ich1=d, dch1=t, el=c, ed=s,
-# From ucbvax!geoff Mon Sep 21 21:15:45 1981 
-# This entry has been tested.
-tec500|tec 500,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	cup=\E=%p1%' '%+%c%p2%' '%+%c, clear=^Z$<20>,
-	cols#80, home=^^, lines#24, cuf1=^L, cuu1=^K, smso=^], rmso=^\,
-# I would appreciate more information on this terminal, such as the
-# manufacturer and the model number.  There are too many 'tecs' in here.
-tec,
-	lines#24, cols#80, clear=^l, cuu1=^k, cuf1=\037, am,
-	cub1=^H, home=\036, cr=^M, cud1=^J, ind=^J, bel=^G,
-teletec|Teletec Datascreen,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	am, cub1=^H, cols#80, clear=^l, home=^^, lines#24, cuf1=^_, cuu1=^k,
-aed512|aed|AED 512,
-	if=/usr/lib/tabset/aed,
-	cr=^M, cud1=^J, bel=^G,
-	cols#64, lines#40, clear=^L,
-	cub1=^H, cuf1=\Ei0800\001,
-	cnorm=\E\072004=000200??\001,
-	flash=\EK0001??0000K0001202080\001,
-	smso=\E\07200>8000140[80C00\001, rmso=\E[00C80\001,
-	smul=\E\07200>8000140\001, rmul=\E\07200>8000100\001,
-	uc=\Ei???>l0800i0102\001,
-	smcup=\E\07200>8000140{<04<0??00001010L<0\072004=0002??00\001,
-	rmcup=\E\07200>8000100{804<0??00001000L80\072004=000200??\001,
-	ind=\E;1100\072004=000200??;1300\047\200\001\n\E\072004=0002??00;1200\001\n,
-	cuu1=^K, .cup=\E;1300%p1%c%p2%c\001,
-digilog|333|digilog 333,
-	cub1=^H, cols#80, el=\030, home=^n, lines#16, cuf1=^i, cuu1=^o,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-ep48|ep4080|execuport 4080,
-	am, cub1=^H, os, cols#80, hu=\036, hd=\034,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-ep40|ep4000|execuport 4000,
-	am, cub1=^H, os, cols#136, hu=\036, hd=\034,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-terminet1200|terminet300|tn1200|tn300|terminet|ge terminet 1200,
-	cols#120, hc, os,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-datapoint|dp3|dp3360|datapoint 3360,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	ed=^_, el=^^, clear=^]^_, cols#82, home=^], lines#25, cuf1=^x, cuu1=^z,
-dg|dg6053|data general 6053,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	am, cub1=^H, cup=^P%p2%c%p1%c, clear=^L, home=^H, cuf1=^S,
-	cuu1=^W, el=^K, cols#80, lines#24,
-cdi|cdi1203,
-	am, cub1=^H, hc, os, cols#80,
-	cr=^M$<200>, cud1=^J, ind=^J, bel=^G,
-# ^S is an arrow key!  Boy is this guy in for a surprise on v7!
-sol,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, cup=\E^1%p1%c\E^2%p2%c,
-	clear=^K, home=^N, cols#64, lines#16, cuf1=^S, cuu1=^W,
-	kcub1=^A, kcuf1=^S, kcuu1=^W, kcud1=^Z,
-xl83|cybernex XL-83,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, ed=^P$<62>, el=^O$<3>,
-	clear=^L$<62>, cup=^W%p1%' '%+%c%p2%' '%+%c, cols#80, home=^K,
-	kcud1=^J, kcub1=^H, kcuu1=^N, lines#24, cuu1=^N, cuf1=^I,
-omron|Omron 8025AG,
-	cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EL, am, cub1=^H, ed=\ER,
-	cols#80, el=\EK, clear=\EJ, da, db, dch1=\EP, dl1=\EM, home=\EH,
-	lines#24, cuf1=\EC, rmso=\E4, ind=\ES, smso=\Ef, ri=\ET,
-	cuu1=\EA, cnorm=, cvvis=\EN,
-plasma|plasma panel,
-	am, cub1=^H, clear=^L, cols#85, home=^^, lines#45, cuf1=\030, cuu1=\026,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-swtp|ct82|Southwest Technical Products CT82,
-	cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H, il1=^\^y,
-	ed=^v, el=^F, clear=^L, cup=^k%p2%c%p1%c, cols#82, lines#20, dl1=^z,
-	cuf1=^s, cuu1=^a, smso=^^^v, rmso=^^^F, dch1=^\^h, ich1=^\^x, home=^p,
-	ind=^n, ri=^o, ll=^c,
-	is2=^\^r^^^s^^^d^]^w^i^s^^^]^^^o^]^w^r^i,
-terak|Terak emulating Datamedia 1520,
-	use=dm1520,
-remote|virtual remote terminal,
-	cols#79, am@, use=virtual,
-virtual|CB-UNIX virtual terminal,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#24, am, clear=\E\112,
-	cub1=^H, cup=\E\107%p2%c%p1%c, cuf1=\E\103, cuu1=\E\101, el=\E\113,
-	ed=\E\114, il1=\E\120, dl1=\E\116, ich1=\E\117, lm#0, da, db,
-	kcub1=\E\104, kcuf1=\E\103, kcuu1=\E\101, kcud1=\E\102, khome=\E\105,
-	smso=\E\141\004, rmso=\E\142\004, smul=\E\141\001, rmul=\E\142\001,
-# This is untested.  The cup sequence is hairy enough that it probably
-# needs work.  The idea is ctrl(O), dd(row), dd(col), where dd(x)
-# is x - 2*(x%16) + '9'
-delta|dd5000|delta data 5000,
-	cud1=^J, ind=^J, bel=^G, am, cub1=^H, clear=^NR,
-	cup=^O%p1%p1%{16}%m%{2}%*%-%'9'%+%c%p2%p2%{16}%m%{2}%*%-%'9'%+%c,
-	cols#80, lines#27, home=^NQ, cuf1=^Y, cuu1=^Z, el=^NU, dch1=^NV,
-mdl110|cybernex mdl-110,
-	cup=^P%p1%' '%+%c%p2%' '%+%c, cols#80, lines#24, am, clear=^X$<70>,
-	cub1=^H, cr=^M, cud1=^J, ind=^J, bel=^G, cuf1=^U, cuu1=^Z, home=^Y,
-	el=^N@^V$<145>, ed=^NA^W$<145>, il1=^NA^N^]$<65>, dl1=^NA^N^^$<40>,
-	ich1=^NA^]$<3.5>, smdc=, rmdc=, dch1=^NA^^$<3.5>, smso=^NF, rmso=^NG,
-	ht=\t$<43>, ed=^N@^V$<6>,
-zen30|z30|zentec 30,
-	cr=^M, cud1=^J, ind=^J, bel=^G, mir, cols#80, lines#24,
-	ul, il1=\EE$<1.5*>, cub1=^H, el=\ET$<1.0*>,
-	cup=\E=%p1%' '%+%c%p2%' '%+%c, clear=\E*, home=^^, cuf1=^L,
-	rmso=\EG0, smso=\EG6, cuu1=^K, smir=\Eq, rmir=\Er,
-	am, dch1=\EW, dl1=\ER$<1.5*>, ed=\EY,
-# Test version for Falco ts-1. See "arpavax.hickman@ucb" for info
-falco|ts1|ts-1|falco ts-1,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#24, ht=^I,
-	is2=\Eu\E3, il1=\EE, am, el=\ET\EG0^H, cup=\E=%p1%' '%+%c%p2%' '%+%c,
-	clear=\E*, ed=\EY, dch1=\EW, cub1=^H, dl1=\ER, rmir=\Er, smir=\Eq,
-	home=^^, kf0=^A0\r, kcud1=^J, kcub1=^H, kcuf1=^L, kcuu1=^K, cuf1=^L,
-	rmso=\Eg0, smso=\Eg1, cuu1=^K, smul=\Eg1, rmul=\Eg0,
diff --git a/usr/src/lib/libxcurses/src/terminfo/okimtron b/usr/src/lib/libxcurses/src/terminfo/okimtron
deleted file mode 100644
index 9abaf7c127..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/okimtron
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# Kimtron KT-7 with VT-100 emulation ROMs.
-# This is a hack of the VC2100 VT-100 emulation.
-#
-kt7|kt7io|Kimtron KT-7,
-	cols#80, lines#24, am, bw, xon,
-	cr=^M, bel=^G,
-# Status line
-	hs, dsl=\E[0;0z
-# Cursor one position
-	cuu1=\E[A, cud1=^J, cuf1=\E[C, cub1=^H,
-# Cursor multiple positions
-	cuu=\E[%p1%dA, cud=\E[%p1%dB, cuf=\E[%p1%dC, cub=\E[%p1%dD,
-# Cursor position
-	cup=\E[%i%p1%d;%p2%dH, home=\E[H,
-# Scrolling Region
-	csr=\E[%p1%d;%p2%dr, sc=\E7, rc=\E8,
-# Scroll down and up
-	ind=^J, ri=\EM,
-# Area Clears - contrary to documentation, \E2J doesn't home the cursor!
-	el=\E[K, ed=\E[J, clear=\E[H\E[2J,
-# Attributes
-	bold=\E[1m, rev=\E[7m, blink=\E[5m, invis=\E[3m, sgr0=\E[m,
-	smul=\E[4m, rmul=\E[m, smso=\E[4;7m, rmso=\E[m, msgr,
-	sgr=\E[0;%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;2m,
-# Tabs
-	ht=^I, tbc=\E[3g, hts=\EH, it#8,
-# Keypad
-	kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, khome=\E[H, kbs=^H,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	pfkey=\E[?%p1%dh/%p2%s/,
-# Initialization
-	is1=\E<\017\E[0m\E[?7h\E[?1l\E[?11k\E[?10k\E>,
-	rs1=\E[0m\Ec,
-# Applications dependent for 10 - initialize US keys as function keys
-	is2=\E|11\EOP^Y\E|21\EOQ^Y\E|31\EOR^Y\E|41\EOS^Y\E|51\Ef5^Y\E|61\Ef6^Y\E|71\Ef7^Y\E|81\Ef8^Y\E|91\Ef9^Y\E|01\Ef0^Y,
-	kf5=\Ef5, kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kf10=\Ef0,
diff --git a/usr/src/lib/libxcurses/src/terminfo/perkinelmer b/usr/src/lib/libxcurses/src/terminfo/perkinelmer
deleted file mode 100644
index 7b4ec5684c..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/perkinelmer
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 1996 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# perkinelmer: PERKIN ELMER
-#
-bantam|pe550|perkin elmer 550,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, cols#80, el=\EI$<20>,
-	clear=\EK$<20>, cup=\EX%p1%' '%+%c\EY%p2%' '%+%c, home=\EH,
-	lines#24, ll=\EH\EA, cuf1=\EC, cuu1=\EA, ed=^N@^V$<6>,
-fox|perkin elmer 1100,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G, am, cub1=^H,
-	ed=\EJ$<5.5*>, el=\EI, clear=\EH\EJ$<132>, cols#80, home=\EH, lines#24,
-	ll=\EH\EA, cuf1=\EC, cup=\EX%p1%' '%+%c\EY%p2%' '%+%c,
-	cuu1=\EA, flash=^P^B^P^C,
-owl|perkin elmer 1200,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EL$<5.5*>,
-	am, cub1=^H, ed=\EJ$<5.5*>, el=\EI$<5.5>, clear=\EH\EJ$<132>, home=\EH,
-	ll=\EH\EA, cup=\EX%p1%' '%+%c\EY%p2%' '%+%c, cols#80, dch1=\EO$<5.5*>,
-	dl1=\EM$<5.5*>, ich1=\EN, ip=$<5.5*>, kbs=^h, in, lines#24,
-	cuf1=\EC, cuu1=\EA, rmso=\E!\200, smso=\E!^H, flash=^P^B^P^C,
-	kf1=\ERA, kf2=\ERB, kf3=\ERC, kf4=\ERD, kf5=\ERE, kf6=\ERF,
-	kf7=\ERG, kf8=\ERH, kf9=\ERI, kf0=\ERJ,
diff --git a/usr/src/lib/libxcurses/src/terminfo/print b/usr/src/lib/libxcurses/src/terminfo/print
deleted file mode 100644
index 9386a2ac03..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/print
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)print	1.1 print 5/19/82
-#
-# print: PRINTERS
-#
-# Generic line printer.  We assume it can backspace, since even those
-# line printers that can't have this hidden by UNIX lpr driver.
-lpr|lp|printer|print|printing|line printer,
-	cr=^M, cud1=^J, ff=^L, bel=^G, cub1=^H, cols#132, hc, os,
-citoh|ci8510|8510|c.itoh 8510a,
-	cols#80, ri=\Er, bold=\E!, smul=\EX, rmul=\EY, sgr0=\E"\EY, 
-	is2=\E(009\054017\054025\054033\054041\054049\054057\054065\054073.,
-	rep=\ER%p2%3d%p1%c, use=lpr,
diff --git a/usr/src/lib/libxcurses/src/terminfo/simple b/usr/src/lib/libxcurses/src/terminfo/simple
deleted file mode 100644
index b8a63dc96e..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/simple
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-simple52|Minimum VT52 definitions required for Curses,
-#
-#  These should not be required.  Curses can determine the 
-#  screen dimensions from the stty values or environment
-#  variables LINES and COLUMNS.  
-#
-	cols#80,
-	lines#24,
-#
-#  These functions are required.
-#
-	clear=\EH\EJ$<100>,
-	cud1=\EB,
-	cub1=\ED,
-	cuu1=\EA,
-	cuf1=\EC,
-
-simple100|Minimum VT100 definitions required for Curses,
-#
-#  These should not be required.  Curses can determine the 
-#  screen dimensions from the stty values or environment
-#  variables LINES and COLUMNS.  
-#
-	cols#80,
-	lines#24,
-#
-#  These functions are required.
-#
-	clear=\E[H\E[J$<100>,
-	cud1=\E[B,
-	cub1=\E[D,
-	cuu1=\E[A,
-	cuf1=\E[C,
-
diff --git a/usr/src/lib/libxcurses/src/terminfo/special b/usr/src/lib/libxcurses/src/terminfo/special
deleted file mode 100644
index 500b2d3213..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/special
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)special	1.5	5/19/82
-#
-# special: SPECIALS
-#
-# Generic "terminals".  These are used to label tty lines when you don't
-# know what kind of terminal is on it.  The characteristics of an unknown
-# terminal are the lowest common denominator - they look about like a ti 700.
-arpanet|network,
-	use=unknown,
-bussiplexer,
-	use=unknown,
-dialup,
-	use=unknown,
-ethernet|network,
-	use=unknown,
-plugboard|patch|patchboard,
-	use=unknown,
-dumb,
-	am, bel=^G, cols#80, cr=^M, cud1=^J, ind=^J,
-unknown,
-	gn, use=dumb,
-switch|intelligent switch,
-	use=unknown,
diff --git a/usr/src/lib/libxcurses/src/terminfo/tektronix b/usr/src/lib/libxcurses/src/terminfo/tektronix
deleted file mode 100644
index 85560bcf85..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/tektronix
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)tektronix	1.5	5/20/82
-#
-# tektronix: TEKTRONIX
-#
-tek|tek4012|4012|tektronix 4012,
-	cr=^M, cud1=^J, bel=^G, ff=^L$<1000>,
-	is2=\E^O, cub1=^H, clear=\E^L$<1000>, cols#75, lines#35, os,
-tek4013|4013|tektronix 4013,
-	rmacs=\E^N, smacs=\E^O, use=4012,
-tek4014|4014|tektronix 4014,
-	is2=\E^O\E9, cols#81, lines#38, use=tek4012,
-tek4015|4015|tektronix 4015,
-	rmacs=\E^N, smacs=\E^O, use=4014,
-tek4014-sm|4014-sm|tektronix 4014 in small font,
-	is2=\E^O\E\072, cols#121, lines#58, use=tek4014,
-tek4015-sm|4015-sm|tektronix 4015 in small font,
-	rmacs=\E^N, smacs=\E^O, use=4014-sm,
-tek4023|4023|tex|tektronix 4023,
-	cr=^M, cud1=^J, ind=^J, bel=^G, smso=^_P, rmso=^_@,
-	cup=\034%p2%' '%+%c%p1%' '%+%c, cuf1=\t, cub1=^H,
-	clear=\E^L$<4>, cols#80, lines#24, am, vt#4,
-# Can't use cursor motion because it's memory relative, and because
-# it only works in the workspace, not the monitor.  Same for home.
-# Likewise, standout only works in the workspace.
-# el was commented out since vi and rogue seem to work better simulating
-# it with lots of spaces!
-4025|4027|4024|tek4025|tek4027|tek4024|4025cu|4027cu|tektronix 4024/4025/4027,
-	cr=^M, ind=^F^J, cud1=^F^J, bel=^G, am, da, db, ht=^I, 
-	cub1=^H, lm#0, lines#34, cols#80, clear=^_era\r\n\n,
-	is2=\41com 31\r\n^_sto 9 17 25 33 41 49 57 65 73\r,
-	smkx=^_lea p4 /h/\r^_lea p8 /k/\r^_lea p6 / /\r^_lea p2 /j/\r^_lea f5 /H/\r,
-	rmkx=^_lea p2\r^_lea p4\r^_lea p6\r^_lea p8\r^_lea f5\r,
-	cuu1=^K, cuf1=^_rig\r, il1=^_up\r^_ili\r$<145>, dl1=^_dli\r^F,
-	dch1=^_dch\r, smir=^_ich\r, rmir=^F^_dow\r^K,
-	.el=^_dch 80\r, ed=^_dli 50\r, cmdch=^_,
-	il=^_up\r^_ili %p1%d\r$<145>, dl1=^_dli %p1%d\r^F,
-	cuu=^_up %p1%d\r, cud=^_dow %p1%d\r, cub=^_lef %p1%d\r, cuf=^_rig %p1%d\r,
-4025-17|4027-17|tek 4025 17 line window,
-	lines#17, use=4025,
-4025-17ws|4027-17ws|tek 4025 17 line window in workspace,
-	is2=\41com 31\r\n^_sto 9 17 25 33 41 49 57 65 73\r^_wor 17\r^_mon 17\r,
-	smcup=^_wor h\r, rmcup=^_mon h\r, smso=^_att e\r, rmso=^_att s\r, use=4025-17,
-4025ex|4027ex|tek 4025 w/!,
-	smcup=\41com 31\r, rmcup=^_com 33\r,
-	is2=^_com 33\r\n\41sto 9 17 25 33 41 49 57 65 73\r, use=4025,
-# The 4110 series may be a wonderful graphics series, but they make the 4025
-# look good for screen editing.  In the dialog area, you can't move the cursor
-# off the bottom line.  Out of the dialog area, ^K moves it up, but there
-# is no way to scroll.  Note that there is a floppy for free from Tek that
-# makes the 4112 emulate the vt52 (use the vt52 termcap).  There is also
-# an expected enhancement that will use ANSI standard sequences.
-4112|4113|4114|tek4112|tektronix 4110 series,
-	cub1=^H, cr=^M, cud1=^J, bel=^G, am,
-	clear=\ELZ, lines#34, cols#80,
-# 4112 in non-dialog area pretending to scroll.  It really wraps but vi is
-# said to work (more or less) in this mode.
-4112-fs,
-	ind=^J, ri=^K,
-4112-nd|4112 not in dialog area,
-	cuu1=^K, use=4112,
-4112-5|4112 in 5 line dialog area,
-	lines#5, use=4112,
diff --git a/usr/src/lib/libxcurses/src/terminfo/teleray b/usr/src/lib/libxcurses/src/terminfo/teleray
deleted file mode 100644
index ec91283c16..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/teleray
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)teleray	1.4	5/19/82
-#
-# teleray: TELERAY
-#
-# Note two things called "teleray".  Reorder should move the common one
-# to the front if you have either.  A dumb teleray with the cursor stuck
-# on the bottom and no obvious model number is probably a 3700.
-t3700|teleray|dumb teleray 3700,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, clear=^L, cols#80, lines#24,
-t3800|teleray 3800 series,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, ed=\EJ, el=\EK, clear=^L,
-	cup=\EY%p1%' '%+%c%p2%' '%+%c, cols#80,  
-	cud1=\n, home=\EH, lines#24, ll=\EY7 , cuf1=\EC, ht=^I, cuu1=^K,
-t1061|t10|teleray 1061,
-	tbc=\EG, hts=\EF, cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EL$<2*>,
-	am, cub1=^H, ed=\EJ$<1>, el=\EK, clear=^L$<1>,
-	cup=\EY%p1%' '%+%c%p2%' '%+%c, cols#80,
-	dch1=\EQ, dl1=\EM$<2*>, home=\EH, ich1=\EP, ip=$<0.4*>,
-	kf1=^Z1, kf2=^Z2, kf3=^Z3, kf4=^Z4, kf5=^Z5, kf6=^Z6, kf7=^Z7, kf8=^Z8,
-	lines#24, cuf1=\EC, ht=^I, rmso=\ER@, smso= \ERD, km,
-	is2=\Ee\EU01^Z1\EV\EU02^Z2\EV\EU03^Z3\EV\EU04^Z4\EV\EU05^Z5\EV\EU06^Z6\EV\EU07^Z7\EV\EU08^Z8\EV\Ef,
-	cuu1=\EA, smul=\ERH, rmul=\ER@, xhp, xt, xmc#1,
-t1061f|teleray 1061 with fast PROMs,
-	il1=\EL, ip@, dl1=\EM, use=t1061,
diff --git a/usr/src/lib/libxcurses/src/terminfo/teletype b/usr/src/lib/libxcurses/src/terminfo/teletype
deleted file mode 100644
index bfb7afa184..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/teletype
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)teletype	1.7	5/19/82
-#
-# teletype: TELETYPE
-#
-# This works on the default blit, except that output is by exclusive or,
-# and insert line leaves 1/2 line at the bottom of the screen.
-blit|jerq,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#88, lines#72, ht=^I,
-	am, ul, eo, mir, il=\Ef%p1%' '%+%c, dl=\Ee%p1%' '%+%c,
-	dl1=\EE, rmir=\ER, smir=\EQ, dch1=\EO, cub1=\ED, da, db,
-	il1=\EF, ed=\EJ, el=\EK, clear=^L, cup=\EY%p2%' '%+%c%p1%' '%+%c,
-	cuf1=\EC, cuu1=\EA, kcuu1=\EA, kcud1=\EB, kcuf1=\EC, kcub1=\ED,
-	flash=\E^G, smso=\EU!, rmso=\EV!, smul=\EU", rmul=\EV",
-blitlayer|layer|vitty,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#24, ht=^I,
-	am, clear=^L, cup=\EY%p2%' '%+%c%p1%' '%+%c, el=\EK, il=\EI, dl=\ED,
-33|tty33|tty|model 33 teletype,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#72, hc, os,
-# The Dataspeed 40's have lots of braindamage, such as xmc (?) and printing
-# a visible newline indicator after each newline.  The 40-1 is a half duplex
-# terminal and is hopeless.  The 40-2 is braindamaged but has hope and is
-# described here.  The 40-4 is a 3270 lookalike and beyond hope.
-# The terminal has blinking standout.  It also has visible bell but I don't
-# know it - it's null here to prevent it from showing the BL character.
-# I am not sure if the 40 has xmc or not, it looked like it didn't.
-# Note also that the control characters have been randomly rearranged,
-# for example, to get escape you type control-P!
-40|tty40|ds40|ds40-2|dataspeed40|teletype dataspeed 40/2,
-	clear=\ER$<160>, ed=\EJ$<160>, il1=\EL$<160>, dl1=\EM$<160>,
-	dch1=\EP$<50>, ich1=\E\^$<50>, cuf1=\EC, cuu1=\E7, cub1=^H, cr=\EG,
-	ind=^J, cud1=\EB, cols#80, lines#24, flash=, smso=\E3, rmso=\E4,
-43|tty43|model 43 teletype,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	kbs=^h, am, cub1=^H, hc, os, cols#132,
-37|tty37|model 37 teletype,
-	cr=^M, cud1=^J, ind=^J, bel=^G,
-	cub1=^H, hc, hu=\E8, hd=\E9, cuu1=\E7, os,
-# From jwb Wed Mar 31 13:25:09 1982 remote from ihuxp
-# This description seems to avoid line 1 - I don't know why.
-# It looks a lot like a vt100 with ins/del line/char.
-# But the insert char is not ANSI standard!
-4424|tty4424|teletype 4424m,
-	il1=\EL, da, db, ip=$<2>, ich1=\E^, dch1=\EP, dl1=\EM,
-	cols#80, lines#23, am, clear=\E[2;H\E[J, cub1=^H,
-	cup=\E[%i%p1%2d;%p2%2dH\E[B,
-	cuf1=\E[C, cuu1=\E[A, mir, ri=\ET,
-	el=\E[K, smso=\E[7m, rmso=\E[m, smul=\E[4m, rmul=\E[m,
-	is2=\E[m\E[2;24r,
-	kcud1=\E[B, kcub1=\E[D, kcuu1=\E[A, kcuf1=\E[C,
-	khome=\E[H, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
diff --git a/usr/src/lib/libxcurses/src/terminfo/televideo b/usr/src/lib/libxcurses/src/terminfo/televideo
deleted file mode 100644
index 32b35c1073..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/televideo
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)televideo	1.4	5/19/82
-#
-# televideo: TELEVIDEO
-#
-# There are some tvi's that require incredible amounts of padding and
-# some that don't.  I'm assuming 912 and 920 are the old slow ones,
-# and 912b, 912c, 920b, 920c are the new ones that don't need padding.
-tvi912|912|920|tvi920|old televideo,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G, il1=\EE$<33*>, am,
-	cub1=^H, el=\ET, cup=\E=%p1%' '%+%c%p2%' '%+%c, clear=^Z,
-	cols#80, dch1=\EW, dl1=\ER$<33*>,
-	kbs=^h, kcuu1=^K, kcud1=^J, kcub1=^H, kcuf1=^L,
-	kf0=^A@\r, kf1=^AA\r, kf2=^AB\r, kf3=^AC\r, kf4=^AD\r,
-	kf5=^AE\r, kf6=^AF\r, kf7=^AG\r, kf8=^AH\r, kf9=^AI\r,
-	home=^^, ich1=\EQ, lines#24, cuf1=^L, ht=^I, 
-	rmso=\Ek, smso=\Ej, cuu1=^K, smul=\El, rmul=\Em, xmc#1,
-# the 912 has a <funct> key that's like shift: <funct>8 xmits "^A8\r".
-# The 920 has this plus real function keys that xmit different things.
-# Terminfo makes you use the funct key on the 912 but the real keys on the 920.
-912b|912c|tvi912b|tvi912c|tvi|new televideo 912,
-	il1=\EE$<5*>, dl1=\ER$<5*>, use=tvi912,
-920b|920c|tvi920b|tvi920c|new televideo 920,
-	kf0=^A@\r, kf1=^AA\r, kf2=^AB\r, kf3=^AC\r, kf4=^AD\r, kf5=^AE\r,
-	kf6=^AF\r, kf7=^AG\r, kf8=^AH\r, kf9=^AI\r, use=tvi912b,
-# Two page TVI 912/920.
-# set to page 1 when entering ex (\E-17 )
-# reset to page 0 when exiting ex (\E-07 )
-tvi912-2p|tvi920-2p|912-2p|920-2p|tvi-2p|televideo w/2 pages,
-	smcup=\E-17 , rmcup=\E-07 , use=tvi912,
-tvi950-ap|tvi 950 w/alt pages,
-	is2=\E\\1, smcup=\E-06 , rmcup=\E-16 , use=tvi950,
-tvi950-b|bare tvi950 no is2,
-	is2@, smkx=\El, rmkx=\Ek, use=tvi950,
-tvi950-ns|tvi950 w/no standout,
-	smso@, rmso@, smul@, rmul@, use=tvi950,
-# The following tvi descriptions from B:pjphar
-# Now that we have is1, is2, and is3, these should be factored.
-#
-# is2 for all 950's.  It sets the following attributes:
-# full duplex (\EDF)		write protect off (\E()
-# conversation mode (\EC)	graphics mode off (\E%)
-# white on black (\Ed)		auto page flip off (\Ew)
-# turn off status line (\Eg)	clear status line (\Ef\r)
-# normal video (\E0)		monitor mode off (\EX or \Eu)
-# edit mode (\Er)		load blank char to space (\Ee\040)
-# line edit mode (\EO)		enable buffer control (^O)
-# protect mode off (\E\047)	local edit keys (\Ek)
-# program unshifted send key to send line all (\E016)
-# program shifted send key to send line unprotected (\E004)
-# set the following to nulls:
-#	field delimiter (\Ex0\0\0)
-#	line delimiter (\Ex1\0\0)
-#	start-protected field delimiter (\Ex2\0\0)
-#	end-protected field delimiter (\Ex3\0\0)
-# set end of text delimiter to carriage return/null (\Ex4\r\0)
-#
-# tvi950 sets duplex (send) edit keys (\El) when entering vi
-#        sets local (no send) edit keys (\Ek) when exiting vi
-#
-tvi950|950|televideo950,
-	tbc=\E3, hts=\E1, cr=^M, cud1=^J, ind=^J, bel=^G,
-	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O
-	\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0
-	\Ex3\0\0\Ex4\r\0\Ef\r\El,
-	il1=\EE, am, cub1=^H, cbt=\EI, ed=\Ey, el=\Et, clear=\E*,
-	cup=\E=%p1%' '%+%c%p2%' '%+%c, cols#80, dch1=\EW, dl1=\ER,
-	cud1=^V, rmir=\Er, home=^^, smir=\Eq, kf0=^A0\r,
-	kf1=^A@\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r, kf6=^AE\r,
-	kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, kbs=^H, kcud1=^V, khome=^^, kcub1=^H,
-	kcuf1=^L, kcuu1=^K, lines#24, mir, msgr, cuf1=^L,
-	ht=^I, rmso=\EG0, xmc#1, smso=\EG4, ri=\Ej,
-	rmul=\EG0, cuu1=^K, smul=\EG8,
-	flash=\Eb$<20>\Ed, cnorm=\Ek, cvvis=\El, xenl,
-	hs, tsl=\Eg\Ef, fsl=\r,
-#
-# is2 for 950 with two pages adds the following:
-#	set 48 line page (\E\\2)
-#	place cursor at page 0, line 24, column 1 (\E-07 )
-#
-# two page 950 adds the following:
-#	when entering ex, set 24 line page (\E\\1)
-#	when exiting ex, reset 48 line page (\E\\2)
-#			 place cursor at 0,24,1 (\E-07 )
-#
-tvi950-2p|950-2p|televideo950 w/2 pages,
-	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O
-	\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0
-	\Ex3\0\0\Ex4\r\0\E\\2\E-07 
-	rmcup=\E\\2\E-07 , smcup=\E\\1\E-07 , use=tvi950,
-#
-# is2 for 950 with four pages adds the following:
-#	set 96 line page (\E\\3)
-#	place cursor at page 0, line 24, column 1 (\E-07 )
-#
-# four page 950 adds the following:
-#	when entering ex, set 24 line page (\E\\1)
-#	when exiting ex, reset 96 line page (\E\\3)
-#			 place cursor at 0,24,1 (\E-07 )
-#
-tvi950-4p|950-4p|televideo950 w/4 pages,
-	is2=\EDF\EC\Ed\EG0\Eg\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O
-	\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0
-	\Ex3\0\0\Ex4\r\0\E\\3\E-07 
-	rmcup=\E\\3\E-07 , smcup=\E\\1\E-07 , use=tvi950,
-#
-# is2 for reverse video 950 changes the following:
-#	set reverse video (\Ed)
-#
-# set flash accordingly (\Eb ...nulls... \Ed)
-#
-tvi950-rv|950-rv|televideo950 rev video,
-	tbc=\E3, hts=\E1,
-	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O
-	\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0
-	\Ex3\0\0\Ex4\r\0, flash=\Ed$<20>\Eb, use=tvi950,
-#
-# uses the appropriate entries from 9502p and 950rv
-#
-tvi950-rv2p|950-rv2p|televideo950 rev video w/2 pages,
-	is2=\EDF\EC\Eb\EG0\Eg\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O
-	\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0
-	\Ex3\0\0\Ex4\r\0\E\\2\E-07 
-	rmcup=\E\\2\E-07 , smcup=\E\\1\E-07 , use=tvi950rv,
-#
-# uses the appropriate entries from 9504p and 950rv
-#
-tvi950-rv4p|950-rv4p|televideo950 rev video w/4 pages,
-	is2=\EDF\EC\Eb\EG0\Er\EO\E\047\E(\E%\Ew\EX\Ee ^O
-	\Ek\E016\E004\Ex0\0\0\Ex1\0\0\Ex2\0\0
-	\Ex3\0\0\Ex4\r\0\E\\3\E-07 
-	rmcup=\E\\3\E-07 , smcup=\E\\1\E-07 , use=tvi950rv,
diff --git a/usr/src/lib/libxcurses/src/terminfo/testterm b/usr/src/lib/libxcurses/src/terminfo/testterm
deleted file mode 100644
index 93b48c5e29..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/testterm
+++ /dev/null
@@ -1,386 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-testterm|test.term|HP Curses Test Terminal,
-# Booleans
-	.bw,	am,	.bce,	.ccc,	.xhp,	.xhpa,
-	.cpix,	.crxm,	.xt,	.xenl,	.eo,	.gn,
-	.hc,	.chts,	.km,	.daisy,	.hs,	.hls,
-	.in,	.lpix,	.da,	.db,	.mir,	msgr,
-	.nxon,	.xsb,	.npc,	.nrrmc,	.os,	.mc5i,
-	.xvpa,	.sam,	.eslok,	.hz,	.ul,	xon,
-# Numbers
-	bufsz#100,	cols#80,	
-	spinh#100,	spinv#100,	
-	it#8,		lh#100,
-	lw#100,		lines#24,	
-	lm#100,		.xmc#100,	
-	colors#100,	maddr#100,	
-	mjump#100,	pairs#100,	
-	mcs#100,	mls#100,	
-	ncv#100,	nlab#100,	
-	.npins#100,	orc#100,	
-	orhi#100,	orl#100,	
-	orvi#100,	pb#100,
-	.vt#100,		widcs#100,	
-	wsl#80,	
-# Strings
-	acsc=x|q-l+k+m+j+u+t+v+w+n+o-s_`+a:f\'g#~o\,<+>.v-^h#I#0#,
-	cbt=<cbt>\n,
-	bel=<bel>\n,
-	cr=<cr>\n,
-	cpi=<cpi>\n,
-	lpi=<lpi>\n,
-	chr=<chr>\n,
-	csr=<csr %p1%d %p2%d>\n,
-	rmp=<rmp>\n,
-	csnm=<csnm>\n,
-	tbc=<tbc>\n,
-	mgc=<mgc>\n,
-	clear=<clear>\n,
-	el1=<el1>\n,
-	el=<el>\n,
-	ed=<ed>\n,
-	.hpa=<hpa %p1%d>\n,
-	cmdch=<cmdch>\n,
-	cup=<cup %p1%d %p2%d>\n,
-	.cud1=<cud1>\n,
-	.home=<home>\n,
-	civis=<civis>\n,
-	.cub1=<cub1>\n,
-	.mrcup=<mrcup>\n,
-	cnorm=<cnorm>\n,
-	.cuf1=<cuf1>\n,
-	.ll=<ll>\n,
-	.cuu1=<cuu1>\n,
-	cvvis=<cvvis>\n,
-	defc=<defc>\n,
-	dch1=<dch1>\n,
-	dl1=<dl1>\n,
-	dsl=<dsl>\n,
-	.hd=<hd>\n,
-	.enacs=<enacs>\n,
-	.smacs=<smacs>\n,
-	smam=<smam>\n,
-	blink=<blink>\n,
-	bold=<bold>\n,
-	smcup=<smcup>\n,
-	smdc=<smdc>\n,
-	dim=<dim>\n,
-	swidm=<swidm>\n,
-	sdrfq=<sdrfq>\n,
-	.smir=<smir>\n,
-	sitm=<sitm>\n,
-	slm=<slm>\n,
-	smicm=<smicm>\n,
-	snlq=<snlq>\n,
-	snrmq=<snrmq>\n,
-	prot=<prot>\n,
-	rev=<rev>\n,
-	invis=<invis>\n,
-	sshm=<sshm>\n,
-	smso=<smso>\n,
-	ssubm=<ssubm>\n,
-	ssupm=<ssupm>\n,
-	smul=<smul>\n,
-	sum=<sum>\n,
-	smxon=<smxon>\n,
-	ech=<ech %p1%d>\n,
-	.rmacs=<rmacs>\n,
-	rmam=<rmam>\n,
-	sgr0=<sgr0>\n,
-	rmcup=<rmcup>\n,
-	rmdc=<rmdc>\n,
-	rwidm=<rwidm>\n,
-	.rmir=<rmir>\n,
-	ritm=<ritm>\n,
-	rlm=<rlm>\n,
-	rmicm=<rmicm>\n,
-	rshm=<rshm>\n,
-	rmso=<rmso>\n,
-	rsubm=<rsubm>\n,
-	rsupm=<rsupm>\n,
-	rmul=<rmul>\n,
-	rum=<rum>\n,
-	rmxon=<rmxon>\n,
-	flash=<flash>\n,
-	ff=<ff>\n,
-	fsl=<fsl>\n,
-	is1=<is1>\n,
-	is2=<is2>\n,
-	is3=<is3>\n,
-	if=<if>\n,
-	iprog=<iprog>\n,
-	initc=<initc>\n,
-	initp=<initp>\n,
-	ich1=<ich1>\n,
-	il1=<il1>\n,
-	ip=<ip>\n,
-	ka1=<ka1>\n,
-	ka3=<ka3>\n,
-	kb2=<kb2>\n,
-	kbs=<kbs>\n,
-	kbeg=<kbeg>\n,
-	kcbt=<kcbt>\n,
-	kc1=<kc1>\n,
-	kc3=<kc3>\n,
-	kcan=<kcan>\n,
-	ktbc=<ktbc>\n,
-	kclr=<kclr>\n,
-	kclo=<kclo>\n,
-	kcmd=<kcmd>\n,
-	kcpy=<kcpy>\n,
-	.kcrt=<kcrt>\n,
-	kctab=<kctab>\n,
-	kdch1=<kdch1>\n,
-	kdl1=<kdl1>\n,
-	kcud1=<kcud1>\n,
-	krmir=<krmir>\n,
-	kend=<kend>\n,
-	kent=<kent>\n,
-	kel=<kel>\n,
-	ked=<ked>\n,
-	kext=<kext>\n,
-	kf0=<kf0>\n,
-	kf1=<kf1>\n,
-	kf10=<kf10>\n,
-	kf11=<kf11>\n,
-	kf12=<kf12>\n,
-	kf13=<kf13>\n,
-	kf14=<kf14>\n,
-	kf15=<kf15>\n,
-	kf16=<kf16>\n,
-	kf17=<kf17>\n,
-	kf18=<kf18>\n,
-	kf19=<kf19>\n,
-	kf2=<kf2>\n,
-	kf20=<kf20>\n,
-	kf21=<kf21>\n,
-	kf22=<kf22>\n,
-	kf23=<kf23>\n,
-	kf24=<kf24>\n,
-	kf25=<kf25>\n,
-	kf26=<kf26>\n,
-	kf27=<kf27>\n,
-	kf28=<kf28>\n,
-	kf29=<kf29>\n,
-	kf3=<kf3>\n,
-	kf30=<kf30>\n,
-	kf31=<kf31>\n,
-	kf32=<kf32>\n,
-	kf33=<kf33>\n,
-	kf34=<kf34>\n,
-	kf35=<kf35>\n,
-	kf36=<kf36>\n,
-	kf37=<kf37>\n,
-	kf38=<kf38>\n,
-	kf39=<kf39>\n,
-	kf4=<kf4>\n,
-	kf40=<kf40>\n,
-	kf41=<kf41>\n,
-	kf42=<kf42>\n,
-	kf43=<kf43>\n,
-	kf44=<kf44>\n,
-	kf45=<kf45>\n,
-	kf46=<kf46>\n,
-	kf47=<kf47>\n,
-	kf48=<kf48>\n,
-	kf49=<kf49>\n,
-	kf5=<kf5>\n,
-	kf50=<kf50>\n,
-	kf51=<kf51>\n,
-	kf52=<kf52>\n,
-	kf53=<kf53>\n,
-	kf54=<kf54>\n,
-	kf55=<kf55>\n,
-	kf56=<kf56>\n,
-	kf57=<kf57>\n,
-	kf58=<kf58>\n,
-	kf59=<kf59>\n,
-	kf6=<kf6>\n,
-	kf60=<kf60>\n,
-	kf61=<kf61>\n,
-	kf62=<kf62>\n,
-	kf63=<kf63>\n,
-	kf7=<kf7>\n,
-	kf8=<kf8>\n,
-	kf9=<kf9>\n,
-	kfnd=<kfnd>\n,
-	khlp=<khlp>\n,
-	khome=<khome>\n,
-	kich1=<kich1>\n,
-	kil1=<kil1>\n,
-	kcub1=<kcub1>\n,
-	kll=<kll>\n,
-	kmrk=<kmrk>\n,
-	kmsg=<kmsg>\n,
-	kmov=<kmov>\n,
-	knxt=<knxt>\n,
-	knp=<knp>\n,
-	kopn=<kopn>\n,
-	kopt=<kopt>\n,
-	kpp=<kpp>\n,
-	kprv=<kprv>\n,
-	kprt=<kprt>\n,
-	krdo=<krdo>\n,
-	kref=<kref>\n,
-	krfr=<krfr>\n,
-	krpl=<krpl>\n,
-	krst=<krst>\n,
-	kres=<kres>\n,
-	kcuf1=<kcuf1>\n,
-	ksav=<ksav>\n,
-	kBEG=<kBEG>\n,
-	kCAN=<kCAN>\n,
-	kCMD=<kCMD>\n,
-	kCPY=<kCPY>\n,
-	kCRT=<kCRT>\n,
-	kDC=<kDC>\n,
-	kDL=<kDL>\n,
-	kslt=<kslt>\n,
-	kEND=<kEND>\n,
-	kEOL=<kEOL>\n,
-	kEXT=<kEXT>\n,
-	kind=<kind>\n,
-	kFND=<kFND>\n,
-	kHLP=<kHLP>\n,
-	kHOM=<kHOM>\n,
-	kIC=<kIC>\n,
-	kLFT=<kLFT>\n,
-	kMSG=<kMSG>\n,
-	kMOV=<kMOV>\n,
-	kNXT=<kNXT>\n,
-	kOPT=<kOPT>\n,
-	kPRV=<kPRV>\n,
-	kPRT=<kPRT>\n,
-	kri=<kri>\n,
-	kRDO=<kRDO>\n,
-	kRPL=<kRPL>\n,
-	kRIT=<kRIT>\n,
-	kRES=<kRES>\n,
-	kSAV=<kSAV>\n,
-	kSPD=<kSPD>\n,
-	khts=<khts>\n,
-	kUND=<kUND>\n,
-	kspd=<kspd>\n,
-	kund=<kund>\n,
-	kcuu1=<kcuu1>\n,
-	rmkx=<rmkx>\n,
-	smkx=<smkx>\n,
-	lf0=<lf0>\n,
-	lf1=<lf1>\n,
-	lf10=<lf10>\n,
-	lf2=<lf2>\n,
-	lf3=<lf3>\n,
-	lf4=<lf4>\n,
-	lf5=<lf5>\n,
-	lf6=<lf6>\n,
-	lf7=<lf7>\n,
-	lf8=<lf8>\n,
-	lf9=<lf9>\n,
-	rmln=<rmln>\n,
-	smln=<smln>\n,
-	rmm=<rmm>\n,
-	smm=<smm>\n,
-	mhpa=<mhpa %p1%d>\n,
-	.mcud1=<mcud1>\n,
-	.mcub1=<mcub1>\n,
-	.mcuf1=<mcuf1>\n,
-	.mvpa=<mvpa %p1%d>\n,
-	.mcuu1=<mcuu1>\n,
-	nel=<nel>\n,
-	porder=<porder>\n,
-	oc=<oc>\n,
-	op=<op>\n,
-	pad=P,
-	dch=<dch %p1%d>\n,
-	.dl=<dl %p1%d>\n,
-	.cud=<cud %p1%d>\n,
-	.mcud=<mcud %p1%d>\n,
-	ich=<ich %p1%d>\n,
-	indn=<indn %p1%d>\n,
-	.il=<il %p1%d>\n,
-	.cub=<cub %p1%d>\n,
-	.mcub=<mcub %p1%d>\n,
-	.cuf=<cuf %p1%d>\n,
-	.mcuf=<mcuf %p1%d>\n,
-	rin=<rin %p1%d>\n,
-	.cuu=<cuu %p1%d>\n,
-	.mcuu=<mcuu %p1%d>\n,
-	pfkey=<pfkey %p1%d %p2%d>\n,
-	pfloc=<pfloc %p1%d %p2%d>\n,
-	pfx=<pfx %p1%d %p2%d>\n,
-	pln=<pln %p1%d %p2%d>\n,
-	mc0=<mc0>\n,
-	mc5p=<mc5p>\n,
-	mc4=<mc4 %p1%d>\n,
-	mc5=<mc5>\n,
-	rep=<rep %p1%d %p2%d>\n,
-	rfi=<rfi>\n,
-	rs1=<rs1>\n,
-	rs2=<rs2>\n,
-	rs3=<rs3>\n,
-	rf=<rf>\n,
-	rc=<rc>\n,
-	.vpa=<vpa %p1%d>\n,
-	sc=<sc>\n,
-	ind=<ind>\n,
-	ri=<ri>\n,
-	scs=<scs>\n,
-	sgr=<sgr%?%p1%t standout%;%?%p2%t underline%;%?%p3%t reverse%;%?%p4%t blink%;%?%p5%t dim%;%?%p6%t bold%;%?%p7%t invis%;%?%p8%t protect%;%?%p9%t altcharset%;>\n,
-	.setb=<setb>\n,
-	smgb=<smgb>\n,
-	smgbp=<smgbp %p1%d %p2%d>\n,
-	scp=<scp>\n,
-	setf=<setf>\n,
-	smgl=<smgl>\n,
-	smglp=<smglp %p1%d %p2%d>\n,
-	smgr=<smgr>\n,
-	smgrp=<smgrp %p1%d>\n,
-	hts=<hts>\n,
-	smgt=<smgt>\n,
-	smgtp=<smgtp %p1%d %p2%d>\n,
-	wind=<wind %p1%d %p2%d %p3%d %p4%d>\n,
-	sbim=<sbim>\n,
-	scsd=<scsd>\n,
-	rbim=<rbim>\n,
-	rcsd=<rcsd>\n,
-	subcs=<subcs>\n,
-	supcs=<supcs>\n,
-	ht=<ht>\n,
-	docr=<docr>\n,
-	tsl=<tsl %p1%d>\n,
-	uc=<uc>\n,
-	hu=<hu>\n,
-	xoffc=<xoffc>\n,
-	xonc=<xonc>\n,
-	zerom=<zerom>\n,
-
-testterm-hp|Test Term with HP glitch support,
-	xhp,
-	msgr@,
-	use=testterm,
diff --git a/usr/src/lib/libxcurses/src/terminfo/ti b/usr/src/lib/libxcurses/src/terminfo/ti
deleted file mode 100644
index 25a1cea7ee..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/ti
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)ti	1.4	5/20/82
-#
-# ti: TEXAS INSTRUMENTS
-#
-ti700|ti733|735|ti735|ti silent 700,
-	cr=^M$<162>, use=ti745,
-ti|ti745|745|743|ti silent 745,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cub1=^H, cols#80, hc, os,
-ti800|ti omni 800,
-	cols#132, use=ti745,
diff --git a/usr/src/lib/libxcurses/src/terminfo/trailer b/usr/src/lib/libxcurses/src/terminfo/trailer
deleted file mode 100644
index da3181612f..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/trailer
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#
-# The following have been included for upward compatibility with previous
-# names.  They are considered obsolete and the new name (which typically
-# contains an extra dash) should be used instead.  These names will go
-# away eventually (read: "soon") so you should start converting!
-#
-aaa20, use=aaa-20,
-aaa20rev, use=aaa-20-rv,
-aaa30, use=aaa-30,
-aaa30rev, use=aaa-30-rv,
-aaa40, use=aaa-40,
-aaa40rev, use=aaa-40-rv,
-aaa48, use=aaa-48,
-aaa48rev, use=aaa-48-rv,
-aaarev, use=aaa-48-rv,
-aaa60, use=aaa-60,
-aaa60rev, use=aaa-60-rv,
-vt100-np, use=vt100,
-aaa-29-np, use=aaa-29,
-hp2621nl|2621nl, use=2621-nl,
-hp2621nt|2621nt, use=2621-nt,
-hp2621wl|2621wl, use=2621-wl,
-9122p, use=912-2p,
-9202p, use=920-2p,
-9502p, use=950-2p,
-9504p, use=950-4p,
-950rv, use=950-rv,
-950rv2p, use=950-rv2p,
-950rv4p, use=950-rv4p,
-aaadb, use=aaa-db,
-c1004p, use=c100-4p,
-c100rv, use=c100-rv,
-c100rv4p, use=c100-rv4p,
-c100rv4pna, use=c100-rv4pna,
-c100rv4ppp, use=c100-rv4ppp,
-c100rvna, use=c100-rvna,
-c100rvpp, use=c100-rvpp,
-c100rvs, use=c100-rvs,
-c100s, use=c100-s,
-c108-4, use=c108-4p,
-c108-8, use=c108-8p,
-c100-s|concept-s|concept100-s, use=c100,
-c100-rvs|concept-rvs|concept100-rvs, use=c100-rv,
-h19a|h19A, use=h19-a,
-h19b, use=h19-b,
-h19bs, use=h19-bs,
-h19u, use=h19-u,
-mime2as, use=mime2a-s,
-mime2av, use=mime2a-v,
-mimefb, use=mime-fb,
-mimehb, use=mime-hb,
-tvi2p, use=tvi-2p,
-tvi9122p, use=tvi912-2p,
-tvi9202p, use=tvi920-2p,
-tvi9502p, use=tvi950-2p,
-tvi9504p, use=tvi950-4p,
-tvi950b, use=tvi950-b,
-tvi950ns, use=tvi950-ns,
-tvi950rv, use=tvi950-rv,
-tvi950rv2p, use=tvi950-rv2p,
-tvi950rv4p, use=tvi950-rv4p,
-vt100am, use=vt100-am,
-vt100nam, use=vt100-nam,
-vt100s, use=vt100-s,
-vt100w, use=vt100-w,
-#
-# END OF TERMINFO
-#  ------------------------
diff --git a/usr/src/lib/libxcurses/src/terminfo/vc b/usr/src/lib/libxcurses/src/terminfo/vc
deleted file mode 100644
index 3e6f68e75c..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/vc
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# Volker Craig 2100 in ansi mode.
-#
-vc2100|vc2100io|Volker Craig 2100,
-	cols#80, lines#24, am, bw, xon,
-	cr=^M, bel=^G,
-# Status line
-	hs, dsl=\E[?8k,
-# Cursor one position
-	cuu1=\E[A, cud1=^J, cuf1=\E[C, cub1=^H,
-# Cursor multiple positions
-	cuu=\E[%p1%dA, cud=\E[%p1%dB, cuf=\E[%p1%dC, cub=\E[%p1%dD,
-# Cursor position
-	cup=\E[%i%p1%d;%p2%dH, home=\E[H,
-# Scrolling Region
-	csr=\E[%p1%d;%p2%dr, sc=\E7, rc=\E8,
-# Scroll down and up
-	ind=^J, ri=\EM,
-# Area Clears - contrary to documentation, \E2J doesn't home the cursor!
-	el=\E[K, ed=\E[J, clear=\E[H\E[2J,
-# Attributes
-	bold=\E[1m, rev=\E[7m, blink=\E[5m, invis=\E[3m, sgr0=\E[m,
-	smul=\E[4m, rmul=\E[m, smso=\E[4;7m, rmso=\E[m, msgr,
-	sgr=\E[0;%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;2m,
-# Tabs
-	ht=^I, tbc=\E[3g, hts=\EH, it#8,
-# Keypad
-	kcuu1=\E[A, kcud1=\E[B, kcub1=\E[D, kcuf1=\E[C, khome=\E[H, kbs=^H,
-	kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-	pfkey=\E[?%p1%dh/%p2%s/,
-# Initialization
-	is1=\E<\E(B\E)0\017\E[m\E[?7h\E[?3l\E[?1l\E[?11k\E[?10k\E>,
-	rs1=\Ec,
-# Applications dependent for 10 - initialize US keys as function keys
-	is3=\E[?1j/\Ef5/\E[?2j/\Ef6/\E[?3j/\Ef7/\E[?4j/\Ef8/\E[?5j/\Ef9/\E[?6j/\Ef0/\E[?7j/\EF1/\E[?8j/\EF2/,
-	kf5=\Ef5, kf6=\Ef6, kf7=\Ef7, kf8=\Ef8, kf9=\Ef9, kf10=\Ef0, kf11=\EF1,
-	kf12=\EF2,
-	lf5=US1, lf5=US2, lf6=US3, lf7=US4, lf8=US5, lf9=US6, lf10=US7,
-#
-#  System V only supports 10 function key labels.
-#	lf11=US8, lf12=US9,
-
-vc4404adm3a|4404adm3a|Volker Craig 4404 The Chat ADM-3A mode,
-	kf1=\EP, kf2=\EQ, kf3=\ER, kf4=\E , kf5=\E\041,
-	kf6=\E", kf7=\E#, kf8=\E$, kf9=\E%,
-	ed=\EY$<40>, el=\ET$<20>, rmso=\E(, smso=\E),
-	use=adm3aplus,
-
-vc4604adm3a|4604adm3a|Volker Craig 4604 in ADM-3A mode,
-	kf10=\E&, kf11=\E', kf12=\E*, khome=^^, smul=\E), rmul=\E),
-	use=4404adm3a,
diff --git a/usr/src/lib/libxcurses/src/terminfo/visual b/usr/src/lib/libxcurses/src/terminfo/visual
deleted file mode 100644
index 689b2130ab..0000000000
--- a/usr/src/lib/libxcurses/src/terminfo/visual
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-#	@(#)visual	1.4	5/20/82
-#
-# visual: VISUAL
-#
-# The Visual 200 beeps when you type a character in insert mode.
-# This is a horribly obnoxious misfeature, and some of the entries
-# below try to get around the problem by ignoring the feature or
-# turning it off when inputting a character.  They are said not to
-# work well at 300 baud.  (You could always cut the wire to the bell!)
-vi200|visual 200 with function keys,
-	cr=^M, cud1=^J, ind=^J, bel=^G, lines#24, cols#80,
-	il1=\EL, am, cub1=^H, ed=\Ey, el=\Ex$<4*>, clear=\Ev,
-	cup=\EY%p1%' '%+%c%p2%' '%+%c, dch1=\EO$<4*>, dl1=\EM$<4*>,
-	home=\EH, ich1=\Ei \b\Ej, is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek,
-	kf0=\EP, kf1=\EQ, kf2=\ER, kf3=\E , kf4=\E!, kf5=\E", kf6=\E#,
-	kf7=\E$, kf8=\E%, kf9=\E&,
-	kcub1=\ED, kcuf1=\EC, kcuu1=\EA, kcud1=\EB, khome=\EH,
-	cuf1=\EC, ht=^I, ri=\EI, cuu1=\EA, cvvis=\Ed, cnorm=\Ec,
-vi200-rv-ic|visual 200 reverse video using insert char,
-	rmir=\Ej, smir=\Ei, ich1@, use=vi200-rv,
-# The older Visuals didn't come with function keys. This entry uses
-# smkx and rmkx so that the keypad keys can be used as function keys.
-# If your version of vi doesn't support function keys you may want
-# to use vi200-f.
-vi200-f|visual|visual 200 no function keys,
-	cr=^M, cud1=^J, ind=^J, bel=^G, cols#80, lines#24,
-	il1=\EL, am, cub1=^H, ed=\Ey, el=\Ex$<4*>, clear=\Ev,
-	cup=\EY%p1%' '%+%c%p2%' '%+%c, dch1=\EO$<4*>, dl1=\EM$<4*>,
-	home=\EH, ich1=\Ei \b\Ej, is2=\E3\Eb\Ej\E\\\El\EG\Ed\Ek,
-	smkx=\E=, rmkx=\E>,
-	kf0=\E?p, kf1=\E?q, kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v,
-	kf7=\E?w, kf8=\E?x, kf9=\E?y,
-	kcub1=\ED, kcuf1=\EC, kcuu1=\EA, kcud1=\EB, khome=\EH,
-	cuf1=\EC, ht=^I, ri=\EI, cuu1=\EA, cvvis=\Ed, cnorm=\Ec,
-vi200-rv|visual 200 reverse video,
-	smso=\E4, rmso=\E3, ri@, cvvis@, cnorm@, use=vi200,
-vi200-ic|visual 200 using insert char,
-	rmir=\Ej, smir=\Ei, ich1@, use=vi200,
diff --git a/usr/src/lib/smbsrv/libsmb/common/smb_util.c b/usr/src/lib/smbsrv/libsmb/common/smb_util.c
index 102708b26a..27d770912a 100644
--- a/usr/src/lib/smbsrv/libsmb/common/smb_util.c
+++ b/usr/src/lib/smbsrv/libsmb/common/smb_util.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  */
 
 #include <ctype.h>
@@ -418,8 +419,8 @@ smb_chk_hostaccess(smb_inaddr_t *ipaddr, char *access_list)
 	char *host;
 	int off;
 	int i;
-	int netgroup_match;
 	int response;
+	int clres;
 	struct nd_hostservlist *clnames;
 	struct in_addr inaddr;
 	struct sockaddr_in sa;
@@ -450,10 +451,7 @@ smb_chk_hostaccess(smb_inaddr_t *ipaddr, char *access_list)
 	if (config == NULL)
 		return (1);
 
-	if (__netdir_getbyaddr_nosrv(config, &clnames, &buf)) {
-		freenetconfigent(config);
-		return (0);
-	}
+	clres = __netdir_getbyaddr_nosrv(config, &clnames, &buf);
 	freenetconfigent(config);
 
 	for (gr = strtok_r(access_list, ":", &lasts);
@@ -472,8 +470,20 @@ smb_chk_hostaccess(smb_inaddr_t *ipaddr, char *access_list)
 		}
 
 		/*
-		 * The following loops through all the
-		 * client's aliases.  Usually it's just one name.
+		 * First check if we have '@' entry, as smb_netmatch doesn't
+		 * care if client address can be resolved.
+		 */
+		if (*gr == '@')
+			if (smb_netmatch(&buf, gr + 1))
+				return (response);
+		/*
+		 * No other checks can be performed if client address
+		 * can't be resolved.
+		 */
+		if (clres)
+			continue;
+		/*
+		 * Otherwise loop through all client hostname aliases.
 		 */
 		for (i = 0; i < clnames->h_cnt; i++) {
 			host = clnames->h_hostservs[i].h_host;
@@ -495,30 +505,21 @@ smb_chk_hostaccess(smb_inaddr_t *ipaddr, char *access_list)
 					}
 				}
 			} else {
-
 				/*
-				 * If the list name begins with an at
-				 * sign then do a network comparison.
+				 * Just do a hostname match
 				 */
-				if (*gr == '@') {
-					if (smb_netmatch(&buf, gr + 1))
-						return (response);
-				} else {
-					/*
-					 * Just do a hostname match
-					 */
-					if (strcasecmp(gr, host) == 0)
-						return (response);
+				if (strcasecmp(gr, host) == 0)
+					return (response);
 				}
 			}
-		}
 
 		nentries++;
 	}
 
-	netgroup_match = smb_netgroup_match(clnames, access_list, nentries);
+	if (clres)
+		return (0);
 
-	return (netgroup_match);
+	return (smb_netgroup_match(clnames, access_list, nentries));
 }
 
 /*