pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

io-*: Update to 2013.12.04. Restore to mostly working order.



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Mon Nov 2 17:12:18 2015 +0100
Changeset:	da205867bd50a369413562c9c7cd1e5847af77fa

Modified Files:
	Makefile
	io-base/Makefile
	io-blowfish/Makefile
	io-blowfish/PLIST
	io-cgi/Makefile
	io-cgi/PLIST
	io-continuedfraction/Makefile
	io-continuedfraction/PLIST
	io-distributedobjects/Makefile
	io-distributedobjects/PLIST
	io-editline/Makefile
	io-editline/PLIST
	io-fnmatch/Makefile
	io-fnmatch/PLIST
	io-lzo/Makefile
	io-lzo/PLIST
	io-md5/Makefile
	io-md5/PLIST
	io-random/Makefile
	io-random/PLIST
	io-range/Makefile
	io-range/PLIST
	io-range/buildlink3.mk
	io-rational/Makefile
	io-rational/PLIST
	io-securesocket/Makefile
	io-securesocket/PLIST
	io-sha1/Makefile
	io-sha1/PLIST
	io-socket/Makefile
	io-socket/PLIST
	io-socket/buildlink3.mk
	io-sqldatabase/Makefile
	io-sqldatabase/PLIST
	io-sqlite3/Makefile
	io-sqlite3/PLIST
	io-syslog/Makefile
	io-syslog/PLIST
	io-systemcall/Makefile
	io-systemcall/PLIST
	io-thread/Makefile
	io-thread/PLIST
	io-user/Makefile
	io-user/PLIST
	io-vm/Makefile
	io-vm/PLIST
	io-vm/buildlink3.mk
	io-vm/distinfo
	io-zlib/Makefile
	io-zlib/PLIST
Added Files:
	io-base/addon.mk
	io-base/version.mk
Removed Files:
	io-blowfish/distinfo
	io-cgi/distinfo
	io-continuedfraction/distinfo
	io-contracts/DESCR
	io-contracts/Makefile
	io-contracts/PLIST
	io-contracts/distinfo
	io-distributedobjects/distinfo
	io-editline/distinfo
	io-fnmatch/distinfo
	io-lzo/distinfo
	io-md5/distinfo
	io-random/distinfo
	io-range/distinfo
	io-rational/distinfo
	io-regex/distinfo
	io-securesocket/distinfo
	io-sha1/distinfo
	io-socket/distinfo
	io-sqldatabase/distinfo
	io-sqlite3/distinfo
	io-syslog/distinfo
	io-systemcall/distinfo
	io-thread/distinfo
	io-user/distinfo
	io-vm/patches/patch-aa
	io-vm/patches/patch-ab
	io-vm/patches/patch-ac
	io-vm/patches/patch-ad
	io-vm/patches/patch-ae
	io-zlib/distinfo
	io/addon.mk
	io/version.mk

Log Message:
io-*: Update to 2013.12.04. Restore to mostly working order.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=da205867bd50a369413562c9c7cd1e5847af77fa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                       |   2 -
 io-base/Makefile               |   6 +--
 io-base/addon.mk               |  29 ++++++++++
 io-base/version.mk             |  14 +++++
 io-blowfish/Makefile           |   4 +-
 io-blowfish/PLIST              |  29 ++++++++--
 io-blowfish/distinfo           |   5 --
 io-cgi/Makefile                |   5 +-
 io-cgi/PLIST                   |  22 ++++++--
 io-cgi/distinfo                |   5 --
 io-continuedfraction/Makefile  |   4 +-
 io-continuedfraction/PLIST     |  22 ++++++--
 io-continuedfraction/distinfo  |   5 --
 io-contracts/DESCR             |   1 -
 io-contracts/Makefile          |  15 ------
 io-contracts/PLIST             |   6 ---
 io-contracts/distinfo          |   5 --
 io-distributedobjects/Makefile |   8 +--
 io-distributedobjects/PLIST    |  28 ++++++++--
 io-distributedobjects/distinfo |   5 --
 io-editline/Makefile           |   4 +-
 io-editline/PLIST              |  24 +++++++--
 io-editline/distinfo           |   5 --
 io-fnmatch/Makefile            |   5 +-
 io-fnmatch/PLIST               |  25 +++++++--
 io-fnmatch/distinfo            |   5 --
 io-lzo/Makefile                |   5 +-
 io-lzo/PLIST                   |  34 ++++++++++--
 io-lzo/distinfo                |   5 --
 io-md5/Makefile                |   6 +--
 io-md5/PLIST                   |  30 +++++++++--
 io-md5/distinfo                |   5 --
 io-random/Makefile             |   4 +-
 io-random/PLIST                |  27 ++++++++--
 io-random/distinfo             |   5 --
 io-range/Makefile              |   5 +-
 io-range/PLIST                 |  30 +++++++++--
 io-range/buildlink3.mk         |   3 +-
 io-range/distinfo              |   5 --
 io-rational/Makefile           |   4 +-
 io-rational/PLIST              |  24 +++++++--
 io-rational/distinfo           |   5 --
 io-regex/distinfo              |   5 --
 io-securesocket/Makefile       |  19 +++++--
 io-securesocket/PLIST          | 118 +++++++++++++++++++++++++++++++++++++----
 io-securesocket/distinfo       |   5 --
 io-sha1/Makefile               |   4 +-
 io-sha1/PLIST                  |  32 +++++++++--
 io-sha1/distinfo               |   5 --
 io-socket/Makefile             |   9 ++--
 io-socket/PLIST                | 110 +++++++++++++++++++++++++++++++++-----
 io-socket/buildlink3.mk        |   3 +-
 io-socket/distinfo             |   5 --
 io-sqldatabase/Makefile        |   4 +-
 io-sqldatabase/PLIST           |  21 ++++++--
 io-sqldatabase/distinfo        |   5 --
 io-sqlite3/Makefile            |   4 +-
 io-sqlite3/PLIST               |  26 +++++++--
 io-sqlite3/distinfo            |   5 --
 io-syslog/Makefile             |   4 +-
 io-syslog/PLIST                |  25 +++++++--
 io-syslog/distinfo             |   5 --
 io-systemcall/Makefile         |   4 +-
 io-systemcall/PLIST            |  30 +++++++++--
 io-systemcall/distinfo         |   5 --
 io-thread/Makefile             |   4 +-
 io-thread/PLIST                |  32 +++++++++--
 io-thread/distinfo             |   5 --
 io-user/Makefile               |   4 +-
 io-user/PLIST                  |  26 +++++++--
 io-user/distinfo               |   5 --
 io-vm/Makefile                 |  38 ++++---------
 io-vm/PLIST                    |  16 ++++--
 io-vm/buildlink3.mk            |   3 +-
 io-vm/distinfo                 |  12 ++---
 io-vm/patches/patch-aa         |   7 ---
 io-vm/patches/patch-ab         |   9 ----
 io-vm/patches/patch-ac         |   6 ---
 io-vm/patches/patch-ad         |   6 ---
 io-vm/patches/patch-ae         |  72 -------------------------
 io-zlib/Makefile               |   5 +-
 io-zlib/PLIST                  |  29 ++++++++--
 io-zlib/distinfo               |   5 --
 io/addon.mk                    |  66 -----------------------
 io/version.mk                  |   4 --
 85 files changed, 791 insertions(+), 501 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 69292ed..64ffb2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1263,12 +1263,10 @@ SUBDIR+=	info2man
 SUBDIR+=	infraarcana
 SUBDIR+=	intel-gpu-tools
 SUBDIR+=	interbase-docs
-#SUBDIR+=	io			# not a package, same as jabberd bellow
 SUBDIR+=	io-base
 SUBDIR+=	io-blowfish
 SUBDIR+=	io-cgi
 SUBDIR+=	io-continuedfraction
-SUBDIR+=	io-contracts
 SUBDIR+=	io-distributedobjects
 SUBDIR+=	io-editline
 SUBDIR+=	io-fnmatch
diff --git a/io-base/Makefile b/io-base/Makefile
index 57ac218..9a14aff 100644
--- a/io-base/Makefile
+++ b/io-base/Makefile
@@ -2,7 +2,7 @@
 
 META_PACKAGE=	# empty
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 DISTNAME =	io-${IO_VERSION}
 PKGNAME =	io-base-${IO_VERSION}
@@ -16,8 +16,8 @@ DEPENDS+=	io-vm>=${IO_VERSION}:../../wip/io-vm
 DEPENDS+=	io-blowfish>=${IO_VERSION}:../../wip/io-blowfish
 DEPENDS+=	io-cgi>=${IO_VERSION}:../../wip/io-cgi
 DEPENDS+=	io-continuedfraction>=${IO_VERSION}:../../wip/io-continuedfraction
-DEPENDS+=	io-contracts>=${IO_VERSION}:../../wip/io-contracts
-DEPENDS+=	io-socket>=${IO_VERSION}:../../wip/io-socket
+# conflicts with securesocket
+#DEPENDS+=	io-socket>=${IO_VERSION}:../../wip/io-socket
 DEPENDS+=	io-distributedobjects>=${IO_VERSION}:../../wip/io-distributedobjects
 DEPENDS+=	io-editline>=${IO_VERSION}:../../wip/io-editline
 DEPENDS+=	io-fnmatch>=${IO_VERSION}:../../wip/io-fnmatch
diff --git a/io-base/addon.mk b/io-base/addon.mk
new file mode 100644
index 0000000..fd2484d
--- /dev/null
+++ b/io-base/addon.mk
@@ -0,0 +1,29 @@
+# $NetBSD: addon.mk,v 1.5 2012/09/30 05:34:21 asau Exp $
+
+.include "../../wip/io-base/version.mk"
+
+SUBST_CLASSES+=			disable-addons
+SUBST_STAGE.disable-addons=	pre-configure
+SUBST_MESSAGE.disable-addons=	Disabling all addons
+SUBST_FILES.disable-addons=	addons/CMakeLists.txt
+SUBST_SED.disable-addons=	-e 's,^add_subdirectory(,\# pkgsrc_disabled &,g'
+
+SUBST_CLASSES+=			enable-addon
+SUBST_STAGE.enable-addon=	pre-configure
+SUBST_MESSAGE.enable-addon=	Enabling ${ADDON_NAME} addon
+SUBST_FILES.enable-addon=	addons/CMakeLists.txt
+SUBST_SED.enable-addon=		-e 's,^\# pkgsrc_disabled add_subdirectory(${ADDON_NAME}),add_subdirectory(${ADDON_NAME}),g'
+.for i in ${ADDON_DEPENDS_ON_ADDONS}
+SUBST_SED.enable-addon+=	-e 's,^\# pkgsrc_disabled add_subdirectory(${i}),add_subdirectory(${i}),g'
+.endfor
+
+pre-build:
+	cd ${WRKSRC}/addons/${ADDON_NAME} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/io ${WRKSRC}/addons/generate.io ${WRKSRC}/addons ${ADDON_NAME}
+
+BUILD_DIRS+=addons/${ADDON_NAME}
+INSTALL_DIRS+=addons/${ADDON_NAME}
+
+.include "../../wip/io-vm/buildlink3.mk"
+.for i in ${ADDON_DEPENDS_ON_ADDONS}
+.include "../../wip/io-${i:tl}/buildlink3.mk"
+.endfor
diff --git a/io-base/version.mk b/io-base/version.mk
new file mode 100644
index 0000000..5f7acb0
--- /dev/null
+++ b/io-base/version.mk
@@ -0,0 +1,14 @@
+# $NetBSD: version.mk,v 1.4 2009/07/04 19:17:23 milosn Exp $
+
+IO_VERSION=		2013.12.04
+DISTNAME=		io-${IO_VERSION}
+MASTER_SITES=		${MASTER_SITE_GITHUB:=stevedekorte/}
+GITHUB_PROJECT=		io
+EXTRACT_USING=		bsdtar
+
+USE_CMAKE=		yes
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake pax pkg-config
+MAKE_JOBS_SAFE=		no
+
+DISTINFO_FILE=		${.CURDIR}/../../wip/io-vm/distinfo
diff --git a/io-blowfish/Makefile b/io-blowfish/Makefile
index 968cdfd..dad4bae 100644
--- a/io-blowfish/Makefile
+++ b/io-blowfish/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2012/11/14 00:16:09 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-blowfish-${IO_VERSION}
 CATEGORIES=		security
