lang/io: update to 2017.09.06

9 files changed, 448 insertions, 632 deletions

diff --git a/lang/io/Makefile b/lang/io/Makefile
index 4ee60e78bd43..9e332eb656bd 100644
--- a/lang/io/Makefile
+++ b/lang/io/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	io
-PORTVERSION=	2015.11.11
-PORTREVISION=	7
+PORTVERSION=	2017.09.06
 CATEGORIES=	lang
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -13,11 +12,11 @@ LICENSE=	BSD3CLAUSE
 
 BROKEN_armv6=		fails to compile: ucontext.h: expected parameter declarator
 
+USES=		cmake:outsource,noninja compiler:c11 ssl
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	stevedekorte
-GH_TAGNAME=	23afbcc
 
-USES=		cmake:outsource,noninja compiler:c11
 MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 
@@ -48,4 +47,8 @@ post-install:
 	${MKDIR}  ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
+do-test:
+	cd ${BUILD_WRKSRC} && \
+	    ./_build/binaries/io ${WRKSRC}/libs/iovm/tests/correctness/run.io
+
 .include <bsd.port.mk>
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index da921ad16c7f..1f3c52cf92c8 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -17,6 +17,7 @@ DEFAULT_ADDONS=	AsyncRequest \
 		Loki \
 		MD5 \
 		NotificationCenter \
+		Oauth \
 		Obsidian \
 		Random \
 		Range \
@@ -39,6 +40,7 @@ DEFAULT_ADDONS=	AsyncRequest \
 #
 OPTIONAL_ADDONS=BigNum \
 		CFFI \
+		Cairo \
 		Clutter \
 		DBI \
 		EditLine \
@@ -72,6 +74,7 @@ OPTIONS_GROUP_ADDONS=${OPTIONAL_ADDONS}
 
 BigNum_LIB_DEPENDS=	libgmp.so:math/gmp
 CFFI_LIB_DEPENDS=	libffi.so:devel/libffi
+Cairo_USE=		GNOME=cairo
 Clutter_LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 EditLine_USES=		libedit
@@ -92,7 +95,7 @@ MySQL_USES=		mysql:client
 Ogg_LIB_DEPENDS=	libogg.so:audio/libogg
 OpenGL_USE=		GL=glut XORG=xmu
 PostgreSQL_USES=	pgsql
-Python_USES=		python
+Python_USES=		python:3.3+
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 ReadLine_USES=		readline:port
 Regex_LIB_DEPENDS=	libpcre.so:devel/pcre
