microsoft · Neumann-A · Jun 24, 2019 · Aug 2, 2019 · Aug 5, 2019 · Aug 5, 2019
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
@@ -1,5 +1,5 @@
 Source: arrow
-Version: 0.14.1-1
+Version: 0.14.1-2
 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
 Homepage: https://github.com/apache/arrow
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch
@@ -25,7 +25,7 @@ index 8410916..a196b25 100644
 +endif()
 
 -set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
-+set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_MSVC_STATIC_LIB_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
++set(LZ4_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_MSVC_STATIC_LIB_SUFFIX}${LZ4_LIB_NAME_DEBUG_SUFFIX})
 
  if(LZ4_ROOT)
    find_library(
@@ -99,7 +99,7 @@ index 8e47086..d7ce559 100644
 +  set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
 +endif()
 +
-+set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
++set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}")
  set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
 
  # First, find via if specified ZTD_ROOT

diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
@@ -1,5 +1,5 @@
 Source: curl
-Version: 7.66.0
+Version: 7.66.0-1
 Build-Depends: zlib
 Homepage: https://github.com/curl/curl
 Description: A library for transferring data with URLs

diff --git a/ports/fluidsynth/CONTROL b/ports/fluidsynth/CONTROL
@@ -1,4 +1,4 @@
 Source: fluidsynth
-Version: 2.0.5-1
+Version: 2.0.5-2 
 Description: FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.
 Build-Depends: glib
diff --git a/ports/fluidsynth/Genexp.patch b/ports/fluidsynth/Genexp.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake_admin/FluidUnitTest.cmake b/cmake_admin/FluidUnitTest.cmake
+index 367a406c5..77f5703a9 100644
+--- a/cmake_admin/FluidUnitTest.cmake	
++++ b/cmake_admin/FluidUnitTest.cmake
+@@ -8,7 +8,7 @@ macro ( ADD_FLUID_TEST _test )
+     if ( FLUID_CPPFLAGS )
+         set_target_properties ( ${_test} PROPERTIES COMPILE_FLAGS ${FLUID_CPPFLAGS} )
+     endif ( FLUID_CPPFLAGS )
+-    TARGET_LINK_LIBRARIES(${_test} $<TARGET_PROPERTY:libfluidsynth,INTERFACE_LINK_LIBRARIES>)
++    TARGET_LINK_LIBRARIES(${_test} $<GENEX_EVAL:$<TARGET_PROPERTY:libfluidsynth,INTERFACE_LINK_LIBRARIES>>)
+
+     # use the local include path to look for fluidsynth.h, as we cannot be sure fluidsynth is already installed
+     target_include_directories(${_test}
diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     SHA512 5344ac889d2927dc2465bae40096d756a9bf9b1100e287ba0621c55ffc76f9cb8fa763f6bc832d701cd0ad2997965cf344f58ae4b3dd445eb3491e3659c093d9
     HEAD_REF master
     PATCHES
+       Genexp.patch
        force-x86-gentables.patch
 )
 

diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL
@@ -1,4 +1,4 @@
 Source: forge
-Version: 1.0.4-1
+Version: 1.0.4-3
 Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
 Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