@@ -11,5 +11,5 @@ COMMENT=		Blowfish addon for Io
 
 ADDON_NAME=		Blowfish
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-blowfish/PLIST b/io-blowfish/PLIST
index f8ce01b..f839cf0 100644
--- a/io-blowfish/PLIST
+++ b/io-blowfish/PLIST
@@ -1,6 +1,29 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Blowfish/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/C.includecache
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/DependInfo.cmake
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/build.make
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/cmake_clean.cmake
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/depend.internal
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/depend.make
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/flags.make
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/link.txt
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/progress.make
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/source/IoBlowfish.c.o
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/source/IoBlowfishInit.c.o
+lib/io/addons/Blowfish/CMakeFiles/IoBlowfish.dir/source/blowfish.c.o
+lib/io/addons/Blowfish/CMakeFiles/progress.marks
+lib/io/addons/Blowfish/CMakeLists.txt
+lib/io/addons/Blowfish/Makefile
 lib/io/addons/Blowfish/_build/dll/libIoBlowfish.so
-lib/io/addons/Blowfish/_build/lib/libIoBlowfish.a
-lib/io/addons/Blowfish/build.io
+lib/io/addons/Blowfish/cmake_install.cmake
 lib/io/addons/Blowfish/depends
 lib/io/addons/Blowfish/io/Blowfish.io
+lib/io/addons/Blowfish/protos
+lib/io/addons/Blowfish/source/IoBlowfish.c
+lib/io/addons/Blowfish/source/IoBlowfish.h
+lib/io/addons/Blowfish/source/IoBlowfishInit.c
+lib/io/addons/Blowfish/source/blowfish.c
+lib/io/addons/Blowfish/source/blowfish.h
+lib/io/addons/Blowfish/tests/correctness/BlowfishTest.io
+lib/io/addons/Blowfish/tests/correctness/run.io
diff --git a/io-blowfish/distinfo b/io-blowfish/distinfo
deleted file mode 100644
index 491545f..0000000
--- a/io-blowfish/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:37:40 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-cgi/Makefile b/io-cgi/Makefile
index aae5377..d0ea88d 100644
--- a/io-cgi/Makefile
+++ b/io-cgi/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 22:25:32 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-cgi-${IO_VERSION}
-#PKGREVISION=		1
 CATEGORIES=		www
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
@@ -12,5 +11,5 @@ COMMENT=		CGI addon for Io
 
 ADDON_NAME=		CGI
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-cgi/PLIST b/io-cgi/PLIST
index d87f31c..1d2bcec 100644
--- a/io-cgi/PLIST
+++ b/io-cgi/PLIST
@@ -1,7 +1,23 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/CGI/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/C.includecache
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/DependInfo.cmake
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/build.make
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/cmake_clean.cmake
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/depend.internal
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/depend.make
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/flags.make
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/link.txt
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/progress.make
+lib/io/addons/CGI/CMakeFiles/IoCGI.dir/source/IoCGIInit.c.o
+lib/io/addons/CGI/CMakeFiles/progress.marks
+lib/io/addons/CGI/CMakeLists.txt
+lib/io/addons/CGI/Makefile
 lib/io/addons/CGI/_build/dll/libIoCGI.so
-lib/io/addons/CGI/_build/lib/libIoCGI.a
-lib/io/addons/CGI/build.io
+lib/io/addons/CGI/cmake_install.cmake
 lib/io/addons/CGI/depends
 lib/io/addons/CGI/io/CGI.io
 lib/io/addons/CGI/protos
+lib/io/addons/CGI/source/IoCGIInit.c
+lib/io/addons/CGI/tests/correctness/CGITest.io
+lib/io/addons/CGI/tests/correctness/run.io
diff --git a/io-cgi/distinfo b/io-cgi/distinfo
deleted file mode 100644
index 2de4002..0000000
--- a/io-cgi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:38:19 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-continuedfraction/Makefile b/io-continuedfraction/Makefile
index b4d5a39..97d1432 100644
--- a/io-continuedfraction/Makefile
+++ b/io-continuedfraction/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:23 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-continuedfraction-${IO_VERSION}
 CATEGORIES=		math
@@ -11,5 +11,5 @@ COMMENT=		ContinuedFraction addon for Io
 
 ADDON_NAME=		ContinuedFraction
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-continuedfraction/PLIST b/io-continuedfraction/PLIST
index af9b9b5..51538d7 100644
--- a/io-continuedfraction/PLIST
+++ b/io-continuedfraction/PLIST
@@ -1,6 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/ContinuedFraction/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/C.includecache
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/DependInfo.cmake
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/build.make
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/cmake_clean.cmake
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/depend.internal
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/depend.make
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/flags.make
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/link.txt
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/progress.make
+lib/io/addons/ContinuedFraction/CMakeFiles/IoContinuedFraction.dir/source/IoContinuedFractionInit.c.o
+lib/io/addons/ContinuedFraction/CMakeFiles/progress.marks
+lib/io/addons/ContinuedFraction/CMakeLists.txt
+lib/io/addons/ContinuedFraction/Makefile
 lib/io/addons/ContinuedFraction/_build/dll/libIoContinuedFraction.so
-lib/io/addons/ContinuedFraction/_build/lib/libIoContinuedFraction.a
-lib/io/addons/ContinuedFraction/build.io
+lib/io/addons/ContinuedFraction/cmake_install.cmake
 lib/io/addons/ContinuedFraction/depends
 lib/io/addons/ContinuedFraction/io/ContinuedFraction.io
+lib/io/addons/ContinuedFraction/protos
+lib/io/addons/ContinuedFraction/samples/Sample.io
+lib/io/addons/ContinuedFraction/source/IoContinuedFractionInit.c
diff --git a/io-continuedfraction/distinfo b/io-continuedfraction/distinfo
deleted file mode 100644
index 0d21f4d..0000000
--- a/io-continuedfraction/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:38:57 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-contracts/DESCR b/io-contracts/DESCR
deleted file mode 100644
index 85070bf..0000000
--- a/io-contracts/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Contracts addon for Io.
diff --git a/io-contracts/Makefile b/io-contracts/Makefile
deleted file mode 100644
index 339146b..0000000
--- a/io-contracts/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2012/11/13 23:05:23 othyro Exp $
-
-.include "../../wip/io/version.mk"
-
-PKGNAME=		io-contracts-${IO_VERSION}
-CATEGORIES=		devel
-
-MAINTAINER=		milos.negovanovic%googlemail.com@localhost
-HOMEPAGE=		www.iolanguage.com
-COMMENT=		Contracts addon for Io
-
-ADDON_NAME=		Contracts
-
-.include "../../wip/io/addon.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/io-contracts/PLIST b/io-contracts/PLIST
deleted file mode 100644
index 7150f22..0000000
--- a/io-contracts/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
-lib/io/addons/Contracts/_build/dll/libIoContracts.so
-lib/io/addons/Contracts/_build/lib/libIoContracts.a
-lib/io/addons/Contracts/build.io
-lib/io/addons/Contracts/depends
-lib/io/addons/Contracts/io/Contracts.io
diff --git a/io-contracts/distinfo b/io-contracts/distinfo
deleted file mode 100644
index 08b4110..0000000
--- a/io-contracts/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:39:39 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-distributedobjects/Makefile b/io-distributedobjects/Makefile
index 6950ae6..d359bb8 100644
--- a/io-distributedobjects/Makefile
+++ b/io-distributedobjects/Makefile
@@ -1,19 +1,15 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 22:25:32 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-distributedobjects-${IO_VERSION}
-#PKGREVISION=		1
 CATEGORIES=		devel
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
 HOMEPAGE=		www.iolanguage.com
 COMMENT=		DistributedObjects addon for Io
 
-DEPENDS+=       	io-socket>=${IO_VERSION}:../../wip/io-socket
-
 ADDON_NAME=		DistributedObjects
 
-
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-distributedobjects/PLIST b/io-distributedobjects/PLIST
index bc015b8..77a1606 100644
--- a/io-distributedobjects/PLIST
+++ b/io-distributedobjects/PLIST
@@ -1,10 +1,32 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/DistributedObjects/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/C.includecache
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/DependInfo.cmake
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/build.make
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/cmake_clean.cmake
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/depend.internal
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/depend.make
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/flags.make
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/link.txt
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/progress.make
+lib/io/addons/DistributedObjects/CMakeFiles/IoDistributedObjects.dir/source/IoDistributedObjectsInit.c.o
+lib/io/addons/DistributedObjects/CMakeFiles/progress.marks
+lib/io/addons/DistributedObjects/CMakeLists.txt
+lib/io/addons/DistributedObjects/Makefile
 lib/io/addons/DistributedObjects/_build/dll/libIoDistributedObjects.so
-lib/io/addons/DistributedObjects/_build/lib/libIoDistributedObjects.a
-lib/io/addons/DistributedObjects/build.io
+lib/io/addons/DistributedObjects/cmake_install.cmake
 lib/io/addons/DistributedObjects/depends
 lib/io/addons/DistributedObjects/io/DOConnection.io
 lib/io/addons/DistributedObjects/io/DOServer.io
 lib/io/addons/DistributedObjects/io/MDOConnection.io
 lib/io/addons/DistributedObjects/io/MDOServer.io
 lib/io/addons/DistributedObjects/protos
+lib/io/addons/DistributedObjects/samples/DOTest.io
+lib/io/addons/DistributedObjects/samples/MDOConnectionTest.io
+lib/io/addons/DistributedObjects/samples/MDOServerTest.io
+lib/io/addons/DistributedObjects/source/IoDistributedObjectsInit.c
+lib/io/addons/DistributedObjects/tests/correctness/DOTest.io
+lib/io/addons/DistributedObjects/tests/correctness/MDOTest.io
+lib/io/addons/DistributedObjects/tests/correctness/run.io
+lib/io/addons/DistributedObjects/tests/performance/MDOTest.io
+lib/io/addons/DistributedObjects/tests/performance/run.io
diff --git a/io-distributedobjects/distinfo b/io-distributedobjects/distinfo
deleted file mode 100644
index 4cd4f46..0000000
--- a/io-distributedobjects/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:40:16 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-editline/Makefile b/io-editline/Makefile
index 3b86d84..daced99 100644
--- a/io-editline/Makefile
+++ b/io-editline/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:23 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-editline-${IO_VERSION}
 CATEGORIES=		devel