diff --git a/lang/io/distinfo b/lang/io/distinfo
index 6631f623bece..533f52531134 100644
--- a/lang/io/distinfo
+++ b/lang/io/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467100370
-SHA256 (stevedekorte-io-2015.11.11-23afbcc_GH0.tar.gz) = d66a085288c278c3641c6c7360967ace54e5469b751659fca4e31fef7987975a
-SIZE (stevedekorte-io-2015.11.11-23afbcc_GH0.tar.gz) = 9212486
+TIMESTAMP = 1505299993
+SHA256 (stevedekorte-io-2017.09.06_GH0.tar.gz) = 9ac5cd94bbca65c989cd254be58a3a716f4e4f16480f0dc81070457aa353c217
+SIZE (stevedekorte-io-2017.09.06_GH0.tar.gz) = 9153588
diff --git a/lang/io/files/patch-addons-SQLite3_CMakeLists.txt b/lang/io/files/patch-addons-SQLite3_CMakeLists.txt
deleted file mode 100644
index 924b403e371c..000000000000
--- a/lang/io/files/patch-addons-SQLite3_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- addons/SQLite3/CMakeLists.txt.orig	2012-10-02 16:24:59.000000000 +0200
-+++ addons/SQLite3/CMakeLists.txt	2012-10-02 16:25:24.000000000 +0200
-@@ -20,6 +20,9 @@
- 	# Additional include directories
- 	include_directories(${SQLITE_INCLUDE_DIRS})
- 
-+	# Additional link directories
-+	link_directories(${SQLITE_LIBRARY_DIRS})
-+
- 	# Generate the IoSQLite3Init.c file.
- 	# Argument SHOULD ALWAYS be the exact name of the addon, case is
- 	# important.
diff --git a/lang/io/files/patch-addons_Oauth_source_Oauth_http.c b/lang/io/files/patch-addons_Oauth_source_Oauth_http.c
new file mode 100644
index 000000000000..49e6653e1320
--- /dev/null
+++ b/lang/io/files/patch-addons_Oauth_source_Oauth_http.c
@@ -0,0 +1,13 @@
+--- addons/Oauth/source/Oauth/http.c.orig	2017-09-13 10:44:59 UTC
++++ addons/Oauth/source/Oauth/http.c
+@@ -6,7 +6,10 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <sys/select.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <fcntl.h>
+ #include <errno.h>
diff --git a/lang/io/files/patch-memchached-1-fd67950 b/lang/io/files/patch-memchached-1-fd67950
deleted file mode 100644
index 4cf23b1d273a..000000000000
--- a/lang/io/files/patch-memchached-1-fd67950
+++ /dev/null
@@ -1,93 +0,0 @@
-From fd6795035e4bcd1d2606f4f8f69c104bfbf5d5ff Mon Sep 17 00:00:00 2001
-From: Charles Ellis <hamled@gmail.com>
-Date: Sun, 20 May 2012 23:20:33 -0700
-Subject: [PATCH] Memcached stats method compatiblity fix
-
-The stats method of Memcached is now compatible with libmemcached 1.0+.
----
- addons/Memcached/source/IoMemcached.c | 41 +++++++++++++++++++++--------------
- modules/FindLibMemcached.cmake        |  2 +-
- 2 files changed, 26 insertions(+), 17 deletions(-)
-
-diff --git a/addons/Memcached/source/IoMemcached.c b/addons/Memcached/source/IoMemcached.c
-index c1be9ff..aa3fe67 100644
---- addons/Memcached/source/IoMemcached.c
-+++ addons/Memcached/source/IoMemcached.c
-@@ -472,39 +472,48 @@ values are maps with actual stats.
- IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- {
- 	IoMap *results_map = IoMap_new(IOSTATE);
-+	memcached_st *mc = DATA(self)->mc;
- 
--	int i;
--	for(i = 0; i < memcached_server_list_count(DATA(self)->mc->servers); i++) {
--		memcached_server_st *server = DATA(self)->mc->servers + i;
-+	uint32_t pos = 0;
-+	while(pos < memcached_server_count(mc)) {
-+		memcached_server_instance_st server = memcached_server_instance_by_position(mc, pos);
-+		if(server == NULL)
-+			continue;
-+
-+		const char *hostname = memcached_server_name(server);
-+		const in_port_t port = memcached_server_port(server);
- 
- 		memcached_stat_st stats;
--		if(memcached_stat_servername(&stats, "", server->hostname, server->port) != 0)
-+		memcached_return_t rc = memcached_stat_servername(&stats, "", hostname, port);
-+		if(rc != MEMCACHED_SUCCESS)
- 			continue;
- 
--		memcached_return rc;
--		char **ckeys = memcached_stat_get_keys(DATA(self)->mc, &stats, &rc);
--
--		int ckeys_count = 0;
--		while(ckeys[ckeys_count] != NULL)
--			ckeys_count++;
-+		char **ckeys = memcached_stat_get_keys(mc, &stats, &rc);
-+		if(rc != MEMCACHED_SUCCESS)
-+			continue;
- 
- 		IoMap *per_server_map = IoMap_new(IOSTATE);
--		int k;
--		for(k = 0; k < ckeys_count; k++) {
--			char *ckey = ckeys[k];
--			char *cvalue = memcached_stat_get_value(DATA(self)->mc, &stats, ckey, &rc);
-+		char *ckey = *ckeys;
-+		while(ckey != NULL) {
-+			char *cvalue = memcached_stat_get_value(mc, &stats, ckey, &rc);
-+			if(rc != MEMCACHED_SUCCESS)
-+				continue;
-+
- 			IoMap_rawAtPut(per_server_map, IOSYMBOL(ckey), IOSYMBOL(cvalue));
- 			free(cvalue);
-+			ckey++;
- 		}
- 
- 		free(ckeys);
- 
- 		// "127.0.0.1:11211"
--		char *server_key = (char *) malloc((strlen(server->hostname) + 1 + 5 + 1) * sizeof(char));
--		sprintf(server_key, "%s:%d", server->hostname, server->port);
-+		char *server_key = (char *) malloc((strlen(hostname) + 1 + 5 + 1) * sizeof(char));
-+		sprintf(server_key, "%s:%d", hostname, port);
- 
- 		IoMap_rawAtPut(results_map, IOSYMBOL(server_key), per_server_map);
- 		free(server_key);
-+
-+		pos++;
- 	}
- 
- 	return results_map;
-diff --git a/modules/FindLibMemcached.cmake b/modules/FindLibMemcached.cmake
-index 46bf5e5..07ee3bb 100644
---- modules/FindLibMemcached.cmake
-+++ modules/FindLibMemcached.cmake
-@@ -6,7 +6,7 @@
- 
- FIND_PATH(LIBMEMCACHED_INCLUDE_DIR libmemcached/memcached.h)
- 
--FIND_LIBRARY(LIBMEMCACHED_LIBRARY NAMES memcached PATH /usr/lib /usr/local/lib)
-+FIND_LIBRARY(LIBMEMCACHED_LIBRARY NAMES memcached libmemcached PATH /usr/lib /usr/local/lib)
- 
- IF(LIBMEMCACHED_INCLUDE_DIR AND LIBMEMCACHED_LIBRARY)
- 	SET(LIBMEMCACHED_FOUND 1)
diff --git a/lang/io/files/patch-memchached-2-b53b3d8 b/lang/io/files/patch-memchached-2-b53b3d8
deleted file mode 100644
index 6fcd8ab83ff1..000000000000
--- a/lang/io/files/patch-memchached-2-b53b3d8
+++ /dev/null
@@ -1,180 +0,0 @@
-From b53b3d8e66d3e4f173500f70ce2df45763b2e0b2 Mon Sep 17 00:00:00 2001
-From: Charles Ellis <hamled@gmail.com>
-Date: Mon, 21 May 2012 00:01:35 -0700
-Subject: [PATCH] Further Memcached compatibility fixes
-
-The Memcached addon is now compatible with the API for libmemcached 1.0
-throughout. The stats method also sets the error state if errors were
-encountered.
----
- addons/Memcached/source/IoMemcached.c | 49 +++++++++++++++++++++--------------
- 1 file changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/addons/Memcached/source/IoMemcached.c b/addons/Memcached/source/IoMemcached.c
-index aa3fe67..0d0dfb4 100644
---- addons/Memcached/source/IoMemcached.c
-+++ addons/Memcached/source/IoMemcached.c
-@@ -105,7 +105,7 @@ Returns self.
- */
- IoObject *IoMemcached_addServer(IoMemcached *self, IoObject *locals, IoMessage *m)
- {
--	memcached_server_st *server;
-+	memcached_server_list_st server;
- 
- 	server = memcached_servers_parse(IoMessage_locals_cStringArgAt_(m, locals, 0));
- 	memcached_server_push(DATA(self)->mc, server);
-@@ -132,7 +132,7 @@ IoObject *IoMemcached_set(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	size_t size;
- 	char *cvalue = IoMemcached_serialize(self, locals, value, &size, &flags);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_set(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		cvalue, size,
-@@ -164,7 +164,7 @@ IoObject *IoMemcached_add(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	size_t size;
- 	char *cvalue = IoMemcached_serialize(self, locals, value, &size, &flags);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_add(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		cvalue, size,
-@@ -200,7 +200,7 @@ IoObject *IoMemcached_replace(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	size_t size;
- 	char *cvalue = IoMemcached_serialize(self, locals, value, &size, &flags);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_replace(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		cvalue, size,
-@@ -230,7 +230,7 @@ IoObject *IoMemcached_append(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	IoSeq *key   = IoMessage_locals_seqArgAt_(m, locals, 0);
- 	IoSeq *value = IoMessage_locals_seqArgAt_(m, locals, 1);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_append(DATA(self)->mc,
- 		CSTRING(key),   IOSEQ_LENGTH(key),
- 		CSTRING(value), IOSEQ_LENGTH(value),
-@@ -254,7 +254,7 @@ IoObject *IoMemcached_prepend(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	IoSeq *key   = IoMessage_locals_seqArgAt_(m, locals, 0);
- 	IoSeq *value = IoMessage_locals_seqArgAt_(m, locals, 1);
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_prepend(DATA(self)->mc,
- 		CSTRING(key),   IOSEQ_LENGTH(key),
- 		CSTRING(value), IOSEQ_LENGTH(value),
-@@ -279,7 +279,7 @@ IoObject *IoMemcached_get(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	size_t size;
- 	uint32_t flags;
--	memcached_return rc;
-+	memcached_return_t rc;
- 
- 	char *cvalue;
- 	cvalue = memcached_get(DATA(self)->mc,
-@@ -322,7 +322,7 @@ IoObject *IoMemcached_getMulti(IoMemcached *self, IoObject *locals, IoMessage *m
- 		IOASSERT(IOSEQ_LENGTH(key) < MEMCACHED_MAX_KEY, "key is too long");
- 	}
- 
--	char **ckeys = (char **) malloc(sizeof(char *) * keys_list_size);
-+	const char **ckeys = (const char **) malloc(sizeof(const char *) * keys_list_size);
- 	size_t *ckey_lengths = (size_t *) malloc(sizeof(size_t) * keys_list_size);
- 
- 	for(i = 0; i < keys_list_size; i++) {
-@@ -330,7 +330,7 @@ IoObject *IoMemcached_getMulti(IoMemcached *self, IoObject *locals, IoMessage *m
- 		ckey_lengths[i] = strlen(ckeys[i]);
- 	}
- 
--	memcached_return rc = memcached_mget(DATA(self)->mc, ckeys, ckey_lengths, keys_list_size);
-+	memcached_return_t rc = memcached_mget(DATA(self)->mc, ckeys, ckey_lengths, keys_list_size);
- 
- 	free(ckeys);
- 	free(ckey_lengths);
-@@ -377,7 +377,7 @@ IoObject *IoMemcached_delete(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	time_t time = IoMessage_argCount(m) == 2 ? IoMessage_locals_intArgAt_(m, locals, 1) : 0;
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_delete(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		time
-@@ -423,7 +423,7 @@ IoObject *IoMemcached_incr(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	uint64_t new_value;
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_increment(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		offset, &new_value
-@@ -451,7 +451,7 @@ IoObject *IoMemcached_decr(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 	uint64_t new_value;
- 
--	memcached_return rc;
-+	memcached_return_t rc;
- 	rc = memcached_decrement(DATA(self)->mc,
- 		CSTRING(key), IOSEQ_LENGTH(key),
- 		offset, &new_value
-@@ -472,11 +472,11 @@ values are maps with actual stats.
- IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- {
- 	IoMap *results_map = IoMap_new(IOSTATE);
--	memcached_st *mc = DATA(self)->mc;
- 
-+	int errors = 0;
- 	uint32_t pos = 0;
--	while(pos < memcached_server_count(mc)) {
--		memcached_server_instance_st server = memcached_server_instance_by_position(mc, pos);
-+	while(pos < memcached_server_count(DATA(self)->mc)) {
-+		memcached_server_instance_st server = memcached_server_instance_by_position(DATA(self)->mc, pos);
- 		if(server == NULL)
- 			continue;
- 
-@@ -485,19 +485,25 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- 
- 		memcached_stat_st stats;
- 		memcached_return_t rc = memcached_stat_servername(&stats, "", hostname, port);
--		if(rc != MEMCACHED_SUCCESS)
-+		if(rc != MEMCACHED_SUCCESS) {
-+			errors++;
- 			continue;
-+		}
- 
--		char **ckeys = memcached_stat_get_keys(mc, &stats, &rc);
--		if(rc != MEMCACHED_SUCCESS)
-+		char **ckeys = memcached_stat_get_keys(DATA(self)->mc, &stats, &rc);
-+		if(rc != MEMCACHED_SUCCESS) {
-+			errors++;
- 			continue;
-+		}
- 
- 		IoMap *per_server_map = IoMap_new(IOSTATE);
- 		char *ckey = *ckeys;
- 		while(ckey != NULL) {
--			char *cvalue = memcached_stat_get_value(mc, &stats, ckey, &rc);
--			if(rc != MEMCACHED_SUCCESS)
-+			char *cvalue = memcached_stat_get_value(DATA(self)->mc, &stats, ckey, &rc);
-+			if(rc != MEMCACHED_SUCCESS) {
-+				errors++;
- 				continue;
-+			}
- 
- 			IoMap_rawAtPut(per_server_map, IOSYMBOL(ckey), IOSYMBOL(cvalue));
- 			free(cvalue);
-@@ -516,6 +522,9 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- 		pos++;
- 	}
- 
-+	if(errors > 0)
-+		IoState_error_(IOSTATE, m, memcached_strerror(DATA(self)->mc, MEMCACHED_SOME_ERRORS));
-+
- 	return results_map;
- }
- 
diff --git a/lang/io/files/patch-memchached-3-0b4f7e7 b/lang/io/files/patch-memchached-3-0b4f7e7
deleted file mode 100644
index 217eef68527a..000000000000
--- a/lang/io/files/patch-memchached-3-0b4f7e7
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0b4f7e75e80bf25d382901f098b60c724e0dd6b3 Mon Sep 17 00:00:00 2001
-From: Kyle Marek-Spartz <zeckalpha@gmail.com>
-Date: Sat, 1 Feb 2014 09:23:43 -0600
-Subject: [PATCH] Changed type to get memcached >= 1.0.17 to compile. Still
- gives warning for: io/addons/Memcached/source/IoMemcached.c:46:2: warning:
- implicit declaration of function IoState_registerProtoWithFunc_ is invalid in
- C99
-
----
- addons/Memcached/source/IoMemcached.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addons/Memcached/source/IoMemcached.c b/addons/Memcached/source/IoMemcached.c
-index 0d0dfb4..a4f3901 100644
---- addons/Memcached/source/IoMemcached.c
-+++ addons/Memcached/source/IoMemcached.c
-@@ -476,7 +476,7 @@ IoObject *IoMemcached_stats(IoMemcached *self, IoObject *locals, IoMessage *m)
- 	int errors = 0;
- 	uint32_t pos = 0;
- 	while(pos < memcached_server_count(DATA(self)->mc)) {
--		memcached_server_instance_st server = memcached_server_instance_by_position(DATA(self)->mc, pos);
-+		const memcached_instance_st *server = memcached_server_instance_by_position(DATA(self)->mc, pos);
- 		if(server == NULL)
- 			continue;
- 
diff --git a/lang/io/pkg-plist b/lang/io/pkg-plist
index 76106c9aa993..37ce2c20bcc7 100644
--- a/lang/io/pkg-plist
+++ b/lang/io/pkg-plist
@@ -4,24 +4,24 @@ lib/libbasekit.so
 lib/libcoroutine.so
 lib/libgarbagecollector.so
 lib/libiovmall.so
-%%AsyncRequest%%lib/io/addons/AsyncRequest/CMakeLists.txt
 %%AsyncRequest%%lib/io/addons/AsyncRequest/_build/dll/libIoAsyncRequest.so
+%%AsyncRequest%%lib/io/addons/AsyncRequest/CMakeLists.txt
 %%AsyncRequest%%lib/io/addons/AsyncRequest/depends
 %%AsyncRequest%%lib/io/addons/AsyncRequest/io/AsyncRequest.io
 %%AsyncRequest%%lib/io/addons/AsyncRequest/protos
 %%AsyncRequest%%lib/io/addons/AsyncRequest/source/IoAsyncRequest.c
 %%AsyncRequest%%lib/io/addons/AsyncRequest/source/IoAsyncRequest.h
 %%AsyncRequest%%lib/io/addons/AsyncRequest/source/IoAsyncRequestInit.c
-%%BigNum%%lib/io/addons/BigNum/CMakeLists.txt
 %%BigNum%%lib/io/addons/BigNum/_build/dll/libIoBigNum.so
+%%BigNum%%lib/io/addons/BigNum/CMakeLists.txt
 %%BigNum%%lib/io/addons/BigNum/depends
 %%BigNum%%lib/io/addons/BigNum/io/BigNum.io
 %%BigNum%%lib/io/addons/BigNum/protos
 %%BigNum%%lib/io/addons/BigNum/source/IoBigNum.c
 %%BigNum%%lib/io/addons/BigNum/source/IoBigNum.h
 %%BigNum%%lib/io/addons/BigNum/source/IoBigNumInit.c
-%%Bitly%%lib/io/addons/Bitly/CMakeLists.txt
 %%Bitly%%lib/io/addons/Bitly/_build/dll/libIoBitly.so
+%%Bitly%%lib/io/addons/Bitly/CMakeLists.txt
 %%Bitly%%lib/io/addons/Bitly/depends
 %%Bitly%%lib/io/addons/Bitly/io/Bitly.io
 %%Bitly%%lib/io/addons/Bitly/io/BitlyClient.io
@@ -29,20 +29,20 @@ lib/libiovmall.so
 %%Bitly%%lib/io/addons/Bitly/protos
 %%Bitly%%lib/io/addons/Bitly/source/.gitsidumb
 %%Bitly%%lib/io/addons/Bitly/source/IoBitlyInit.c
-%%Blowfish%%lib/io/addons/Blowfish/CMakeLists.txt
 %%Blowfish%%lib/io/addons/Blowfish/_build/dll/libIoBlowfish.so
+%%Blowfish%%lib/io/addons/Blowfish/CMakeLists.txt
 %%Blowfish%%lib/io/addons/Blowfish/depends
 %%Blowfish%%lib/io/addons/Blowfish/io/Blowfish.io
 %%Blowfish%%lib/io/addons/Blowfish/protos
+%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.c
+%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.h
 %%Blowfish%%lib/io/addons/Blowfish/source/IoBlowfish.c
 %%Blowfish%%lib/io/addons/Blowfish/source/IoBlowfish.h
 %%Blowfish%%lib/io/addons/Blowfish/source/IoBlowfishInit.c
-%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.c
-%%Blowfish%%lib/io/addons/Blowfish/source/blowfish.h
 %%Blowfish%%lib/io/addons/Blowfish/tests/correctness/BlowfishTest.io
 %%Blowfish%%lib/io/addons/Blowfish/tests/correctness/run.io
-%%Box%%lib/io/addons/Box/CMakeLists.txt
 %%Box%%lib/io/addons/Box/_build/dll/libIoBox.so
+%%Box%%lib/io/addons/Box/CMakeLists.txt
 %%Box%%lib/io/addons/Box/depends
 %%Box%%lib/io/addons/Box/frameworks
 %%Box%%lib/io/addons/Box/io/Vector.io
@@ -53,16 +53,101 @@ lib/libiovmall.so
 %%Box%%lib/io/addons/Box/source/IoBoxInit.c
 %%Box%%lib/io/addons/Box/tests/correctness/BoxTest.io
 %%Box%%lib/io/addons/Box/tests/correctness/run.io
-%%Box%%lib/io/addons/Box/tests/performance/SpeedResults.txt
 %%Box%%lib/io/addons/Box/tests/performance/mandlebrot.c
 %%Box%%lib/io/addons/Box/tests/performance/mandlebrot.io
 %%Box%%lib/io/addons/Box/tests/performance/mandlebrot.py
 %%Box%%lib/io/addons/Box/tests/performance/runSpeedTests.io
 %%Box%%lib/io/addons/Box/tests/performance/speed.io
 %%Box%%lib/io/addons/Box/tests/performance/speed.py
-%%CFFI%%lib/io/addons/CFFI/CMakeLists.txt
-%%CFFI%%lib/io/addons/CFFI/README
+%%Box%%lib/io/addons/Box/tests/performance/SpeedResults.txt
+%%Cairo%%lib/io/addons/Cairo/_build/dll/libIoCairo.so
+%%Cairo%%lib/io/addons/Cairo/CMakeLists.txt
+%%Cairo%%lib/io/addons/Cairo/depends
+%%Cairo%%lib/io/addons/Cairo/io/Cairo.io
+%%Cairo%%lib/io/addons/Cairo/io/Z_RemoveGlobalAccess.io
+%%Cairo%%lib/io/addons/Cairo/protos
+%%Cairo%%lib/io/addons/Cairo/samples/arc.io
+%%Cairo%%lib/io/addons/Cairo/samples/arcNegative.io
+%%Cairo%%lib/io/addons/Cairo/samples/chart.io
+%%Cairo%%lib/io/addons/Cairo/samples/clip.io
+%%Cairo%%lib/io/addons/Cairo/samples/clipImage.io
+%%Cairo%%lib/io/addons/Cairo/samples/curveRectangle.io
+%%Cairo%%lib/io/addons/Cairo/samples/curveTo.io
+%%Cairo%%lib/io/addons/Cairo/samples/dash.io
+%%Cairo%%lib/io/addons/Cairo/samples/data/romedalen.png
+%%Cairo%%lib/io/addons/Cairo/samples/fillAndStroke.io
+%%Cairo%%lib/io/addons/Cairo/samples/fillAndStroke2.io
+%%Cairo%%lib/io/addons/Cairo/samples/fillAndStroke2.png
+%%Cairo%%lib/io/addons/Cairo/samples/gradient.io
+%%Cairo%%lib/io/addons/Cairo/samples/image.io
+%%Cairo%%lib/io/addons/Cairo/samples/imagePattern.io
+%%Cairo%%lib/io/addons/Cairo/samples/multiSegmentCaps.io
+%%Cairo%%lib/io/addons/Cairo/samples/path.io
+%%Cairo%%lib/io/addons/Cairo/samples/runAll.io
+%%Cairo%%lib/io/addons/Cairo/samples/Sample.io
+%%Cairo%%lib/io/addons/Cairo/samples/setLineCap.io
+%%Cairo%%lib/io/addons/Cairo/samples/setLineJoin.io
+%%Cairo%%lib/io/addons/Cairo/samples/text.io
+%%Cairo%%lib/io/addons/Cairo/samples/textAlignCenter.io
+%%Cairo%%lib/io/addons/Cairo/samples/textExtents.io
+%%Cairo%%lib/io/addons/Cairo/source/_IoCairoPDFSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/_IoCairoPSSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/_IoCairoSVGSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairo_fileSurfaces.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairo.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairo.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoContext.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoContext.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoExtents.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoExtents.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontExtents.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontExtents.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontFace.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontFace.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontOptions.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoFontOptions.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGlyph.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGlyph.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGradient.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoGradient.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoImageSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoImageSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoInit.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoLinearGradient.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoLinearGradient.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoMatrix.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoMatrix.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPath.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPath.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPathElement.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPathElement.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPattern_inline.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPattern.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPattern.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPDFSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoPSSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRadialGradient.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRadialGradient.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRectangle.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoRectangle.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoScaledFont.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoScaledFont.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSolidPattern.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSolidPattern.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurface_inline.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurface.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurfacePattern.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSurfacePattern.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoSVGSurface.h
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoTextExtents.c
+%%Cairo%%lib/io/addons/Cairo/source/IoCairoTextExtents.h
+%%Cairo%%lib/io/addons/Cairo/source/tools.c
+%%Cairo%%lib/io/addons/Cairo/source/tools.h
+%%Cairo%%lib/io/addons/Cairo/tests/correctness/CairoTest.io
+%%Cairo%%lib/io/addons/Cairo/tests/correctness/run.io
 %%CFFI%%lib/io/addons/CFFI/_build/dll/libIoCFFI.so
+%%CFFI%%lib/io/addons/CFFI/CMakeLists.txt
 %%CFFI%%lib/io/addons/CFFI/depends
 %%CFFI%%lib/io/addons/CFFI/io/A_init.io
 %%CFFI%%lib/io/addons/CFFI/io/B_DataType.io
@@ -72,6 +157,7 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/io/Structure.io
 %%CFFI%%lib/io/addons/CFFI/io/Z_Array.io
 %%CFFI%%lib/io/addons/CFFI/protos
+%%CFFI%%lib/io/addons/CFFI/README
 %%CFFI%%lib/io/addons/CFFI/samples/LibC.io
 %%CFFI%%lib/io/addons/CFFI/samples/qsort.io
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIArray.c
@@ -87,12 +173,6 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIPointer.h
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIStructure.c
 %%CFFI%%lib/io/addons/CFFI/source/IoCFFIStructure.h
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/LICENSE
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc.in
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README.vc
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/VERSION
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/build/libffi.def
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/build/libffi.def.in
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/build/libffi.rc
@@ -101,9 +181,14 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/configure.awk
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/fficonfig.h
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/fficonfig.hw
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi_common.h
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi.h
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi.h.in
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/include/ffi_common.h
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/LICENSE
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/Makefile.vc.in
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/README.vc
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/closures.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/debug.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/dlmalloc.c
@@ -118,8 +203,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/ffi.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/ffi64.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/ffitarget.h
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win32.S
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win32.asm
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win32.S
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/src/x86/win64.S
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_fn0.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_fn1.c
@@ -130,11 +215,11 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_fn6.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_loc_fn0.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/closure_stdcall.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_1_1byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_12byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_16byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_18byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_19byte.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_1_1byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_20byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_20byte1.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_24byte.c
@@ -146,8 +231,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_4byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_5_1_byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_5byte.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_64byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_6_1_byte.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_64byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_6byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_7_1_byte.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_7byte.c
@@ -156,9 +241,9 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_9byte2.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_double.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_float.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble_split.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble_split2.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_pointer.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_sint16.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_sint32.c
@@ -167,19 +252,19 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_uint32.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_align_uint64.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_dbls_struct.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_double.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_double_va.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_double.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_float.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_longdouble_va.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_longdouble.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_schar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_sshort.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_sshortchar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_uchar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_ushort.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_multi_ushortchar.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_pointer.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_pointer_stack.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_pointer.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_schar.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_sint.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/cls_sshort.c
@@ -196,8 +281,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/float3.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/float4.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/huge_struct.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/many.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/many_win32.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/many.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/negint.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/nested_struct.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/nested_struct1.c
@@ -231,8 +316,8 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/stret_large2.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/stret_medium.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/stret_medium2.c
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/strlen.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/strlen_win32.c
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/strlen.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct1.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct2.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct3.c
@@ -244,34 +329,35 @@ lib/libiovmall.so
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/struct9.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.call/testclosure.c
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/ffitestcxx.h
-%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/unwindtest.cc
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/unwindtest_ffi_call.cc
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/libffi.special/unwindtest.cc
 %%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/testsuite/runtests.bat
+%%CFFI%%lib/io/addons/CFFI/source/libffi-msvc/VERSION
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/ArrayTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/CastingTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/ComplexTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/DataTypeTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/PointerTest.io
+%%CFFI%%lib/io/addons/CFFI/tests/correctness/run.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/StructureTest.io
 %%CFFI%%lib/io/addons/CFFI/tests/correctness/UnionTest.io
-%%CFFI%%lib/io/addons/CFFI/tests/correctness/run.io
-%%CGI%%lib/io/addons/CGI/CMakeLists.txt
 %%CGI%%lib/io/addons/CGI/_build/dll/libIoCGI.so
+%%CGI%%lib/io/addons/CGI/CMakeLists.txt
 %%CGI%%lib/io/addons/CGI/depends
 %%CGI%%lib/io/addons/CGI/io/CGI.io
 %%CGI%%lib/io/addons/CGI/protos
 %%CGI%%lib/io/addons/CGI/source/IoCGIInit.c
 %%CGI%%lib/io/addons/CGI/tests/correctness/CGITest.io
 %%CGI%%lib/io/addons/CGI/tests/correctness/run.io
-%%ContinuedFraction%%lib/io/addons/ContinuedFraction/CMakeLists.txt
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/_build/dll/libIoContinuedFraction.so
+%%ContinuedFraction%%lib/io/addons/ContinuedFraction/CMakeLists.txt
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/depends
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/io/ContinuedFraction.io
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/protos
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/samples/Sample.io
 %%ContinuedFraction%%lib/io/addons/ContinuedFraction/source/IoContinuedFractionInit.c
-%%Curses%%lib/io/addons/Curses/CMakeLists.txt
 %%Curses%%lib/io/addons/Curses/_build/dll/libIoCurses.so
+%%Curses%%lib/io/addons/Curses/CMakeLists.txt
 %%Curses%%lib/io/addons/Curses/depends
 %%Curses%%lib/io/addons/Curses/io/Curses.io
 %%Curses%%lib/io/addons/Curses/protos
@@ -281,18 +367,18 @@ lib/libiovmall.so
 %%Curses%%lib/io/addons/Curses/source/IoCurses.c
 %%Curses%%lib/io/addons/Curses/source/IoCurses.h
 %%Curses%%lib/io/addons/Curses/source/IoCursesInit.c
-%%DBI%%lib/io/addons/DBI/CMakeLists.txt
 %%DBI%%lib/io/addons/DBI/_build/dll/libIoDBI.so
+%%DBI%%lib/io/addons/DBI/CMakeLists.txt
 %%DBI%%lib/io/addons/DBI/depends
 %%DBI%%lib/io/addons/DBI/io/DBIConn.io
 %%DBI%%lib/io/addons/DBI/io/DBIRecord.io
 %%DBI%%lib/io/addons/DBI/protos
-%%DBI%%lib/io/addons/DBI/samples/Person.io
 %%DBI%%lib/io/addons/DBI/samples/benchmark.io
 %%DBI%%lib/io/addons/DBI/samples/dbi_init.io
 %%DBI%%lib/io/addons/DBI/samples/driver_info.io
 %%DBI%%lib/io/addons/DBI/samples/dummydata.io
 %%DBI%%lib/io/addons/DBI/samples/fetchobj.io
+%%DBI%%lib/io/addons/DBI/samples/Person.io
 %%DBI%%lib/io/addons/DBI/samples/queryOne.io
 %%DBI%%lib/io/addons/DBI/samples/simple.io
 %%DBI%%lib/io/addons/DBI/source/IoDBI.c
@@ -302,8 +388,8 @@ lib/libiovmall.so
 %%DBI%%lib/io/addons/DBI/source/IoDBIInit.c
 %%DBI%%lib/io/addons/DBI/source/IoDBIResult.c
 %%DBI%%lib/io/addons/DBI/source/IoDBIResult.h
-%%DistributedObjects%%lib/io/addons/DistributedObjects/CMakeLists.txt
 %%DistributedObjects%%lib/io/addons/DistributedObjects/_build/dll/libIoDistributedObjects.so
+%%DistributedObjects%%lib/io/addons/DistributedObjects/CMakeLists.txt
 %%DistributedObjects%%lib/io/addons/DistributedObjects/depends
 %%DistributedObjects%%lib/io/addons/DistributedObjects/io/DOConnection.io
 %%DistributedObjects%%lib/io/addons/DistributedObjects/io/DOServer.io
@@ -319,21 +405,21 @@ lib/libiovmall.so
 %%DistributedObjects%%lib/io/addons/DistributedObjects/tests/correctness/run.io
 %%DistributedObjects%%lib/io/addons/DistributedObjects/tests/performance/MDOTest.io
 %%DistributedObjects%%lib/io/addons/DistributedObjects/tests/performance/run.io
-%%EditLine%%lib/io/addons/EditLine/CMakeLists.txt
 %%EditLine%%lib/io/addons/EditLine/_build/dll/libIoEditLine.so
+%%EditLine%%lib/io/addons/EditLine/CMakeLists.txt
 %%EditLine%%lib/io/addons/EditLine/depends
 %%EditLine%%lib/io/addons/EditLine/protos
 %%EditLine%%lib/io/addons/EditLine/source/IoEditLine.c
 %%EditLine%%lib/io/addons/EditLine/source/IoEditLine.h
 %%EditLine%%lib/io/addons/EditLine/source/IoEditLineInit.c
-%%Facebook%%lib/io/addons/Facebook/CMakeLists.txt
 %%Facebook%%lib/io/addons/Facebook/_build/dll/libIoFacebook.so
+%%Facebook%%lib/io/addons/Facebook/CMakeLists.txt
 %%Facebook%%lib/io/addons/Facebook/depends
 %%Facebook%%lib/io/addons/Facebook/io/FBPost.io
 %%Facebook%%lib/io/addons/Facebook/protos
 %%Facebook%%lib/io/addons/Facebook/source/IoFacebookInit.c
-%%Flux%%lib/io/addons/Flux/CMakeLists.txt
 %%Flux%%lib/io/addons/Flux/_build/dll/libIoFlux.so
+%%Flux%%lib/io/addons/Flux/CMakeLists.txt
 %%Flux%%lib/io/addons/Flux/depends
 %%Flux%%lib/io/addons/Flux/io/Flux.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Action.io
@@ -343,6 +429,12 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/io/Flux/GLObject.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Keyboard.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Mouse.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/HelloWorld.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/ObjectView.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/SlotView.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/StrokeFont.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/old/test.io
+%%Flux%%lib/io/addons/Flux/io/Flux/new/TreeView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/OSMenu.io
 %%Flux%%lib/io/addons/Flux/io/Flux/OSWindow.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Preferences.io
@@ -384,20 +476,17 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/Text.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/TextCell.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/TextField.io
+%%Flux%%lib/io/addons/Flux/io/Flux/Views/VideoView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VKnob.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VScrollArea.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VScroller.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VStackView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/VTabView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/Views/VideoView.io
 %%Flux%%lib/io/addons/Flux/io/Flux/Views/Window.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/HelloWorld.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/TreeView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/ObjectView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/SlotView.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/StrokeFont.io
-%%Flux%%lib/io/addons/Flux/io/Flux/new/old/test.io
 %%Flux%%lib/io/addons/Flux/protos
+%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/AUTHORS
+%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/ChangeLog
+%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/README
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Mono/Bold.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Mono/BoldItalic.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Mono/Italic.ttf
@@ -410,11 +499,12 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Serif/BoldItalic.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Serif/Italic.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Free/Serif/Normal.ttf
-%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/AUTHORS
-%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/ChangeLog
-%%Flux%%lib/io/addons/Flux/resources/fonts/Free/_ReadMe/README
 %%Flux%%lib/io/addons/Flux/resources/fonts/ProFont/Mono/Normal.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/T207/Mono/Normal.ttf
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/COPYRIGHT.TXT
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/local.conf
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/README.TXT
+%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/RELEASENOTES.TXT
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Mono/Black.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Mono/Bold.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Mono/Italic.ttf
@@ -425,10 +515,7 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Sans/Normal.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Serif/Bold.ttf
 %%Flux%%lib/io/addons/Flux/resources/fonts/Vera/Serif/Normal.ttf
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/COPYRIGHT.TXT
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/README.TXT
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/RELEASENOTES.TXT
-%%Flux%%lib/io/addons/Flux/resources/fonts/Vera/_ReadMe/local.conf
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/_ReadMe.txt
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Arrows/Right.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Browser/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Browser/BottomLeft.png
@@ -443,6 +530,9 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/CheckBox/CheckedDisabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/CheckBox/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/CheckBox/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/MiniPlay.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Music.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Add/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Add/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Add/Normal/Middle.png
@@ -467,9 +557,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Stop/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Stop/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/Volume/Volume.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/MiniPlay.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Music.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Popup/Check.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Popup/CheckWhite.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Buttons/Popup/LittleArrows.png
@@ -571,7 +658,46 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Window/Top.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Window/TopLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Milk/Window/TopRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Milk/_ReadMe.txt
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_ReadMe.txt
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Document Window TItlebar Stretch.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GroupWell.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Caps - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Fill - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeClose.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeCollapse.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeZoom.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Popup.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PopupDisabled.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Push Button Caps3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneUp.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertFillD.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderHorizTrackCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnob.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertFill.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WaveAnimation.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WindowBackground.tiff
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Arrows/Right.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Browser/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Browser/BottomLeft.png
@@ -586,6 +712,9 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/CheckBox/CheckedDisabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/CheckBox/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/CheckBox/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/MiniPlay.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Music.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Add/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Add/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Add/Normal/Middle.png
@@ -610,9 +739,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Stop/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Stop/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/Volume/Volume.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/MiniPlay.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Music.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Popup/Check.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Popup/CheckWhite.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Buttons/Popup/LittleArrows.png
@@ -685,6 +811,10 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/TextField/Square/Left.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/TextField/Square/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/TextField/Square/Right.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottom.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottomLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowRight.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/BottomLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/BottomRight.png
@@ -709,50 +839,45 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/Top.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/TopLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/TopRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottom.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowBottomLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/Window/_old/shadowRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_ReadMe.txt
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ComboBoxDisclosureLarge3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Document Window TItlebar Stretch.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GroupWell.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/GrowBoxDetachedRight2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Caps - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/H Scroll Thumb Fill - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeClose.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeCollapse.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/MetalWindowLargeZoom.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Popup.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PopupDisabled.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/Push Button Caps3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/PushButtonCaps2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RadioButtonD2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/RoundButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollArrowsNoneUp.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.png
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertCapsA.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertFillD.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/ScrollVertKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderHorizTrackCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnob.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/SliderVertFill.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WaveAnimation.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/Neos/_unused/WindowBackground.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Document Window TItlebar Stretch.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GroupWell.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Caps - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Fill - Inactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeClose.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeCollapse.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeZoom.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Popup.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PopupDisabled.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Push Button Caps3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton1.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton2.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton3.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneRight.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneUp.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertFillD.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderHorizTrackCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnob.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnobInactive.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertCaps.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertFill.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WaveAnimation.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WindowBackground.tiff
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Arrows/Right.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Browser/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Browser/BottomLeft.png
@@ -767,6 +892,9 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/CheckBox/CheckedDisabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/CheckBox/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/CheckBox/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/MiniPlay.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Music.tiff
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Add/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Add/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Add/Normal/Middle.png
@@ -791,9 +919,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Stop/Disabled/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Stop/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/Volume/Volume.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/MiniPlay.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Music.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Music/_old/Next.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Popup/Active/Left.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Popup/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Buttons/Popup/Active/Right.png
@@ -875,6 +1000,10 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/TextField/Square/Left.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/TextField/Square/Middle.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/TextField/Square/Right.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottom.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottomLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowLeft.png
+%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowRight.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/Bottom.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/BottomLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/BottomRight.png
@@ -899,49 +1028,6 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/Top.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/TopLeft.png
 %%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/TopRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottom.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowBottomLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowLeft.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/Window/_old/shadowRight.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ComboBoxDisclosureLarge3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Document Window TItlebar Stretch.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GroupWell.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/GrowBoxDetachedRight2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Caps - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/H Scroll Thumb Fill - Inactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeClose.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeCollapse.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/MetalWindowLargeZoom.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Popup.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PopupDisabled.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/Push Button Caps3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/PushButtonCaps2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RadioButtonD2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton1.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton2.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/RoundButton3.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneRight.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollArrowsNoneUp.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.png
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertCapsA.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertFillD.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/ScrollVertKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderHorizTrackCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnob.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderKnobInactive.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertCaps.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/SliderVertFill.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WaveAnimation.tiff
-%%Flux%%lib/io/addons/Flux/resources/themes/OSX/_unused/WindowBackground.tiff
 %%Flux%%lib/io/addons/Flux/samples/Calculator/Calc.io
 %%Flux%%lib/io/addons/Flux/samples/China/china-instructions.html
 %%Flux%%lib/io/addons/Flux/samples/China/china.io
@@ -961,12 +1047,12 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/Diagram/DBox.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/LabelView.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/LineView.io
-%%Flux%%lib/io/addons/Flux/samples/Diagram/Selectable.io
-%%Flux%%lib/io/addons/Flux/samples/Diagram/SelectionArea.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/main.io
 %%Flux%%lib/io/addons/Flux/samples/Diagram/notes/bugs.txt
 %%Flux%%lib/io/addons/Flux/samples/Diagram/notes/next-actions.txt
 %%Flux%%lib/io/addons/Flux/samples/Diagram/notes/plan.txt
+%%Flux%%lib/io/addons/Flux/samples/Diagram/Selectable.io
+%%Flux%%lib/io/addons/Flux/samples/Diagram/SelectionArea.io
 %%Flux%%lib/io/addons/Flux/samples/FileBrowser/main.io
 %%Flux%%lib/io/addons/Flux/samples/IRC/IRC.io
 %%Flux%%lib/io/addons/Flux/samples/IRC/main.io
@@ -978,13 +1064,14 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/Self/main.io
 %%Flux%%lib/io/addons/Flux/samples/SheetTest/main.io
 %%Flux%%lib/io/addons/Flux/samples/Slideshow/main.io
-%%Flux%%lib/io/addons/Flux/samples/Slideshow/slides.txt
 %%Flux%%lib/io/addons/Flux/samples/Slideshow/slides_oopsla.txt
+%%Flux%%lib/io/addons/Flux/samples/Slideshow/slides.txt
+%%Flux%%lib/io/addons/Flux/samples/SongJam/_BSDLicense.txt
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/GuitarOld.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Bass.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Drum.png
-%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/FX.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Full Band.png
+%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/FX.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Guitar.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Horns.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Instruments/Keyboard.png
@@ -997,6 +1084,7 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/MuteButton/Normal/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/MuteButton/Select/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/MuteButton/Select/Normal/Middle.png
+%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/newlogo.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Normal/Active/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Normal/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Normal/Normal/Middle.psd
@@ -1004,8 +1092,8 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/SoloButton/Select/Normal/Middle.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/Volume.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Images/VolumeBack.png
-%%Flux%%lib/io/addons/Flux/samples/SongJam/Images/newlogo.png
 %%Flux%%lib/io/addons/Flux/samples/SongJam/LoopPanel.io
+%%Flux%%lib/io/addons/Flux/samples/SongJam/main.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Prefs copy.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/Prefs.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/ProgressPanel.io
@@ -1020,32 +1108,30 @@ lib/libiovmall.so
 %%Flux%%lib/io/addons/Flux/samples/SongJam/SoundExtensions.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/TrackLabel.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/TrackMeter.io
-%%Flux%%lib/io/addons/Flux/samples/SongJam/TrackView.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/TracksView.io
+%%Flux%%lib/io/addons/Flux/samples/SongJam/TrackView.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/UserLicense.txt
 %%Flux%%lib/io/addons/Flux/samples/SongJam/VolumeSlider.io
 %%Flux%%lib/io/addons/Flux/samples/SongJam/WaveView.io
-%%Flux%%lib/io/addons/Flux/samples/SongJam/_BSDLicense.txt
-%%Flux%%lib/io/addons/Flux/samples/SongJam/main.io
 %%Flux%%lib/io/addons/Flux/samples/Test/main.io
 %%Flux%%lib/io/addons/Flux/samples/Test/main2.io
 %%Flux%%lib/io/addons/Flux/source/IoFluxInit.c
-%%Fnmatch%%lib/io/addons/Fnmatch/CMakeLists.txt
 %%Fnmatch%%lib/io/addons/Fnmatch/_build/dll/libIoFnmatch.so
+%%Fnmatch%%lib/io/addons/Fnmatch/CMakeLists.txt
 %%Fnmatch%%lib/io/addons/Fnmatch/depends
 %%Fnmatch%%lib/io/addons/Fnmatch/source/IoFnmatch.c
 %%Fnmatch%%lib/io/addons/Fnmatch/source/IoFnmatch.h
 %%Fnmatch%%lib/io/addons/Fnmatch/source/IoFnmatchInit.c
 %%Fnmatch%%lib/io/addons/Fnmatch/tests/correctness/FnmatchTest.io
 %%Fnmatch%%lib/io/addons/Fnmatch/tests/correctness/run.io
-%%Font%%lib/io/addons/Font/CMakeLists.txt
 %%Font%%lib/io/addons/Font/_build/dll/libIoFont.so
+%%Font%%lib/io/addons/Font/CMakeLists.txt
 %%Font%%lib/io/addons/Font/depends
 %%Font%%lib/io/addons/Font/protos
-%%Font%%lib/io/addons/Font/samples/Terminal.io
 %%Font%%lib/io/addons/Font/samples/fontTest.io
 %%Font%%lib/io/addons/Font/samples/oopsla.txt
 %%Font%%lib/io/addons/Font/samples/slides.io
+%%Font%%lib/io/addons/Font/samples/Terminal.io
 %%Font%%lib/io/addons/Font/samples/test.io
 %%Font%%lib/io/addons/Font/samples/test2.io
 %%Font%%lib/io/addons/Font/source/FreeTypeErrorCodes.c
@@ -1055,8 +1141,8 @@ lib/libiovmall.so
 %%Font%%lib/io/addons/Font/source/IoFont.c
 %%Font%%lib/io/addons/Font/source/IoFont.h
 %%Font%%lib/io/addons/Font/source/IoFontInit.c
-%%GLFW%%lib/io/addons/GLFW/CMakeLists.txt
 %%GLFW%%lib/io/addons/GLFW/_build/dll/libIoGLFW.so
+%%GLFW%%lib/io/addons/GLFW/CMakeLists.txt
 %%GLFW%%lib/io/addons/GLFW/depends
 %%GLFW%%lib/io/addons/GLFW/protos
 %%GLFW%%lib/io/addons/GLFW/samples/lesson01.io
@@ -1069,21 +1155,19 @@ lib/libiovmall.so
 %%GLFW%%lib/io/addons/GLFW/samples/lesson08.io
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFW.c
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFW.h
-%%GLFW%%lib/io/addons/GLFW/source/IoGLFWInit.c
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFWconst.h
 %%GLFW%%lib/io/addons/GLFW/source/IoGLFWfunc.h
-%%GoogleSearch%%lib/io/addons/GoogleSearch/CMakeLists.txt
+%%GLFW%%lib/io/addons/GLFW/source/IoGLFWInit.c
 %%GoogleSearch%%lib/io/addons/GoogleSearch/_build/dll/libIoGoogleSearch.so
+%%GoogleSearch%%lib/io/addons/GoogleSearch/CMakeLists.txt
 %%GoogleSearch%%lib/io/addons/GoogleSearch/depends
 %%GoogleSearch%%lib/io/addons/GoogleSearch/io/GoogleSearch.io
 %%GoogleSearch%%lib/io/addons/GoogleSearch/protos
 %%GoogleSearch%%lib/io/addons/GoogleSearch/samples/Google.io
 %%GoogleSearch%%lib/io/addons/GoogleSearch/samples/GoogleTranslate.io
 %%GoogleSearch%%lib/io/addons/GoogleSearch/source/IoGoogleSearchInit.c
-%%HttpClient%%lib/io/addons/HttpClient/CMakeLists.txt
-%%HttpClient%%lib/io/addons/HttpClient/README
-%%HttpClient%%lib/io/addons/HttpClient/TODO
 %%HttpClient%%lib/io/addons/HttpClient/_build/dll/libIoHttpClient.so
+%%HttpClient%%lib/io/addons/HttpClient/CMakeLists.txt
 %%HttpClient%%lib/io/addons/HttpClient/depends
 %%HttpClient%%lib/io/addons/HttpClient/io/HCConnection.io
 %%HttpClient%%lib/io/addons/HttpClient/io/HCRequest.io
@@ -1092,18 +1176,20 @@ lib/libiovmall.so
 %%HttpClient%%lib/io/addons/HttpClient/io/HCUrl.io
 %%HttpClient%%lib/io/addons/HttpClient/io/HttpClient.io
 %%HttpClient%%lib/io/addons/HttpClient/protos
+%%HttpClient%%lib/io/addons/HttpClient/README
 %%HttpClient%%lib/io/addons/HttpClient/source/.gitsidumb
 %%HttpClient%%lib/io/addons/HttpClient/source/IoHttpClientInit.c
-%%Image%%lib/io/addons/Image/CMakeLists.txt
+%%HttpClient%%lib/io/addons/HttpClient/TODO
 %%Image%%lib/io/addons/Image/_build/dll/libIoImage.so
+%%Image%%lib/io/addons/Image/CMakeLists.txt
 %%Image%%lib/io/addons/Image/depends
 %%Image%%lib/io/addons/Image/io/Image.io
 %%Image%%lib/io/addons/Image/protos
+%%Image%%lib/io/addons/Image/samples/images/lotus_t.jpg
+%%Image%%lib/io/addons/Image/samples/images/lotus_t.png
 %%Image%%lib/io/addons/Image/samples/images/lotus.jpg
 %%Image%%lib/io/addons/Image/samples/images/lotus.png
 %%Image%%lib/io/addons/Image/samples/images/lotus.tiff
-%%Image%%lib/io/addons/Image/samples/images/lotus_t.jpg
-%%Image%%lib/io/addons/Image/samples/images/lotus_t.png
 %%Image%%lib/io/addons/Image/samples/scale.io
 %%Image%%lib/io/addons/Image/samples/test.io
 %%Image%%lib/io/addons/Image/source/Image.c
@@ -1118,33 +1204,16 @@ lib/libiovmall.so
 %%Image%%lib/io/addons/Image/source/PNGImage.h
 %%Image%%lib/io/addons/Image/source/TIFFImage.c
 %%Image%%lib/io/addons/Image/source/TIFFImage.h
-%%LZO%%lib/io/addons/LZO/CMakeLists.txt
-%%LZO%%lib/io/addons/LZO/_build/dll/libIoLZO.so
-%%LZO%%lib/io/addons/LZO/depends
-%%LZO%%lib/io/addons/LZO/io/LZO.io
-%%LZO%%lib/io/addons/LZO/protos
-%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.c
-%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.h
-%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.c
-%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.h
-%%LZO%%lib/io/addons/LZO/source/IoLZOInit.c
-%%LZO%%lib/io/addons/LZO/source/lzoconf.h
-%%LZO%%lib/io/addons/LZO/source/lzodefs.h
-%%LZO%%lib/io/addons/LZO/source/minilzo.c
-%%LZO%%lib/io/addons/LZO/source/minilzo.h
-%%LZO%%lib/io/addons/LZO/source/minilzo_COPYING
-%%LZO%%lib/io/addons/LZO/tests/correctness/LZOTest.io
-%%LZO%%lib/io/addons/LZO/tests/correctness/run.io
-%%LibSndFile%%lib/io/addons/LibSndFile/CMakeLists.txt
 %%LibSndFile%%lib/io/addons/LibSndFile/_build/dll/libIoLibSndFile.so
+%%LibSndFile%%lib/io/addons/LibSndFile/CMakeLists.txt
 %%LibSndFile%%lib/io/addons/LibSndFile/depends
 %%LibSndFile%%lib/io/addons/LibSndFile/io/LibSndFile.io
 %%LibSndFile%%lib/io/addons/LibSndFile/protos
 %%LibSndFile%%lib/io/addons/LibSndFile/source/IoLibSndFile.c
 %%LibSndFile%%lib/io/addons/LibSndFile/source/IoLibSndFile.h
 %%LibSndFile%%lib/io/addons/LibSndFile/source/IoLibSndFileInit.c
-%%Libxml2%%lib/io/addons/Libxml2/CMakeLists.txt
 %%Libxml2%%lib/io/addons/Libxml2/_build/dll/libIoLibxml2.so
+%%Libxml2%%lib/io/addons/Libxml2/CMakeLists.txt
 %%Libxml2%%lib/io/addons/Libxml2/depends
 %%Libxml2%%lib/io/addons/Libxml2/io/Libxml2.io
 %%Libxml2%%lib/io/addons/Libxml2/protos
@@ -1153,8 +1222,8 @@ lib/libiovmall.so
 %%Libxml2%%lib/io/addons/Libxml2/source/IoXmlReader.h
 %%Libxml2%%lib/io/addons/Libxml2/source/IoXmlWriter.c
 %%Libxml2%%lib/io/addons/Libxml2/source/IoXmlWriter.h
-%%Loki%%lib/io/addons/Loki/CMakeLists.txt
 %%Loki%%lib/io/addons/Loki/_build/dll/libIoLoki.so
+%%Loki%%lib/io/addons/Loki/CMakeLists.txt
 %%Loki%%lib/io/addons/Loki/depends
 %%Loki%%lib/io/addons/Loki/io/Assembler.io
 %%Loki%%lib/io/addons/Loki/io/CodeGeneration.io
@@ -1188,8 +1257,8 @@ lib/libiovmall.so
 %%Loki%%lib/io/addons/Loki/source/IoLinker.h
 %%Loki%%lib/io/addons/Loki/source/IoLokiInit.c
 %%Loki%%lib/io/addons/Loki/tests/correctness/testcg.io
-%%Loudmouth%%lib/io/addons/Loudmouth/CMakeLists.txt
 %%Loudmouth%%lib/io/addons/Loudmouth/_build/dll/libIoLoudmouth.so
+%%Loudmouth%%lib/io/addons/Loudmouth/CMakeLists.txt
 %%Loudmouth%%lib/io/addons/Loudmouth/depends
 %%Loudmouth%%lib/io/addons/Loudmouth/io/JID.io
 %%Loudmouth%%lib/io/addons/Loudmouth/io/Loudmouth.io
@@ -1201,8 +1270,25 @@ lib/libiovmall.so
 %%Loudmouth%%lib/io/addons/Loudmouth/tests/correctness/JID.io
 %%Loudmouth%%lib/io/addons/Loudmouth/tests/correctness/LoudmouthMessage.io
 %%Loudmouth%%lib/io/addons/Loudmouth/tests/correctness/run.io
-%%MD5%%lib/io/addons/MD5/CMakeLists.txt
+%%LZO%%lib/io/addons/LZO/_build/dll/libIoLZO.so
+%%LZO%%lib/io/addons/LZO/CMakeLists.txt
+%%LZO%%lib/io/addons/LZO/depends
+%%LZO%%lib/io/addons/LZO/io/LZO.io
+%%LZO%%lib/io/addons/LZO/protos
+%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.c
+%%LZO%%lib/io/addons/LZO/source/IoLZODecoder.h
+%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.c
+%%LZO%%lib/io/addons/LZO/source/IoLZOEncoder.h
+%%LZO%%lib/io/addons/LZO/source/IoLZOInit.c
+%%LZO%%lib/io/addons/LZO/source/lzoconf.h
+%%LZO%%lib/io/addons/LZO/source/lzodefs.h
+%%LZO%%lib/io/addons/LZO/source/minilzo_COPYING
+%%LZO%%lib/io/addons/LZO/source/minilzo.c
+%%LZO%%lib/io/addons/LZO/source/minilzo.h
+%%LZO%%lib/io/addons/LZO/tests/correctness/LZOTest.io
+%%LZO%%lib/io/addons/LZO/tests/correctness/run.io
 %%MD5%%lib/io/addons/MD5/_build/dll/libIoMD5.so
+%%MD5%%lib/io/addons/MD5/CMakeLists.txt
 %%MD5%%lib/io/addons/MD5/depends
 %%MD5%%lib/io/addons/MD5/io/MD5_extras.io
 %%MD5%%lib/io/addons/MD5/protos
@@ -1214,8 +1300,8 @@ lib/libiovmall.so
 %%MD5%%lib/io/addons/MD5/source/md5.c
 %%MD5%%lib/io/addons/MD5/source/md5.h
 %%MD5%%lib/io/addons/MD5/tests/correctness/MD5Test.io
-%%Memcached%%lib/io/addons/Memcached/CMakeLists.txt
 %%Memcached%%lib/io/addons/Memcached/_build/dll/libIoMemcached.so
+%%Memcached%%lib/io/addons/Memcached/CMakeLists.txt
 %%Memcached%%lib/io/addons/Memcached/depends
 %%Memcached%%lib/io/addons/Memcached/io/Memcached_extras.io
 %%Memcached%%lib/io/addons/Memcached/protos
@@ -1223,14 +1309,35 @@ lib/libiovmall.so
 %%Memcached%%lib/io/addons/Memcached/source/IoMemcached.h
 %%Memcached%%lib/io/addons/Memcached/source/IoMemcachedInit.c
 %%Memcached%%lib/io/addons/Memcached/tests/correctness/run.io
-%%NotificationCenter%%lib/io/addons/NotificationCenter/CMakeLists.txt
 %%NotificationCenter%%lib/io/addons/NotificationCenter/_build/dll/libIoNotificationCenter.so
+%%NotificationCenter%%lib/io/addons/NotificationCenter/CMakeLists.txt
 %%NotificationCenter%%lib/io/addons/NotificationCenter/depends
 %%NotificationCenter%%lib/io/addons/NotificationCenter/io/NotificationCenter.io
 %%NotificationCenter%%lib/io/addons/NotificationCenter/protos
 %%NotificationCenter%%lib/io/addons/NotificationCenter/source/IoNotificationCenterInit.c
-%%Obsidian%%lib/io/addons/Obsidian/CMakeLists.txt
+%%Oauth%%lib/io/addons/Oauth/_build/dll/libIoOauth.so
+%%Oauth%%lib/io/addons/Oauth/CMakeLists.txt
+%%Oauth%%lib/io/addons/Oauth/depends
+%%Oauth%%lib/io/addons/Oauth/io/Oauth_extras.io
+%%Oauth%%lib/io/addons/Oauth/io/OauthRequest.io
+%%Oauth%%lib/io/addons/Oauth/io/OauthResponse.io
+%%Oauth%%lib/io/addons/Oauth/protos
+%%Oauth%%lib/io/addons/Oauth/source/IoOauth.c
+%%Oauth%%lib/io/addons/Oauth/source/IoOauth.h
+%%Oauth%%lib/io/addons/Oauth/source/IoOauthInit.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/_aux.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/_aux.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/crypto.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/crypto.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/http.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/http.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/Oauth.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/Oauth.h
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/tls.c
+%%Oauth%%lib/io/addons/Oauth/source/Oauth/tls.h
+%%Oauth%%lib/io/addons/Oauth/tests/correctness/OAuthTest.io
 %%Obsidian%%lib/io/addons/Obsidian/_build/dll/libIoObsidian.so
+%%Obsidian%%lib/io/addons/Obsidian/CMakeLists.txt
 %%Obsidian%%lib/io/addons/Obsidian/depends
 %%Obsidian%%lib/io/addons/Obsidian/io/Obsidian.io
 %%Obsidian%%lib/io/addons/Obsidian/io/ObsidianClient.io
@@ -1249,8 +1356,8 @@ lib/libiovmall.so
 %%Obsidian%%lib/io/addons/Obsidian/tests/performance/ObsidianNetwork.io
 %%Obsidian%%lib/io/addons/Obsidian/tests/performance/ObsidianTest.io
 %%Obsidian%%lib/io/addons/Obsidian/tests/performance/run.io
-%%Ogg%%lib/io/addons/Ogg/CMakeLists.txt
 %%Ogg%%lib/io/addons/Ogg/_build/dll/libIoOgg.so
+%%Ogg%%lib/io/addons/Ogg/CMakeLists.txt
 %%Ogg%%lib/io/addons/Ogg/depends
 %%Ogg%%lib/io/addons/Ogg/io/Ogg.io
 %%Ogg%%lib/io/addons/Ogg/protos
@@ -1265,8 +1372,8 @@ lib/libiovmall.so
 %%Ogg%%lib/io/addons/Ogg/source/IoOggStreamState.h
 %%Ogg%%lib/io/addons/Ogg/source/IoOggSyncState.c
 %%Ogg%%lib/io/addons/Ogg/source/IoOggSyncState.h
-%%OpenGL%%lib/io/addons/OpenGL/CMakeLists.txt
 %%OpenGL%%lib/io/addons/OpenGL/_build/dll/libIoOpenGL.so
+%%OpenGL%%lib/io/addons/OpenGL/CMakeLists.txt
 %%OpenGL%%lib/io/addons/OpenGL/depends
 %%OpenGL%%lib/io/addons/OpenGL/io/DisplayList.io
 %%OpenGL%%lib/io/addons/OpenGL/io/GLApp.io
@@ -1279,16 +1386,15 @@ lib/libiovmall.so
 %%OpenGL%%lib/io/addons/OpenGL/io/Texture.io
 %%OpenGL%%lib/io/addons/OpenGL/io/Vector.io
 %%OpenGL%%lib/io/addons/OpenGL/protos
-%%OpenGL%%lib/io/addons/OpenGL/samples/Mandlebrot.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/balls.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/cube.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/cylinder.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/events.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/game.io
-%%OpenGL%%lib/io/addons/OpenGL/samples/game/Tank.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/game/_ReadMe.txt
 %%OpenGL%%lib/io/addons/OpenGL/samples/game/client.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/game/server.io
+%%OpenGL%%lib/io/addons/OpenGL/samples/game/Tank.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/globe.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/grabTextureTest.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/images/earth.gif
@@ -1297,28 +1403,29 @@ lib/libiovmall.so
 %%OpenGL%%lib/io/addons/OpenGL/samples/images/world_hires.jpg
 %%OpenGL%%lib/io/addons/OpenGL/samples/images/world_hires2.jpg
 %%OpenGL%%lib/io/addons/OpenGL/samples/lines.io
+%%OpenGL%%lib/io/addons/OpenGL/samples/Mandlebrot.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/polygonSmoothing.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/sphere.io
 %%OpenGL%%lib/io/addons/OpenGL/samples/test2.io
 %%OpenGL%%lib/io/addons/OpenGL/source/GLIncludes.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoBox_gl.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoBox_gl.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLconst.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLEconst.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLEfunc.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLfunc.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLScissor.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLScissor.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLU.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLU.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUconst.h
+%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUfunc.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUQuadric.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUQuadric.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUT.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUT.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUTconst.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoGLUTfunc.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUconst.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLUfunc.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLconst.h
-%%OpenGL%%lib/io/addons/OpenGL/source/IoGLfunc.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoOpenGL.c
 %%OpenGL%%lib/io/addons/OpenGL/source/IoOpenGL.h
 %%OpenGL%%lib/io/addons/OpenGL/source/IoOpenGLInit.c
@@ -1328,16 +1435,16 @@ lib/libiovmall.so
 %%OpenGL%%lib/io/addons/OpenGL/source/new/IoGLE.h
 %%OpenGL%%lib/io/addons/OpenGL/source/new/IoSceneNode.c
 %%OpenGL%%lib/io/addons/OpenGL/source/new/IoSceneNode.h
-%%PostgreSQL%%lib/io/addons/PostgreSQL/CMakeLists.txt
 %%PostgreSQL%%lib/io/addons/PostgreSQL/_build/dll/libIoPostgreSQL.so
+%%PostgreSQL%%lib/io/addons/PostgreSQL/CMakeLists.txt
 %%PostgreSQL%%lib/io/addons/PostgreSQL/depends
 %%PostgreSQL%%lib/io/addons/PostgreSQL/io/PostgreSQL.io
 %%PostgreSQL%%lib/io/addons/PostgreSQL/protos
 %%PostgreSQL%%lib/io/addons/PostgreSQL/samples/pgsql-sample.io
-%%PostgreSQL%%lib/io/addons/PostgreSQL/source/IoPostgreSQLInit.c
 %%PostgreSQL%%lib/io/addons/PostgreSQL/source/empty
-%%Python%%lib/io/addons/Python/CMakeLists.txt
+%%PostgreSQL%%lib/io/addons/PostgreSQL/source/IoPostgreSQLInit.c
 %%Python%%lib/io/addons/Python/_build/dll/libIoPython.so
+%%Python%%lib/io/addons/Python/CMakeLists.txt
 %%Python%%lib/io/addons/Python/depends
 %%Python%%lib/io/addons/Python/protos
 %%Python%%lib/io/addons/Python/samples/UsingPython.io
@@ -1346,23 +1453,23 @@ lib/libiovmall.so
 %%Python%%lib/io/addons/Python/source/IoPythonInit.c
 %%Python%%lib/io/addons/Python/source/PythonData.c
 %%Python%%lib/io/addons/Python/source/PythonData.h
-%%Python%%lib/io/addons/Python/tests/correctness/UserTest.io
 %%Python%%lib/io/addons/Python/tests/correctness/run.io
-%%QDBM%%lib/io/addons/QDBM/CMakeLists.txt
+%%Python%%lib/io/addons/Python/tests/correctness/UserTest.io
 %%QDBM%%lib/io/addons/QDBM/_build/dll/libIoQDBM.so
+%%QDBM%%lib/io/addons/QDBM/CMakeLists.txt
 %%QDBM%%lib/io/addons/QDBM/depends
 %%QDBM%%lib/io/addons/QDBM/io/QDBM.io
 %%QDBM%%lib/io/addons/QDBM/protos
 %%QDBM%%lib/io/addons/QDBM/source/IoQDBM.c
 %%QDBM%%lib/io/addons/QDBM/source/IoQDBM.h
 %%QDBM%%lib/io/addons/QDBM/source/IoQDBMInit.c
-%%QDBM%%lib/io/addons/QDBM/tests/correctness/QDBMTest.io
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/basic.io
+%%QDBM%%lib/io/addons/QDBM/tests/correctness/QDBMTest.io
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/run.io
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/test.c
 %%QDBM%%lib/io/addons/QDBM/tests/correctness/testPath.io
-%%Random%%lib/io/addons/Random/CMakeLists.txt
 %%Random%%lib/io/addons/Random/_build/dll/libIoRandom.so
+%%Random%%lib/io/addons/Random/CMakeLists.txt
 %%Random%%lib/io/addons/Random/depends
 %%Random%%lib/io/addons/Random/io/List.io
 %%Random%%lib/io/addons/Random/protos
@@ -1371,21 +1478,21 @@ lib/libiovmall.so
 %%Random%%lib/io/addons/Random/source/IoRandomInit.c
 %%Random%%lib/io/addons/Random/tests/correctness/ListTest.io
 %%Random%%lib/io/addons/Random/tests/correctness/run.io
-%%Range%%lib/io/addons/Range/CMakeLists.txt
 %%Range%%lib/io/addons/Range/_build/dll/libIoRange.so
+%%Range%%lib/io/addons/Range/CMakeLists.txt
 %%Range%%lib/io/addons/Range/depends
 %%Range%%lib/io/addons/Range/io/Extras.io
 %%Range%%lib/io/addons/Range/io/Range.io
 %%Range%%lib/io/addons/Range/protos
+%%Range%%lib/io/addons/Range/source/IoRange_inline.h
 %%Range%%lib/io/addons/Range/source/IoRange.c
 %%Range%%lib/io/addons/Range/source/IoRange.h
 %%Range%%lib/io/addons/Range/source/IoRangeApi.h
 %%Range%%lib/io/addons/Range/source/IoRangeInit.c
-%%Range%%lib/io/addons/Range/source/IoRange_inline.h
 %%Range%%lib/io/addons/Range/tests/correctness/RangeTest.io
 %%Range%%lib/io/addons/Range/tests/correctness/run.io
-%%Rational%%lib/io/addons/Rational/CMakeLists.txt
 %%Rational%%lib/io/addons/Rational/_build/dll/libIoRational.so
+%%Rational%%lib/io/addons/Rational/CMakeLists.txt
 %%Rational%%lib/io/addons/Rational/depends
 %%Rational%%lib/io/addons/Rational/io/Rational.io
 %%Rational%%lib/io/addons/Rational/protos
@@ -1393,8 +1500,8 @@ lib/libiovmall.so
 %%Rational%%lib/io/addons/Rational/source/IoRationalInit.c
 %%Rational%%lib/io/addons/Rational/tests/correctness/RationalTest.io
 %%Rational%%lib/io/addons/Rational/tests/correctness/run.io
-%%ReadLine%%lib/io/addons/ReadLine/CMakeLists.txt
 %%ReadLine%%lib/io/addons/ReadLine/_build/dll/libIoReadLine.so
+%%ReadLine%%lib/io/addons/ReadLine/CMakeLists.txt
 %%ReadLine%%lib/io/addons/ReadLine/depends
 %%ReadLine%%lib/io/addons/ReadLine/protos
 %%ReadLine%%lib/io/addons/ReadLine/source/IoReadLine.c
@@ -1402,8 +1509,8 @@ lib/libiovmall.so
 %%ReadLine%%lib/io/addons/ReadLine/source/IoReadLineInit.c
 %%ReadLine%%lib/io/addons/ReadLine/tests/correctness/ReadLineTest.io
 %%ReadLine%%lib/io/addons/ReadLine/tests/correctness/run.io
-%%Regex%%lib/io/addons/Regex/CMakeLists.txt
 %%Regex%%lib/io/addons/Regex/_build/dll/libIoRegex.so
+%%Regex%%lib/io/addons/Regex/CMakeLists.txt
 %%Regex%%lib/io/addons/Regex/depends
 %%Regex%%lib/io/addons/Regex/io/Regex.io
 %%Regex%%lib/io/addons/Regex/io/RegexMatch.io
@@ -1419,41 +1526,47 @@ lib/libiovmall.so
 %%Regex%%lib/io/addons/Regex/source/IoRegexMatches.h
 %%Regex%%lib/io/addons/Regex/source/Regex.c
 %%Regex%%lib/io/addons/Regex/source/Regex.h
-%%Regex%%lib/io/addons/Regex/tests/correctness/RegexMatchTest.io
 %%Regex%%lib/io/addons/Regex/tests/correctness/RegexMatchesTest.io
+%%Regex%%lib/io/addons/Regex/tests/correctness/RegexMatchTest.io
 %%Regex%%lib/io/addons/Regex/tests/correctness/RegexTest.io
-%%Regex%%lib/io/addons/Regex/tests/correctness/SequenceTest.io
 %%Regex%%lib/io/addons/Regex/tests/correctness/run.io
-%%SGML%%lib/io/addons/SGML/CMakeLists.txt
+%%Regex%%lib/io/addons/Regex/tests/correctness/SequenceTest.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/_build/dll/libIoSampleRateConverter.so
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/CMakeLists.txt
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/depends
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/io/SampleRateConverter.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/protos
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/loopback.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3filestream.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3netstream.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/server.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sndplay.io
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.mp3
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.wav
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.c
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.h
+%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverterInit.c
 %%SGML%%lib/io/addons/SGML/_build/dll/libIoSGML.so
 %%SGML%%lib/io/addons/SGML/_build/dll/libsgml.a
+%%SGML%%lib/io/addons/SGML/CMakeLists.txt
 %%SGML%%lib/io/addons/SGML/depends
 %%SGML%%lib/io/addons/SGML/io/SGMLElement.io
 %%SGML%%lib/io/addons/SGML/protos
 %%SGML%%lib/io/addons/SGML/source/IoSGMLInit.c
 %%SGML%%lib/io/addons/SGML/source/IoSGMLParser.c
 %%SGML%%lib/io/addons/SGML/source/IoSGMLParser.h
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/acgeneral.m4
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Bugs
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/ChangeLog
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/License
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile.in
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/README
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/TODO
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/acgeneral.m4
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/configure
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/configure.in
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/annotated.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomComment_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomDocument_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomElement_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomNodeList_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomNode_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomNodeList_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/DomText_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionHtml_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionXml_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlParser_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/Variant_8h-source.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/annotated.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/doxygen.css
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/doxygen.png
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/examples.html
@@ -1473,20 +1586,24 @@ lib/libiovmall.so
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/index.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/libsgml_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/modules.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/namespaceSgml.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/namespaces.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node.html
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node__list.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/namespaceSgml.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionHtml_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlExtensionXml_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/SgmlParser_8h-source.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node__list__node.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node__list.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__dom__node.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__sgml__handlers.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/struct__variant__value.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/test_8c-example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/testhtml_8c-example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/testxml_8c-example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/variant_8c-example.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/docs/html/Variant_8h-source.html
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/Makefile
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/Makefile.in
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/example.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/slashdot.html
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/slashdot.xml
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/examples/test.c
@@ -1500,12 +1617,16 @@ lib/libiovmall.so
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/DomNode.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/DomNodeList.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/DomText.h
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/libsgml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/SgmlExtensionHtml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/SgmlExtensionXml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/SgmlParser.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/Variant.h
-%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/include/sgml/libsgml.h
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/libsgml.doxy
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/License
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/Makefile.in
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/README
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/CMakeLists.txt
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/DomComment.c
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/DomDocument.c
@@ -1519,49 +1640,25 @@ lib/libiovmall.so
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/SgmlExtensionXml.c
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/SgmlParser.c
 %%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/src/Variant.c
-%%SGML%%lib/io/addons/SGML/tests/correctness/SGMLTest.io
+%%SGML%%lib/io/addons/SGML/source/libsgml-1.1.4/TODO
 %%SGML%%lib/io/addons/SGML/tests/correctness/run.io
-%%SHA1%%lib/io/addons/SHA1/CMakeLists.txt
+%%SGML%%lib/io/addons/SGML/tests/correctness/SGMLTest.io
 %%SHA1%%lib/io/addons/SHA1/_build/dll/libIoSHA1.so
+%%SHA1%%lib/io/addons/SHA1/CMakeLists.txt
 %%SHA1%%lib/io/addons/SHA1/depends
 %%SHA1%%lib/io/addons/SHA1/io/sha1.io
 %%SHA1%%lib/io/addons/SHA1/protos
+%%SHA1%%lib/io/addons/SHA1/source/hmac.c
+%%SHA1%%lib/io/addons/SHA1/source/hmac.h
 %%SHA1%%lib/io/addons/SHA1/source/IoSHA1.c
 %%SHA1%%lib/io/addons/SHA1/source/IoSHA1.h
 %%SHA1%%lib/io/addons/SHA1/source/IoSHA1Init.c
-%%SHA1%%lib/io/addons/SHA1/source/hmac.c
-%%SHA1%%lib/io/addons/SHA1/source/hmac.h
 %%SHA1%%lib/io/addons/SHA1/source/sha1.c
 %%SHA1%%lib/io/addons/SHA1/source/sha1.h
-%%SHA1%%lib/io/addons/SHA1/tests/correctness/SHA1Test.io
 %%SHA1%%lib/io/addons/SHA1/tests/correctness/run.io
-%%SQLite3%%lib/io/addons/SQLite3/CMakeLists.txt
-%%SQLite3%%lib/io/addons/SQLite3/_build/dll/libIoSQLite3.so
-%%SQLite3%%lib/io/addons/SQLite3/depends
-%%SQLite3%%lib/io/addons/SQLite3/io/SQLite3.io
-%%SQLite3%%lib/io/addons/SQLite3/protos
-%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.c
-%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.h
-%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3Init.c
-%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/SQLite3Test.io
-%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/run.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/CMakeLists.txt
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/_build/dll/libIoSampleRateConverter.so
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/depends
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/io/SampleRateConverter.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/protos
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/loopback.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3filestream.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/mp3netstream.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/server.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sndplay.io
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.mp3
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/samples/sounds/max.wav
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.c
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverter.h
-%%SampleRateConverter%%lib/io/addons/SampleRateConverter/source/IoSampleRateConverterInit.c
-%%Socket%%lib/io/addons/Socket/CMakeLists.txt
+%%SHA1%%lib/io/addons/SHA1/tests/correctness/SHA1Test.io
 %%Socket%%lib/io/addons/Socket/_build/dll/libIoSocket.so
+%%Socket%%lib/io/addons/Socket/CMakeLists.txt
 %%Socket%%lib/io/addons/Socket/depends
 %%Socket%%lib/io/addons/Socket/io/A0_EventManager.io
 %%Socket%%lib/io/addons/Socket/io/A1_Socket.io
@@ -1574,8 +1671,8 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/io/EvOutResponse.io
 %%Socket%%lib/io/addons/Socket/io/EvStatusCodes.io
 %%Socket%%lib/io/addons/Socket/io/IPAddress.io
-%%Socket%%lib/io/addons/Socket/io/URL.io
 %%Socket%%lib/io/addons/Socket/io/UnixPath.io
+%%Socket%%lib/io/addons/Socket/io/URL.io
 %%Socket%%lib/io/addons/Socket/protos
 %%Socket%%lib/io/addons/Socket/samples/ChatServer.io
 %%Socket%%lib/io/addons/Socket/samples/ClientServer.io
@@ -1590,6 +1687,7 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/samples/IRC/IoBot.io
 %%Socket%%lib/io/addons/Socket/samples/MiniEmailServer.io
 %%Socket%%lib/io/addons/Socket/samples/MinimalWebServer.io
+%%Socket%%lib/io/addons/Socket/samples/ptest.io
 %%Socket%%lib/io/addons/Socket/samples/Radio.io
 %%Socket%%lib/io/addons/Socket/samples/TerminalServer.io
 %%Socket%%lib/io/addons/Socket/samples/UDP/UDPClient.io
@@ -1597,27 +1695,24 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/samples/URLTest.io
 %%Socket%%lib/io/addons/Socket/samples/WebDownload.io
 %%Socket%%lib/io/addons/Socket/samples/WebRequest.io
-%%Socket%%lib/io/addons/Socket/samples/WebServer/WebServer.io
 %%Socket%%lib/io/addons/Socket/samples/WebServer/test.io
-%%Socket%%lib/io/addons/Socket/samples/ptest.io
+%%Socket%%lib/io/addons/Socket/samples/WebServer/WebServer.io
 %%Socket%%lib/io/addons/Socket/source/Address.c
 %%Socket%%lib/io/addons/Socket/source/Address.h
-%%Socket%%lib/io/addons/Socket/source/IPAddress.c
-%%Socket%%lib/io/addons/Socket/source/IPAddress.h
 %%Socket%%lib/io/addons/Socket/source/IoDNS.c
 %%Socket%%lib/io/addons/Socket/source/IoDNS.h
 %%Socket%%lib/io/addons/Socket/source/IoEvConnection.c
 %%Socket%%lib/io/addons/Socket/source/IoEvConnection.h
+%%Socket%%lib/io/addons/Socket/source/IoEvent.c
+%%Socket%%lib/io/addons/Socket/source/IoEvent.h
+%%Socket%%lib/io/addons/Socket/source/IoEventManager.c
+%%Socket%%lib/io/addons/Socket/source/IoEventManager.h
 %%Socket%%lib/io/addons/Socket/source/IoEvHttpServer.c
 %%Socket%%lib/io/addons/Socket/source/IoEvHttpServer.h
 %%Socket%%lib/io/addons/Socket/source/IoEvOutRequest.c
 %%Socket%%lib/io/addons/Socket/source/IoEvOutRequest.h
 %%Socket%%lib/io/addons/Socket/source/IoEvOutResponse.c
 %%Socket%%lib/io/addons/Socket/source/IoEvOutResponse.h
-%%Socket%%lib/io/addons/Socket/source/IoEvent.c
-%%Socket%%lib/io/addons/Socket/source/IoEvent.h
-%%Socket%%lib/io/addons/Socket/source/IoEventManager.c
-%%Socket%%lib/io/addons/Socket/source/IoEventManager.h
 %%Socket%%lib/io/addons/Socket/source/IoIPAddress.c
 %%Socket%%lib/io/addons/Socket/source/IoIPAddress.h
 %%Socket%%lib/io/addons/Socket/source/IoSocket.c
@@ -1625,48 +1720,60 @@ lib/libiovmall.so
 %%Socket%%lib/io/addons/Socket/source/IoSocketInit.c
 %%Socket%%lib/io/addons/Socket/source/IoUnixPath.c
 %%Socket%%lib/io/addons/Socket/source/IoUnixPath.h
+%%Socket%%lib/io/addons/Socket/source/IPAddress.c
+%%Socket%%lib/io/addons/Socket/source/IPAddress.h
 %%Socket%%lib/io/addons/Socket/source/LocalNameServers.c
 %%Socket%%lib/io/addons/Socket/source/LocalNameServers.h
-%%Socket%%lib/io/addons/Socket/source/Socket.c
-%%Socket%%lib/io/addons/Socket/source/Socket.h
-%%Socket%%lib/io/addons/Socket/source/UnixPath.c
-%%Socket%%lib/io/addons/Socket/source/UnixPath.h
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNS.c
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNS.h
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNSRequest.c
 %%Socket%%lib/io/addons/Socket/source/new/IoEvDNSRequest.h
+%%Socket%%lib/io/addons/Socket/source/Socket.c
+%%Socket%%lib/io/addons/Socket/source/Socket.h
+%%Socket%%lib/io/addons/Socket/source/UnixPath.c
+%%Socket%%lib/io/addons/Socket/source/UnixPath.h
 %%Socket%%lib/io/addons/Socket/tests/correctness/DNSTest.io
-%%Socket%%lib/io/addons/Socket/tests/correctness/SocketTest.io
 %%Socket%%lib/io/addons/Socket/tests/correctness/run.io
-%%SqlDatabase%%lib/io/addons/SqlDatabase/CMakeLists.txt
+%%Socket%%lib/io/addons/Socket/tests/correctness/SocketTest.io
 %%SqlDatabase%%lib/io/addons/SqlDatabase/_build/dll/libIoSqlDatabase.so
+%%SqlDatabase%%lib/io/addons/SqlDatabase/CMakeLists.txt
 %%SqlDatabase%%lib/io/addons/SqlDatabase/depends
 %%SqlDatabase%%lib/io/addons/SqlDatabase/io/SqlDatabase.io
 %%SqlDatabase%%lib/io/addons/SqlDatabase/protos
 %%SqlDatabase%%lib/io/addons/SqlDatabase/source/IoSqlDatabaseInit.c
-%%Syslog%%lib/io/addons/Syslog/CMakeLists.txt
+%%SQLite3%%lib/io/addons/SQLite3/_build/dll/libIoSQLite3.so
+%%SQLite3%%lib/io/addons/SQLite3/CMakeLists.txt
+%%SQLite3%%lib/io/addons/SQLite3/depends
+%%SQLite3%%lib/io/addons/SQLite3/io/SQLite3.io
+%%SQLite3%%lib/io/addons/SQLite3/protos
+%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.c
+%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3.h
+%%SQLite3%%lib/io/addons/SQLite3/source/IoSQLite3Init.c
+%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/run.io
+%%SQLite3%%lib/io/addons/SQLite3/tests/correctness/SQLite3Test.io
 %%Syslog%%lib/io/addons/Syslog/_build/dll/libIoSyslog.so
+%%Syslog%%lib/io/addons/Syslog/CMakeLists.txt
 %%Syslog%%lib/io/addons/Syslog/depends
 %%Syslog%%lib/io/addons/Syslog/protos
 %%Syslog%%lib/io/addons/Syslog/samples/sample.io
 %%Syslog%%lib/io/addons/Syslog/source/IoSyslog.c
 %%Syslog%%lib/io/addons/Syslog/source/IoSyslog.h
 %%Syslog%%lib/io/addons/Syslog/source/IoSyslogInit.c
-%%SystemCall%%lib/io/addons/SystemCall/CMakeLists.txt
 %%SystemCall%%lib/io/addons/SystemCall/_build/dll/libIoSystemCall.so
+%%SystemCall%%lib/io/addons/SystemCall/CMakeLists.txt
 %%SystemCall%%lib/io/addons/SystemCall/depends
 %%SystemCall%%lib/io/addons/SystemCall/io/SystemCall.io
 %%SystemCall%%lib/io/addons/SystemCall/protos
 %%SystemCall%%lib/io/addons/SystemCall/samples/pingtest.io
 %%SystemCall%%lib/io/addons/SystemCall/samples/test.io
 %%SystemCall%%lib/io/addons/SystemCall/samples/test2.io
+%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.c
+%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.h
 %%SystemCall%%lib/io/addons/SystemCall/source/IoSystemCall.c
 %%SystemCall%%lib/io/addons/SystemCall/source/IoSystemCall.h
 %%SystemCall%%lib/io/addons/SystemCall/source/IoSystemCallInit.c
-%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.c
-%%SystemCall%%lib/io/addons/SystemCall/source/callsystem.h
-%%TagLib%%lib/io/addons/TagLib/CMakeLists.txt
 %%TagLib%%lib/io/addons/TagLib/_build/dll/libIoTagLib.so
+%%TagLib%%lib/io/addons/TagLib/CMakeLists.txt
 %%TagLib%%lib/io/addons/TagLib/depends
 %%TagLib%%lib/io/addons/TagLib/io/TagLib_extras.io
 %%TagLib%%lib/io/addons/TagLib/protos
@@ -1676,8 +1783,8 @@ lib/libiovmall.so
 %%TagLib%%lib/io/addons/TagLib/source/IoTagLib.c
 %%TagLib%%lib/io/addons/TagLib/source/IoTagLib.h
 %%TagLib%%lib/io/addons/TagLib/source/IoTagLibInit.c
-%%Theora%%lib/io/addons/Theora/CMakeLists.txt
 %%Theora%%lib/io/addons/Theora/_build/dll/libIoTheora.so
+%%Theora%%lib/io/addons/Theora/CMakeLists.txt
 %%Theora%%lib/io/addons/Theora/depends
 %%Theora%%lib/io/addons/Theora/io/Theora.io
 %%Theora%%lib/io/addons/Theora/protos
@@ -1690,8 +1797,8 @@ lib/libiovmall.so
 %%Theora%%lib/io/addons/Theora/source/IoTheoraInit.c
 %%Theora%%lib/io/addons/Theora/source/IoTheoraSetupInfo.c
 %%Theora%%lib/io/addons/Theora/source/IoTheoraSetupInfo.h
-%%Thread%%lib/io/addons/Thread/CMakeLists.txt
 %%Thread%%lib/io/addons/Thread/_build/dll/libIoThread.so
+%%Thread%%lib/io/addons/Thread/CMakeLists.txt
 %%Thread%%lib/io/addons/Thread/depends
 %%Thread%%lib/io/addons/Thread/protos
 %%Thread%%lib/io/addons/Thread/source/IoThread.c
@@ -1701,10 +1808,10 @@ lib/libiovmall.so
 %%Thread%%lib/io/addons/Thread/source/Thread.h
 %%Thread%%lib/io/addons/Thread/source/ThreadMutex.c
 %%Thread%%lib/io/addons/Thread/source/ThreadMutex.h
-%%Thread%%lib/io/addons/Thread/tests/correctness/ThreadTest.io
 %%Thread%%lib/io/addons/Thread/tests/correctness/run.io
-%%TokyoCabinet%%lib/io/addons/TokyoCabinet/CMakeLists.txt
+%%Thread%%lib/io/addons/Thread/tests/correctness/ThreadTest.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/_build/dll/libIoTokyoCabinet.so
+%%TokyoCabinet%%lib/io/addons/TokyoCabinet/CMakeLists.txt
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/depends
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/io/TokyoCabinet.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/protos
@@ -1716,13 +1823,13 @@ lib/libiovmall.so
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/source/IoTokyoCabinetPrefixCursor.c
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/source/IoTokyoCabinetPrefixCursor.h
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/test.db
-%%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/TokyoCabinetTest.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/basic.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/run.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/testPath.io
+%%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/correctness/TokyoCabinetTest.io
 %%TokyoCabinet%%lib/io/addons/TokyoCabinet/tests/performance/perf.io
-%%Twitter%%lib/io/addons/Twitter/CMakeLists.txt
 %%Twitter%%lib/io/addons/Twitter/_build/dll/libIoTwitter.so
+%%Twitter%%lib/io/addons/Twitter/CMakeLists.txt
 %%Twitter%%lib/io/addons/Twitter/depends
 %%Twitter%%lib/io/addons/Twitter/io/A_TwitterFriendsFollowersCursor.io
 %%Twitter%%lib/io/addons/Twitter/io/Object.io
@@ -1741,8 +1848,17 @@ lib/libiovmall.so
 %%Twitter%%lib/io/addons/Twitter/samples/twitterSample.io
 %%Twitter%%lib/io/addons/Twitter/source/.gitsidumb
 %%Twitter%%lib/io/addons/Twitter/source/IoTwitterInit.c
-%%UUID%%lib/io/addons/UUID/CMakeLists.txt
+%%User%%lib/io/addons/User/_build/dll/libIoUser.so
+%%User%%lib/io/addons/User/CMakeLists.txt
+%%User%%lib/io/addons/User/depends
+%%User%%lib/io/addons/User/protos
+%%User%%lib/io/addons/User/source/IoUser.c
+%%User%%lib/io/addons/User/source/IoUser.h
+%%User%%lib/io/addons/User/source/IoUserInit.c
+%%User%%lib/io/addons/User/tests/correctness/run.io
+%%User%%lib/io/addons/User/tests/correctness/UserTest.io
 %%UUID%%lib/io/addons/UUID/_build/dll/libIoUUID.so
+%%UUID%%lib/io/addons/UUID/CMakeLists.txt
 %%UUID%%lib/io/addons/UUID/depends
 %%UUID%%lib/io/addons/UUID/io/uuid.io
 %%UUID%%lib/io/addons/UUID/protos
@@ -1750,19 +1866,9 @@ lib/libiovmall.so
 %%UUID%%lib/io/addons/UUID/source/IoUUID.h
 %%UUID%%lib/io/addons/UUID/source/IoUUIDInit.c
 %%UUID%%lib/io/addons/UUID/tests/correctness/run.io
-%%User%%lib/io/addons/User/CMakeLists.txt
-%%User%%lib/io/addons/User/_build/dll/libIoUser.so
-%%User%%lib/io/addons/User/depends
-%%User%%lib/io/addons/User/protos
-%%User%%lib/io/addons/User/source/IoUser.c
-%%User%%lib/io/addons/User/source/IoUser.h
-%%User%%lib/io/addons/User/source/IoUserInit.c
-%%User%%lib/io/addons/User/tests/correctness/UserTest.io
-%%User%%lib/io/addons/User/tests/correctness/run.io
-%%VertexDB%%lib/io/addons/VertexDB/CMakeLists.txt
 %%VertexDB%%lib/io/addons/VertexDB/_build/dll/libIoVertexDB.so
+%%VertexDB%%lib/io/addons/VertexDB/CMakeLists.txt
 %%VertexDB%%lib/io/addons/VertexDB/depends
-%%VertexDB%%lib/io/addons/VertexDB/io/VertexDB.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Node.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Queue.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Request.io
@@ -1770,15 +1876,15 @@ lib/libiovmall.so
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Server.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Settings.io
 %%VertexDB%%lib/io/addons/VertexDB/io/protos/Transaction.io
+%%VertexDB%%lib/io/addons/VertexDB/io/VertexDB.io
 %%VertexDB%%lib/io/addons/VertexDB/protos
 %%VertexDB%%lib/io/addons/VertexDB/samples/vertexdb.io
 %%VertexDB%%lib/io/addons/VertexDB/source/.gitisdumb
 %%VertexDB%%lib/io/addons/VertexDB/source/IoVertexDBInit.c
-%%VertexDB%%lib/io/addons/VertexDB/tests/correctness/VDBTest.io
 %%VertexDB%%lib/io/addons/VertexDB/tests/correctness/run.io
-%%Volcano%%lib/io/addons/Volcano/CMakeLists.txt
-%%Volcano%%lib/io/addons/Volcano/README
+%%VertexDB%%lib/io/addons/VertexDB/tests/correctness/VDBTest.io
 %%Volcano%%lib/io/addons/Volcano/_build/dll/libIoVolcano.so
+%%Volcano%%lib/io/addons/Volcano/CMakeLists.txt
 %%Volcano%%lib/io/addons/Volcano/depends
 %%Volcano%%lib/io/addons/Volcano/io/HandlerQueue.io
 %%Volcano%%lib/io/addons/Volcano/io/HttpParser.io
@@ -1791,18 +1897,19 @@ lib/libiovmall.so
 %%Volcano%%lib/io/addons/Volcano/io/VolcanoRequestHandler.io
 %%Volcano%%lib/io/addons/Volcano/io/VolcanoServer.io
 %%Volcano%%lib/io/addons/Volcano/protos
+%%Volcano%%lib/io/addons/Volcano/README
 %%Volcano%%lib/io/addons/Volcano/samples/example.io
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser_common.rl
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser.c
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser.h
+%%Volcano%%lib/io/addons/Volcano/source/http11_parser.rl
 %%Volcano%%lib/io/addons/Volcano/source/HttpParser.c
 %%Volcano%%lib/io/addons/Volcano/source/HttpParser.h
 %%Volcano%%lib/io/addons/Volcano/source/IoHttpParser.c
 %%Volcano%%lib/io/addons/Volcano/source/IoHttpParser.h
 %%Volcano%%lib/io/addons/Volcano/source/IoVolcanoInit.c
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser.c
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser.h
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser.rl
-%%Volcano%%lib/io/addons/Volcano/source/http11_parser_common.rl
-%%Vorbis%%lib/io/addons/Vorbis/CMakeLists.txt
 %%Vorbis%%lib/io/addons/Vorbis/_build/dll/libIoVorbis.so
+%%Vorbis%%lib/io/addons/Vorbis/CMakeLists.txt
 %%Vorbis%%lib/io/addons/Vorbis/depends
 %%Vorbis%%lib/io/addons/Vorbis/io/Vorbis.io
 %%Vorbis%%lib/io/addons/Vorbis/protos
@@ -1816,8 +1923,8 @@ lib/libiovmall.so
 %%Vorbis%%lib/io/addons/Vorbis/source/IoVorbisInfo.c
 %%Vorbis%%lib/io/addons/Vorbis/source/IoVorbisInfo.h
 %%Vorbis%%lib/io/addons/Vorbis/source/IoVorbisInit.c
-%%Yajl%%lib/io/addons/Yajl/CMakeLists.txt
 %%Yajl%%lib/io/addons/Yajl/_build/dll/libIoYajl.so
+%%Yajl%%lib/io/addons/Yajl/CMakeLists.txt
 %%Yajl%%lib/io/addons/Yajl/depends
 %%Yajl%%lib/io/addons/Yajl/io/YajlElement.io
 %%Yajl%%lib/io/addons/Yajl/protos
@@ -1827,10 +1934,10 @@ lib/libiovmall.so
 %%Yajl%%lib/io/addons/Yajl/source/IoYajlGen.h
 %%Yajl%%lib/io/addons/Yajl/source/IoYajlInit.c
 %%Yajl%%lib/io/addons/Yajl/test.io
-%%Yajl%%lib/io/addons/Yajl/tests/correctness/YajlTest.io
 %%Yajl%%lib/io/addons/Yajl/tests/correctness/run.io
-%%Zlib%%lib/io/addons/Zlib/CMakeLists.txt
+%%Yajl%%lib/io/addons/Yajl/tests/correctness/YajlTest.io
 %%Zlib%%lib/io/addons/Zlib/_build/dll/libIoZlib.so
+%%Zlib%%lib/io/addons/Zlib/CMakeLists.txt
 %%Zlib%%lib/io/addons/Zlib/depends
 %%Zlib%%lib/io/addons/Zlib/io/Zlib.io
 %%Zlib%%lib/io/addons/Zlib/protos
@@ -1839,6 +1946,6 @@ lib/libiovmall.so
 %%Zlib%%lib/io/addons/Zlib/source/IoZlibEncoder.c
 %%Zlib%%lib/io/addons/Zlib/source/IoZlibEncoder.h
 %%Zlib%%lib/io/addons/Zlib/source/IoZlibInit.c
-%%Zlib%%lib/io/addons/Zlib/tests/correctness/ZlibTest.io
 %%Zlib%%lib/io/addons/Zlib/tests/correctness/run.io
 %%Zlib%%lib/io/addons/Zlib/tests/correctness/test.gz
+%%Zlib%%lib/io/addons/Zlib/tests/correctness/ZlibTest.io