diff --git a/ports/forge/FindFreeImage.patch b/ports/forge/FindFreeImage.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeModules/FindFreeImage.cmake b/CMakeModules/FindFreeImage.cmake
+index f305d7f41..94bf04117 100644
+--- a/CMakeModules/FindFreeImage.cmake	
++++ b/CMakeModules/FindFreeImage.cmake
+@@ -65,9 +65,8 @@ find_library(FreeImage_LINK_LIBRARY
+
+ find_library(FreeImage_STATIC_LIBRARY
+   NAMES
+-    ${CMAKE_STATIC_LIBRARY_PREFIX}FreeImageLIB${CMAKE_STATIC_LIBRARY_SUFFIX}
+-    ${CMAKE_STATIC_LIBRARY_PREFIX}FreeImage${CMAKE_STATIC_LIBRARY_SUFFIX}
+-    ${CMAKE_STATIC_LIBRARY_PREFIX}freeimage${CMAKE_STATIC_LIBRARY_SUFFIX}
++    ${CMAKE_STATIC_LIBRARY_PREFIX}FreeImageLIB
++    ${CMAKE_STATIC_LIBRARY_PREFIX}FreeImage
+   PATHS
+     /usr
+     /usr/local
+@@ -83,14 +82,11 @@ find_library(FreeImage_STATIC_LIBRARY
+ if (WIN32)
+   find_file(FreeImage_DLL_LIBRARY
+     NAMES
+-      ${CMAKE_SHARED_LIBRARY_PREFIX}FreeImage${CMAKE_SHARED_LIBRARY_SUFFIX}
+-      ${CMAKE_SHARED_LIBRARY_PREFIX}freeimage${CMAKE_SHARED_LIBRARY_SUFFIX}
++      ${CMAKE_SHARED_LIBRARY_PREFIX}FreeImage
++      ${CMAKE_SHARED_LIBRARY_PREFIX}freeimage
+     PATHS
+       ${FreeImage_ROOT}
+     PATH_SUFFIXES
+-      lib
+-      lib64
+-      x64/lib
+       bin
+       x64/bin
+     DOC "The FreeImage dll")
diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
     SHA512 2093464db0f3a7f0178f65bed37986a4df1117f1d7ad65157d525584490cdf234475f01ed1a2003a9e54bdc3b9e2e450808044a264c2284d67b8c2a353400027
     HEAD_REF master
 	PATCHES fix-static_build.patch
+            FindFreeImage.patch
 )
 
 vcpkg_configure_cmake(

diff --git a/ports/g2o/CONTROL b/ports/g2o/CONTROL
@@ -1,5 +1,5 @@
 Source: g2o
 Version: 20170730_git-5
 Build-Depends: suitesparse, eigen3, clapack (!osx), ceres
-Description: g2o: A General Framework for Graph Optimization
+Description: g2o: A General Framework for Graph Optimization 
 Homepage: https://openslam.org/g2o.html
diff --git a/ports/gppanel/CONTROL b/ports/gppanel/CONTROL
@@ -1,5 +1,5 @@
 Source: gppanel
-Version: 2018-04-06
+Version: 2018-04-06_1
 Build-Depends: wxwidgets
 Homepage: https://github.com/woollybah/gppanel
 Description: gpPanel is chart libary for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine. 
diff --git a/ports/gppanel/FindwxWidgets.patch b/ports/gppanel/FindwxWidgets.patch
@@ -0,0 +1,36 @@
+diff --git a/FindwxWidgets.cmake b/FindwxWidgets.cmake
+index 22d7e7315..74c91d0fd 100644
+--- a/FindwxWidgets.cmake	
++++ b/FindwxWidgets.cmake
+@@ -281,6 +281,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+     find_library(WX_base${_DBG}
+       NAMES
+       wxbase31${_UCD}${_DBG}
++      wxbase31${_UCD}
+       wxbase30${_UCD}${_DBG}
+       wxbase29${_UCD}${_DBG}
+       wxbase28${_UCD}${_DBG}
+@@ -295,6 +296,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+       find_library(WX_${LIB}${_DBG}
+         NAMES
+         wxbase31${_UCD}${_DBG}_${LIB}
++        wxbase31${_UCD}_${LIB}
+         wxbase30${_UCD}${_DBG}_${LIB}
+         wxbase29${_UCD}${_DBG}_${LIB}
+         wxbase28${_UCD}${_DBG}_${LIB}
+@@ -311,6 +313,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+     find_library(WX_mono${_DBG}
+       NAMES
+       wxmsw${_UNV}31${_UCD}${_DBG}
++      wxmsw${_UNV}31${_UCD}
+       wxmsw${_UNV}30${_UCD}${_DBG}
+       wxmsw${_UNV}29${_UCD}${_DBG}
+       wxmsw${_UNV}28${_UCD}${_DBG}
+@@ -328,6 +331,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
+       find_library(WX_${LIB}${_DBG}
+         NAMES
+         wxmsw${_UNV}31${_UCD}${_DBG}_${LIB}
++        wxmsw${_UNV}31${_UCD}_${LIB}
+         wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
+         wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
+         wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
diff --git a/ports/gppanel/portfile.cmake b/ports/gppanel/portfile.cmake
@@ -13,13 +13,15 @@ vcpkg_from_github(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
+
 vcpkg_from_github(
     OUT_SOURCE_PATH VCPKG_WX_FIND_SOURCE_PATH
     REPO CaeruleusAqua/vcpkg-wx-find
     REF 17993e942f677799b488a06ca659a8e46ff272c9
     SHA512 0fe07d3669f115c9b6a761abd7743f87e67f24d1eae3f3abee4715fa4d6b76af0d1ea3a4bd82dbdbed430ae50295e1722615ce0ee7d46182125f5048185ee153
     HEAD_REF master
-)
+    PATCHES FindwxWidgets.patch
+) # Hmm. How is this different from the CMake version of FindwxWidget? Issue #4756 -> should probably be solved with a vcpkg_cmake_wrapper.cmake
 
 file(COPY ${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake DESTINATION ${VCPKG_WX_FIND_SOURCE_PATH})
 file(COPY ${CMAKE_ROOT}/Modules/FindPackageMessage.cmake DESTINATION ${VCPKG_WX_FIND_SOURCE_PATH})

diff --git a/ports/liblas/fix-BuildError.patch b/ports/liblas/fix-BuildError.patch
@@ -41,7 +41,7 @@ index e35de06..f7c25d2 100644
    ${LASZIP_LIBRARY}
 -  ${Boost_LIBRARIES})
 +  ${Boost_LIBRARIES}
-+  proj)
++  ${PROJ4_LIBRARY})
 
  target_link_libraries(${LIBLAS_C_LIB_NAME}
    ${LIBLAS_LIB_NAME} )
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL
@@ -1,5 +1,5 @@
 Source: libmysql
-Version: 8.0.4-4
+Version: 8.0.4-4 
 Homepage: https://github.com/mysql/mysql-server
 Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib
 Description: A MySQL client library for C development.
diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL
@@ -1,4 +1,4 @@
 Source: openmvs
-Version: 1.0-1
+Version: 1.0-3
 Description: OpenMVS: open Multi-View Stereo reconstruction library
 Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib
diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake
@@ -27,37 +27,30 @@ else()
   vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/OpenMVS)
 endif()
 
-#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
-if(CMAKE_HOST_WIN32)
-set(EXECUTABLE_SUFFIX ".exe")
-else()
-set(EXECUTABLE_SUFFIX "")
-endif()
-
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/DensifyPointCloud${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceCOLMAP${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceVisualSFM${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/ReconstructMesh${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/RefineMesh${VCPKG_HOST_EXECUTABLE_SUFFIX})
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/TextureMesh${VCPKG_HOST_EXECUTABLE_SUFFIX})
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openmvs/)
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX}")
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/DensifyPointCloud${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/DensifyPointCloud${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX}")
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceCOLMAP${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceCOLMAP${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX}")
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceVisualSFM${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceVisualSFM${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX}")
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/ReconstructMesh${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/ReconstructMesh${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX}")
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/RefineMesh${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/RefineMesh${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX}")
-  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/TextureMesh${EXECUTABLE_SUFFIX})
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/TextureMesh${VCPKG_HOST_EXECUTABLE_SUFFIX})
 endif()
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openmvs)
 

diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL
@@ -1,5 +1,5 @@
 Source: orc
-Version: 1.5.6
+Version: 1.5.6 
 Homepage: https://orc.apache.org/
 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest
 Description: The smallest, fastest columnar storage for Hadoop workloads.
diff --git a/ports/paho-mqttpp3/CONTROL b/ports/paho-mqttpp3/CONTROL
@@ -1,5 +1,5 @@
 Source: paho-mqttpp3
-Version: 1.0.1-2
+Version: 1.0.1-4
 Description: Paho project provides open-source C++ wrapper for Paho C library
 Build-Depends: paho-mqtt
 Default-Features: ssl

diff --git a/ports/paho-mqttpp3/FindPahoMqttC_name_fix.patch b/ports/paho-mqttpp3/FindPahoMqttC_name_fix.patch
@@ -0,0 +1,24 @@
+diff --git a/cmake/FindPahoMqttC.cmake b/cmake/FindPahoMqttC.cmake
+index 10c2bfa62..afbf7f9c5 100644
+--- a/cmake/FindPahoMqttC.cmake	
++++ b/cmake/FindPahoMqttC.cmake
+@@ -1,9 +1,17 @@
+ # find the Paho MQTT C library
+ if(PAHO_WITH_SSL)
+-    set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3as)
++    if(PAHO_MQTTPP3_SHARED)
++        set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3as)
++    else()
++        set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3as-static paho-mqtt3as)
++    endif()
+     find_package(OpenSSL REQUIRED)
+ else()
+-    set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3a)
++    if(PAHO_MQTTPP3_SHARED)
++        set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3a)
++    else()
++        set(_PAHO_MQTT_C_LIB_NAME paho-mqtt3a-static paho-mqtt3a)
++    endif()
+ endif()
+
+ find_library(PAHO_MQTT_C_LIBRARIES NAMES ${_PAHO_MQTT_C_LIB_NAME})
diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake
@@ -9,14 +9,15 @@ vcpkg_from_github(
   HEAD_REF master
   PATCHES
     fix-include-path.patch  
+    FindPahoMqttC_name_fix.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS 
   "ssl" PAHO_WITH_SSL
 )
 
 # Link with 'paho-mqtt3as' library
-set(PAHO_C_LIBNAME paho-mqtt3as)
+
 
 # Setting the library path
 if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
@@ -35,11 +36,13 @@ set(PAHO_CMAKE_GENERATOR "Ninja")
 # It uses two different options PAHO_BUILD_STATIC and PAHO_BUILD_SHARED instead of just using one variable.
 # Unless the open source community cleans up the cmake files, we are stuck with setting both of them.
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  set(PAHO_C_LIBNAME paho-mqtt3as-static)
   set(PAHO_MQTTPP3_STATIC ON)
   set(PAHO_MQTTPP3_SHARED OFF)
   set(PAHO_C_LIB "${PAHO_C_LIBRARY_PATH}/${PAHO_C_LIBNAME}")
   set(PAHO_OPTIONS -DPAHO_MQTT_C_LIBRARIES=${PAHO_C_LIB})
 else()
+  set(PAHO_C_LIBNAME paho-mqtt3as)
   set(PAHO_MQTTPP3_STATIC OFF)
   set(PAHO_MQTTPP3_SHARED ON)
   set(PAHO_OPTIONS)

diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL
@@ -1,5 +1,5 @@
 Source: pybind11
-Version: 2.3.0
+Version: 2.3.0-2
 Homepage: https://github.com/pybind/pybind11
 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code.
 Build-Depends: python3 (windows)
diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake
@@ -13,22 +13,27 @@ vcpkg_from_github(
 vcpkg_find_acquire_program(PYTHON3)
 
 get_filename_component(PYPATH ${PYTHON3} PATH)
-set(ENV{PATH} "$ENV{PATH};${PYPATH}")
+set(ENV{PATH} "$ENV{PATH};${PYPATH}") #TODO: Use vcpkg_add_to_path
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(PYTHON3_LIBS  -DPYTHON_LIBRARIES=\"optimized\\\\\\\\;${CURRENT_INSTALLED_DIR}/lib/python36.lib\\\\\\\\;debug\\\\\\\\;${CURRENT_INSTALLED_DIR}/debug/lib/python36_d.lib\"
+                      -DPYTHONLIBS_FOUND=ON
+                      -DPYTHON_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include)
+else()
+    set(PYTHON3_LIBS)
+endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
         -DPYBIND11_TEST=OFF
-        -DPYTHONLIBS_FOUND=ON
-        -DPYTHON_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include
-        -DPYTHON_MODULE_EXTENSION=.dll
+        -DPYTHON_MODULE_EXTENSION=${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}
+        ${PYTHON3_LIBS}
+        -DVCPKG_LIBTRACK_DEACTIVATE=ON
     OPTIONS_RELEASE
         -DPYTHON_IS_DEBUG=OFF
-        -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/python36.lib
     OPTIONS_DEBUG
         -DPYTHON_IS_DEBUG=ON
-        -DPYTHON_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/python36_d.lib
 )
 
 vcpkg_install_cmake()

diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL
@@ -1,4 +1,4 @@
 Source: qt-advanced-docking-system
-Version: 2019-08-14
+Version: 2019-08-14 
 Build-Depends: qt5-base, zlib, bzip2
 Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio
diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake
@@ -16,7 +16,7 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY")
     find_package(PNG)
     find_package(Freetype)
     find_package(sqlite3 CONFIG)
-    find_package(PostgreSQL MODULE REQUIRED)
+    #find_package(PostgreSQL MODULE REQUIRED)
     find_package(double-conversion CONFIG)
     find_package(OpenSSL)
     find_package(harfbuzz CONFIG)

diff --git a/ports/quickfix/CONTROL b/ports/quickfix/CONTROL
@@ -1,5 +1,5 @@
 Source: quickfix
-Version: 1.15.1
+Version: 1.15.1 
 Build-Depends: openssl
 Homepage: https://github.com/quickfix/quickfix
 Description: QuickFIX is a free and open source implementation of the FIX protocol.
diff --git a/ports/rpclib/CONTROL b/ports/rpclib/CONTROL
@@ -1,4 +1,4 @@
 Source: rpclib
-Version: 2.2.1-1
+Version: 2.2.1-1 
 Homepage: https://github.com/rpclib/rpclib
 Description: a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.
diff --git a/ports/solid3/CONTROL b/ports/solid3/CONTROL
@@ -1,3 +1,3 @@
 Source: solid3
-Version: 3.5.8
+Version: 3.5.8 
 Description: Software Library for Interference Detection