@@ -11,5 +11,5 @@ COMMENT=		EditLine addon for Io
 
 ADDON_NAME=		EditLine
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-editline/PLIST b/io-editline/PLIST
index 824497b..c89d6f5 100644
--- a/io-editline/PLIST
+++ b/io-editline/PLIST
@@ -1,5 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/EditLine/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/C.includecache
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/DependInfo.cmake
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/build.make
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/cmake_clean.cmake
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/depend.internal
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/depend.make
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/flags.make
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/link.txt
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/progress.make
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/source/IoEditLine.c.o
+lib/io/addons/EditLine/CMakeFiles/IoEditLine.dir/source/IoEditLineInit.c.o
+lib/io/addons/EditLine/CMakeFiles/progress.marks
+lib/io/addons/EditLine/CMakeLists.txt
+lib/io/addons/EditLine/Makefile
 lib/io/addons/EditLine/_build/dll/libIoEditLine.so
-lib/io/addons/EditLine/_build/lib/libIoEditLine.a
-lib/io/addons/EditLine/build.io
+lib/io/addons/EditLine/cmake_install.cmake
 lib/io/addons/EditLine/depends
+lib/io/addons/EditLine/protos
+lib/io/addons/EditLine/source/IoEditLine.c
+lib/io/addons/EditLine/source/IoEditLine.h
+lib/io/addons/EditLine/source/IoEditLineInit.c
diff --git a/io-editline/distinfo b/io-editline/distinfo
deleted file mode 100644
index a32c875..0000000
--- a/io-editline/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:40:54 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-fnmatch/Makefile b/io-fnmatch/Makefile
index e0b5193..e074fad 100644
--- a/io-fnmatch/Makefile
+++ b/io-fnmatch/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.2 2012/11/13 22:25:33 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-fnmatch-${IO_VERSION}
-PKGREVISION=		0
 CATEGORIES=		devel
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
@@ -12,5 +11,5 @@ COMMENT=		Fnmatch addon for Io
 
 ADDON_NAME=		Fnmatch
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-fnmatch/PLIST b/io-fnmatch/PLIST
index caae1e6..9af1804 100644
--- a/io-fnmatch/PLIST
+++ b/io-fnmatch/PLIST
@@ -1,5 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Fnmatch/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/C.includecache
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/DependInfo.cmake
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/build.make
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/cmake_clean.cmake
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/depend.internal
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/depend.make
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/flags.make
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/link.txt
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/progress.make
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/source/IoFnmatch.c.o
+lib/io/addons/Fnmatch/CMakeFiles/IoFnmatch.dir/source/IoFnmatchInit.c.o
+lib/io/addons/Fnmatch/CMakeFiles/progress.marks
+lib/io/addons/Fnmatch/CMakeLists.txt
+lib/io/addons/Fnmatch/Makefile
 lib/io/addons/Fnmatch/_build/dll/libIoFnmatch.so
-lib/io/addons/Fnmatch/_build/lib/libIoFnmatch.a
-lib/io/addons/Fnmatch/build.io
+lib/io/addons/Fnmatch/cmake_install.cmake
 lib/io/addons/Fnmatch/depends
+lib/io/addons/Fnmatch/source/IoFnmatch.c
+lib/io/addons/Fnmatch/source/IoFnmatch.h
+lib/io/addons/Fnmatch/source/IoFnmatchInit.c
+lib/io/addons/Fnmatch/tests/correctness/FnmatchTest.io
+lib/io/addons/Fnmatch/tests/correctness/run.io
diff --git a/io-fnmatch/distinfo b/io-fnmatch/distinfo
deleted file mode 100644
index d681c55..0000000
--- a/io-fnmatch/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:41:28 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-lzo/Makefile b/io-lzo/Makefile
index f37c393..75232cf 100644
--- a/io-lzo/Makefile
+++ b/io-lzo/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 22:25:33 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-lzo-${IO_VERSION}
-#PKGREVISION=		1
 CATEGORIES=		archivers
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
@@ -12,6 +11,6 @@ COMMENT=		LZO addon for Io
 
 ADDON_NAME=		LZO
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-lzo/PLIST b/io-lzo/PLIST
index 6b07566..fdc3743 100644
--- a/io-lzo/PLIST
+++ b/io-lzo/PLIST
@@ -1,7 +1,35 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/LZO/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/C.includecache
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/DependInfo.cmake
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/build.make
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/cmake_clean.cmake
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/depend.internal
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/depend.make
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/flags.make
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/link.txt
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/progress.make
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/source/IoLZODecoder.c.o
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/source/IoLZOEncoder.c.o
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/source/IoLZOInit.c.o
+lib/io/addons/LZO/CMakeFiles/IoLZO.dir/source/minilzo.c.o
+lib/io/addons/LZO/CMakeFiles/progress.marks
+lib/io/addons/LZO/CMakeLists.txt
+lib/io/addons/LZO/Makefile
 lib/io/addons/LZO/_build/dll/libIoLZO.so
-lib/io/addons/LZO/_build/lib/libIoLZO.a
-lib/io/addons/LZO/build.io
+lib/io/addons/LZO/cmake_install.cmake
 lib/io/addons/LZO/depends
 lib/io/addons/LZO/io/LZO.io
 lib/io/addons/LZO/protos
+lib/io/addons/LZO/source/IoLZODecoder.c
+lib/io/addons/LZO/source/IoLZODecoder.h
+lib/io/addons/LZO/source/IoLZOEncoder.c
+lib/io/addons/LZO/source/IoLZOEncoder.h
+lib/io/addons/LZO/source/IoLZOInit.c
+lib/io/addons/LZO/source/lzoconf.h
+lib/io/addons/LZO/source/lzodefs.h
+lib/io/addons/LZO/source/minilzo.c
+lib/io/addons/LZO/source/minilzo.h
+lib/io/addons/LZO/source/minilzo_COPYING
+lib/io/addons/LZO/tests/correctness/LZOTest.io
+lib/io/addons/LZO/tests/correctness/run.io
diff --git a/io-lzo/distinfo b/io-lzo/distinfo
deleted file mode 100644
index f83be55..0000000
--- a/io-lzo/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:42:08 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-md5/Makefile b/io-md5/Makefile
index d106af2..097a072 100644
--- a/io-md5/Makefile
+++ b/io-md5/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:26 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-md5-${IO_VERSION}
 CATEGORIES=		devel
@@ -9,9 +9,7 @@ MAINTAINER=		milos.negovanovic%googlemail.com@localhost
 HOMEPAGE=		www.iolanguage.com
 COMMENT=		MD5 addon for Io
 
-DEPENDS+=       	io-sha1>=${IO_VERSION}:../../wip/io-sha1
-
 ADDON_NAME=		MD5
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-md5/PLIST b/io-md5/PLIST
index 42e27f5..08530f6 100644
--- a/io-md5/PLIST
+++ b/io-md5/PLIST
@@ -1,6 +1,30 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/MD5/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/C.includecache
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/DependInfo.cmake
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/build.make
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/cmake_clean.cmake
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/depend.internal
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/depend.make
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/flags.make
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/link.txt
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/progress.make
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/source/IoMD5.c.o
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/source/IoMD5Init.c.o
+lib/io/addons/MD5/CMakeFiles/IoMD5.dir/source/md5.c.o
+lib/io/addons/MD5/CMakeFiles/progress.marks
+lib/io/addons/MD5/CMakeLists.txt
+lib/io/addons/MD5/Makefile
 lib/io/addons/MD5/_build/dll/libIoMD5.so
-lib/io/addons/MD5/_build/lib/libIoMD5.a
-lib/io/addons/MD5/build.io
+lib/io/addons/MD5/cmake_install.cmake
 lib/io/addons/MD5/depends
 lib/io/addons/MD5/io/MD5_extras.io
+lib/io/addons/MD5/protos
+lib/io/addons/MD5/samples/data.txt
+lib/io/addons/MD5/samples/md5.io
+lib/io/addons/MD5/source/IoMD5.c
+lib/io/addons/MD5/source/IoMD5.h
+lib/io/addons/MD5/source/IoMD5Init.c
+lib/io/addons/MD5/source/md5.c
+lib/io/addons/MD5/source/md5.h
+lib/io/addons/MD5/tests/correctness/MD5Test.io
diff --git a/io-md5/distinfo b/io-md5/distinfo
deleted file mode 100644
index fd5b48b..0000000
--- a/io-md5/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:42:42 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-random/Makefile b/io-random/Makefile
index a857589..c3cc29b 100644
--- a/io-random/Makefile
+++ b/io-random/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:26 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-random-${IO_VERSION}
 CATEGORIES=		devel
@@ -11,5 +11,5 @@ COMMENT=		Random addon for Io
 
 ADDON_NAME=		Random
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-random/PLIST b/io-random/PLIST
index c740ba8..f81c6f8 100644
--- a/io-random/PLIST
+++ b/io-random/PLIST
@@ -1,5 +1,26 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Random/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/C.includecache
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/DependInfo.cmake
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/build.make
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/cmake_clean.cmake
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/depend.internal
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/depend.make
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/flags.make
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/link.txt
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/progress.make
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/source/IoRandom.c.o
+lib/io/addons/Random/CMakeFiles/IoRandom.dir/source/IoRandomInit.c.o
+lib/io/addons/Random/CMakeFiles/progress.marks
+lib/io/addons/Random/CMakeLists.txt
+lib/io/addons/Random/Makefile
 lib/io/addons/Random/_build/dll/libIoRandom.so
-lib/io/addons/Random/_build/lib/libIoRandom.a
-lib/io/addons/Random/build.io
+lib/io/addons/Random/cmake_install.cmake
 lib/io/addons/Random/depends
