diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt
new file mode 100644
index 0000000000..2d7af54cc0
--- /dev/null
+++ b/ports/angle/CMakeLists.txt
@@ -0,0 +1,148 @@
+cmake_minimum_required(VERSION 3.8)
+project(angle)
+
+add_compile_options(/d2guard4 /Wv:18 /WX)
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /guard:cf")
+
+add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DANGLE_STANDALONE_BUILD -DANGLE_ENABLE_DEBUG_ANNOTATIONS)
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/include/id/commit.h" "#define ANGLE_COMMIT_HASH \"invalid-hash\"\n#define ANGLE_COMMIT_HASH_SIZE 12\n#define ANGLE_COMMIT_DATE \"invalid-date\"\n")
+
+include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
+
+##########
+# anglebase
+add_library(anglebase INTERFACE)
+file(GLOB_RECURSE anglebase_SOURCES "src/common/third_party/base/*.h")
+target_sources(anglebase INTERFACE ${anglebase_SOURCES})
+target_include_directories(anglebase INTERFACE src/common/third_party/base)
+
+##########
+# angle_common
+file(GLOB ANGLE_COMMON_SOURCES "src/common/*.h" "src/common/*.inl" "src/common/*.cpp")
+list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|_linux|_mac")
+add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES})
+target_link_libraries(angle_common PUBLIC anglebase)
+
+##########
+# angle_image_util
+file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inl" "src/image_util/*.cpp")
+add_library(angle_image_util STATIC ${ANGLE_IMAGE_UTIL_SOURCES})
+target_link_libraries(angle_image_util PRIVATE angle_common)
+
+##########
+# translator
+file(GLOB TRANSLATOR_SOURCES
+    "src/compiler/translator/glslang.l"
+    "src/compiler/translator/glslang.y"
+    "src/compiler/translator/*.h"
+    "src/compiler/translator/*.cpp"
+    "src/third_party/compiler/ArrayBoundsClamper.cpp"
+)
+add_library(translator STATIC ${TRANSLATOR_SOURCES})
+target_compile_definitions(translator PUBLIC
+    -DANGLE_ENABLE_ESSL
+    -DANGLE_ENABLE_GLSL
+    -DANGLE_ENABLE_HLSL
+)
+target_link_libraries(translator PRIVATE angle_common)
+
+##########
+# preprocessor
+file(GLOB PREPROCESSOR_SOURCES
+    "src/compiler/preprocessor/*.h"
+    "src/compiler/preprocessor/*.cpp"
+)
+add_library(preprocessor STATIC ${PREPROCESSOR_SOURCES})
+target_link_libraries(preprocessor PRIVATE angle_common)
+
+##########
+# libANGLE
+file(GLOB LIBANGLE_SOURCES
+    "src/third_party/systeminfo/SystemInfo.cpp"
+    "src/common/third_party/murmurhash/MurmurHash3.cpp"
+    "src/common/event_tracer.cpp"
+
+    "src/libANGLE/*.cpp"
+    "src/libANGLE/*.inl"
+    "src/libANGLE/*.h"
+
+    "src/libANGLE/renderer/*.cpp"
+    "src/libANGLE/renderer/*.inl"
+    "src/libANGLE/renderer/*.h"
+
+    "src/libANGLE/renderer/gl/*.cpp"
+    "src/libANGLE/renderer/gl/*.inl"
+    "src/libANGLE/renderer/gl/*.h"
+
+    "src/libANGLE/renderer/gl/wgl/*.cpp"
+    "src/libANGLE/renderer/gl/wgl/*.inl"
+    "src/libANGLE/renderer/gl/wgl/*.h"
+
+    # "src/libANGLE/renderer/vulkan/*.cpp"
+    # "src/libANGLE/renderer/vulkan/*.inl"
+    # "src/libANGLE/renderer/vulkan/*.h"
+
+    "src/libANGLE/renderer/null/*.cpp"
+    "src/libANGLE/renderer/null/*.inl"
+    "src/libANGLE/renderer/null/*.h"
+)
+file(GLOB_RECURSE LIBANGLE_D3D_SOURCES "src/libANGLE/renderer/d3d/*.h" "src/libANGLE/renderer/d3d/*.cpp" "src/libANGLE/renderer/d3d/*.inl")
+list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest")
+list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest|winrt")
+add_library(libANGLE STATIC ${LIBANGLE_SOURCES} ${LIBANGLE_D3D_SOURCES})
+find_library(D3D9_LIB NAMES d3d9)
+find_library(DXGUID_LIB NAMES dxguid)
+target_link_libraries(libANGLE PRIVATE angle_common angle_image_util translator ${D3D9_LIB} ${DXGUID_LIB} preprocessor)
+target_include_directories(libANGLE PRIVATE "src/third_party/khronos")
+target_compile_definitions(libANGLE PUBLIC
+    -DANGLE_ENABLE_D3D9
+    -DANGLE_ENABLE_D3D11
+    -DANGLE_ENABLE_OPENGL
+    # -DANGLE_ENABLE_VULKAN
+    -DANGLE_ENABLE_NULL
+)
+target_compile_definitions(libANGLE PRIVATE -DLIBANGLE_IMPLEMENTATION)
+
+##########
+# libGLESv2
+file(GLOB LIBGLESV2_SOURCES "src/libGLESv2/*.h" "src/libGLESv2/*.cpp" "src/libGLESv2/libGLESv2.def")
+add_library(libGLESv2 ${LIBGLESV2_SOURCES})
+target_link_libraries(libGLESv2 PRIVATE angle_common libANGLE)
+target_compile_definitions(libGLESv2 PRIVATE
+    -DLIBGLESV2_IMPLEMENTATION
+    -DLIBANGLE_IMPLEMENTATION
+    -DGL_GLEXT_PROTOTYPES
+    "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }"
+    -DGL_APICALL=
+    -DEGLAPI=
+)
+
+##########
+# libEGL
+add_library(libEGL "src/libEGL/libEGL.def" "src/libEGL/libEGL.cpp" "src/libEGL/libEGL.rc" "src/libEGL/resource.h")
+target_link_libraries(libEGL PRIVATE angle_common libANGLE libGLESv2)
+target_compile_definitions(libEGL PRIVATE
+    -DLIBANGLE_IMPLEMENTATION
+    -DGL_GLEXT_PROTOTYPES
+    "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }"
+    -DGL_APICALL=
+    -DEGLAPI=
+)
+
+
+install(TARGETS libEGL libGLESv2
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+    install(
+        DIRECTORY include/
+        DESTINATION include
+        FILES_MATCHING PATTERN "*.h"
+        PATTERN "GLSLANG" EXCLUDE
+        PATTERN "export.h" EXCLUDE
+    )
+endif()
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
new file mode 100644
index 0000000000..4f5f8880da
--- /dev/null
+++ b/ports/angle/CONTROL
@@ -0,0 +1,4 @@
+Source: angle
+Version: 2017-06-14-8d471f
+Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
+  The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
new file mode 100644
index 0000000000..4668b7dea9
--- /dev/null
+++ b/ports/angle/portfile.cmake
@@ -0,0 +1,27 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    message(STATUS "ANGLE currently only supports being built as a dynamic library")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/angle
+    REF 8d471f907d8d4ec1d46bc9366493bd76c11c1870 
+    SHA512 b9235d2a98330bc8533c3fe871129e7235c680420eac16610eae4ca7224c5284313ab6377f30ddfb8a2da39b69f3ef0d16023fe1e7cec3fc2198f4eb4bdccb26
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angle RENAME copyright)
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
index eed3c518d2..ac1b7d5c33 100644
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@@ -1,3 +1,3 @@
 Source: apr
-Version: 1.5.2
+Version: 1.6.2
 Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index f65b446491..414ca1dda5 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -7,11 +7,11 @@
 #
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-1.5.2)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-1.6.2)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.apache.org/dist/apr/apr-1.5.2.tar.bz2"
-    FILENAME "apr-1.5.2.tar.bz2"
-    SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
+    URLS "https://www.apache.org/dist/apr/apr-1.6.2.tar.bz2"
+    FILENAME "apr-1.6.2.tar.bz2"
+    SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt
new file mode 100644
index 0000000000..bb24c5b156
--- /dev/null
+++ b/ports/aubio/CMakeLists.txt
@@ -0,0 +1,90 @@
+cmake_minimum_required(VERSION 3.8)
+project(aubio C)
+
+add_definitions(
+    -DHAVE_STDLIB_H=1
+    -DHAVE_STDIO_H=1
+    -DHAVE_MATH_H=1
+    -DHAVE_STRING_H=1
+    -DHAVE_LIMITS_H=1
+    -DHAVE_STDARG_H=1
+    -DHAVE_C99_VARARGS_MACROS=1
+
+    -DHAVE_SNDFILE=1
+    -DHAVE_WAVWRITE=1
+    -DHAVE_WAVREAD=1
+    -DHAVE_LIBAV=1
+    -DHAVE_SWRESAMPLE=1
+)
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+set(CMAKE_DEBUG_POSTFIX d)
+
+option(BUILD_TOOLS "Build and install tools" ON)
+set(TOOLS_INSTALLDIR "bin" CACHE STRING "Target directory for installed tools")
+
+find_path(LIBSNDFILE_H sndfile.h)
+find_library(LIBSNDFILE_LIB NAMES libsndfile-1 libsndfile)
+find_library(AVCODEC_LIB avcodec)
+find_library(AVUTIL_LIB avutil)
+find_library(AVDEVICE_LIB avdevice)
+find_library(AVFILTER_LIB avfilter)
+find_library(AVFORMAT_LIB avformat)
+find_library(SWRESAMPLE_LIB swresample)
+find_library(OGG_LIB ogg)
+find_library(FLAC_LIB flac)
+find_library(VORBIS_LIB vorbis)
+find_library(VORBISENC_LIB vorbisenc)
+
+include_directories(src ${LIBSNDFILE_H})
+
+file(GLOB_RECURSE SOURCES src/*.c)
+
+set_source_files_properties(src/io/sink_wavwrite.c PROPERTIES COMPILE_FLAGS /FIWinsock2.h)
+add_library(aubio ${SOURCES})
+target_link_libraries(aubio PUBLIC
+    ${LIBSNDFILE_LIB}
+    ${OGG_LIB}
+    ${FLAC_LIB}
+    ${VORBIS_LIB}
+    ${VORBISENC_LIB}
+    ${AVCODEC_LIB}
+    ${AVUTIL_LIB}
+    ${AVDEVICE_LIB}
+    ${AVFILTER_LIB}
+    ${AVFORMAT_LIB}
+    ${SWRESAMPLE_LIB}
+    ws2_32.lib
+)
+
+if(BUILD_TOOLS)
+    set(EXAMPLE_EXECS aubiomfcc aubionotes aubioonset aubiopitch aubioquiet aubiotrack)
+    foreach(EXAMPLE_EXEC ${EXAMPLE_EXECS})
+        add_executable(${EXAMPLE_EXEC} examples/${EXAMPLE_EXEC}.c examples/utils.c examples/jackio.c)
+        target_link_libraries(${EXAMPLE_EXEC} PRIVATE aubio)
+        target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_WIN_HACKS=1)
+    endforeach()
+
+    install(
+        TARGETS ${EXAMPLE_EXECS}
+        RUNTIME DESTINATION ${TOOLS_INSTALLDIR}
+    )
+endif()
+
+install(
+    TARGETS aubio
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+    install(
+        DIRECTORY src/
+        DESTINATION include/aubio
+        FILES_MATCHING
+        PATTERN "*.h"
+        PATTERN "*_priv.h" EXCLUDE
+        PATTERN "config.h" EXCLUDE
+    )
+endif()
diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL
new file mode 100644
index 0000000000..3edc3db74a
--- /dev/null
+++ b/ports/aubio/CONTROL
@@ -0,0 +1,4 @@
+Source: aubio
+Version: 0.46~alpha
+Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
+Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake
new file mode 100644
index 0000000000..6f7b5fbc88
--- /dev/null
+++ b/ports/aubio/portfile.cmake
@@ -0,0 +1,34 @@
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd71bae6172359a)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/aubio/aubio/archive/3c230fae309e9ea3298783368dd71bae6172359a.zip"
+    FILENAME "aubio-0.4.6-3c230f.zip"
+    SHA512 081fe59612f0b1860f465208739b1377869c64b91cecf4a6f6fbdea19204b801c650ff956b34be5988ef1905f3546d3c55846037487e0b34b014f1adbb68629c
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS_RELEASE
+    #-DTOOLS_INSTALLDIR=tools/aubio
+    -DBUILD_TOOLS=OFF
+  OPTIONS_DEBUG
+    -DDISABLE_INSTALL_HEADERS=1
+    -DBUILD_TOOLS=OFF
+)
+vcpkg_install_cmake()
+
+# Handle copyright and credentials
+file(COPY
+    ${SOURCE_PATH}/COPYING
+    ${SOURCE_PATH}/AUTHORS
+    ${SOURCE_PATH}/ChangeLog
+    ${SOURCE_PATH}/README.md
+  DESTINATION
+    ${CURRENT_PACKAGES_DIR}/share/aubio)
+
+vcpkg_copy_pdbs()
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/aubio/COPYING ${CURRENT_PACKAGES_DIR}/share/aubio/copyright)
diff --git a/ports/aurora/CONTROL b/ports/aurora/CONTROL
new file mode 100644
index 0000000000..172c019cd0
--- /dev/null
+++ b/ports/aurora/CONTROL
@@ -0,0 +1,3 @@
+Source: aurora
+Version: 2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933
+Description: Aurora is an open-source C++ library providing various rather uncommon C++ utilities
diff --git a/ports/aurora/portfile.cmake b/ports/aurora/portfile.cmake
new file mode 100644
index 0000000000..32e3d804f9
--- /dev/null
+++ b/ports/aurora/portfile.cmake
@@ -0,0 +1,11 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Bromeon/Aurora
+    REF c75699d2a8caa726260c29b6d7a0fd35f8f28933
+    SHA512  862253e281eb441b773feb330d5ce4d7fe10769f516e927c0f875477ec912671fc35132a48986b2394f6d0a7160a5cb70afe868c597350c385ce23686b9613d6
+    HEAD_REF master
+)
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/aurora RENAME copyright)
+vcpkg_copy_pdbs()
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
new file mode 100644
index 0000000000..d8fb3681ae
--- /dev/null
+++ b/ports/corrade/CONTROL
@@ -0,0 +1,3 @@
+Source: corrade
+Version: jun2017-2
+Description: C++11/C++14 multiplatform utility library http://mosra.cz/blog/corrade.php
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
new file mode 100644
index 0000000000..3ae3710f60
--- /dev/null
+++ b/ports/corrade/portfile.cmake
@@ -0,0 +1,47 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mosra/corrade
+    REF c182fe636894a998f241212d0205d0c126b7926f
+    SHA512 e62486368eab9c5f90ef9f4af91500f465d9e3baa6e5f6e9f2a49844d09676faefcb965a9d5b27a54eda19436af6b23dcda19504be6cd0dcd52dfad2ad4bfa21
+    HEAD_REF master
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(BUILD_STATIC 1)
+else()
+    set(BUILD_STATIC 0)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS -DBUILD_STATIC=${BUILD_STATIC}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+# Drop a copy of tools
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/corrade-rc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/corrade)
+
+# Tools require dlls
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/corrade)
+
+file(GLOB_RECURSE TO_REMOVE 
+   ${CURRENT_PACKAGES_DIR}/bin/*.exe
+   ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(REMOVE ${TO_REMOVE})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/corrade)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/corrade/COPYING ${CURRENT_PACKAGES_DIR}/share/corrade/copyright)
+
+vcpkg_copy_pdbs()
\ No newline at end of file
diff --git a/ports/ctemplate/CMakeLists.txt b/ports/ctemplate/CMakeLists.txt
new file mode 100644
index 0000000000..c7cc211f41
--- /dev/null
+++ b/ports/ctemplate/CMakeLists.txt
@@ -0,0 +1,96 @@
+cmake_minimum_required(VERSION 3.5.1)
+project(libctemplate C CXX)
+
+# find_package(PythonInterp)
+if(NOT PYTHON_EXECUTABLE)
+  message(FATAL_ERROR "PYTHON_EXECUTABLE must be set")
+endif()
+
+if(MSVC)
+  add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+  add_definitions(-D_VARIADIC_MAX=10)
+endif()
+
+set(SOURCE_PATH ${PROJECT_SOURCE_DIR}/src)
+set(BASE_SOURCE_PATH ${SOURCE_PATH}/base)
+set(WINDOWS_SOURCE_PATH ${SOURCE_PATH}/windows)
+set(HTMLPARSER_SOURCE_PATH ${SOURCE_PATH}/htmlparser)
+
+set(COMMON_INCLUDES ${PROJECT_BINARY_DIR}/include)
+
+set(HTMLPARSER_CONFIG ${HTMLPARSER_SOURCE_PATH}/htmlparser_fsm.config)
+set(JSPASPER_CONFIG ${HTMLPARSER_SOURCE_PATH}/jsparser_fsm.config)
+set(FSM_GENERATOR ${HTMLPARSER_SOURCE_PATH}/generate_fsm.py)
+
+set(BASE_HEADERS
+  "${BASE_SOURCE_PATH}/arena.h"
+  "${BASE_SOURCE_PATH}/manual_constructor.h"
+  "${BASE_SOURCE_PATH}/mutex.h"
+  "${BASE_SOURCE_PATH}/small_map.h"
+  "${BASE_SOURCE_PATH}/thread_annotations.h"
+  "${BASE_SOURCE_PATH}/util.h"
+  "${BASE_SOURCE_PATH}/arena-inl.h"
+)
+
+set(
+  HTMLPARSER_HEADERS
+  "${HTMLPARSER_SOURCE_PATH}/htmlparser.h"
+  "${HTMLPARSER_SOURCE_PATH}/htmlparser_cpp.h"
+  "${HTMLPARSER_SOURCE_PATH}/jsparser.h"
+  "${HTMLPARSER_SOURCE_PATH}/statemachine.h"
+)
+set(SRC_FILES
+  "${SOURCE_PATH}/base/arena.cc"
+  "${SOURCE_PATH}/htmlparser/htmlparser.cc"
+  "${SOURCE_PATH}/htmlparser/jsparser.cc"
+  "${SOURCE_PATH}/htmlparser/statemachine.cc"
+  "${SOURCE_PATH}/per_expand_data.cc"
+  "${SOURCE_PATH}/template.cc"
+  "${SOURCE_PATH}/template_annotator.cc"
+  "${SOURCE_PATH}/template_cache.cc"
+  "${SOURCE_PATH}/template_dictionary.cc"
+  "${SOURCE_PATH}/template_modifiers.cc"
+  "${SOURCE_PATH}/template_namelist.cc"
+  "${SOURCE_PATH}/template_pathops.cc"
+  "${SOURCE_PATH}/template_string.cc"
+  "${SOURCE_PATH}/windows/port.cc"
+)
+
+file(COPY "${WINDOWS_SOURCE_PATH}/" DESTINATION ${COMMON_INCLUDES})
+file(COPY "${WINDOWS_SOURCE_PATH}/config.h" DESTINATION ${COMMON_INCLUDES}/windows)
+file(COPY "${WINDOWS_SOURCE_PATH}/port.h" DESTINATION ${COMMON_INCLUDES}/windows)
+file(COPY ${HTMLPARSER_HEADERS} DESTINATION ${COMMON_INCLUDES}/htmlparser)
+file(COPY ${BASE_HEADERS} DESTINATION ${COMMON_INCLUDES}/base)
+
+execute_process(
+  COMMAND ${PYTHON_EXECUTABLE} ${FSM_GENERATOR} ${HTMLPARSER_CONFIG}
+  WORKING_DIRECTORY ${COMMON_INCLUDES}/htmlparser
+  OUTPUT_VARIABLE  HTMLPARSER_CONFIG_H
+)
+execute_process(
+  COMMAND ${PYTHON_EXECUTABLE} ${FSM_GENERATOR} ${JSPASPER_CONFIG}
+  WORKING_DIRECTORY ${COMMON_INCLUDES}/htmlparser
+  OUTPUT_VARIABLE JSPASPER_CONFIG_H
+)
+
+file(WRITE "${COMMON_INCLUDES}/htmlparser/htmlparser_fsm.h" "${HTMLPARSER_CONFIG_H}")
+file(WRITE "${COMMON_INCLUDES}/htmlparser/jsparser_fsm.h" "${JSPASPER_CONFIG_H}")
+
+include_directories(${COMMON_INCLUDES})
+
+add_library(libctemplate ${SRC_FILES})
+if(NOT BUILD_SHARED_LIBS)
+  # Note: CTEMPLATE_DLL_DECL should be empty to build static file
+  target_compile_definitions(libctemplate PRIVATE -DCTEMPLATE_DLL_DECL=)
+endif()
+
+install(
+  TARGETS libctemplate
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(DIRECTORY "${COMMON_INCLUDES}/" DESTINATION include FILES_MATCHING PATTERN "*.h")
+endif()
diff --git a/ports/ctemplate/CONTROL b/ports/ctemplate/CONTROL
new file mode 100644
index 0000000000..eb78d4c0f7
--- /dev/null
+++ b/ports/ctemplate/CONTROL
@@ -0,0 +1,3 @@
+Source: ctemplate
+Version:  2017-06-23-44b7c5b918a08ad561c63e9d28beecb40c10ebca
+Description: C++ CTemplate system
diff --git a/ports/ctemplate/fix-msvc.patch b/ports/ctemplate/fix-msvc.patch
new file mode 100644
index 0000000000..acfbce4bfb
--- /dev/null
+++ b/ports/ctemplate/fix-msvc.patch
@@ -0,0 +1,17 @@
+diff --git a/src/per_expand_data.cc b/src/per_expand_data.cc
+index f8f3025..0a468cf 100644
+--- a/src/per_expand_data.cc
++++ b/src/per_expand_data.cc
+@@ -42,10 +42,12 @@ namespace ctemplate {
+ 
+ using std::string;
+ 
++#ifndef _MSC_VER
+ bool PerExpandData::DataEq::operator()(const char* s1, const char* s2) const {
+   return ((s1 == 0 && s2 == 0) ||
+           (s1 && s2 && *s1 == *s2 && strcmp(s1, s2) == 0));
+ }
++#endif
+ 
+ PerExpandData::~PerExpandData() {
+   delete map_;
diff --git a/ports/ctemplate/portfile.cmake b/ports/ctemplate/portfile.cmake
new file mode 100644
index 0000000000..af1f0532cd
--- /dev/null
+++ b/ports/ctemplate/portfile.cmake
@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+set(GIT_REF 44b7c5b918a08ad561c63e9d28beecb40c10ebca)
+vcpkg_from_github(
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO OlafvdSpek/ctemplate
+  REF 44b7c5b918a08ad561c63e9d28beecb40c10ebca
+  SHA512 b572f6d0d182e977d3a459e68bde6244dad7196c44c16407990dc1fb6a7a93bcd8d6851e515d50b6051c1d011f71695f895f6ab233664baadae0bf6a3d464305
+  HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_find_acquire_program(PYTHON2)
+
+vcpkg_apply_patches(
+  SOURCE_PATH ${SOURCE_PATH}
+  PATCHES
+  ${CMAKE_CURRENT_LIST_DIR}/fix-msvc.patch
+)
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  OPTIONS -DPYTHON_EXECUTABLE=${PYTHON2}
+  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctemplate RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/dirent/CONTROL b/ports/dirent/CONTROL
new file mode 100644
index 0000000000..50f6d7ede0
--- /dev/null
+++ b/ports/dirent/CONTROL
@@ -0,0 +1,3 @@
+Source: dirent
+Version: 2017-06-23-5c7194c2fe2c68c1a8212712c0b4b6195382d27d
+Description: Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.
diff --git a/ports/dirent/portfile.cmake b/ports/dirent/portfile.cmake
new file mode 100644
index 0000000000..9476a8dcdb
--- /dev/null
+++ b/ports/dirent/portfile.cmake
@@ -0,0 +1,11 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tronkko/dirent
+    REF 8b1db5092479a73d47eafd3de739b27e876e6bf3
+    SHA512 f529aa65c2a4b8249c1291f3bccad25fa3a9c2146a2c74abc0a4710f68e2bd6f73cd52682bb406fbcab71d6a5225a354f9e8bdc22ce63b7a4e64bb65bab34b9f
+    HEAD_REF master
+)
+file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/dirent RENAME copyright)
+vcpkg_copy_pdbs()
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL
index d6e01c6ccf..4dd1cd983c 100644
--- a/ports/eigen3/CONTROL
+++ b/ports/eigen3/CONTROL
@@ -1,3 +1,3 @@
 Source: eigen3
-Version: 3.3.3-2
+Version: 3.3.3-3
 Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.
diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake
index 229da45e7c..ba968950a6 100644
--- a/ports/eigen3/portfile.cmake
+++ b/ports/eigen3/portfile.cmake
@@ -21,6 +21,10 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Targets.cmake" EIGEN_TARGETS)
+string(REPLACE "set(_IMPORT_PREFIX " "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_DIR}/../..\" ABSOLUTE) #" EIGEN_TARGETS "${EIGEN_TARGETS}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Targets.cmake" "${EIGEN_TARGETS}")
+
 # Put the licence file where vcpkg expects it
 file(COPY ${SOURCE_PATH}/COPYING.README DESTINATION ${CURRENT_PACKAGES_DIR}/share/eigen3)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/eigen3/COPYING.README ${CURRENT_PACKAGES_DIR}/share/eigen3/copyright)
diff --git a/ports/kinectsdk1/CONTROL b/ports/kinectsdk1/CONTROL
new file mode 100644
index 0000000000..3d4c83fd28
--- /dev/null
+++ b/ports/kinectsdk1/CONTROL
@@ -0,0 +1,3 @@
+Source: kinectsdk1
+Version: 1.8-1
+Description: Kinect for Windows SDK for Kinect v1 sensor.
diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake
new file mode 100644
index 0000000000..aef4cd1c2f
--- /dev/null
+++ b/ports/kinectsdk1/portfile.cmake
@@ -0,0 +1,42 @@
+include(vcpkg_common_functions)
+
+get_filename_component(KINECTSDK10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Kinect;SDKInstallPath]" ABSOLUTE CACHE)
+if(NOT EXISTS "${KINECTSDK10_DIR}")
+    message(FATAL_ERROR "Error: Could not find Kinect for Windows SDK v1.x. It can be downloaded from https://www.microsoft.com/en-us/download/details.aspx?id=40278.")
+endif()
+
+file(
+    INSTALL
+        "${KINECTSDK10_DIR}/inc/NuiApi.h"
+        "${KINECTSDK10_DIR}/inc/NuiImageCamera.h"
+        "${KINECTSDK10_DIR}/inc/NuiSensor.h"
+        "${KINECTSDK10_DIR}/inc/NuiSkeleton.h"
+    DESTINATION
+        ${CURRENT_PACKAGES_DIR}/include
+)
+
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+    set(ARCHITECTURE x86)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    set(ARCHITECTURE amd64)
+else()
+    message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+file(
+    INSTALL
+        "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib"
+    DESTINATION
+        ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(
+    INSTALL
+        "${KINECTSDK10_DIR}/lib/${ARCHITECTURE}/Kinect10.lib"
+    DESTINATION
+        ${CURRENT_PACKAGES_DIR}/debug/lib
+)
+
+# Handle copyright
+file(COPY "${KINECTSDK10_DIR}/SDKEula.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/kinectsdk1)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/kinectsdk1/SDKEula.rtf ${CURRENT_PACKAGES_DIR}/share/kinectsdk1/copyright)
\ No newline at end of file
diff --git a/ports/magnum-plugins/001-tools-path.patch b/ports/magnum-plugins/001-tools-path.patch
new file mode 100644
index 0000000000..18a351c2ea
--- /dev/null
+++ b/ports/magnum-plugins/001-tools-path.patch
@@ -0,0 +1,26 @@
+diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
+index e63bc03..052006f 100644
+--- a/modules/FindCorrade.cmake
++++ b/modules/FindCorrade.cmake
+@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
+         if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS})
+             add_executable(Corrade::${_component} IMPORTED)
+ 
+-            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component})
++            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade)
+             mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE)
+ 
+             if(CORRADE_${_COMPONENT}_EXECUTABLE)
+diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
+index 8df555d..12f7aa4 100644
+--- a/modules/FindMagnum.cmake
++++ b/modules/FindMagnum.cmake
+@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
+         if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS})
+             add_executable(Magnum::${_component} IMPORTED)
+ 
+-            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component})
++            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum)
+             mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE)
+ 
+             if(MAGNUM_${_COMPONENT}_EXECUTABLE)
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
new file mode 100644
index 0000000000..f6e194c9f4
--- /dev/null
+++ b/ports/magnum-plugins/CONTROL
@@ -0,0 +1,4 @@
+Source: magnum-plugins
+Version: jun2017-4
+Build-Depends: stb, magnum
+Description: Plugins for C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
new file mode 100644
index 0000000000..b262624909
--- /dev/null
+++ b/ports/magnum-plugins/portfile.cmake
@@ -0,0 +1,75 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mosra/magnum-plugins
+    REF 34a3bc34335ca05097e735db19fe1fae81dbfbb5
+    SHA512 918c3eeae246d1ac67e3595c50ff599872a0c1498e9a8a0386ad656f3d9d2209b048b53c25f198660e15201147795578c5c931b00116da46fd77d8e91c0826cb
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/001-tools-path.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(BUILD_STATIC 1)
+    set(BUILD_PLUGINS_STATIC 1)
+else()
+    set(BUILD_STATIC 0)
+    set(BUILD_PLUGINS_STATIC 0)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DWITH_STBIMAGECONVERTER=ON
+        -DWITH_STBIMAGEIMPORTER=ON
+        -DWITH_STBTRUETYPEFONT=ON
+        -DWITH_STBTRUETYPEFONT=ON
+        -DWITH_MINIEXRIMAGECONVERTER=ON
+        -DWITH_OPENGEXIMPORTER=ON
+        -DWITH_OPENGEXIMPORTER=ON
+        -DWITH_STANFORDIMPORTER=ON
+        -DWITH_DRWAVAUDIOIMPORTER=ON
+        -DWITH_ANYAUDIOIMPORTER=ON
+        -DWITH_ANYIMAGECONVERTER=ON
+        -DWITH_ANYSCENEIMPORTER=ON
+        -DBUILD_STATIC=${BUILD_STATIC}
+        -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
+        -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
+        -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+   # move plugin libs to conventional place
+   file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*)
+   file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
+   file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*)
+   file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
+else()
+   # remove headers and libs for plugins
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib)
+   # hint vcpkg
+   set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+   set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/magnum-plugins)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/magnum-plugins/COPYING ${CURRENT_PACKAGES_DIR}/share/magnum-plugins/copyright)
+
+vcpkg_copy_pdbs()
\ No newline at end of file
diff --git a/ports/magnum/001-sdl-includes.patch b/ports/magnum/001-sdl-includes.patch
new file mode 100644
index 0000000000..afa1301d91
--- /dev/null
+++ b/ports/magnum/001-sdl-includes.patch
@@ -0,0 +1,20 @@
+diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
+index 99c3174..311b2c1 100644
+--- a/src/Magnum/Platform/Sdl2Application.h
++++ b/src/Magnum/Platform/Sdl2Application.h
+@@ -42,11 +42,11 @@
+ #ifdef CORRADE_TARGET_WINDOWS /* Windows version of SDL2 redefines main(), we don't want that */
+ #define SDL_MAIN_HANDLED
+ #endif
+-#include <SDL.h>
+-#include <SDL_scancode.h>
++#include <SDL2/SDL.h>
++#include <SDL2/SDL_scancode.h>
+ 
+ #ifdef CORRADE_TARGET_WINDOWS_RT
+-#include <SDL_main.h> /* For SDL_WinRTRunApp */
++#include <SDL2/SDL_main.h> /* For SDL_WinRTRunApp */
+ #include <wrl.h> /* For the WinMain entrypoint */
+ #endif
+ 
+
diff --git a/ports/magnum/002-tools-path.patch b/ports/magnum/002-tools-path.patch
new file mode 100644
index 0000000000..18a351c2ea
--- /dev/null
+++ b/ports/magnum/002-tools-path.patch
@@ -0,0 +1,26 @@
+diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake
+index e63bc03..052006f 100644
+--- a/modules/FindCorrade.cmake
++++ b/modules/FindCorrade.cmake
+@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS})
+         if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS})
+             add_executable(Corrade::${_component} IMPORTED)
+ 
+-            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component})
++            find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade)
+             mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE)
+ 
+             if(CORRADE_${_COMPONENT}_EXECUTABLE)
+diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
+index 8df555d..12f7aa4 100644
+--- a/modules/FindMagnum.cmake
++++ b/modules/FindMagnum.cmake
+@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
+         if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS})
+             add_executable(Magnum::${_component} IMPORTED)
+ 
+-            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component})
++            find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum)
+             mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE)
+ 
+             if(MAGNUM_${_COMPONENT}_EXECUTABLE)
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
new file mode 100644
index 0000000000..a040014daf
--- /dev/null
+++ b/ports/magnum/CONTROL
@@ -0,0 +1,4 @@
+Source: magnum
+Version: jun2017-5
+Build-Depends: corrade, sdl2, openal-soft
+Description: C++11/C++14 and OpenGL graphics engine http://mosra.cz/blog/magnum.php
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
new file mode 100644
index 0000000000..9eff36dcff
--- /dev/null
+++ b/ports/magnum/portfile.cmake
@@ -0,0 +1,88 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mosra/magnum
+    REF ed7eac0b42a598dff8984830e7f943dd6af07deb
+    SHA512 843e209b82b4f6f7c3f9612aec2641a28cb09361eefefe435bb7d2c06d0e4df65b6b9adf5893222cf31ddc3ccec967eb343da1da6180e9fbfef1b26234e145d5
+    HEAD_REF master
+)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/001-sdl-includes.patch 
+        ${CMAKE_CURRENT_LIST_DIR}/002-tools-path.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(BUILD_STATIC 1)
+    set(BUILD_PLUGINS_STATIC 1)
+else()
+    set(BUILD_STATIC 0)
+    set(BUILD_PLUGINS_STATIC 0)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DWITH_SDL2APPLICATION=ON
+        -DWITH_WINDOWLESSWGLAPPLICATION=ON
+        -DWITH_WGLCONTEXT=ON
+        -DWITH_OPENGLTESTER=ON
+        -DWITH_AUDIO=ON
+        -DWITH_WAVAUDIOIMPORTER=ON
+        -DWITH_MAGNUMFONT=ON
+        -DWITH_MAGNUMFONTCONVERTER=ON
+        -DWITH_OBJIMPORTER=ON
+        -DWITH_TGAIMPORTER=ON
+        -DWITH_DISTANCEFIELDCONVERTER=ON
+        -DWITH_FONTCONVERTER=ON
+        -DWITH_TGAIMAGECONVERTER=ON
+        -DBUILD_STATIC=${BUILD_STATIC}
+        -DBUILD_PLUGINS_STATIC=${BUILD_PLUGINS_STATIC}
+        -DMAGNUM_PLUGINS_DEBUG_DIR=${CURRENT_INSTALLED_DIR}/debug/bin/magnum-d
+        -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum
+        --trace
+)
+
+vcpkg_install_cmake()
+
+# Drop a copy of tools
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-distancefieldconverter.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/magnum-fontconverter.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/magnum)
+
+# Tools require dlls
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/magnum)
+
+file(GLOB_RECURSE TO_REMOVE 
+   ${CURRENT_PACKAGES_DIR}/bin/*.exe
+   ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(REMOVE ${TO_REMOVE})
+
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+   # move plugin libs to conventional place
+   file(GLOB_RECURSE LIB_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/magnum/*)
+   file(COPY ${LIB_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
+   file(GLOB_RECURSE LIB_TO_MOVE_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/magnum/*)
+   file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
+else()
+   # remove headers and libs for plugins
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/MagnumPlugins)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
+   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/magnum)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/magnum/COPYING ${CURRENT_PACKAGES_DIR}/share/magnum/copyright)
+
+vcpkg_copy_pdbs()
\ No newline at end of file
diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL
index aaf569f25b..a360612852 100644
--- a/ports/qhull/CONTROL
+++ b/ports/qhull/CONTROL
@@ -1,3 +1,3 @@
 Source: qhull
-Version:1.0
+Version: 2015.2
 Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake
index 77c585b403..493a14e385 100644
--- a/ports/qhull/portfile.cmake
+++ b/ports/qhull/portfile.cmake
@@ -1,7 +1,7 @@
 # Common Ambient Variables:
 #   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
 #   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
 #   PORT                      = current port name (zlib, etc)
 #   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
 #   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
@@ -13,33 +13,45 @@
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
+    OUT_SOURCE_PATH SOURCE_PATH
     REPO qhull/qhull
-	REF  master
-    SHA512 16aa9f93ce6fe8342a3b579881f10bb417679b0a70849e6b0cc5a89551e4de773a43bb0d54948196690d68d168f3a2a215e4600745ff1566302b0b426565fb25	
+    REF 5a79a0009454c86e9848646b3c296009125231bf # Qhull 2015.2
+    SHA512 ebcbf452eff420c62f92b734e5359b275493930b3e6798801eb1a81aa4fbf631b41e298a6071698c3b18c0939c55ddbc1b66b7019091bb4988dcfc7deb25e287
+    HEAD_REF master
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-     #PREFER_NINJA # Disable this option if project cannot be built with Ninja
-     OPTIONS 
-	-DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
-    -DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
-	-DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
-	 
-	 OPTIONS_RELEASE
-    -Dqhull_TARGETS_INSTALL=qhullcpp	 
-	-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib
-     
-	 OPTIONS_DEBUG	 
-	-Dqhull_TARGETS_INSTALL=qhullcpp_d	  	 
-	-DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib	 
+    #PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS 
+        -DINCLUDE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/include
+        -DMAN_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
+        -DDOC_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/doc/qhull
+    OPTIONS_RELEASE
+        -DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib
+    OPTIONS_DEBUG
+        -DLIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib
 )
 
 vcpkg_install_cmake()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(GLOB_RECURSE HTMFILES ${CURRENT_PACKAGES_DIR}/include/*.htm)
 file(REMOVE ${HTMFILES})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)
+
+file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qhull)
+file(COPY ${EXEFILES_DEBUG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/qhull)
+file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_d.lib)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_p.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_pd.lib)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/qhull_r.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qhull_rd.lib)
+endif()
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/qhull)
diff --git a/ports/rtmidi/CMakeLists.txt b/ports/rtmidi/CMakeLists.txt
new file mode 100644
index 0000000000..91782fd181
--- /dev/null
+++ b/ports/rtmidi/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.8)
+project(rtmidi CXX)
+
+add_library(rtmidi RtMidi.cpp rtmidi_c.cpp)
+if(BUILD_SHARED_LIBS)
+  target_compile_definitions(rtmidi PRIVATE -DRTMIDI_EXPORT)
+endif()
+
+file(READ "${PROJECT_SOURCE_DIR}/rtmidi_c.h" RTMIDI_EXPORT)
+if (BUILD_SHARED_LIBS)
+  string(REPLACE "if defined(RTMIDI_EXPORT)" "if 1" RTMIDI_EXPORT "${RTMIDI_EXPORT}")
+else()
+  string(REPLACE "if defined(RTMIDI_EXPORT)" "if 0" RTMIDI_EXPORT "${RTMIDI_EXPORT}")
+endif()
+file(WRITE "${PROJECT_BINARY_DIR}/rtmidi_c.h" "${RTMIDI_EXPORT}")
+
+install(
+  TARGETS rtmidi
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES "RtMidi.h" DESTINATION include)
+  install(FILES "${PROJECT_BINARY_DIR}/rtmidi_c.h" DESTINATION include)
+endif()
diff --git a/ports/rtmidi/CONTROL b/ports/rtmidi/CONTROL
new file mode 100644
index 0000000000..9057812a05
--- /dev/null
+++ b/ports/rtmidi/CONTROL
@@ -0,0 +1,3 @@
+Source: rtmidi
+Version: 2.1.1-1
+Description: A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)
diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake
new file mode 100644
index 0000000000..cee6e1a73a
--- /dev/null
+++ b/ports/rtmidi/portfile.cmake
@@ -0,0 +1,20 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO thestk/rtmidi
+    REF  2.1.1
+    SHA512 4d378720dd0f7c0e1a87741c088756839878ed56465b053040f70a1e039828fe221a6b1669b77b2fdd146cb192934c5719cc934c2c6a6304f44dbee2972c68e8
+    HEAD_REF master
+)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+
+file(INSTALL ${SOURCE_PATH}/readme DESTINATION ${CURRENT_PACKAGES_DIR}/share/rtmidi RENAME copyright)
diff --git a/ports/thor/CONTROL b/ports/thor/CONTROL
new file mode 100644
index 0000000000..46396427bc
--- /dev/null
+++ b/ports/thor/CONTROL
@@ -0,0 +1,4 @@
+Source: thor
+Version: v2.0
+Description: Extends the multimedia library SFML with higher-level features
+Build-Depends: sfml, aurora
diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake
new file mode 100644
index 0000000000..c96df47284
--- /dev/null
+++ b/ports/thor/portfile.cmake
@@ -0,0 +1,70 @@
+include(vcpkg_common_functions)
+
+
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/tests)
+vcpkg_from_github(ARCHIVE
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO Bromeon/Thor
+  REF v2.0
+  SHA512 634fa5286405d9a8a837c082ace98bbb02e609521418935855b9e2fcad57003dbe35088bd771cf6a9292e55d3787f7e463d7a4cca0d0f007509de2520d9a8cf9
+  HEAD_REF master
+)
+
+file(COPY ${CURRENT_INSTALLED_DIR}/include/Aurora DESTINATION ${SOURCE_PATH}/extlibs/aurora/include)
+
+
+set(ENV{SFML_ROOT} ${CURRENT_INSTALLED_DIR})
+
+if(VCPKG_CRT_LINKAGE STREQUAL static)
+  set(THOR_STATIC_STD_LIBS  ON)
+else()
+  set(THOR_STATIC_STD_LIBS  OFF)
+endif()
+
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  set(THOR_SHARED_LIBS ON)
+else()
+  set(THOR_SHARED_LIBS OFF)
+endif()
+
+vcpkg_configure_cmake(
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+  -DTHOR_SHARED_LIBS=${THOR_SHARED_LIBS}
+  -DTHOR_STATIC_STD_LIBS=${THOR_STATIC_STD_LIBS}
+)
+
+vcpkg_install_cmake()
+
+
+set(CONFIG_FILE "${CURRENT_PACKAGES_DIR}/include/Thor/Config.hpp")
+
+file(READ ${CONFIG_FILE} CONFIG_H)
+   if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+       string(REPLACE "defined(SFML_STATIC)" "1" CONFIG_H "${CONFIG_H}")
+   else()
+       string(REPLACE "defined(SFML_STATIC)" "0" CONFIG_H "${CONFIG_H}")
+   endif()
+
+file(WRITE ${CONFIG_FILE} "${CONFIG_H}")
+
+file(GLOB LICENSE
+  "${CURRENT_PACKAGES_DIR}/debug/LicenseThor.txt"
+  "${CURRENT_PACKAGES_DIR}/debug/LicenseAurora.txt"
+  "${CURRENT_PACKAGES_DIR}/LicenseThor.txt"
+  "${CURRENT_PACKAGES_DIR}/LicenseAurora.txt"
+)
+
+if(LICENSE)
+  file(REMOVE ${LICENSE})
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/Aurora)
+
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/thor RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL
index ee5e20f342..aaa9a7c4fd 100644
--- a/ports/tinyxml2/CONTROL
+++ b/ports/tinyxml2/CONTROL
@@ -1,3 +1,3 @@
 Source: tinyxml2
-Version: 5.0.0
-Description: A simple, small, efficient, C++ XML parser
\ No newline at end of file
+Version: 5.0.1
+Description: A simple, small, efficient, C++ XML parser
diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake
index 59184178db..0c8b0b84b2 100644
--- a/ports/tinyxml2/portfile.cmake
+++ b/ports/tinyxml2/portfile.cmake
@@ -3,13 +3,21 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO leethomason/tinyxml2
-    REF 5.0.0
-    SHA512 ef310a466d0aec9dd0d25063c68f5312cd063366ee57499d8e462e25a556ea510617b66cdec1a368e8867dc082e0297e27fe09f16eb915392235be34206881e4
+    REF 5.0.1
+    SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
     HEAD_REF master
 )
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  set(BUILD_STATIC_LIBS 1)
+else()
+  set(BUILD_STATIC_LIBS 0)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+      -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
 )
 
 vcpkg_install_cmake()