. Update to 4-20030825.

PR:		56430
Submitted by:	Stefan Farfeleder <stefan@fafoe.narf.at> (maintainer)

10 files changed, 582 insertions, 374 deletions

diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile
index d70bdeb8f092..f5b9a53549e3 100644
--- a/lang/TenDRA/Makefile
+++ b/lang/TenDRA/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	TenDRA
-PORTVERSION=	4.20030526
+PORTVERSION=	4.20030825
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.tendra.org/pub/snapshot/
+MASTER_SITES=	ftp://ftp.allbsd.org/pub/TenDRA/snapshots/
 DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/4.//}
 
 MAINTAINER=	stefan@fafoe.narf.at
@@ -17,13 +17,14 @@ COMMENT=	A portable BSD-licensed compiler suite
 
 ONLY_FOR_ARCHS=	i386
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+DIST_SUBDIR=	${PKGBASE}
 USE_BZIP2=	yes
 USE_PERL5_BUILD=	yes
 ALL_TARGET=	# nada
+MAKE_ARGS=	BIN_CC="${CC}"
 
 TENDRA_OSREL!=	uname -r
-TENDRA_ARCH=	80x86
+TENDRA_ARCH=	${ARCH:S/i386/80x86/}
 TENDRA_VER=	5.0.0
 TENDRA_PATH=	${TENDRA_VER}/FreeBSD/${TENDRA_OSREL}/${TENDRA_ARCH}
 PLIST_SUB+=	TENDRA_VER=${TENDRA_VER} TENDRA_OSREL=${TENDRA_OSREL} \
diff --git a/lang/TenDRA/distinfo b/lang/TenDRA/distinfo
index f11236e93c00..5a1e02011e6a 100644
--- a/lang/TenDRA/distinfo
+++ b/lang/TenDRA/distinfo
@@ -1 +1 @@
-MD5 (tendra-20030526.tar.bz2) = 277d6b5efd9358c8aa75382d6934c4c2
+MD5 (TenDRA/tendra-20030825.tar.bz2) = 7ea9716d04d4f6bf8df11d55ca37659b
diff --git a/lang/TenDRA/files/patch-aligned b/lang/TenDRA/files/patch-aligned
index 2c907477e889..b498c0ff680a 100644
--- a/lang/TenDRA/files/patch-aligned
+++ b/lang/TenDRA/files/patch-aligned
@@ -1,17 +1,33 @@
-Index: src/lib/machines/freebsd/80x86/include/gcc_dependency.h
+Index: src/lib/machines/freebsd/80x86/startup/ansi.h
 ===================================================================
-RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/machines/freebsd/80x86/include/gcc_dependency.h,v
+RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/machines/freebsd/80x86/startup/ansi.h,v
 retrieving revision 1.1
-diff -c -u -r1.1 gcc_dependency.h
---- src/lib/machines/freebsd/80x86/include/gcc_dependency.h	18 Feb 2003 07:35:09 -0000	1.1
-+++ src/lib/machines/freebsd/80x86/include/gcc_dependency.h	25 Feb 2003 10:32:53 -0000
-@@ -17,4 +17,9 @@
- 
- #pragma TenDRA unknown directive warning
+diff -u -r1.1 ansi.h
+--- src/lib/machines/freebsd/80x86/startup/ansi.h	26 Jan 2002 21:31:47 -0000	1.1
++++ src/lib/machines/freebsd/80x86/startup/ansi.h	16 Aug 2003 19:50:55 -0000
+@@ -28,3 +28,8 @@
+ #ifndef __signed
+ #define __signed	signed
+ #endif
++
++/* Work around __aligned() */
++#ifndef	__aligned
++#define	__aligned(x)	/* nothing */
++#endif
+Index: src/lib/machines/freebsd/80x86/startup/system.h
+===================================================================
+RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/machines/freebsd/80x86/startup/system.h,v
+retrieving revision 1.1
+diff -u -r1.1 system.h
+--- src/lib/machines/freebsd/80x86/startup/system.h	26 Jan 2002 21:31:47 -0000	1.1
++++ src/lib/machines/freebsd/80x86/startup/system.h	4 Aug 2003 21:07:05 -0000
+@@ -36,4 +36,9 @@
+ #define __signed	signed
+ #endif
  
 +/* Work around __aligned() */
 +#ifndef	__aligned
 +#define	__aligned(x)	/* nothing */
 +#endif
 +