+lib/io/addons/Random/io/List.io
+lib/io/addons/Random/protos
+lib/io/addons/Random/source/IoRandom.c
+lib/io/addons/Random/source/IoRandom.h
+lib/io/addons/Random/source/IoRandomInit.c
+lib/io/addons/Random/tests/correctness/ListTest.io
+lib/io/addons/Random/tests/correctness/run.io
diff --git a/io-random/distinfo b/io-random/distinfo
deleted file mode 100644
index 5866786..0000000
--- a/io-random/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:43:18 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-range/Makefile b/io-range/Makefile
index 4249ca9..15d49fb 100644
--- a/io-range/Makefile
+++ b/io-range/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 22:25:33 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-range-${IO_VERSION}
-#PKGREVISION=		1
 CATEGORIES=		devel
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
@@ -13,5 +12,5 @@ COMMENT=		Range addon for Io
 ADDON_NAME=		Range
 ADDON_INSTALL_HEADERS=	yes
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-range/PLIST b/io-range/PLIST
index f0bf89a..b6f411a 100644
--- a/io-range/PLIST
+++ b/io-range/PLIST
@@ -1,9 +1,29 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:47 thomasklausner Exp $
-include/io/Range/IoRange.h
-include/io/Range/IoRange_inline.h
+@comment $NetBSD$
+lib/io/addons/Range/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Range/CMakeFiles/IoRange.dir/C.includecache
+lib/io/addons/Range/CMakeFiles/IoRange.dir/DependInfo.cmake
+lib/io/addons/Range/CMakeFiles/IoRange.dir/build.make
+lib/io/addons/Range/CMakeFiles/IoRange.dir/cmake_clean.cmake
+lib/io/addons/Range/CMakeFiles/IoRange.dir/depend.internal
+lib/io/addons/Range/CMakeFiles/IoRange.dir/depend.make
+lib/io/addons/Range/CMakeFiles/IoRange.dir/flags.make
+lib/io/addons/Range/CMakeFiles/IoRange.dir/link.txt
+lib/io/addons/Range/CMakeFiles/IoRange.dir/progress.make
+lib/io/addons/Range/CMakeFiles/IoRange.dir/source/IoRange.c.o
+lib/io/addons/Range/CMakeFiles/IoRange.dir/source/IoRangeInit.c.o
+lib/io/addons/Range/CMakeFiles/progress.marks
+lib/io/addons/Range/CMakeLists.txt
+lib/io/addons/Range/Makefile
 lib/io/addons/Range/_build/dll/libIoRange.so
-lib/io/addons/Range/_build/lib/libIoRange.a
-lib/io/addons/Range/build.io
+lib/io/addons/Range/cmake_install.cmake
 lib/io/addons/Range/depends
 lib/io/addons/Range/io/Extras.io
 lib/io/addons/Range/io/Range.io
+lib/io/addons/Range/protos
+lib/io/addons/Range/source/IoRange.c
+lib/io/addons/Range/source/IoRange.h
+lib/io/addons/Range/source/IoRangeApi.h
+lib/io/addons/Range/source/IoRangeInit.c
+lib/io/addons/Range/source/IoRange_inline.h
+lib/io/addons/Range/tests/correctness/RangeTest.io
+lib/io/addons/Range/tests/correctness/run.io
diff --git a/io-range/buildlink3.mk b/io-range/buildlink3.mk
index 48467bb..37cdc3a 100644
--- a/io-range/buildlink3.mk
+++ b/io-range/buildlink3.mk
@@ -5,8 +5,7 @@ BUILDLINK_TREE+=        io-range
 .if !defined(IORANGE_BUILDLINK3_MK)
 IORANGE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.io-range+=	io-range>=20080904
-BUILDLINK_ABI_DEPENDS.io-range+=	io-range>=20080904
+BUILDLINK_API_DEPENDS.io-range+=	io-range>=2013.12.04
 BUILDLINK_PKGSRCDIR.io-range?=		../../wip/io-range
 
 BUILDLINK_LIBDIRS.io-range+=		lib/io/addons/Range/_build/dll
diff --git a/io-range/distinfo b/io-range/distinfo
deleted file mode 100644
index 9a96f4d..0000000
--- a/io-range/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:43:56 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-rational/Makefile b/io-rational/Makefile
index 7b73706..11af1a36 100644
--- a/io-rational/Makefile
+++ b/io-rational/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:27 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-rational-${IO_VERSION}
 CATEGORIES=		math
@@ -11,5 +11,5 @@ COMMENT=		Rational math addon for Io
 
 ADDON_NAME=		Rational
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-rational/PLIST b/io-rational/PLIST
index efebb4c..25b198d 100644
--- a/io-rational/PLIST
+++ b/io-rational/PLIST
@@ -1,6 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Rational/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/C.includecache
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/DependInfo.cmake
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/build.make
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/cmake_clean.cmake
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/depend.internal
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/depend.make
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/flags.make
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/link.txt
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/progress.make
+lib/io/addons/Rational/CMakeFiles/IoRational.dir/source/IoRationalInit.c.o
+lib/io/addons/Rational/CMakeFiles/progress.marks
+lib/io/addons/Rational/CMakeLists.txt
+lib/io/addons/Rational/Makefile
 lib/io/addons/Rational/_build/dll/libIoRational.so
-lib/io/addons/Rational/_build/lib/libIoRational.a
-lib/io/addons/Rational/build.io
+lib/io/addons/Rational/cmake_install.cmake
 lib/io/addons/Rational/depends
 lib/io/addons/Rational/io/Rational.io
+lib/io/addons/Rational/protos
+lib/io/addons/Rational/samples/Sample.io
+lib/io/addons/Rational/source/IoRationalInit.c
+lib/io/addons/Rational/tests/correctness/RationalTest.io
+lib/io/addons/Rational/tests/correctness/run.io
diff --git a/io-rational/distinfo b/io-rational/distinfo
deleted file mode 100644
index ddbe48d..0000000
--- a/io-rational/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:44:31 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-regex/distinfo b/io-regex/distinfo
deleted file mode 100644
index f784c04..0000000
--- a/io-regex/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/05 10:29:46 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-securesocket/Makefile b/io-securesocket/Makefile
index 75902c5..65e894d 100644
--- a/io-securesocket/Makefile
+++ b/io-securesocket/Makefile
@@ -1,17 +1,26 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 22:25:33 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-securesocket-${IO_VERSION}
-#PKGREVISION=		1
 CATEGORIES=		devel
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
 HOMEPAGE=		www.iolanguage.com
 COMMENT=		SSL socket addon for Io
 
-ADDON_NAME=			SecureSocket
-ADDON_DEPENDS_ON_ADDONS=	Socket
+ADDON_NAME=			Socket
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
+
+SUBST_CLASSES+=			enable-securesocket
+SUBST_STAGE.enable-securesocket=	pre-configure
+SUBST_MESSAGE.enable-securesocket=	Enabling SecureSocket addon
+SUBST_FILES.enable-securesocket=	addons/CMakeLists.txt
+SUBST_SED.enable-securesocket=		-e 's,^\# pkgsrc_disabled add_subdirectory(SecureSocket),add_subdirectory(SecureSocket),g'
+
+INSTALL_DIRS+=		addons/Socket addons/SecureSocket
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/libevent/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-securesocket/PLIST b/io-securesocket/PLIST
index 17c9a89..5e010ae 100644
--- a/io-securesocket/PLIST
+++ b/io-securesocket/PLIST
@@ -1,10 +1,108 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:47 thomasklausner Exp $
-lib/io/addons/SecureSocket/_build/dll/libIoSecureSocket.so
-lib/io/addons/SecureSocket/_build/lib/libIoSecureSocket.a
-lib/io/addons/SecureSocket/build.io
-lib/io/addons/SecureSocket/depends
-lib/io/addons/SecureSocket/io/Certificate.io
-lib/io/addons/SecureSocket/io/SecureClient.io
-lib/io/addons/SecureSocket/io/SecureServer.io
-lib/io/addons/SecureSocket/io/SecureSocket.io
-lib/io/addons/SecureSocket/protos
+@comment $NetBSD$
+lib/io/addons/Socket/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/C.includecache
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/DependInfo.cmake
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/build.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/cmake_clean.cmake
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/depend.internal
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/depend.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/flags.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/link.txt
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/progress.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/Address.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IPAddress.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoDNS.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvConnection.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvHttpServer.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvOutRequest.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvOutResponse.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvent.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEventManager.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoIPAddress.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoSocket.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoSocketInit.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoUnixPath.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/LocalNameServers.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/Socket.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/UnixPath.c.o
+lib/io/addons/Socket/CMakeFiles/progress.marks
+lib/io/addons/Socket/CMakeLists.txt
+lib/io/addons/Socket/Makefile
+lib/io/addons/Socket/_build/dll/libIoSocket.so
+lib/io/addons/Socket/cmake_install.cmake
+lib/io/addons/Socket/depends
+lib/io/addons/Socket/io/A0_EventManager.io
+lib/io/addons/Socket/io/A1_Socket.io
+lib/io/addons/Socket/io/A2_Server.io
+lib/io/addons/Socket/io/A3_Host.io
+lib/io/addons/Socket/io/A4_Object.io
+lib/io/addons/Socket/io/DNSResolver.io
+lib/io/addons/Socket/io/EvHttpCookie.io
+lib/io/addons/Socket/io/EvHttpServer.io
+lib/io/addons/Socket/io/EvOutResponse.io
+lib/io/addons/Socket/io/EvStatusCodes.io
+lib/io/addons/Socket/io/IPAddress.io
+lib/io/addons/Socket/io/URL.io
+lib/io/addons/Socket/io/UnixPath.io
+lib/io/addons/Socket/protos
+lib/io/addons/Socket/samples/ChatServer.io
+lib/io/addons/Socket/samples/ClientServer.io
+lib/io/addons/Socket/samples/ClientServerUnixPath.io
+lib/io/addons/Socket/samples/EchoServer.io
+lib/io/addons/Socket/samples/EmailMessage.io
+lib/io/addons/Socket/samples/EmailMessageTest.io
+lib/io/addons/Socket/samples/EvHttpServerTest.io
+lib/io/addons/Socket/samples/HTTPServer.io
+lib/io/addons/Socket/samples/IRC/CursesScreen.io
+lib/io/addons/Socket/samples/IRC/EchoBot.io
+lib/io/addons/Socket/samples/IRC/IoBot.io
+lib/io/addons/Socket/samples/MiniEmailServer.io
+lib/io/addons/Socket/samples/MinimalWebServer.io
+lib/io/addons/Socket/samples/Radio.io
+lib/io/addons/Socket/samples/TerminalServer.io
+lib/io/addons/Socket/samples/UDP/UDPClient.io
+lib/io/addons/Socket/samples/UDP/UDPServer.io
+lib/io/addons/Socket/samples/URLTest.io
+lib/io/addons/Socket/samples/WebDownload.io
+lib/io/addons/Socket/samples/WebRequest.io
+lib/io/addons/Socket/samples/WebServer/WebServer.io
+lib/io/addons/Socket/samples/WebServer/test.io
+lib/io/addons/Socket/samples/ptest.io
+lib/io/addons/Socket/source/Address.c
+lib/io/addons/Socket/source/Address.h
+lib/io/addons/Socket/source/IPAddress.c
+lib/io/addons/Socket/source/IPAddress.h
+lib/io/addons/Socket/source/IoDNS.c
+lib/io/addons/Socket/source/IoDNS.h
+lib/io/addons/Socket/source/IoEvConnection.c
+lib/io/addons/Socket/source/IoEvConnection.h
+lib/io/addons/Socket/source/IoEvHttpServer.c
+lib/io/addons/Socket/source/IoEvHttpServer.h
+lib/io/addons/Socket/source/IoEvOutRequest.c
+lib/io/addons/Socket/source/IoEvOutRequest.h
+lib/io/addons/Socket/source/IoEvOutResponse.c
+lib/io/addons/Socket/source/IoEvOutResponse.h
+lib/io/addons/Socket/source/IoEvent.c
+lib/io/addons/Socket/source/IoEvent.h
+lib/io/addons/Socket/source/IoEventManager.c
+lib/io/addons/Socket/source/IoEventManager.h
+lib/io/addons/Socket/source/IoIPAddress.c
+lib/io/addons/Socket/source/IoIPAddress.h
+lib/io/addons/Socket/source/IoSocket.c
+lib/io/addons/Socket/source/IoSocket.h
+lib/io/addons/Socket/source/IoSocketInit.c
+lib/io/addons/Socket/source/IoUnixPath.c
+lib/io/addons/Socket/source/IoUnixPath.h
+lib/io/addons/Socket/source/LocalNameServers.c
+lib/io/addons/Socket/source/LocalNameServers.h
+lib/io/addons/Socket/source/Socket.c
+lib/io/addons/Socket/source/Socket.h
+lib/io/addons/Socket/source/UnixPath.c
+lib/io/addons/Socket/source/UnixPath.h
+lib/io/addons/Socket/source/new/IoEvDNS.c
+lib/io/addons/Socket/source/new/IoEvDNS.h
+lib/io/addons/Socket/source/new/IoEvDNSRequest.c
+lib/io/addons/Socket/source/new/IoEvDNSRequest.h
+lib/io/addons/Socket/tests/correctness/DNSTest.io
+lib/io/addons/Socket/tests/correctness/SocketTest.io
+lib/io/addons/Socket/tests/correctness/run.io
diff --git a/io-securesocket/distinfo b/io-securesocket/distinfo
deleted file mode 100644
index 3fc32ea..0000000
--- a/io-securesocket/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:45:12 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-sha1/Makefile b/io-sha1/Makefile
index 06c1312..c448e5b 100644
--- a/io-sha1/Makefile
+++ b/io-sha1/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:28 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-sha1-${IO_VERSION}
 CATEGORIES=		devel
@@ -11,5 +11,5 @@ COMMENT=		SHA1 addon for Io
 
 ADDON_NAME=		SHA1
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-sha1/PLIST b/io-sha1/PLIST
index 692a532..e6384be 100644
--- a/io-sha1/PLIST
+++ b/io-sha1/PLIST
@@ -1,6 +1,32 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/SHA1/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/C.includecache
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/DependInfo.cmake
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/build.make
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/cmake_clean.cmake
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/depend.internal
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/depend.make
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/flags.make
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/link.txt
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/progress.make
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/source/IoSHA1.c.o
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/source/IoSHA1Init.c.o
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/source/hmac.c.o
+lib/io/addons/SHA1/CMakeFiles/IoSHA1.dir/source/sha1.c.o
+lib/io/addons/SHA1/CMakeFiles/progress.marks
+lib/io/addons/SHA1/CMakeLists.txt
+lib/io/addons/SHA1/Makefile
 lib/io/addons/SHA1/_build/dll/libIoSHA1.so
-lib/io/addons/SHA1/_build/lib/libIoSHA1.a
-lib/io/addons/SHA1/build.io
+lib/io/addons/SHA1/cmake_install.cmake
 lib/io/addons/SHA1/depends
 lib/io/addons/SHA1/io/sha1.io
+lib/io/addons/SHA1/protos
+lib/io/addons/SHA1/source/IoSHA1.c
+lib/io/addons/SHA1/source/IoSHA1.h
+lib/io/addons/SHA1/source/IoSHA1Init.c
+lib/io/addons/SHA1/source/hmac.c
+lib/io/addons/SHA1/source/hmac.h
+lib/io/addons/SHA1/source/sha1.c
+lib/io/addons/SHA1/source/sha1.h
+lib/io/addons/SHA1/tests/correctness/SHA1Test.io
+lib/io/addons/SHA1/tests/correctness/run.io
diff --git a/io-sha1/distinfo b/io-sha1/distinfo
deleted file mode 100644
index 1357ede..0000000
--- a/io-sha1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:45:47 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-socket/Makefile b/io-socket/Makefile
index a9e0ef7..e6dcefb 100644
--- a/io-socket/Makefile
+++ b/io-socket/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.5 2012/11/13 22:25:33 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
-PKGNAME=		io-socket-${IO_VERSION}
-#PKGREVISION=		2
+PKGNAME=		${DISTNAME:S/io-/&socket-/}
 CATEGORIES=		net
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
@@ -11,7 +10,7 @@ HOMEPAGE=		www.iolanguage.com
 COMMENT=		Socket addon for Io
 
 ADDON_NAME=		Socket
-ADDON_INSTALL_HEADERS=	yes
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
+.include "../../devel/libevent/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-socket/PLIST b/io-socket/PLIST
index 3d2d887..5e010ae 100644
--- a/io-socket/PLIST
+++ b/io-socket/PLIST
@@ -1,17 +1,35 @@
-@comment $NetBSD: PLIST,v 1.5 2009/10/11 10:44:47 thomasklausner Exp $
-include/io/Socket/IPAddress.h
-include/io/Socket/IoDNS.h
-include/io/Socket/IoEvConnection.h
-include/io/Socket/IoEvRequest.h
-include/io/Socket/IoEvent.h
-include/io/Socket/IoEventManager.h
-include/io/Socket/IoIPAddress.h
-include/io/Socket/IoSocket.h
-include/io/Socket/LocalNameServers.h
-include/io/Socket/Socket.h
+@comment $NetBSD$
+lib/io/addons/Socket/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/C.includecache
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/DependInfo.cmake
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/build.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/cmake_clean.cmake
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/depend.internal
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/depend.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/flags.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/link.txt
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/progress.make
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/Address.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IPAddress.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoDNS.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvConnection.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvHttpServer.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvOutRequest.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvOutResponse.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEvent.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoEventManager.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoIPAddress.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoSocket.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoSocketInit.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/IoUnixPath.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/LocalNameServers.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/Socket.c.o
+lib/io/addons/Socket/CMakeFiles/IoSocket.dir/source/UnixPath.c.o
+lib/io/addons/Socket/CMakeFiles/progress.marks
+lib/io/addons/Socket/CMakeLists.txt
+lib/io/addons/Socket/Makefile
 lib/io/addons/Socket/_build/dll/libIoSocket.so
-lib/io/addons/Socket/_build/lib/libIoSocket.a
-lib/io/addons/Socket/build.io
+lib/io/addons/Socket/cmake_install.cmake
 lib/io/addons/Socket/depends
 lib/io/addons/Socket/io/A0_EventManager.io
 lib/io/addons/Socket/io/A1_Socket.io
@@ -19,6 +37,72 @@ lib/io/addons/Socket/io/A2_Server.io
 lib/io/addons/Socket/io/A3_Host.io
 lib/io/addons/Socket/io/A4_Object.io
 lib/io/addons/Socket/io/DNSResolver.io
+lib/io/addons/Socket/io/EvHttpCookie.io
+lib/io/addons/Socket/io/EvHttpServer.io
+lib/io/addons/Socket/io/EvOutResponse.io
+lib/io/addons/Socket/io/EvStatusCodes.io
 lib/io/addons/Socket/io/IPAddress.io
 lib/io/addons/Socket/io/URL.io
+lib/io/addons/Socket/io/UnixPath.io
 lib/io/addons/Socket/protos
+lib/io/addons/Socket/samples/ChatServer.io
+lib/io/addons/Socket/samples/ClientServer.io
+lib/io/addons/Socket/samples/ClientServerUnixPath.io
+lib/io/addons/Socket/samples/EchoServer.io
+lib/io/addons/Socket/samples/EmailMessage.io
+lib/io/addons/Socket/samples/EmailMessageTest.io
+lib/io/addons/Socket/samples/EvHttpServerTest.io
+lib/io/addons/Socket/samples/HTTPServer.io
+lib/io/addons/Socket/samples/IRC/CursesScreen.io
+lib/io/addons/Socket/samples/IRC/EchoBot.io
+lib/io/addons/Socket/samples/IRC/IoBot.io
+lib/io/addons/Socket/samples/MiniEmailServer.io
+lib/io/addons/Socket/samples/MinimalWebServer.io
+lib/io/addons/Socket/samples/Radio.io
+lib/io/addons/Socket/samples/TerminalServer.io
+lib/io/addons/Socket/samples/UDP/UDPClient.io
+lib/io/addons/Socket/samples/UDP/UDPServer.io
+lib/io/addons/Socket/samples/URLTest.io
+lib/io/addons/Socket/samples/WebDownload.io
+lib/io/addons/Socket/samples/WebRequest.io
+lib/io/addons/Socket/samples/WebServer/WebServer.io
+lib/io/addons/Socket/samples/WebServer/test.io
+lib/io/addons/Socket/samples/ptest.io
+lib/io/addons/Socket/source/Address.c
+lib/io/addons/Socket/source/Address.h
+lib/io/addons/Socket/source/IPAddress.c
+lib/io/addons/Socket/source/IPAddress.h
+lib/io/addons/Socket/source/IoDNS.c
+lib/io/addons/Socket/source/IoDNS.h
+lib/io/addons/Socket/source/IoEvConnection.c
+lib/io/addons/Socket/source/IoEvConnection.h
+lib/io/addons/Socket/source/IoEvHttpServer.c
+lib/io/addons/Socket/source/IoEvHttpServer.h
+lib/io/addons/Socket/source/IoEvOutRequest.c
+lib/io/addons/Socket/source/IoEvOutRequest.h
+lib/io/addons/Socket/source/IoEvOutResponse.c
+lib/io/addons/Socket/source/IoEvOutResponse.h
+lib/io/addons/Socket/source/IoEvent.c
+lib/io/addons/Socket/source/IoEvent.h
+lib/io/addons/Socket/source/IoEventManager.c
+lib/io/addons/Socket/source/IoEventManager.h
+lib/io/addons/Socket/source/IoIPAddress.c
+lib/io/addons/Socket/source/IoIPAddress.h
+lib/io/addons/Socket/source/IoSocket.c
+lib/io/addons/Socket/source/IoSocket.h
+lib/io/addons/Socket/source/IoSocketInit.c
+lib/io/addons/Socket/source/IoUnixPath.c
+lib/io/addons/Socket/source/IoUnixPath.h
+lib/io/addons/Socket/source/LocalNameServers.c
+lib/io/addons/Socket/source/LocalNameServers.h
+lib/io/addons/Socket/source/Socket.c
+lib/io/addons/Socket/source/Socket.h
+lib/io/addons/Socket/source/UnixPath.c
+lib/io/addons/Socket/source/UnixPath.h
+lib/io/addons/Socket/source/new/IoEvDNS.c
+lib/io/addons/Socket/source/new/IoEvDNS.h
+lib/io/addons/Socket/source/new/IoEvDNSRequest.c
+lib/io/addons/Socket/source/new/IoEvDNSRequest.h
+lib/io/addons/Socket/tests/correctness/DNSTest.io
+lib/io/addons/Socket/tests/correctness/SocketTest.io
+lib/io/addons/Socket/tests/correctness/run.io
diff --git a/io-socket/buildlink3.mk b/io-socket/buildlink3.mk
index 06cb5c2..32e3dac 100644
--- a/io-socket/buildlink3.mk
+++ b/io-socket/buildlink3.mk
@@ -5,8 +5,7 @@ BUILDLINK_TREE+=	io-socket
 .if !defined(IOSOCKET_BUILDLINK3_MK)
 IOSOCKET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.io-socket+=	io-socket>=20080904