- #endif /* __FREEBSD_GCC_DEPENDENCY_H__ */
+ #endif
diff --git a/lang/TenDRA/files/patch-common::default b/lang/TenDRA/files/patch-common::default
new file mode 100644
index 000000000000..eedec340abee
--- /dev/null
+++ b/lang/TenDRA/files/patch-common::default
@@ -0,0 +1,16 @@
+Index: src/lib/env/common/default
+===================================================================
+RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/env/common/default,v
+retrieving revision 1.5
+diff -u -r1.5 default
+--- src/lib/env/common/default	17 Aug 2003 20:20:28 -0000	1.5
++++ src/lib/env/common/default	19 Aug 2003 14:42:23 -0000
+@@ -51,7 +51,7 @@
+ +STARTUP_CPP_DIR	"-I<TENDRA_STARTUPDIR>/Bounds.ansi -I<TENDRA_STARTUPDIR>/Modes.cpp"
+ +STARTUP_CPP		"-f<TENDRA_STARTUPDIR>/Modes.cpp/Xc"
+ +PORTABILITY		"<TENDRA_STARTUPDIR>/Bounds.ansi/default.pf"
+-+LINK			"-L<TENDRA_STARTUPDIR>"
+++LINK			"-L<TENDRA_LIBDIR>"
+ +LIB			"-lansi"
+ 
+ +SYS_LIB		""
diff --git a/lang/TenDRA/files/patch-default-gcc_dependency b/lang/TenDRA/files/patch-default-gcc_dependency
deleted file mode 100644
index 1e041d0d3d63..000000000000
--- a/lang/TenDRA/files/patch-default-gcc_dependency
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/lib/env/common/default.orig	Tue May 13 01:35:23 2003
-+++ src/lib/env/common/default	Tue May 13 01:35:42 2003
-@@ -55,3 +55,4 @@
- 
- /* Extra information */
- 
-++FLAG			"-f<TENDRA_MACHDIR>/include/gcc_dependency.h"
diff --git a/lang/TenDRA/files/patch-freebsd::default.extra b/lang/TenDRA/files/patch-freebsd::default.extra
new file mode 100644
index 000000000000..8c5d180e7a15
--- /dev/null
+++ b/lang/TenDRA/files/patch-freebsd::default.extra
@@ -0,0 +1,26 @@
+Index: src/lib/env/freebsd/common/80x86/default.extra
+===================================================================
+RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/lib/env/freebsd/common/80x86/default.extra,v
+retrieving revision 1.3
+diff -u -r1.3 default.extra
+--- src/lib/env/freebsd/common/80x86/default.extra	17 Aug 2003 20:20:51 -0000	1.3
++++ src/lib/env/freebsd/common/80x86/default.extra	19 Aug 2003 15:13:31 -0000
+@@ -13,11 +13,17 @@
+ /* Libraries */
+ 
+ +LIB_CRT0	"-LIB_CRT0-"
+++LIB_CRT1	"-LIB_CRT1-"
+++LIB_CRTI	"-LIB_CRTI-"
+++LIB_CRTN	"-LIB_CRTN-"
+ +LIB_GCRT0	"-LIB_GCRT0-"
+ 
+ 
+ +MACHINE	"freebsd-*-80x86"
+ +AS		"<BIN_AS>"
+-+LD		"<BIN_LD> -e start -dc -dp"
+++LD		"<BIN_LD>"
+ +CC		"<BIN_CC>"
+ +CRT0		"<LIB_CRT0>"
+++CRT1		"<LIB_CRT1>"
+++CRTI		"<LIB_CRTI>"
+++CRTN		"<LIB_CRTN>"
diff --git a/lang/TenDRA/files/patch-install b/lang/TenDRA/files/patch-install
index 2d0a32c6745b..d147fe8c9288 100644
--- a/lang/TenDRA/files/patch-install
+++ b/lang/TenDRA/files/patch-install
@@ -1,12 +1,142 @@
---- mk/base/tendra.install.mk.orig	Mon Mar 31 10:00:01 2003
-+++ mk/base/tendra.install.mk	Mon May 12 21:20:53 2003
-@@ -60,6 +60,9 @@
- 	for i in ${.OBJDIR}.api/*.h; do \
- 		${INSTALL} $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \
- 	done
-+	for i in `${FIND} ${.OBJDIR}.api/ -type d -mindepth 1` ; do \
-+		${CP} -pR $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \
-+	done
- 	for i in ${.OBJDIR:C/apis/apis\/shared/}.api/*.h; do \
- 		${INSTALL} $$i ${INSTALL_PREFIX}/lib/include/shared/${API}.api; \
- 	done
+Index: mk/base/tendra.install.mk
+===================================================================
+RCS file: /usr/home/stefan/tendra/cvsup/tendra/mk/base/tendra.install.mk,v
+retrieving revision 1.19
+diff -u -r1.19 tendra.install.mk
+--- mk/base/tendra.install.mk	18 Aug 2003 04:35:26 -0000	1.19
++++ mk/base/tendra.install.mk	19 Aug 2003 14:23:00 -0000
+@@ -21,7 +21,6 @@
+ 
+ .if defined(API)
+ INSTALL_TARGETS+=	install-api
+-INSTALL_SUB+=		lib/include/${API}.api lib/include/shared/${API}.api
+ .endif
+ 
+ .if defined(INSTALL_ENV)
+@@ -70,14 +69,9 @@
+ 
+ # lib/apis: our api files.
+ install-api:
+-	for i in ${.OBJDIR}.api/*.h; do \
+-		${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/${API}.api; \
+-	done
+-	for i in ${.OBJDIR:C/apis/apis\/shared/}.api/*.h; do \
+-		${BIN_INSTALL} $$i ${INSTALL_PREFIX}/lib/include/shared/${API}.api; \
+-	done
+-	${BIN_INSTALL} ${.OBJDIR:C/apis/apis\/lib/}/${API}.tl \
+-		${INSTALL_PREFIX}/lib
++	env MAKEOBJDIR=${OBJ_DIR}.api INSTALL=${BIN_INSTALL} \
++		MKDIR=${BIN_MKDIR} ARGS_MKDIR=${ARGS_MKDIR} \
++		INSTALL_PREFIX=${INSTALL_PREFIX} make install
+ 
+ # lib/env: our environment files.
+ install-env:
+Index: src/tools/tspec/makefile.c
+===================================================================
+RCS file: /usr/home/stefan/tendra/cvsup/tendra/src/tools/tspec/makefile.c,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.c
+--- src/tools/tspec/makefile.c	12 Dec 2002 05:54:55 -0000	1.3
++++ src/tools/tspec/makefile.c	10 Jun 2003 12:36:12 -0000
+@@ -71,10 +71,10 @@
+  */
+ 
+ static boolean
+-need_info(info *i, char *api)
++need_info(info *i, char *api, boolean lax)
+ {
+     if (restrict_depth && !streq (api, i->api)) return (0);
+-    return (i->implemented && i->tokens && i->src);
++    return (i->implemented && (lax || (i->tokens && i->src)));
+ }
+ 
+ 
+@@ -95,6 +95,8 @@
+     char *api2 = hack_name (api, "_Aa0");
+     int li = output_incl_len;
+     int ls = output_src_len;
++    hash_table *subdirs = make_hash_table("Subdirs");
++    int i;
+ 	
+     /* Open output file */
+     nm = (whole ? MAKEFILE_API : MAKEFILE);
+@@ -135,11 +137,47 @@
+     }
+     IGNORE fputs ("SHELL=/bin/sh\n\n", output);
+ 	
++	/* Print all headers we want to install */
++	IGNORE fprintf (output, "HEADERS=");
++	for (e = f ; e != null ; e = e->next) {
++		info *i = e->obj->u.u_info;
++		char *p;
++		object *o;
++
++		if (!need_info(i, api, 1))
++			continue;
++
++		if (i->file == NULL || strstr(i->file, "dummy") != NULL ||
++			i->api == NULL  || strstr(i->api, "dummy") != NULL)
++			continue;
++
++		IGNORE fprintf (output, "\\\n %s", i->incl + ls);
++
++		buffer[0] = '\0';
++		IGNORE strncat(buffer, i->incl + ls, buffsize);
++		if ((p = strrchr(buffer, '/')) != NULL) {
++			*p = '\0';
++			/* Add the directory if it isn't in the subdirs hash table yet */
++			if (search_hash(subdirs, buffer, 0) == NULL) {
++				p = xalloc(strlen(buffer) + 1);
++				IGNORE strcpy(p, buffer);
++				o = make_object(p, TYPE_VOID);
++				IGNORE add_hash(subdirs, o, 0);
++			}
++		}
++	}
++
++	/* Print the list of subdirectories we have to create */
++	IGNORE fputs ("\n\nDIRS=", output);
++	for (i = 0; i < sizeof (subdirs->array) / sizeof (*subdirs->array); i++)
++		for (e = subdirs->array[i]; e != null; e = e->next)
++			IGNORE fprintf (output, "\\\n %s", e->obj->name);
++
+     /* Print the list of files */
+-    IGNORE fputs ("JFILES=", output);
++    IGNORE fputs ("\n\nJFILES=", output);
+     for (e = f ; e != null ; e = e->next) {
+ 		info *i = e->obj->u.u_info;
+-		if (need_info (i, api)) {
++		if (need_info (i, api, 0)) {
+ 			int m;
+ 			char *a = i->api;
+ 			if (strneq (a, "shared/", 7)) a += 7;
+@@ -159,7 +197,7 @@
+     /* Print the construction for each file */
+     for (e = f ; e != null ; e = e->next) {
+ 		info *i = e->obj->u.u_info;
+-		if (need_info (i, api)) {
++		if (need_info (i, api, 0)) {
+ 			int m;
+ 			char *a = i->api;
+ 			if (strneq (a, "shared/", 7)) a += 7;
+@@ -192,7 +230,19 @@
+ 	
+     /* End of makefile */
+     IGNORE fputs ("clean :\n\trm -f ${JFILES}\n\n", output);
+-    IGNORE fputs ("clobber : clean\n\trm -f ${LIB}\n", output);
++    IGNORE fputs ("clobber : clean\n\trm -f ${LIB}\n\n", output);
++
++    IGNORE fprintf (output, "install : \n"
++					".for i in ${DIRS}\n"
++					"\t${MKDIR} ${ARGS_MKDIR} ${INSTALL_PREFIX}/lib/include/${i}\n"
++					".endfor\n"
++					".for i in ${HEADERS}\n"
++					"\t${INSTALL} ../${i} ${INSTALL_PREFIX}/lib/include/"
++					"${i:H}\n"
++					".endfor\n"
++					"\t${INSTALL} ../lib/%s/%s.tl ${INSTALL_PREFIX}/lib\n",
++					api, api);
++
+     IGNORE fclose (output);
+     return;
+ }
diff --git a/lang/TenDRA/files/patch-tcc_diag b/lang/TenDRA/files/patch-tcc_diag
new file mode 100644
index 000000000000..d62bb12f8dd4
--- /dev/null
+++ b/lang/TenDRA/files/patch-tcc_diag
@@ -0,0 +1,26 @@
+Index: src/lib/env/freebsd/common/80x86/tcc_diag
+===================================================================
+RCS file: /usr/home/stefan/ten15/cvsup/tendra/src/lib/env/freebsd/common/80x86/tcc_diag,v
+retrieving revision 1.3
+diff -u -r1.3 tcc_diag
+--- src/lib/env/freebsd/common/80x86/tcc_diag	17 Aug 2003 20:22:09 -0000	1.3
++++ src/lib/env/freebsd/common/80x86/tcc_diag	1 Sep 2003 23:42:59 -0000
+@@ -4,4 +4,4 @@
+ 
+ +CRT0		"<LIB_CRT0>"
+ <LINK		"-L<TENDRA_LIBDIR>/diag"
+->SYS_LIB	"-static -lg"
++>SYS_LIB	"-static"
+Index: src/lib/env/freebsd/common/alpha/tcc_diag
+===================================================================
+RCS file: /usr/home/stefan/ten15/cvsup/tendra/src/lib/env/freebsd/common/alpha/tcc_diag,v
+retrieving revision 1.2
+diff -u -r1.2 tcc_diag
+--- src/lib/env/freebsd/common/alpha/tcc_diag	17 Aug 2003 20:22:09 -0000	1.2
++++ src/lib/env/freebsd/common/alpha/tcc_diag	1 Sep 2003 23:43:07 -0000
+@@ -5,4 +5,4 @@
+ 
+ +CRT0		"<LIB_CRT0>"
+ <LINK		"-L<TENDRA_LIBDIR>/diag"
+->SYS_LIB	"-static -lg"
++>SYS_LIB	"-static"
diff --git a/lang/TenDRA/files/patch-tcc_time b/lang/TenDRA/files/patch-tcc_time
deleted file mode 100644
index 1f654b20f7c8..000000000000
--- a/lang/TenDRA/files/patch-tcc_time
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/lib/env/common/tcc_time.orig	Sat Jan 17 07:57:02 1998
-+++ src/lib/env/common/tcc_time	Sun Mar 19 02:17:20 2000
-@@ -1,20 +1,20 @@
- /* tcc environment implementing the -time option */
- 
--<TDFC			"/bin/time"
--<TDFCPP			"/bin/time"
--<TCPPLUS		"/bin/time"
--<TCPPLUSPP		"/bin/time"
--<TLD			"/bin/time"
--<TRANS			"/bin/time"
--<AS			"/bin/time"
--<LD			"/bin/time"
--<DISP			"/bin/time"
--<TNC			"/bin/time"
--<PL_TDF			"/bin/time"
--<AS1			"/bin/time"
--<CC			"/bin/time"
--<SPEC_LINK		"/bin/time"
--<CPP_SPEC_LINK		"/bin/time"
--<DUMP_ANAL		"/bin/time"
--<DUMP_LINK            	"/bin/time"
--<DYN_LINK            	"/bin/time"
-+<TDFC			"/usr/bin/time"
-+<TDFCPP			"/usr/bin/time"
-+<TCPPLUS		"/usr/bin/time"
-+<TCPPLUSPP		"/usr/bin/time"
-+<TLD			"/usr/bin/time"
-+<TRANS			"/usr/bin/time"
-+<AS			"/usr/bin/time"
-+<LD			"/usr/bin/time"
-+<DISP			"/usr/bin/time"
-+<TNC			"/usr/bin/time"
-+<PL_TDF			"/usr/bin/time"
-+<AS1			"/usr/bin/time"
-+<CC			"/usr/bin/time"
-+<SPEC_LINK		"/usr/bin/time"
-+<CPP_SPEC_LINK		"/usr/bin/time"
-+<DUMP_ANAL		"/usr/bin/time"
-+<DUMP_LINK            	"/usr/bin/time"
-+<DYN_LINK            	"/usr/bin/time"
diff --git a/lang/TenDRA/pkg-plist b/lang/TenDRA/pkg-plist
index c69337f0b0da..32f0f0c98fb4 100644
--- a/lang/TenDRA/pkg-plist
+++ b/lang/TenDRA/pkg-plist
@@ -1,63 +1,99 @@
 bin/tcc
-lib/TenDRA/%%TENDRA_PATH%%/bin/sid
-lib/TenDRA/%%TENDRA_PATH%%/bin/lexi
 lib/TenDRA/%%TENDRA_PATH%%/bin/calculus
+lib/TenDRA/%%TENDRA_PATH%%/bin/disp
+lib/TenDRA/%%TENDRA_PATH%%/bin/lexi
 lib/TenDRA/%%TENDRA_PATH%%/bin/make_err
 lib/TenDRA/%%TENDRA_PATH%%/bin/make_tdf
-lib/TenDRA/%%TENDRA_PATH%%/bin/disp
 lib/TenDRA/%%TENDRA_PATH%%/bin/pl
+lib/TenDRA/%%TENDRA_PATH%%/bin/sid
 lib/TenDRA/%%TENDRA_PATH%%/bin/tcc
+lib/TenDRA/%%TENDRA_PATH%%/bin/tcpplus
+lib/TenDRA/%%TENDRA_PATH%%/bin/tdfc2
 lib/TenDRA/%%TENDRA_PATH%%/bin/tld
 lib/TenDRA/%%TENDRA_PATH%%/bin/tnc
-lib/TenDRA/%%TENDRA_PATH%%/bin/tspec
-lib/TenDRA/%%TENDRA_PATH%%/bin/tdfc2
-lib/TenDRA/%%TENDRA_PATH%%/bin/tcpplus
 lib/TenDRA/%%TENDRA_PATH%%/bin/trans
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.32/default.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.32/int_sizes.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi/default.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi/int_sizes.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/ansi.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/trad.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xa
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xc
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xp
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xs
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xsystem
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xt
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xw
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/nepc
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/not_ansi
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xa
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xc
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xp
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xs
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xsystem
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xt
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xw
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion/ansi.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion/sign.pf
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/sys/param.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/sys/shm.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/ctype.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/gcc_dependency.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/limits.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/stdarg.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/unistd.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/xti.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/ansi.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/bsd_extn.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/cpp.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/gcc.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/iso.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/posix.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/posix1.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/posix2.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/svid3.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/system.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/unix95.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/xpg3.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/xpg4.h
+lib/TenDRA/%%TENDRA_PATH%%/bin/tspec
+lib/TenDRA/%%TENDRA_PATH%%/env/16bit
+lib/TenDRA/%%TENDRA_PATH%%/env/32bit
+lib/TenDRA/%%TENDRA_PATH%%/env/Goption
+lib/TenDRA/%%TENDRA_PATH%%/env/K-P5
+lib/TenDRA/%%TENDRA_PATH%%/env/K-PIC
+lib/TenDRA/%%TENDRA_PATH%%/env/K-frame
+lib/TenDRA/%%TENDRA_PATH%%/env/K-i386
+lib/TenDRA/%%TENDRA_PATH%%/env/K-i486
+lib/TenDRA/%%TENDRA_PATH%%/env/K-ieee
+lib/TenDRA/%%TENDRA_PATH%%/env/K-noframe
+lib/TenDRA/%%TENDRA_PATH%%/env/K-noieee
+lib/TenDRA/%%TENDRA_PATH%%/env/K-prom
+lib/TenDRA/%%TENDRA_PATH%%/env/Versions
+lib/TenDRA/%%TENDRA_PATH%%/env/Xa
+lib/TenDRA/%%TENDRA_PATH%%/env/Xc
+lib/TenDRA/%%TENDRA_PATH%%/env/Xp
+lib/TenDRA/%%TENDRA_PATH%%/env/Xs
+lib/TenDRA/%%TENDRA_PATH%%/env/Xt
+lib/TenDRA/%%TENDRA_PATH%%/env/Xw
+lib/TenDRA/%%TENDRA_PATH%%/env/Z-p
+lib/TenDRA/%%TENDRA_PATH%%/env/Z-p1
+lib/TenDRA/%%TENDRA_PATH%%/env/Z-p2
+lib/TenDRA/%%TENDRA_PATH%%/env/Z-p4
+lib/TenDRA/%%TENDRA_PATH%%/env/aes
+lib/TenDRA/%%TENDRA_PATH%%/env/alloca
+lib/TenDRA/%%TENDRA_PATH%%/env/ansi
+lib/TenDRA/%%TENDRA_PATH%%/env/bsd_extn
+lib/TenDRA/%%TENDRA_PATH%%/env/building
+lib/TenDRA/%%TENDRA_PATH%%/env/c
+lib/TenDRA/%%TENDRA_PATH%%/env/c++
+lib/TenDRA/%%TENDRA_PATH%%/env/common
+lib/TenDRA/%%TENDRA_PATH%%/env/compact
+lib/TenDRA/%%TENDRA_PATH%%/env/cose
+lib/TenDRA/%%TENDRA_PATH%%/env/default
+lib/TenDRA/%%TENDRA_PATH%%/env/default-build
+lib/TenDRA/%%TENDRA_PATH%%/env/default.extra
+lib/TenDRA/%%TENDRA_PATH%%/env/gcc
+lib/TenDRA/%%TENDRA_PATH%%/env/iso
+lib/TenDRA/%%TENDRA_PATH%%/env/longlong
+lib/TenDRA/%%TENDRA_PATH%%/env/makelib
+lib/TenDRA/%%TENDRA_PATH%%/env/motif_1_1
+lib/TenDRA/%%TENDRA_PATH%%/env/motif_1_2
+lib/TenDRA/%%TENDRA_PATH%%/env/motif_private
+lib/TenDRA/%%TENDRA_PATH%%/env/mse
+lib/TenDRA/%%TENDRA_PATH%%/env/pl_tdf
+lib/TenDRA/%%TENDRA_PATH%%/env/posix
+lib/TenDRA/%%TENDRA_PATH%%/env/posix1
+lib/TenDRA/%%TENDRA_PATH%%/env/posix2
+lib/TenDRA/%%TENDRA_PATH%%/env/status
+lib/TenDRA/%%TENDRA_PATH%%/env/strict_mot_1_2
+lib/TenDRA/%%TENDRA_PATH%%/env/strict_posix
+lib/TenDRA/%%TENDRA_PATH%%/env/strict_svid3
+lib/TenDRA/%%TENDRA_PATH%%/env/strict_xpg3
+lib/TenDRA/%%TENDRA_PATH%%/env/svid3
+lib/TenDRA/%%TENDRA_PATH%%/env/system
+lib/TenDRA/%%TENDRA_PATH%%/env/system+
+lib/TenDRA/%%TENDRA_PATH%%/env/target_tok
+lib/TenDRA/%%TENDRA_PATH%%/env/tcc_diag
+lib/TenDRA/%%TENDRA_PATH%%/env/tcc_pp
+lib/TenDRA/%%TENDRA_PATH%%/env/tcc_prof
+lib/TenDRA/%%TENDRA_PATH%%/env/tcc_time
+lib/TenDRA/%%TENDRA_PATH%%/env/tdf_ext
+lib/TenDRA/%%TENDRA_PATH%%/env/tdp
+lib/TenDRA/%%TENDRA_PATH%%/env/tnc
+lib/TenDRA/%%TENDRA_PATH%%/env/tsimp
+lib/TenDRA/%%TENDRA_PATH%%/env/unix95
+lib/TenDRA/%%TENDRA_PATH%%/env/wsl
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_aw
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_ext
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_lib
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_mit
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_mu
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_private
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_proto
+lib/TenDRA/%%TENDRA_PATH%%/env/x5_t
+lib/TenDRA/%%TENDRA_PATH%%/env/xpg3
+lib/TenDRA/%%TENDRA_PATH%%/env/xpg4
+lib/TenDRA/%%TENDRA_PATH%%/lib/ansi.tl
+lib/TenDRA/%%TENDRA_PATH%%/lib/bsd_extn.tl
+lib/TenDRA/%%TENDRA_PATH%%/lib/cpp.tl
+lib/TenDRA/%%TENDRA_PATH%%/lib/gcc.tl
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/ctype.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/errno.h
@@ -73,113 +109,99 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/stdlib.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/string.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api/time.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/alloc.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/bottom.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/clock_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/enums.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/eof.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/fail.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/file.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/free.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/null.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/rename.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/seek_con.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/size_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/system.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/time_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/tmp_max.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/va_args.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/va_list.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/wchar_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/xpg3_ran.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/xpg4_ran.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/bsd_extn.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/bsd_extn.api/timeval.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/bad_allo.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/except.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api/timeval.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/ctuid.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/enums.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/getopt.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/guid.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/ino_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/mode_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/off_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/pid_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/sigset_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/stat_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/tcpgrp.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/u_old.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/u_proto.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix1.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix1.api/ssize_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix2.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api/config.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api/timeval.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api/u_old.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/chtype.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/curs.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/id_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/in_t.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/rusage.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/sa_famil.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/sig.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/siginfo_.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/st_proto.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/timeval.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/useconds.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/xpg4.api/MASTER.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/xpg4.api/optopt.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/alloca.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/arpa/inet.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/errno.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/netdb.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/netinet/in.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/strings.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/syslog.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/arpa/inet.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/socket.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/file.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/param.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/resource.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/time.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/select.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/uio.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/socket.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/time.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/types.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/netinet/in.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys/uio.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/syslog.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/algorithm
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/assert.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/bitset
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cassert
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cctype
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cerrno
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cfloat
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/climits
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/clocale
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cmath
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/complex
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/csetjmp
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/csignal
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cstdarg
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cstddef
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cstdio
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cstdlib
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cstring
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/ctime
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/ctype.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cwchar
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/cwctype
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/deque
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/errno.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/exception
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/float.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/fstream
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/functional
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iomanip
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iomanip.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/ios
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iosfwd
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iostream
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iostream.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iso646.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/istream
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/iterator
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/limits
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/limits.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/list
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/locale
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/locale.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/map
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/math.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/memory
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/new
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/new.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/numeric
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/ostream
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/queue
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/set
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/setjmp.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/signal.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/sstream
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/stack
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/stdarg.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/stddef.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/stdexcept
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/stdlib.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/streambuf
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/string
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/string.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/strstream.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/time.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/typeinfo
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/utility
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/valarray
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/vector
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/wchar.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api/wctype.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/stab.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/tdf_alloca.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/file.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/param.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/resource.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/time.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys/types.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/tdf_alloca.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/ctype.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/dirent.h
@@ -198,15 +220,15 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/stddef.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/stdlib.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/string.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/termios.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/time.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/unistd.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/utime.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys/stat.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys/times.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys/utsname.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/sys/wait.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/termios.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/time.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/unistd.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix.api/utime.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/ctype.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/dirent.h
@@ -225,15 +247,15 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/stddef.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/stdlib.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/string.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/termios.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/time.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/unistd.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/utime.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys/stat.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys/times.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys/utsname.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/sys/wait.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/termios.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/time.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/unistd.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api/utime.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/ctype.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/dirent.h
@@ -255,16 +277,68 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/stddef.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/stdlib.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/string.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/termios.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/time.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/unistd.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/utime.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/wordexp.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/sys/stat.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/sys/times.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/sys/utsname.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/sys/wait.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/termios.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/time.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/unistd.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/utime.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/wordexp.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/alloc.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/bottom.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/clock_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/enums.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/eof.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/fail.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/file.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/free.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/null.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/rename.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/seek_con.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/size_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/system.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/time_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/tmp_max.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/va_args.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/va_list.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/wchar_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/xpg3_ran.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api/xpg4_ran.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/bsd_extn.api/timeval.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/bad_allo.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api/except.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api/timeval.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/ctuid.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/enums.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/getopt.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/guid.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/ino_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/mode_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/off_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/pid_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/sigset_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/stat_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/tcpgrp.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/u_old.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api/u_proto.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix1.api/ssize_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api/timeval.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api/u_old.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/chtype.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/curs.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/id_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/in_t.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/rusage.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/sa_famil.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/sig.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/siginfo_.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/st_proto.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/timeval.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api/useconds.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/xpg4.api/optopt.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/acl.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/cpio.h
@@ -292,18 +366,39 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/netconfig.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/netdir.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/nl_types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/nlist.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/wait.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/resource.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/types.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/ipc.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/panel.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/pfmt.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/pkginfo.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/poll.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/priv.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/prof.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/pwd.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/regexp.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/remop.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/key_prot.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/rpc.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/types.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/xdr.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/search.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/setjmp.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/siginfo.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/signal.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stdarg.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stddef.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stdio.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stdlib.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/string.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stropts.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/acct.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/audit.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/ipc.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/lock.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/mman.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/mount.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/msg.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/priocntl.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/procset.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/resource.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/rtpriocntl.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/sem.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/shm.h
@@ -313,30 +408,13 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/swap.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/termio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/termios.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/termiox.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/time.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/times.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/tspriocntl.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/uio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/utsname.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/time.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/panel.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/pfmt.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/pkginfo.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/poll.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/priv.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/prof.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/pwd.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/regexp.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/remop.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/search.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/setjmp.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/siginfo.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/signal.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stdarg.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stddef.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stdio.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stdlib.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/string.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/stropts.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys/wait.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/tar.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/term.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/termio.h
@@ -345,17 +423,14 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/time.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/tiuser.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/ucontext.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/ulimit.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/ustat.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/unctrl.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/unistd.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/ustat.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/utime.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/utmp.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/varargs.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/wait.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/key_prot.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/rpc.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/types.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc/xdr.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/arpa/inet.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/cpio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/ctype.h
@@ -378,6 +453,7 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/math.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/monetary.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/ndbm.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/netdb.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/netinet/in.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/nl_types.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/poll.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/pwd.h
@@ -394,6 +470,23 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/stdlib.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/string.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/strings.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/stropts.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/ipc.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/mman.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/msg.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/resource.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/sem.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/shm.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/socket.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/stat.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/statvfs.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/time.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/timeb.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/times.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/types.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/uio.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/un.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/utsname.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/wait.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/syslog.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/tar.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/term.h
@@ -409,25 +502,6 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/varargs.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/wchar.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/wordexp.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/xti.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/arpa/inet.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/netinet/in.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/wait.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/types.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/uio.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/ipc.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/mman.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/msg.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/resource.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/sem.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/shm.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/stat.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/statvfs.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/time.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/timeb.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/times.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/un.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/utsname.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/sys/socket.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/assert.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/cpio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/ctype.h
@@ -454,10 +528,19 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/search.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/setjmp.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/signal.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/stdarg.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/stddef.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/stdio.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/stdlib.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/string.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/ipc.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/msg.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/sem.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/shm.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/stat.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/times.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/types.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/utsname.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/wait.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/tar.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/termios.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/time.h
@@ -468,128 +551,65 @@ lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/varargs.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/wchar.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/wordexp.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/xti.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/wait.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/stat.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/ipc.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/msg.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/sem.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/shm.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/times.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/utsname.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys/types.h
-lib/TenDRA/%%TENDRA_PATH%%/lib/ansi.tl
-lib/TenDRA/%%TENDRA_PATH%%/lib/bsd_extn.tl
-lib/TenDRA/%%TENDRA_PATH%%/lib/cpp.tl
-lib/TenDRA/%%TENDRA_PATH%%/lib/gcc.tl
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/ctype.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/limits.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/stdarg.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/sys/param.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/sys/shm.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/unistd.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/xti.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/ansi.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/bsd_extn.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/cpp.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/gcc.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/iso.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/posix.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/posix1.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/posix2.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/svid3.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/system.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/unix95.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/xpg3.h
+lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup/xpg4.h
 lib/TenDRA/%%TENDRA_PATH%%/lib/posix.tl
 lib/TenDRA/%%TENDRA_PATH%%/lib/posix1.tl
 lib/TenDRA/%%TENDRA_PATH%%/lib/posix2.tl
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.32/default.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.32/int_sizes.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi/default.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi/int_sizes.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/ansi.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal/trad.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xa
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xc
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xp
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xs
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xsystem
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xt
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp/Xw
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xa
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xc
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xp
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xs
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xsystem
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xt
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/Xw
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/nepc
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes/not_ansi
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion/ansi.pf
+lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion/sign.pf
 lib/TenDRA/%%TENDRA_PATH%%/lib/svid3.tl
+lib/TenDRA/%%TENDRA_PATH%%/lib/sys/libcpp.a
+lib/TenDRA/%%TENDRA_PATH%%/lib/sys/libtdf.a
+lib/TenDRA/%%TENDRA_PATH%%/lib/target_tok.tl
 lib/TenDRA/%%TENDRA_PATH%%/lib/unix95.tl
 lib/TenDRA/%%TENDRA_PATH%%/lib/xpg4.tl
-lib/TenDRA/%%TENDRA_PATH%%/env/default
-lib/TenDRA/%%TENDRA_PATH%%/env/16bit
-lib/TenDRA/%%TENDRA_PATH%%/env/32bit
-lib/TenDRA/%%TENDRA_PATH%%/env/Goption
-lib/TenDRA/%%TENDRA_PATH%%/env/K-PIC
-lib/TenDRA/%%TENDRA_PATH%%/env/K-ieee
-lib/TenDRA/%%TENDRA_PATH%%/env/K-noieee
-lib/TenDRA/%%TENDRA_PATH%%/env/K-prom
-lib/TenDRA/%%TENDRA_PATH%%/env/Versions
-lib/TenDRA/%%TENDRA_PATH%%/env/Xa
-lib/TenDRA/%%TENDRA_PATH%%/env/Xc
-lib/TenDRA/%%TENDRA_PATH%%/env/Xp
-lib/TenDRA/%%TENDRA_PATH%%/env/Xs
-lib/TenDRA/%%TENDRA_PATH%%/env/Xt
-lib/TenDRA/%%TENDRA_PATH%%/env/Xw
-lib/TenDRA/%%TENDRA_PATH%%/env/aes
-lib/TenDRA/%%TENDRA_PATH%%/env/alloca
-lib/TenDRA/%%TENDRA_PATH%%/env/ansi
-lib/TenDRA/%%TENDRA_PATH%%/env/bsd_extn
-lib/TenDRA/%%TENDRA_PATH%%/env/building
-lib/TenDRA/%%TENDRA_PATH%%/env/c
-lib/TenDRA/%%TENDRA_PATH%%/env/c++
-lib/TenDRA/%%TENDRA_PATH%%/env/common
-lib/TenDRA/%%TENDRA_PATH%%/env/compact
-lib/TenDRA/%%TENDRA_PATH%%/env/cose
-lib/TenDRA/%%TENDRA_PATH%%/env/gcc
-lib/TenDRA/%%TENDRA_PATH%%/env/iso
-lib/TenDRA/%%TENDRA_PATH%%/env/longlong
-lib/TenDRA/%%TENDRA_PATH%%/env/makelib
-lib/TenDRA/%%TENDRA_PATH%%/env/motif_1_1
-lib/TenDRA/%%TENDRA_PATH%%/env/motif_1_2
-lib/TenDRA/%%TENDRA_PATH%%/env/motif_private
-lib/TenDRA/%%TENDRA_PATH%%/env/mse
-lib/TenDRA/%%TENDRA_PATH%%/env/pl_tdf
-lib/TenDRA/%%TENDRA_PATH%%/env/posix
-lib/TenDRA/%%TENDRA_PATH%%/env/posix1
-lib/TenDRA/%%TENDRA_PATH%%/env/posix2
-lib/TenDRA/%%TENDRA_PATH%%/env/status
-lib/TenDRA/%%TENDRA_PATH%%/env/strict_mot_1_2
-lib/TenDRA/%%TENDRA_PATH%%/env/strict_posix
-lib/TenDRA/%%TENDRA_PATH%%/env/strict_svid3
-lib/TenDRA/%%TENDRA_PATH%%/env/strict_xpg3
-lib/TenDRA/%%TENDRA_PATH%%/env/svid3
-lib/TenDRA/%%TENDRA_PATH%%/env/system
-lib/TenDRA/%%TENDRA_PATH%%/env/system+
-lib/TenDRA/%%TENDRA_PATH%%/env/target_tok
-lib/TenDRA/%%TENDRA_PATH%%/env/tcc_diag
-lib/TenDRA/%%TENDRA_PATH%%/env/tcc_pp
-lib/TenDRA/%%TENDRA_PATH%%/env/tcc_prof
-lib/TenDRA/%%TENDRA_PATH%%/env/tcc_time
-lib/TenDRA/%%TENDRA_PATH%%/env/tdf_ext
-lib/TenDRA/%%TENDRA_PATH%%/env/tdp
-lib/TenDRA/%%TENDRA_PATH%%/env/tnc
-lib/TenDRA/%%TENDRA_PATH%%/env/tsimp
-lib/TenDRA/%%TENDRA_PATH%%/env/unix95
-lib/TenDRA/%%TENDRA_PATH%%/env/wsl
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_aw
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_ext
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_lib
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_mit
-lib/TenDRA/%%TENDRA_PATH%%/env/Z-p
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_mu
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_private
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_proto
-lib/TenDRA/%%TENDRA_PATH%%/env/x5_t
-lib/TenDRA/%%TENDRA_PATH%%/env/xpg3
-lib/TenDRA/%%TENDRA_PATH%%/env/xpg4
-lib/TenDRA/%%TENDRA_PATH%%/env/K-P5
-lib/TenDRA/%%TENDRA_PATH%%/env/K-frame
-lib/TenDRA/%%TENDRA_PATH%%/env/K-i386
-lib/TenDRA/%%TENDRA_PATH%%/env/K-i486
-lib/TenDRA/%%TENDRA_PATH%%/env/K-noframe
-lib/TenDRA/%%TENDRA_PATH%%/env/Z-p1
-lib/TenDRA/%%TENDRA_PATH%%/env/Z-p2
-lib/TenDRA/%%TENDRA_PATH%%/env/Z-p4
-lib/TenDRA/%%TENDRA_PATH%%/env/default.extra
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/bin
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.32
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/sys
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/env
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/ansi.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/bsd_extn.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix1.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix2.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/xpg4.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/arpa
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/netinet
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api/sys
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/bsd_extn.api
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/cpp.api
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/gcc.api/sys
@@ -600,8 +620,18 @@ lib/TenDRA/%%TENDRA_PATH%%/env/default.extra
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix1.api
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api/sys
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/posix2.api
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/ansi.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/bsd_extn.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/cpp.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/gcc.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/posix1.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/svid3.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/unix95.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared/xpg4.api
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/shared
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/rpc
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api/sys
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/svid3.api
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/arpa
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/unix95.api/netinet
@@ -610,8 +640,19 @@ lib/TenDRA/%%TENDRA_PATH%%/env/default.extra
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api/sys
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include/xpg4.api
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/include
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include/sys
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines/include
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines/startup
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/machines
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.32
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Bounds.ansi
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Literal
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Modes.cpp
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup/Promotion
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/startup
+@dirrm lib/TenDRA/%%TENDRA_PATH%%/lib/sys
 @dirrm lib/TenDRA/%%TENDRA_PATH%%/lib
-@dirrm lib/TenDRA/%%TENDRA_PATH%%/env
 @dirrm lib/TenDRA/%%TENDRA_PATH%%
 @dirrm lib/TenDRA/%%TENDRA_VER%%/FreeBSD/%%TENDRA_OSREL%%
 @dirrm lib/TenDRA/%%TENDRA_VER%%/FreeBSD