-BUILDLINK_ABI_DEPENDS.io-socket+=	io-socket>=20080904
+BUILDLINK_API_DEPENDS.io-socket+=	io-socket>=2013.12.04
 BUILDLINK_PKGSRCDIR.io-socket?=		../../wip/io-socket
 
 BUILDLINK_LIBDIRS.io-socket+=		lib/io/addons/Socket/_build/dll
diff --git a/io-socket/distinfo b/io-socket/distinfo
deleted file mode 100644
index 30080ee..0000000
--- a/io-socket/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:46:21 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-sqldatabase/Makefile b/io-sqldatabase/Makefile
index 779b814..1973d39 100644
--- a/io-sqldatabase/Makefile
+++ b/io-sqldatabase/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2012/11/14 00:16:10 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-sqldatabase-${IO_VERSION}
 CATEGORIES=		databases
@@ -11,5 +11,5 @@ COMMENT=		SqlDatabase addon for Io
 
 ADDON_NAME=		SqlDatabase
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-sqldatabase/PLIST b/io-sqldatabase/PLIST
index cdb29a1..b80490d 100644
--- a/io-sqldatabase/PLIST
+++ b/io-sqldatabase/PLIST
@@ -1,6 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/SqlDatabase/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/C.includecache
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/DependInfo.cmake
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/build.make
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/cmake_clean.cmake
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/depend.internal
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/depend.make
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/flags.make
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/link.txt
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/progress.make
+lib/io/addons/SqlDatabase/CMakeFiles/IoSqlDatabase.dir/source/IoSqlDatabaseInit.c.o
+lib/io/addons/SqlDatabase/CMakeFiles/progress.marks
+lib/io/addons/SqlDatabase/CMakeLists.txt
+lib/io/addons/SqlDatabase/Makefile
 lib/io/addons/SqlDatabase/_build/dll/libIoSqlDatabase.so
-lib/io/addons/SqlDatabase/_build/lib/libIoSqlDatabase.a
-lib/io/addons/SqlDatabase/build.io
+lib/io/addons/SqlDatabase/cmake_install.cmake
 lib/io/addons/SqlDatabase/depends
 lib/io/addons/SqlDatabase/io/SqlDatabase.io
+lib/io/addons/SqlDatabase/protos
+lib/io/addons/SqlDatabase/source/IoSqlDatabaseInit.c
diff --git a/io-sqldatabase/distinfo b/io-sqldatabase/distinfo
deleted file mode 100644
index 65345d3..0000000
--- a/io-sqldatabase/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:46:54 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-sqlite3/Makefile b/io-sqlite3/Makefile
index 88b9ffc..3e170ff 100644
--- a/io-sqlite3/Makefile
+++ b/io-sqlite3/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2012/11/13 23:05:28 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-sqlite3-${IO_VERSION}
 CATEGORIES=		databases
@@ -12,5 +12,5 @@ COMMENT=		SQLite3 addon for Io
 ADDON_NAME=		SQLite3
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-sqlite3/PLIST b/io-sqlite3/PLIST
index 3cce699..1903f7c 100644
--- a/io-sqlite3/PLIST
+++ b/io-sqlite3/PLIST
@@ -1,6 +1,26 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:47 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/SQLite3/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/C.includecache
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/DependInfo.cmake
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/build.make
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/cmake_clean.cmake
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/depend.internal
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/depend.make
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/flags.make
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/link.txt
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/progress.make
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/source/IoSQLite3.c.o
+lib/io/addons/SQLite3/CMakeFiles/IoSQLite3.dir/source/IoSQLite3Init.c.o
+lib/io/addons/SQLite3/CMakeFiles/progress.marks
+lib/io/addons/SQLite3/CMakeLists.txt
+lib/io/addons/SQLite3/Makefile
 lib/io/addons/SQLite3/_build/dll/libIoSQLite3.so
-lib/io/addons/SQLite3/_build/lib/libIoSQLite3.a
-lib/io/addons/SQLite3/build.io
+lib/io/addons/SQLite3/cmake_install.cmake
 lib/io/addons/SQLite3/depends
 lib/io/addons/SQLite3/io/SQLite3.io
+lib/io/addons/SQLite3/protos
+lib/io/addons/SQLite3/source/IoSQLite3.c
+lib/io/addons/SQLite3/source/IoSQLite3.h
+lib/io/addons/SQLite3/source/IoSQLite3Init.c
+lib/io/addons/SQLite3/tests/correctness/SQLite3Test.io
+lib/io/addons/SQLite3/tests/correctness/run.io
diff --git a/io-sqlite3/distinfo b/io-sqlite3/distinfo
deleted file mode 100644
index 1c3be26..0000000
--- a/io-sqlite3/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/11 19:42:19 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-syslog/Makefile b/io-syslog/Makefile
index 2c77e3a..8fe6c64 100644
--- a/io-syslog/Makefile
+++ b/io-syslog/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2012/11/14 00:16:11 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-syslog-${IO_VERSION}
 CATEGORIES=		sysutils
@@ -11,5 +11,5 @@ COMMENT=		Syslog addon for Io
 
 ADDON_NAME=		Syslog
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-syslog/PLIST b/io-syslog/PLIST
index be63847..b68dde9 100644
--- a/io-syslog/PLIST
+++ b/io-syslog/PLIST
@@ -1,5 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:48 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Syslog/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/C.includecache
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/DependInfo.cmake
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/build.make
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/cmake_clean.cmake
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/depend.internal
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/depend.make
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/flags.make
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/link.txt
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/progress.make
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/source/IoSyslog.c.o
+lib/io/addons/Syslog/CMakeFiles/IoSyslog.dir/source/IoSyslogInit.c.o
+lib/io/addons/Syslog/CMakeFiles/progress.marks
+lib/io/addons/Syslog/CMakeLists.txt
+lib/io/addons/Syslog/Makefile
 lib/io/addons/Syslog/_build/dll/libIoSyslog.so
-lib/io/addons/Syslog/_build/lib/libIoSyslog.a
-lib/io/addons/Syslog/build.io
+lib/io/addons/Syslog/cmake_install.cmake
 lib/io/addons/Syslog/depends
+lib/io/addons/Syslog/protos
+lib/io/addons/Syslog/samples/sample.io
+lib/io/addons/Syslog/source/IoSyslog.c
+lib/io/addons/Syslog/source/IoSyslog.h
+lib/io/addons/Syslog/source/IoSyslogInit.c
diff --git a/io-syslog/distinfo b/io-syslog/distinfo
deleted file mode 100644
index 6ee4b69..0000000
--- a/io-syslog/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:47:27 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-systemcall/Makefile b/io-systemcall/Makefile
index 039547c..7eb6297 100644
--- a/io-systemcall/Makefile
+++ b/io-systemcall/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2012/11/14 00:16:11 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-systemcall-${IO_VERSION}
 CATEGORIES=		sysutils
@@ -11,5 +11,5 @@ COMMENT=		SystemCall addon for Io
 
 ADDON_NAME=		SystemCall
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-systemcall/PLIST b/io-systemcall/PLIST
index 977d49f..0de957a 100644
--- a/io-systemcall/PLIST
+++ b/io-systemcall/PLIST
@@ -1,6 +1,30 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:48 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/SystemCall/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/C.includecache
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/DependInfo.cmake
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/build.make
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/cmake_clean.cmake
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/depend.internal
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/depend.make
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/flags.make
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/link.txt
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/progress.make
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/source/IoSystemCall.c.o
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/source/IoSystemCallInit.c.o
+lib/io/addons/SystemCall/CMakeFiles/IoSystemCall.dir/source/callsystem.c.o
+lib/io/addons/SystemCall/CMakeFiles/progress.marks
+lib/io/addons/SystemCall/CMakeLists.txt
+lib/io/addons/SystemCall/Makefile
 lib/io/addons/SystemCall/_build/dll/libIoSystemCall.so
-lib/io/addons/SystemCall/_build/lib/libIoSystemCall.a
-lib/io/addons/SystemCall/build.io
+lib/io/addons/SystemCall/cmake_install.cmake
 lib/io/addons/SystemCall/depends
 lib/io/addons/SystemCall/io/SystemCall.io
+lib/io/addons/SystemCall/protos
+lib/io/addons/SystemCall/samples/pingtest.io
+lib/io/addons/SystemCall/samples/test.io
+lib/io/addons/SystemCall/samples/test2.io
+lib/io/addons/SystemCall/source/IoSystemCall.c
+lib/io/addons/SystemCall/source/IoSystemCall.h
+lib/io/addons/SystemCall/source/IoSystemCallInit.c
+lib/io/addons/SystemCall/source/callsystem.c
+lib/io/addons/SystemCall/source/callsystem.h
diff --git a/io-systemcall/distinfo b/io-systemcall/distinfo
deleted file mode 100644
index d8cca0a..0000000
--- a/io-systemcall/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:48:01 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-thread/Makefile b/io-thread/Makefile
index 4b537fc..5c28b69 100644
--- a/io-thread/Makefile
+++ b/io-thread/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2012/11/13 23:05:30 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-thread-${IO_VERSION}
 CATEGORIES=		devel
@@ -11,5 +11,5 @@ COMMENT=		Thread addon for Io
 
 ADDON_NAME=		Thread
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-thread/PLIST b/io-thread/PLIST
index 65f8827..8626e7f 100644
--- a/io-thread/PLIST
+++ b/io-thread/PLIST
@@ -1,5 +1,31 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:48 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Thread/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/C.includecache
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/DependInfo.cmake
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/build.make
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/cmake_clean.cmake
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/depend.internal
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/depend.make
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/flags.make
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/link.txt
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/progress.make
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/source/IoThread.c.o
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/source/IoThreadInit.c.o
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/source/Thread.c.o
+lib/io/addons/Thread/CMakeFiles/IoThread.dir/source/ThreadMutex.c.o
+lib/io/addons/Thread/CMakeFiles/progress.marks
+lib/io/addons/Thread/CMakeLists.txt
+lib/io/addons/Thread/Makefile
 lib/io/addons/Thread/_build/dll/libIoThread.so
-lib/io/addons/Thread/_build/lib/libIoThread.a
-lib/io/addons/Thread/build.io
+lib/io/addons/Thread/cmake_install.cmake
 lib/io/addons/Thread/depends
+lib/io/addons/Thread/protos
+lib/io/addons/Thread/source/IoThread.c
+lib/io/addons/Thread/source/IoThread.h
+lib/io/addons/Thread/source/IoThreadInit.c
+lib/io/addons/Thread/source/Thread.c
+lib/io/addons/Thread/source/Thread.h
+lib/io/addons/Thread/source/ThreadMutex.c
+lib/io/addons/Thread/source/ThreadMutex.h
+lib/io/addons/Thread/tests/correctness/ThreadTest.io
+lib/io/addons/Thread/tests/correctness/run.io
diff --git a/io-thread/distinfo b/io-thread/distinfo
deleted file mode 100644
index ec40ff5..0000000
--- a/io-thread/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2009/07/04 19:48:38 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-user/Makefile b/io-user/Makefile
index d964b80..5cc9ff1 100644
--- a/io-user/Makefile
+++ b/io-user/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2012/11/14 00:16:11 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-user-${IO_VERSION}
 CATEGORIES=		sysutils
@@ -11,5 +11,5 @@ COMMENT=		User addon for Io
 
 ADDON_NAME=		User
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-user/PLIST b/io-user/PLIST
index 20efbb3..19afd8a 100644
--- a/io-user/PLIST
+++ b/io-user/PLIST
@@ -1,5 +1,25 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:48 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/User/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/User/CMakeFiles/IoUser.dir/C.includecache
+lib/io/addons/User/CMakeFiles/IoUser.dir/DependInfo.cmake
+lib/io/addons/User/CMakeFiles/IoUser.dir/build.make
+lib/io/addons/User/CMakeFiles/IoUser.dir/cmake_clean.cmake
+lib/io/addons/User/CMakeFiles/IoUser.dir/depend.internal
+lib/io/addons/User/CMakeFiles/IoUser.dir/depend.make
+lib/io/addons/User/CMakeFiles/IoUser.dir/flags.make
+lib/io/addons/User/CMakeFiles/IoUser.dir/link.txt
+lib/io/addons/User/CMakeFiles/IoUser.dir/progress.make
+lib/io/addons/User/CMakeFiles/IoUser.dir/source/IoUser.c.o
+lib/io/addons/User/CMakeFiles/IoUser.dir/source/IoUserInit.c.o
+lib/io/addons/User/CMakeFiles/progress.marks
+lib/io/addons/User/CMakeLists.txt
+lib/io/addons/User/Makefile
 lib/io/addons/User/_build/dll/libIoUser.so
-lib/io/addons/User/_build/lib/libIoUser.a
-lib/io/addons/User/build.io
+lib/io/addons/User/cmake_install.cmake
 lib/io/addons/User/depends
+lib/io/addons/User/protos
+lib/io/addons/User/source/IoUser.c
+lib/io/addons/User/source/IoUser.h
+lib/io/addons/User/source/IoUserInit.c
+lib/io/addons/User/tests/correctness/UserTest.io
+lib/io/addons/User/tests/correctness/run.io
diff --git a/io-user/distinfo b/io-user/distinfo
deleted file mode 100644
index 6e1bb5c..0000000
--- a/io-user/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:49:15 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io-vm/Makefile b/io-vm/Makefile
index ce68d1e..5681322 100644
--- a/io-vm/Makefile
+++ b/io-vm/Makefile
@@ -1,43 +1,23 @@
 # $NetBSD: Makefile,v 1.8 2012/09/30 05:44:15 asau Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
-DISTNAME=		io-${IO_VERSION}
-PKGNAME=		io-vm-${IO_VERSION}
-#PKGREVISION=		1
+PKGNAME=		${DISTNAME:S/io-/&vm-/}
 CATEGORIES=		lang
-MASTER_SITES=		${IO_MASTER_SITES}
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
 HOMEPAGE=		http://www.iolanguage.com/
 COMMENT=		Small programming language
 
-#USE_PKGLOCALEDIR=	yes
-NO_CONFIGURE=		yes
-USE_TOOLS+=		gmake pax
-BUILD_TARGET=		vm
-WRKSRC=			${WRKDIR}/io
-
-SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		pre-build
-SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
-SUBST_FILES.fix-paths=		Makefile
-SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
-
-SUBST_CLASSES+=			fix-linking
-SUBST_STAGE.fix-linking=	pre-build
-SUBST_MESSAGE.fix-linking=	Fixing linking.
-SUBST_FILES.fix-linking=	tools/Makefile
-SUBST_SED.fix-linking=		-e 's,LFLAGS +=-lm,LFLAGS +=-lm -L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib,g'
+SUBST_CLASSES+=			disable-addons
+SUBST_STAGE.disable-addons=	pre-configure
+SUBST_MESSAGE.disable-addons=	Disabling all addons
+SUBST_FILES.disable-addons=	CMakeLists.txt
+SUBST_SED.disable-addons=	-e 's,^add_subdirectory(addons),\# &,g'
 
 INSTALLATION_DIRS=		bin include/io lib lib/io lib/io/addons
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/_build/binaries/io ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/io
-	cp ${WRKSRC}/_build/headers/*.h ${DESTDIR}${PREFIX}/include/io/
-	${INSTALL_LIB} ${WRKSRC}/_build/dll/libiovmall.so  ${DESTDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/_build/lib/libiovmall.a  ${DESTDIR}${PREFIX}/lib
+post-install:
+	cd ${WRKSRC}/_build/headers && pax -rwpe . ${DESTDIR}${PREFIX}/include/io/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-vm/PLIST b/io-vm/PLIST
index 7d3d629..46b31f4 100644
--- a/io-vm/PLIST
+++ b/io-vm/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/10/11 10:44:48 thomasklausner Exp $
+@comment $NetBSD$
 bin/io
+bin/io_static
+include/io/386-ucontext.h
 include/io/BStream.h
 include/io/BStreamTag.h
 include/io/Base.h
@@ -34,6 +36,7 @@ include/io/IoDynLib.h
 include/io/IoError.h
 include/io/IoFile.h
 include/io/IoFile_stat.h
+include/io/IoInstallPrefix.h
 include/io/IoLexer.h
 include/io/IoList.h
 include/io/IoMap.h
@@ -46,6 +49,7 @@ include/io/IoObject.h
 include/io/IoObject_flow.h
 include/io/IoObject_inline.h
 include/io/IoObject_struct.h
+include/io/IoProfiler.h
 include/io/IoSandbox.h
 include/io/IoSeq.h
 include/io/IoSeq_immutable.h
@@ -83,9 +87,6 @@ include/io/PortableStdint.h
 include/io/PortableStrlcpy.h
 include/io/PortableStrptime.h
 include/io/PortableTruncate.h
-include/io/PortableUContext.h
-include/io/PortableUContext386.h
-include/io/PortableUContextPPC.h
 include/io/PortableUsleep.h
 include/io/RandomGen.h
 include/io/Stack.h
@@ -98,10 +99,15 @@ include/io/UArray_path.h
 include/io/UArray_stream.h
 include/io/UArray_string.h
 include/io/UArray_utf.h
+include/io/amd64-ucontext.h
 include/io/cdecode.h
 include/io/cencode.h
+include/io/power-ucontext.h
+include/io/taskimpl.h
 include/io/utf8.h
 include/io/utf8internal.h
 include/io/utf_convert.h
-lib/libiovmall.a
+lib/libbasekit.so
+lib/libcoroutine.so
+lib/libgarbagecollector.so
 lib/libiovmall.so
diff --git a/io-vm/buildlink3.mk b/io-vm/buildlink3.mk
index 9d341ef..a4d133c 100644
--- a/io-vm/buildlink3.mk
+++ b/io-vm/buildlink3.mk
@@ -5,8 +5,7 @@ BUILDLINK_TREE+=	io-vm
 .if !defined(IOVM_BUILDLINK3_MK)
 IOVM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.io-vm+=		io-vm>=20080904
-BUILDLINK_ABI_DEPENDS.io-vm+=		io-vm>=20080904
+BUILDLINK_API_DEPENDS.io-vm+=		io-vm>=2013.12.04
 BUILDLINK_PKGSRCDIR.io-vm?=		../../wip/io-vm
 
 BUILDLINK_INCDIRS.io-vm+=		include/io
diff --git a/io-vm/distinfo b/io-vm/distinfo
index 0f41c6a..88c62a0 100644
--- a/io-vm/distinfo
+++ b/io-vm/distinfo
@@ -1,10 +1,6 @@
 $NetBSD: distinfo,v 1.5 2009/07/04 19:49:55 milosn Exp $
 
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
-SHA1 (patch-aa) = c489c35743f270010c1b6559768462ba3ea2c904
-SHA1 (patch-ab) = 6022ea6115885089f08d75f51e9f4c3102d0a3a0
-SHA1 (patch-ac) = 854111d569f9d8e90872998d594f6770bda60072
-SHA1 (patch-ad) = 3a7ce37a3c47557ca332b8e1933ad87d959daa44
-SHA1 (patch-ae) = 559d88e7d47c8d296cab4196750db52f83a3e21a
+SHA1 (io-2013.12.04.tar.gz) = 47d9a3e7a8e14c9fbe3b376e4967bb55f6c68aed
+RMD160 (io-2013.12.04.tar.gz) = d0d7dc16b32c4994f771382813e0d107b182613b
+SHA512 (io-2013.12.04.tar.gz) = a223d58e6f9b584694a4a33aad49c8619882d3e1db52aa1f0b3915ed383c6e2477ffbd13dabe3766d5e139d13a0baf05d6e6733726cd7ed70c0c0a342d24c9bb
+Size (io-2013.12.04.tar.gz) = 9136907 bytes
diff --git a/io-vm/patches/patch-aa b/io-vm/patches/patch-aa
deleted file mode 100644
index d0c75b5..0000000
--- a/io-vm/patches/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- libs/basekit/Makefile.orig	2009-02-05 20:42:10.000000000 +0000
-+++ libs/basekit/Makefile	2009-02-05 20:42:25.000000000 +0000
-@@ -1,3 +1,4 @@
- include Makefile.lib
- CFLAGS += -DBUILDING_BASEKIT_DLL $(IOVMALLFLAGS)
- CFLAGS += -Isource/simd_cph/include
-+CFLAGS += -fPIC
diff --git a/io-vm/patches/patch-ab b/io-vm/patches/patch-ab
deleted file mode 100644
index 8800e13..0000000
--- a/io-vm/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
---- libs/coroutine/Makefile.orig	2009-02-05 20:42:45.000000000 +0000
-+++ libs/coroutine/Makefile	2009-02-05 20:43:04.000000000 +0000
-@@ -1,5 +1,6 @@
- include ../../Makefile.lib
- CFLAGS += -DBUILDING_CORO_DLL $(IOVMALLFLAGS)
-+CFLAGS += -fPIC
- 
- # Manually control which coro implementation to use
- #CFLAGS += -DUSE_UCONTEXT   	# preferred on OSX, Linux and friends
diff --git a/io-vm/patches/patch-ac b/io-vm/patches/patch-ac
deleted file mode 100644
index 927479b..0000000
--- a/io-vm/patches/patch-ac
+++ /dev/null
@@ -1,6 +0,0 @@
---- libs/garbagecollector/Makefile.orig	2009-02-05 20:43:16.000000000 +0000
-+++ libs/garbagecollector/Makefile	2009-02-05 20:43:29.000000000 +0000
-@@ -1,2 +1,3 @@
- include ../../Makefile.lib
- CFLAGS += -DBUILDING_COLLECTOR_DLL $(IOVMALLFLAGS)
-+CFLAGS += -fPIC
diff --git a/io-vm/patches/patch-ad b/io-vm/patches/patch-ad
deleted file mode 100644
index f0d6555..0000000
--- a/io-vm/patches/patch-ad
+++ /dev/null
@@ -1,6 +0,0 @@
---- libs/iovm/Makefile.orig	2009-02-05 20:43:56.000000000 +0000
-+++ libs/iovm/Makefile	2009-02-05 20:44:13.000000000 +0000
-@@ -1,2 +1,3 @@
- include ../../Makefile.lib
- CFLAGS += -DBUILDING_IOVM_DLL $(IOVMALLFLAGS)
-+CFLAGS += -fPIC
diff --git a/io-vm/patches/patch-ae b/io-vm/patches/patch-ae
deleted file mode 100644
index 404f8fc..0000000
--- a/io-vm/patches/patch-ae
+++ /dev/null
@@ -1,72 +0,0 @@
---- libs/basekit/source/PortableStdint.h.orig   2009-07-04 12:14:13.000000000 +0100
-+++ libs/basekit/source/PortableStdint.h        2009-07-04 12:17:06.000000000 +0100
-@@ -453,8 +453,8 @@
- #if !defined (stdint_int64_defined)
- # if defined(__GNUC__)
- #  define stdint_int64_defined
--   __extension__ typedef long long int64_t;
--   __extension__ typedef unsigned long long uint64_t;
-+   //__extension__ typedef long long int64_t;
-+   //__extension__ typedef unsigned long long uint64_t;
- #  define UINT64_C(v) v ## ULL
- #  define  INT64_C(v) v ## LL
- #  ifndef PRINTF_INT64_MODIFIER
-@@ -535,8 +535,8 @@
-  */
-
- #ifdef stdint_int64_defined
--  typedef int64_t intmax_t;
--  typedef uint64_t uintmax_t;
-+  //typedef int64_t intmax_t;
-+  //typedef uint64_t uintmax_t;
- # define  INTMAX_MAX   INT64_MAX
- # define  INTMAX_MIN   INT64_MIN
- # define UINTMAX_MAX  UINT64_MAX
-@@ -595,8 +595,8 @@
- # define  INT_LEAST16_MIN  INT16_MIN
- # define  INT_LEAST32_MIN  INT32_MIN
- # ifdef stdint_int64_defined
--    typedef  int64_t  int_least64_t;
--    typedef uint64_t uint_least64_t;
-+    //typedef  int64_t  int_least64_t;
-+    //typedef uint64_t uint_least64_t;
- #   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER
- #   define UINT_LEAST64_MAX UINT64_MAX
- #   define  INT_LEAST64_MAX  INT64_MAX
-@@ -616,10 +616,10 @@
-  *  stdint.h.
-  */
-
--typedef   int_least8_t   int_fast8_t;
--typedef  uint_least8_t  uint_fast8_t;
--typedef  int_least16_t  int_fast16_t;
--typedef uint_least16_t uint_fast16_t;
-+//typedef   int_least8_t   int_fast8_t;
-+//typedef  uint_least8_t  uint_fast8_t;
-+//typedef  int_least16_t  int_fast16_t;
-+//typedef uint_least16_t uint_fast16_t;
- typedef  int_least32_t  int_fast32_t;
- typedef uint_least32_t uint_fast32_t;
- #define  UINT_FAST8_MAX  UINT_LEAST8_MAX
-@@ -632,8 +632,8 @@
- #define  INT_FAST16_MIN  INT_LEAST16_MIN
- #define  INT_FAST32_MIN  INT_LEAST32_MIN
- #ifdef stdint_int64_defined
--  typedef  int_least64_t  int_fast64_t;
--  typedef uint_least64_t uint_fast64_t;
-+  //typedef  int_least64_t  int_fast64_t;
-+  //typedef uint_least64_t uint_fast64_t;
- # define UINT_FAST64_MAX UINT_LEAST64_MAX
- # define  INT_FAST64_MAX  INT_LEAST64_MAX
- # define  INT_FAST64_MIN  INT_LEAST64_MIN
-@@ -707,8 +707,8 @@
- #  ifndef UINTPTR_C
- #    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)
- #  endif
--  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
--  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
-+  //typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
-+  //typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
- # else
- /* TODO -- This following is likely wrong for some platforms, and does
-    nothing for the definition of uintptr_t. */
diff --git a/io-zlib/Makefile b/io-zlib/Makefile
index 7a54169..db89804 100644
--- a/io-zlib/Makefile
+++ b/io-zlib/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2012/11/13 22:25:33 othyro Exp $
 
-.include "../../wip/io/version.mk"
+.include "../../wip/io-base/version.mk"
 
 PKGNAME=		io-zlib-${IO_VERSION}
-#PKGREVISION=		1
 CATEGORIES=		archivers
 
 MAINTAINER=		milos.negovanovic%googlemail.com@localhost
@@ -12,5 +11,5 @@ COMMENT=		Zlib addon for Io
 
 ADDON_NAME=		Zlib
 
-.include "../../wip/io/addon.mk"
+.include "../../wip/io-base/addon.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/io-zlib/PLIST b/io-zlib/PLIST
index 864aa1f..983dccc 100644
--- a/io-zlib/PLIST
+++ b/io-zlib/PLIST
@@ -1,7 +1,30 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/11 10:44:48 thomasklausner Exp $
+@comment $NetBSD$
+lib/io/addons/Zlib/CMakeFiles/CMakeDirectoryInformation.cmake
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/C.includecache
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/DependInfo.cmake
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/build.make
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/cmake_clean.cmake
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/depend.internal
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/depend.make
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/flags.make
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/link.txt
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/progress.make
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/source/IoZlibDecoder.c.o
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/source/IoZlibEncoder.c.o
+lib/io/addons/Zlib/CMakeFiles/IoZlib.dir/source/IoZlibInit.c.o
+lib/io/addons/Zlib/CMakeFiles/progress.marks
+lib/io/addons/Zlib/CMakeLists.txt
+lib/io/addons/Zlib/Makefile
 lib/io/addons/Zlib/_build/dll/libIoZlib.so
-lib/io/addons/Zlib/_build/lib/libIoZlib.a
-lib/io/addons/Zlib/build.io
+lib/io/addons/Zlib/cmake_install.cmake
 lib/io/addons/Zlib/depends
 lib/io/addons/Zlib/io/Zlib.io
 lib/io/addons/Zlib/protos
+lib/io/addons/Zlib/source/IoZlibDecoder.c
+lib/io/addons/Zlib/source/IoZlibDecoder.h
+lib/io/addons/Zlib/source/IoZlibEncoder.c
+lib/io/addons/Zlib/source/IoZlibEncoder.h
+lib/io/addons/Zlib/source/IoZlibInit.c
+lib/io/addons/Zlib/tests/correctness/ZlibTest.io
+lib/io/addons/Zlib/tests/correctness/run.io
+lib/io/addons/Zlib/tests/correctness/test.gz
diff --git a/io-zlib/distinfo b/io-zlib/distinfo
deleted file mode 100644
index ee65ba2..0000000
--- a/io-zlib/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/07/04 19:50:29 milosn Exp $
-
-SHA1 (io-20090704.tar.bz2) = 6980857288c73a3352b2faca015240ecf29d4689
-RMD160 (io-20090704.tar.bz2) = ea10d150125a994183f8387e4bdb6482361af7fc
-Size (io-20090704.tar.bz2) = 6384013 bytes
diff --git a/io/addon.mk b/io/addon.mk
deleted file mode 100644
index fa5384b..0000000
--- a/io/addon.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: addon.mk,v 1.5 2012/09/30 05:34:21 asau Exp $
-
-.include "../../wip/io/version.mk"
-
-DISTNAME=		io-${IO_VERSION}
-MASTER_SITES=		${IO_MASTER_SITES}
-EXTRACT_SUFX=   	.tar.bz2
-
-NO_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/io
-
-TARGET_DIR= ${PREFIX}/lib/io/addons/${ADDON_NAME}
-SRC_DIR= ${WRKSRC}/addons/${ADDON_NAME}
-
-HEADER_PATHS=	append("${PREFIX}/include/io")
-LIB_PATHS=
-.for i in ${ADDON_DEPENDS_ON_ADDONS}
-HEADER_PATHS+=	append("${PREFIX}/include/io/${i}")
-LIB_PATHS+=	append("${PREFIX}/lib/io/addons/${i}/_build/dll")
-.endfor
-
-SUBST_CLASSES+=			fix-ab
-
-SUBST_STAGE.fix-ab=		pre-build
-SUBST_MESSAGE.fix-ab=		Fixing addonbuilder.
-SUBST_FILES.fix-ab=		build/AddonBuilder.io
-SUBST_SED.fix-ab=		-e 's,/usr/pkg,${PREFIX},g'
-SUBST_SED.fix-ab+=		-e 's,headerSearchPaths := List clone,headerSearchPaths := List clone ${HEADER_PATHS},g'
-SUBST_SED.fix-ab+=		-e 's,libSearchPaths := List clone,libSearchPaths := List clone ${LIB_PATHS},g'
-SUBST_SED.fix-ab+=		-e 's,linkDirPathFlag .. v,linkDirPathFlag .. v .. " ${LINKER_RPATH_FLAG}" .. v,g'
-SUBST_SED.fix-ab+=		-e 's,^.*--rpath -Wl.*$$,nil,g'
-
-
-do-build:
-	cd ${WRKSRC} && ${PREFIX}/bin/io build.io -a ${ADDON_NAME}
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${TARGET_DIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${TARGET_DIR}/_build
-	if [ -d  ${SRC_DIR}/_build/dll ]; then \
-		${CP} -rf ${SRC_DIR}/_build/dll ${DESTDIR}${TARGET_DIR}/_build/; \
-	fi
-	if [ -d ${SRC_DIR}/_build/lib ]; then \
-		${CP} -rf ${SRC_DIR}/_build/lib ${DESTDIR}${TARGET_DIR}/_build/; \
-	fi
-	if [ -d ${SRC_DIR}/io ]; then \
-		${CP} -rf ${SRC_DIR}/io ${DESTDIR}${TARGET_DIR}/; \
-	fi
-	if [ -e ${SRC_DIR}/depends ]; then \
-		${CP} -f ${SRC_DIR}/depends ${DESTDIR}${TARGET_DIR}/; \
-	fi
-	if [ -e ${SRC_DIR}/protos ]; then \
-		${CP} -f ${SRC_DIR}/protos ${DESTDIR}${TARGET_DIR}/; \
-	fi
-	if [ -e ${SRC_DIR}/build.io ]; then \
-		${CP} -f ${SRC_DIR}/build.io ${DESTDIR}${TARGET_DIR}/; \
-	fi
-	if [ ! -z "${ADDON_INSTALL_HEADERS}" ]; then \
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/io/${ADDON_NAME}; \
-		${CP} -f ${SRC_DIR}/source/*.h ${DESTDIR}${PREFIX}/include/io/${ADDON_NAME}/; \
-	fi
-
-.include "../../wip/io-vm/buildlink3.mk"
-.for i in ${ADDON_DEPENDS_ON_ADDONS}
-.include "../../wip/io-${i:tl}/buildlink3.mk"
-.endfor
diff --git a/io/version.mk b/io/version.mk
deleted file mode 100644
index 0101846..0000000
--- a/io/version.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: version.mk,v 1.4 2009/07/04 19:17:23 milosn Exp $
-
-IO_VERSION=		20090704
-IO_MASTER_SITES = 	http://milosn.no-ip.org/files/



Home | Main Index | Thread Index | Old Index