diff --git a/CMake/External_PostgreSQL.cmake b/CMake/External_PostgreSQL.cmake
index e08505d4..005640e3 100644
--- a/CMake/External_PostgreSQL.cmake
+++ b/CMake/External_PostgreSQL.cmake
@@ -37,21 +37,21 @@ else()
 endif()
 
 #Always try the patch, it contains the WIN32 logic
-set(_PostgreSQL_PATCH_ARG PATCH_COMMAND
-  ${CMAKE_COMMAND}
-    -DPostgreSQL_patch:PATH=${fletch_SOURCE_DIR}/Patches/PostgreSQL
+set (PostgreSQL_PATCH_DIR ${fletch_SOURCE_DIR}/Patches/PostgreSQL/${PostgreSQL_SELECT_VERSION})
+if(EXISTS ${PostgreSQL_PATCH_DIR})
+set(PostgreSQL_PATCH_COMMAND ${CMAKE_COMMAND}
+    -DPostgreSQL_patch:PATH=${PostgreSQL_PATCH_DIR}
     -DPostgreSQL_source:PATH=${fletch_BUILD_PREFIX}/src/PostgreSQL
-    -DPostgreSQL_SELECT_VERSION:STRING=${PostgreSQL_SELECT_VERSION}
-    -DBUILD_POSTGRESQL_CONTRIB:BOOL=${BUILD_POSTGRESQL_CONTRIB}
-    -P ${fletch_SOURCE_DIR}/Patches/PostgreSQL/Patch.cmake
+    -P ${PostgreSQL_PATCH_DIR}/Patch.cmake
 )
+endif()
 
 ExternalProject_Add(PostgreSQL
   URL ${PostgreSQL_url}
   URL_MD5 ${PostgreSQL_md5}
   ${COMMON_EP_ARGS}
   ${_PostgreSQL_BUILD_IN_SOURCE_ARG}
-  ${_PostgreSQL_PATCH_ARG}
+  PATCH_COMMAND ${PostgreSQL_PATCH_COMMAND}
   ${_PostgreSQL_CONFIGURE_ARG}
   ${_PostgreSQL_BUILD_INSTALL_ARG}
   ${ARG}
diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake
index 53b761d9..23347131 100644
--- a/CMake/fletch-tarballs.cmake
+++ b/CMake/fletch-tarballs.cmake
@@ -341,9 +341,22 @@ endif()
 list(APPEND fletch_external_sources OpenCV)
 
 # PROJ.4
-set(PROJ4_version "4.9.3" )
-set(PROJ4_url "http://download.osgeo.org/proj/proj-${PROJ4_version}.tar.gz" )
-set(PROJ4_md5 "d598336ca834742735137c5674b214a1" )
+if (fletch_ENABLE_PROJ4 OR fletch_ENABLE_ALL_PACKAGES)
+  set(PROJ4_SELECT_VERSION 4.9.3 CACHE STRING "Select the major version of PROJ4 to build.")
+  set_property(CACHE PROJ4_SELECT_VERSION PROPERTY STRINGS "4.9.3" "6.2.1")
+  message(STATUS "PROJ4 Select version: ${PROJ4_SELECT_VERSION}")
+  if (PROJ4_SELECT_VERSION VERSION_EQUAL 4.9.3)
+    set(PROJ4_version "4.9.3" )
+    set(PROJ4_url "http://download.osgeo.org/proj/proj-${PROJ4_version}.tar.gz" )
+    set(PROJ4_md5 "d598336ca834742735137c5674b214a1" )
+  elseif(PROJ4_SELECT_VERSION VERSION_EQUAL 6.2.1)
+    set(PROJ4_version "6.1.1" )
+    set(PROJ4_url "http://download.osgeo.org/proj/proj-${PROJ4_version}.tar.gz" )
+    set(PROJ4_md5 "9a82a3174cacf319d94360a759fbcc8a" )
+  else()
+    message(STATUS "PROJ4_SELECT_VERSION ${PROJ4_SELECT_VERSION}: Not supported")
+  endif()
+endif()
 list(APPEND fletch_external_sources PROJ4 )
 
 # libgeotiff
@@ -372,9 +385,9 @@ endif()
 list(APPEND fletch_external_sources GDAL)
 
 # GEOS
-set(GEOS_version "3.6.2" )
+set(GEOS_version "3.8.1" )
 set(GEOS_url "http://download.osgeo.org/geos/geos-${GEOS_version}.tar.bz2" )
-set(GEOS_md5 "a32142343c93d3bf151f73db3baa651f" )
+set(GEOS_md5 "9d25df02a2c4fcc5a59ac2fb3f0bd977" )
 list(APPEND fletch_external_sources GEOS )
 
 # PDAL
@@ -391,32 +404,31 @@ list(APPEND fletch_external_sources GeographicLib )
 
 # PostgreSQL
 if (fletch_ENABLE_PostgreSQL OR fletch_ENABLE_ALL_PACKAGES)
-  set(PostgreSQL_SELECT_VERSION 9.5.1 CACHE STRING "Select the major version of PostgreSQL to build.")
-  set_property(CACHE PostgreSQL_SELECT_VERSION PROPERTY STRINGS "9.5.1" "10.2")
+  set(PostgreSQL_SELECT_VERSION 12.3 CACHE STRING "Select the major version of PostgreSQL to build.")
+  set_property(CACHE PostgreSQL_SELECT_VERSION PROPERTY STRINGS "9.5.1" "12.3")
   message(STATUS "PostgreSQL Select version: ${PostgreSQL_SELECT_VERSION}")
 
   if (PostgreSQL_SELECT_VERSION VERSION_EQUAL 9.5.1)
     # PostgreSQL 9.5
     set(PostgreSQL_version ${PostgreSQL_SELECT_VERSION})
-    set(PostgreSQL_url "http://ftp.PostgreSQL.org/pub/source/v${PostgreSQL_version}/postgresql-${PostgreSQL_version}.tar.bz2")
     set(PostgreSQL_md5 "11e037afaa4bd0c90bb3c3d955e2b401")
-  elseif(PostgreSQL_SELECT_VERSION VERSION_EQUAL 10.2)
-    # PostgreSQL 9.4
+  elseif(PostgreSQL_SELECT_VERSION VERSION_EQUAL 12.3)
+    # PostgreSQL 12.3
     set(PostgreSQL_version ${PostgreSQL_SELECT_VERSION})
-    set(PostgreSQL_url "http://ftp.PostgreSQL.org/pub/source/v${PostgreSQL_version}/postgresql-${PostgreSQL_version}.tar.bz2")
-    set(PostgreSQL_md5 "e97c3cc72bdf661441f29069299b260a")
+    set(PostgreSQL_md5 "a30c023dd7088e44d73be71af2ef404a")
   else()
     message(STATUS "PostgreSQL_SELECT_VERSION: Not supported")
   endif()
+  set(PostgreSQL_url "http://ftp.PostgreSQL.org/pub/source/v${PostgreSQL_version}/postgresql-${PostgreSQL_version}.tar.bz2")
 endif()
 list(APPEND fletch_external_sources PostgreSQL)
 
 # PostGIS
 # Currently it seems the this version of PostGIS will work with all provided PostgreSQL versions
 if(NOT WIN32)
-  set(PostGIS_version "2.5.3" )
-  set(PostGIS_url "http://download.osgeo.org/postgis/source/postgis-${PostGIS_version}.tar.gz" )
-  set(PostGIS_md5 "475bca6249ee11f675b899de14fd3f42" )
+  set(PostGIS_version "3.0.1" )
+  set(PostGIS_url "https://download.osgeo.org/postgis/source/postgis-${PostGIS_version}.tar.gz" )
+  set(PostGIS_md5 "93f26f162a3961d08caf3b37a3d5fe5d" )
   list(APPEND fletch_external_sources PostGIS )
 endif()
 
diff --git a/Patches/GEOS/BufferOp.cpp b/Patches/GEOS/BufferOp.cpp
deleted file mode 100644
index f2bf5c74..00000000
--- a/Patches/GEOS/BufferOp.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/**********************************************************************
- * $Id: BufferOp.cpp 3537 2011-12-09 10:12:04Z strk $
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2009-2011 Sandro Santilli <strk@keybit.net>
- * Copyright (C) 2005-2007 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation. 
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: operation/buffer/BufferOp.java r378 (JTS-1.12)
- *
- **********************************************************************/
-
-#include <algorithm>
-#include <cmath>
-
-#include <geos/profiler.h>
-#include <geos/operation/buffer/BufferOp.h>
-#include <geos/operation/buffer/BufferBuilder.h>
-#include <geos/geom/Geometry.h>
-#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/PrecisionModel.h>
-
-#include <geos/noding/ScaledNoder.h>
-
-#include <geos/noding/snapround/MCIndexSnapRounder.h>
-#include <geos/noding/snapround/MCIndexPointSnapper.h>
-
-//FIXME: for temporary use, see other FIXME in file
-#include <geos/algorithm/LineIntersector.h>
-#include <geos/noding/MCIndexNoder.h>
-#include <geos/noding/IntersectionAdder.h>
-
-
-
-
-#ifndef GEOS_DEBUG
-#define GEOS_DEBUG 0
-#endif
-
-//#define PROFILE 1
-
-using namespace geos::noding;
-using namespace geos::geom;
-
-namespace geos {
-namespace operation { // geos.operation
-namespace buffer { // geos.operation.buffer
-
-#if PROFILE
-static Profiler *profiler = Profiler::instance();
-#endif
-
-namespace {
-
-double OLDprecisionScaleFactor(const Geometry *g,
-	double distance, int maxPrecisionDigits)
-{
-	const Envelope *env=g->getEnvelopeInternal();
-	double envSize=(std::max)(env->getHeight(), env->getWidth());
-	double expandByDistance=distance > 0.0 ? distance : 0.0;
-	double bufEnvSize=envSize + 2 * expandByDistance;
-	// the smallest power of 10 greater than the buffer envelope
-	int bufEnvLog10=(int) (std::log(bufEnvSize) / std::log(10.0) + 1.0);
-	int minUnitLog10=bufEnvLog10 - maxPrecisionDigits;
-	// scale factor is inverse of min Unit size, so flip sign of exponent
-	double scaleFactor=std::pow(10.0,-minUnitLog10);
-	return scaleFactor;
-}
-
-} // anonymous namespace
-
-/*private*/
-double
-BufferOp::precisionScaleFactor(const Geometry *g,
-	double distance,
-	int maxPrecisionDigits)
-{
-	using namespace std;
-  const Envelope *env=g->getEnvelopeInternal();
-  double envMax = max(
-    max(fabs(env->getMaxX()), fabs(env->getMinX())),
-    max(fabs(env->getMaxY()), fabs(env->getMinY()))
-  );
-
-  double expandByDistance = distance > 0.0 ? distance : 0.0;
-  double bufEnvMax = envMax + 2 * expandByDistance;
-
-  // the smallest power of 10 greater than the buffer envelope
-  int bufEnvPrecisionDigits = (int) (std::log(bufEnvMax) / std::log(10.0) + 1.0);
-  int minUnitLog10 = maxPrecisionDigits - bufEnvPrecisionDigits;
-
-  double scaleFactor = std::pow(10.0, minUnitLog10);
-
-  return scaleFactor;
-}
-
-/*public static*/
-Geometry*
-BufferOp::bufferOp(const Geometry *g, double distance,
-		int quadrantSegments,
-		int nEndCapStyle)
-{
-	BufferOp bufOp(g);
-	bufOp.setQuadrantSegments(quadrantSegments);
-	bufOp.setEndCapStyle(nEndCapStyle);
-	return bufOp.getResultGeometry(distance);
-}
-
-/*public*/
-Geometry*
-BufferOp::getResultGeometry(double nDistance)
-{
-	distance=nDistance;
-	computeGeometry();
-	return resultGeometry;
-}
-
-/*private*/
-void
-BufferOp::computeGeometry()
-{
-#if GEOS_DEBUG
-	std::cerr<<"BufferOp::computeGeometry: trying with original precision"<<std::endl;
-#endif
-
-	bufferOriginalPrecision();
-
-	if (resultGeometry!=NULL) return;
-
-#if GEOS_DEBUG
-	std::cerr << "bufferOriginalPrecision failed (" << saveException.what() << "), trying with reduced precision"
-	          << std::endl;
-#endif
-
-	const PrecisionModel& argPM = *(argGeom->getFactory()->getPrecisionModel());
-	if ( argPM.getType() == PrecisionModel::FIXED )
-		bufferFixedPrecision(argPM);
-	else
-		bufferReducedPrecision();
-}
-
-/*private*/
-void
-BufferOp::bufferReducedPrecision()
-{
-
-	// try and compute with decreasing precision
-	for (int precDigits=MAX_PRECISION_DIGITS; precDigits >= 0; precDigits--)
-	{
-#if GEOS_DEBUG
-		std::cerr<<"BufferOp::computeGeometry: trying with precDigits "<<precDigits<<std::endl;
-#endif
-		try {
-			bufferReducedPrecision(precDigits);
-		} catch (const util::TopologyException& ex) {
-			saveException=ex;
-			// don't propagate the exception - it will be detected by fact that resultGeometry is null
-		} 
-
-		if (resultGeometry!=NULL) {
-			// debug
-			//if ( saveException ) std::cerr<<saveException->toString()<<std::endl;
-			return;
-		}
-	}
-	// tried everything - have to bail
-	throw saveException;
-}
-
-/*private*/
-void
-BufferOp::bufferOriginalPrecision()
-{
-	BufferBuilder bufBuilder(bufParams);
-
-	//std::cerr<<"computing with original precision"<<std::endl;
-	try
-	{
-		resultGeometry=bufBuilder.buffer(argGeom, distance);
-	}
-	catch (const util::TopologyException& ex)
-	{
-		// don't propagate the exception - it will be detected by
-		// fact that resultGeometry is null
-		saveException=ex;
-
-		//std::cerr<<ex->toString()<<std::endl;
-	} 
-	//std::cerr<<"done"<<std::endl;
-}
-
-void
-BufferOp::bufferReducedPrecision(int precisionDigits)
-{
-	double sizeBasedScaleFactor=precisionScaleFactor(argGeom, distance, precisionDigits);
-
-#if GEOS_DEBUG
-	std::cerr << "recomputing with precision scale factor = "
-		<< sizeBasedScaleFactor
-		<< std::endl;
-#endif
-
-	assert(sizeBasedScaleFactor>0);
-	PrecisionModel fixedPM(sizeBasedScaleFactor);
-	bufferFixedPrecision(fixedPM);
-}
-
-/*private*/
-void
-BufferOp::bufferFixedPrecision(const PrecisionModel& fixedPM)
-{
-
-
-	PrecisionModel pm(1.0); // fixed as well
-
-#if 0 /* FIXME: MCIndexSnapRounder seems to be still bogus */
-  snapround::MCIndexSnapRounder inoder(pm);
-#else
-  algorithm::LineIntersector li(&fixedPM);
-  IntersectionAdder ia(li);
-  MCIndexNoder inoder(&ia);
-#endif
-
-	ScaledNoder noder(inoder, fixedPM.getScale());
-
-	BufferBuilder bufBuilder(bufParams);
-	bufBuilder.setWorkingPrecisionModel(&fixedPM);
-
-	bufBuilder.setNoder(&noder);
-
-	// this may throw an exception, if robustness errors are encountered
-	resultGeometry=bufBuilder.buffer(argGeom, distance);
-}
-
-} // namespace geos.operation.buffer
-} // namespace geos.operation
-} // namespace geos
-
diff --git a/Patches/GEOS/CMakeLists.txt b/Patches/GEOS/CMakeLists.txt
index 51887fe9..50819945 100644
--- a/Patches/GEOS/CMakeLists.txt
+++ b/Patches/GEOS/CMakeLists.txt
@@ -1,324 +1,387 @@
-################################################################################
-# $Id: CMakeLists.txt 3503 2011-10-19 00:47:10Z mloskot $
+##############################################################################
+# Part of CMake configuration for GEOS
 #
-# Main GEOS build configuration file for CMake build system
-#
-# Copyright (C) 2009 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (C) 2018-2019 Mateusz Loskot <mateusz@loskot.net>
 #
 # This is free software; you can redistribute and/or modify it under
 # the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation. 
+# by the Free Software Foundation.
 # See the COPYING file for more information.
-#
-################################################################################
-project(geos)
-cmake_minimum_required(VERSION 2.6)
-
-if(NOT CMAKE_VERSION)
-    set(CMAKE_VERSION
-      "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
-endif()
-
-# Location of custom CMake modules with macros used by GEOS
-set(CMAKE_MODULE_PATH "${geos_SOURCE_DIR}/cmake/modules")
-
-################################################################################
-# Setup GEOS version
-################################################################################
-
-# GEOS release version
-# GEOS C++ library SONAME will use these encoding ABI break at every release
-set(VERSION_MAJOR 3)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 2)
-set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-
-# JTS_PORT is the version of JTS this release is bound to
-set(JTS_PORT 1.12.0)
-message(STATUS "Setting GEOS version ${VERSION} as port of JTS ${JTS_PORT}")
-
-# GEOS C API version
-set(CAPI_INTERFACE_CURRENT 8)
-set(CAPI_INTERFACE_REVISION 2)
-set(CAPI_INTERFACE_AGE 7)
-
-math(EXPR CAPI_VERSION_MAJOR "${CAPI_INTERFACE_CURRENT} - ${CAPI_INTERFACE_AGE}")
-set(CAPI_VERSION_MINOR ${CAPI_INTERFACE_AGE})
-set(CAPI_VERSION_PATCH ${CAPI_INTERFACE_REVISION})
-set(CAPI_VERSION "${CAPI_VERSION_MAJOR}.${CAPI_VERSION_MINOR}.${CAPI_VERSION_PATCH}")
-message(STATUS "Setting GEOS C API version ${CAPI_VERSION}")
-if (NOT WIN32)
-  set(CAPI_SOVERSION ${CAPI_VERSION_MAJOR})
-  message(STATUS "Setting GEOS C API soversion ${CAPI_SOVERSION}")
-endif()
-
-################################################################################
-# Check custom global options
-################################################################################
+##############################################################################
 
-option(GEOS_ENABLE_TESTS
-  "Set to OFF|ON (default) to control build of GEOS tests package" ON)
+# Require CMake 3.8+ with support for meta-features that request compiler
+# modes for specific C/C++ language standard levels.
+cmake_minimum_required(VERSION 3.8)
 
-option(GEOS_ENABLE_INLINE
-  "Set to OFF|ON (default) to control GEOS compilation with small functions inlining" ON)
+# Default to release build so packagers don't release debug builds
+set(DEFAULT_BUILD_TYPE Release)
 
-if(NOT MSVC)
-  option(GEOS_ENABLE_ASSERT
-    "Set to ON|OFF (default) to build GEOS with assert() macro enabled" OFF) 
+# Require CMake 3.13+ with VS generator for complete support of VS versions
+# and support by AppVeyor.
+if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
+  cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  option(GEOS_ENABLE_FLOATSTORE
-    "Set to OFF|ON (default) to control IEEE754 conformance and remove extra precision" ON)
-endif()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-if(APPLE)
-  option(GEOS_ENABLE_MACOSX_FRAMEWORK
-    "Set to OFF|ON (default) to build GEOS as a Mac OS X framework" ON)
-  option(GEOS_ENABLE_MACOSX_FRAMEWORK_UNIXCOMPAT
-    "Set to ON|OFF (default) to add Unix compatibility to the Mac OS X framework" OFF)
+# TODO: Follow CMake detection of git and version tagging
+#       https://gitlab.kitware.com/cmake/cmake/blob/master/Source/CMakeVersionSource.cmake
+if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD)
+  set(GEOS_BUILD_FROM_GIT ON)
 endif()
 
-################################################################################
-# Setup C/C++ compiler options
-################################################################################
-
-if(NOT MSVC_IDE)
-  if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Debug CACHE STRING
-      "Choose the type of build, options are: None Debug Release" FORCE)
-  endif()
-  message(STATUS "Setting GEOS build type - ${CMAKE_BUILD_TYPE}")
-endif()
-
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-  add_definitions(-D_DEBUG)
+# Make sure we know our build type
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE ${DEFAULT_BUILD_TYPE})
+  message(STATUS "GEOS: Using default build type: ${CMAKE_BUILD_TYPE}")
+else()
+  message(STATUS "GEOS: Build type: ${CMAKE_BUILD_TYPE}")
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 
-  # General options
-  set(CMAKE_CXX_FLAGS "-pedantic -ansi ${CMAKE_CXX_FLAGS}")
+#-----------------------------------------------------------------------------
+# Options
+#-----------------------------------------------------------------------------
+include(CMakeDependentOption)
 
-  # Numerical stability
-  if(GEOS_ENABLE_FLOATSTORE)
-    # Remove extra precision by forcing conformance to IEEE 754 rather than IEEE 854
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffloat-store")
-  endif()
-  message(STATUS
-    "Forcing IEEE 754 using flag -ffloat-store - ${GEOS_ENABLE_FLOATSTORE}")
-
-  # Warnings specification
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
-
-  # Turn on Position Independent Code generation for GEOS C shared library
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-
-  # Enable glibc ISO C99 features (macros isfinite, isnan)
-  set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_ISOC99_SOURCE=1")
-
-elseif(MSVC)
-    
-  # Set pedantic mode by default
-  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
-  if(MSVC80 OR MSVC90 OR MSVC10)
-
-    # Option is to enable the /MP switch for Visual Studio 2005 or later
-    option(GEOS_MSVC_ENABLE_MP
-      "Set to ON to build GEOS with the /MP option (Visual Studio 2005 and above)." ON)
-    mark_as_advanced(GEOS_MSVC_ENABLE_MP)
-    if(GEOS_MSVC_ENABLE_MP)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-    endif()
-    message(STATUS "Setting Visual Studio 2005+ option /MP to ${GEOS_MSVC_ENABLE_MP}")
-    
-    add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-    add_definitions(-DNOMINMAX)
-  endif()
+## CMake global variables
+option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON)
+set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
 
-endif()
+## GEOS custom variables
+cmake_dependent_option(GEOS_BUILD_DEVELOPER
+  "Build with compilation flags useful for development" ON
+  "GEOS_BUILD_FROM_GIT" OFF)
+mark_as_advanced(GEOS_BUILD_DEVELOPER)
 
-if(GEOS_ENABLE_INLINE)
-  add_definitions(-DGEOS_INLINE)
+if (POLICY CMP0092)
+  # dont set /W3 warning flags by default, we already
+  # set /W4 anyway
+  cmake_policy(SET CMP0092 NEW)
 endif()
-message(STATUS
-  "Setting GEOS compilation with small functions inlining - ${GEOS_ENABLE_INLINE}")
 
-if(NOT MSVC)
-  if(GEOS_ENABLE_ASSERT)
-    string(REGEX REPLACE "[-/]D.*NDEBUG" "-U NDEBUG"
-      CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-  endif()
-  message(STATUS
-    "Setting GEOS compilation with assert() macro enabled - ${GEOS_ENABLE_ASSERT}")
+#-----------------------------------------------------------------------------
+# Setup build directories
+#-----------------------------------------------------------------------------
+# Place executables and shared libraries in the same location for
+# convenience of direct execution from common spot and for
+# convenience in environments without RPATH support.
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+message(STATUS "GEOS: Run-time output: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+message(STATUS "GEOS: Archives output: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+
+#-----------------------------------------------------------------------------
+# Version
+#-----------------------------------------------------------------------------
+file(READ Version.txt _version_txt)
+
+string(REGEX MATCH "GEOS_VERSION_MAJOR=([0-9]+)" _ ${_version_txt})
+set(_version_major ${CMAKE_MATCH_1})
+string(REGEX MATCH "GEOS_VERSION_MINOR=([0-9]+)" _ ${_version_txt})
+set(_version_minor ${CMAKE_MATCH_1})
+string(REGEX MATCH "GEOS_VERSION_PATCH=([0-9]+)" _ ${_version_txt})
+set(_version_patch ${CMAKE_MATCH_1})
+# OPTIONS: "", "dev", "rc1" etc.
+string(REGEX MATCH "GEOS_PATCH_WORD=([a-zA-Z0-9]+)" _ ${_version_txt})
+set(_version_patch_word ${CMAKE_MATCH_1})
+
+# Version of JTS this release is bound to
+string(REGEX MATCH "JTS_PORT=([0-9a-zA-Z\.]+)" _ ${_version_txt})
+set(JTS_PORT ${CMAKE_MATCH_1})
+
+# Version of public C API
+string(REGEX MATCH "CAPI_INTERFACE_CURRENT=([0-9]+)" _ ${_version_txt})
+set(_version_capi_current ${CMAKE_MATCH_1})
+string(REGEX MATCH "CAPI_INTERFACE_REVISION=([0-9]+)" _ ${_version_txt})
+set(_version_capi_revision ${CMAKE_MATCH_1})
+string(REGEX MATCH "CAPI_INTERFACE_AGE=([0-9]+)" _ ${_version_txt})
+set(_version_capi_age ${CMAKE_MATCH_1})
+
+unset(_version_txt)
+
+math(EXPR _version_capi_major "${_version_capi_current} - ${_version_capi_age}")
+set(CAPI_VERSION_MAJOR ${_version_capi_major})
+set(CAPI_VERSION_MINOR ${_version_capi_age})
+set(CAPI_VERSION_PATCH ${_version_capi_revision})
+set(CAPI_VERSION "${_version_capi_major}.${_version_capi_age}.${_version_capi_revision}")
+
+unset(_version_capi_current)
+unset(_version_capi_major)
+unset(_version_capi_age)
+unset(_version_capi_revision)
+
+#-----------------------------------------------------------------------------
+# Project
+#-----------------------------------------------------------------------------
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
+  list(APPEND _project_info DESCRIPTION "GEOS - C++ port of the Java Topology Suite (JTS)")
 endif()
-
-################################################################################
-# Setup C/C++ library features
-################################################################################
-
-include(TestForSTDNamespace)
-if (CMAKE_NO_STD_NAMESPACE)
-  message(FATAL_ERROR "Detected compiler does not support std namespace on STL classes")
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+  list(APPEND _project_info HOMEPAGE_URL "http://geos.osgeo.org")
 endif()
 
-# check header files
-include(CheckIncludeFiles)
+project(GEOS VERSION "${_version_major}.${_version_minor}.${_version_patch}"
+  LANGUAGES C CXX
+  ${_project_info})
 
-check_include_files(stdint.h HAVE_STDINT_H)
-check_include_files(inttypes.h HAVE_INTTYPES_H)
-check_include_files(ieeefp.h HAVE_IEEEFP_H)
-
-# check types and sizes
-include(CheckTypeSize)
-
-if(MSVC)
-  check_type_size("__int64" HAVE_INT64_T_64)
+if("${_version_patch_word}" STREQUAL "")
+  set(GEOS_VERSION_FULL "${GEOS_VERSION}")
 else()
-  if(HAVE_STDINT_H OR HAVE_INTTYPES_H)
-    check_type_size("int64_t" HAVE_INT64_T_64)
-  else()
-    check_type_size("long long int" HAVE_LONG_LONG_INT_64)
-  endif()
+  set(GEOS_VERSION_FULL "${GEOS_VERSION}${_version_patch_word}")
 endif()
 
-# check functions and macros
-include(CheckPrototypeExists)
-include(CheckSymbolExists)
-
-check_prototype_exists(isnan cmath HAVE_STD_ISNAN)
-if(NOT HAVE_STD_ISNAN)
-  if(MSVC)
-    check_prototype_exists(_isnan float.h HAVE_ISNAN)
-  elseif(APPLE)
-    check_prototype_exists(__isnand math.h HAVE_ISNAND_XCODE)
-    if(NOT HAVE_ISNAND_XCODE)
-      check_prototype_exists(__inline_isnand math.h HAVE_INLINE_ISNAND_XCODE)
-    endif()
-  else()
-    check_symbol_exists(isnan math.h HAVE_ISNAN)
-  endif()
+unset(_version_major)
+unset(_version_minor)
+unset(_version_patch)
+unset(_version_patch_word)
+
+message(STATUS "GEOS: Version ${GEOS_VERSION_FULL}")
+message(STATUS "GEOS: C API Version ${CAPI_VERSION}")
+message(STATUS "GEOS: JTS port ${JTS_PORT}")
+
+#-----------------------------------------------------------------------------
+# C++ language version and compilation flags
+#-----------------------------------------------------------------------------
+message(STATUS "GEOS: Require C++${CMAKE_CXX_STANDARD}")
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+#-----------------------------------------------------------------------------
+# Target geos_cxx_flags: common compilation flags
+#-----------------------------------------------------------------------------
+add_library(geos_cxx_flags INTERFACE)
+target_compile_features(geos_cxx_flags INTERFACE cxx_std_11)
+
+#-----------------------------------------------------------------------------
+# Target geos_cxx_flags: common compilation flags
+#-----------------------------------------------------------------------------
+option(DISABLE_GEOS_INLINE "Disable inlining" OFF)
+if(NOT DISABLE_GEOS_INLINE)
+  target_compile_definitions(geos_cxx_flags INTERFACE GEOS_INLINE)
+else()
+  message(STATUS
+  "GEOS: DISABLING inlining of small functions")
 endif()
 
-check_prototype_exists(isfinite cmath HAVE_STD_ISFINITE)
+#-----------------------------------------------------------------------------
+# Target geos_developer_cxx_flags: developer mode compilation flags
+#-----------------------------------------------------------------------------
+# Do NOT install this target for end-users!
+add_library(geos_developer_cxx_flags INTERFACE)
 
-if(NOT HAVE_STD_ISFINITE)
-  if(MSVC)
-    check_prototype_exists(_finite float.h HAVE_FINITE)
-  else()
-    #CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-    check_symbol_exists(isfinite math.h HAVE_ISFINITE)
-  endif()
+if(GEOS_BUILD_DEVELOPER)
+  message(STATUS "GEOS: Developer mode enabled")
 endif()
 
-################################################################################
-# Setup build directories
-################################################################################
-
-# Put the libaries and binaries that get built into directories at the
-# top of the build tree rather than in hard-to-find leaf
-# directories. This simplifies manual testing and the use of the build
-# tree rather than installed Boost libraries.
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+# geos_cxx_flags inherits properties from geos_developer_cxx_flags when
+# building as part of the GEOS repository or on explicit request for
+# developer compilation mode, as GEOS contributor.
+# The flags are intended only for GEOS itself and are not part of
+# usage requirements needed by GEOS consumers.
+if(GEOS_BUILD_DEVELOPER)
+  target_link_libraries(geos_cxx_flags
+    INTERFACE
+      $<BUILD_INTERFACE:geos_developer_cxx_flags>)
+endif()
 
-################################################################################
-# Setup include directories
-################################################################################
+target_compile_definitions(geos_cxx_flags
+  INTERFACE
+    USE_UNSTABLE_GEOS_CPP_API)
+
+target_compile_definitions(geos_developer_cxx_flags
+  INTERFACE
+    $<$<CXX_COMPILER_ID:MSVC>:_CRT_NONSTDC_NO_DEPRECATE>
+    $<$<CXX_COMPILER_ID:MSVC>:_SCL_SECURE_NO_DEPRECATE>
+    $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>
+    $<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>)
+
+target_compile_options(geos_developer_cxx_flags
+  INTERFACE
+    $<$<CXX_COMPILER_ID:MSVC>:-W4>
+    $<$<OR:$<CXX_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:Clang>>:-pedantic -Wall -Wextra -Wno-long-long -Wcast-align -Wconversion -Wchar-subscripts -Wdouble-promotion -Wpointer-arith -Wformat -Wformat-security -Wshadow -Wuninitialized -Wunused-parameter -fno-common>
+    $<$<CXX_COMPILER_ID:GNU>:-fno-implicit-inline-templates>)
+
+# Disable TTMath ASM support on Windows due to build issues
+if(WIN32)
+  target_compile_definitions(geos_cxx_flags
+    INTERFACE TTMATH_NOASM)
+endif()
 
-# for including GEOS C++ API headers
-include_directories(${geos_SOURCE_DIR}/include)
+#-----------------------------------------------------------------------------
+# Define a coverage build
+#-----------------------------------------------------------------------------
+set(CMAKE_CXX_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage")
 
-# for including build-specific GEOS C API headers
-include_directories(${geos_BINARY_DIR}/capi)
+#-----------------------------------------------------------------------------
+# Target geos: C++ API library
+#-----------------------------------------------------------------------------
+add_library(geos "")
+target_link_libraries(geos PUBLIC geos_cxx_flags)
+add_subdirectory(include)
+add_subdirectory(src)
 
-# for including build-specific version.h, platform.h and geos_c.h
-include_directories(${geos_BINARY_DIR}/include)
+if(BUILD_SHARED_LIBS)
+  target_compile_definitions(geos
+    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:GEOS_DLL_EXPORT>)
 
-################################################################################
-# Setup checks and generate config headers
-################################################################################
+  set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION})
+  set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION})
+endif()
 
-# TODO: output to CMAKE_CURRENT_BINARY_DIR instead of CMAKE_SOURCE_DIR
+#-----------------------------------------------------------------------------
+# Target geos_c: C API library
+#-----------------------------------------------------------------------------
+add_library(geos_c "")
+target_link_libraries(geos_c PRIVATE geos)
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h)
-  message(STATUS "Disabling existing ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h")
+if(BUILD_SHARED_LIBS)
+  target_compile_definitions(geos_c
+    PRIVATE $<$<CXX_COMPILER_ID:MSVC>:GEOS_DLL_EXPORT>)
 
-  if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 6)
-    file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h)
-    set(PH_RESULT "removed")
-  else()
-    file(RENAME
-      ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h
-      ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h.disabled)
-      set(PH_RESULT "renamed")
+  set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION})
+  if(NOT WIN32)
+    set_target_properties(geos_c PROPERTIES SOVERSION ${CAPI_VERSION_MAJOR})
   endif()
-
-  message(STATUS "Disabling existing ${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h - ${PH_RESULT}")
 endif()
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h.cmake 
-  ${CMAKE_CURRENT_BINARY_DIR}/include/geos/platform.h)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/geos/version.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/include/geos/version.h @ONLY)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/capi/geos_c.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/capi/geos_c.h @ONLY)
-
-################################################################################
-# Configure tests
-################################################################################
-
-if(GEOS_ENABLE_TESTS)
-
- # Include CTest support
- include(CTest)
- enable_testing()
-
-  # Define "make check" as alias for "make test"
-  add_custom_target(check COMMAND ctest)
+add_subdirectory(capi)
 
+#-----------------------------------------------------------------------------
+# Tests
+#-----------------------------------------------------------------------------
+include(CTest)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
 endif()
 
-################################################################################
-# Configure subdirectories
-################################################################################
+#-----------------------------------------------------------------------------
+# Benchmarks
+#-----------------------------------------------------------------------------
+add_subdirectory(benchmarks)
+
+#-----------------------------------------------------------------------------
+# Documentation/Examples
+#-----------------------------------------------------------------------------
+#add_subdirectory(doc)
+
+#-----------------------------------------------------------------------------
+# Install and export targets - support 'make install' or equivalent
+#-----------------------------------------------------------------------------
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
+  VERSION ${GEOS_VERSION}
+  COMPATIBILITY AnyNewerVersion)
+
+configure_file(cmake/geos-config.cmake
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
+  COPYONLY)
+
+install(TARGETS geos geos_cxx_flags
+  EXPORT geos-targets
+  LIBRARY DESTINATION lib NAMELINK_SKIP
+  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION bin
+  INCLUDES DESTINATION include
+  )
+
+install(TARGETS geos_c
+  EXPORT geos-targets
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION bin
+  INCLUDES DESTINATION include
+  )
+
+install(EXPORT geos-targets
+  FILE geos-targets.cmake
+  NAMESPACE GEOS::
+  DESTINATION lib/cmake/GEOS)
+
+install(FILES
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/geos-config-version.cmake"
+  DESTINATION lib/cmake/GEOS)
+install(DIRECTORY
+  "${CMAKE_CURRENT_LIST_DIR}/include/geos"
+  "${CMAKE_CURRENT_BINARY_DIR}/include/geos"
+  DESTINATION include
+  FILES_MATCHING PATTERN "*.h")
+if(NOT DISABLE_GEOS_INLINE)
+  install(DIRECTORY
+    "${CMAKE_CURRENT_LIST_DIR}/include/geos"
+    "${CMAKE_CURRENT_BINARY_DIR}/include/geos"
+    DESTINATION include
+    FILES_MATCHING PATTERN "*.inl")
+endif()
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/capi/geos_c.h"
+  DESTINATION include)
 
-add_subdirectory(include)
-add_subdirectory(src)
-add_subdirectory(capi)
-add_subdirectory(tests)
 add_subdirectory(tools)
 
-################################################################################
-# Install/Uninstall
-################################################################################
+#-----------------------------------------------------------------------------
+# Uninstall
+#-----------------------------------------------------------------------------
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+configure_file("${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+  "${PROJECT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
 add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake") 
+  "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
+
+#-----------------------------------------------------------------------------
+# "make dist" workalike
+#-----------------------------------------------------------------------------
+get_property(_is_multi_config_generator GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(NOT _is_multi_config_generator)
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GEOS Computational Geometry Library")
+  set(CPACK_PACKAGE_VENDOR "OSGeo")
+  set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
+  set(CPACK_SOURCE_GENERATOR "TBZ2")
+  set(CPACK_PACKAGE_VERSION_MAJOR ${GEOS_VERSION_MAJOR})
+  set(CPACK_PACKAGE_VERSION_MINOR ${GEOS_VERSION_MINOR})
+  set(CPACK_PACKAGE_VERSION_PATCH ${GEOS_VERSION_PATCH})
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME "geos-${GEOS_VERSION_FULL}")
+
+  set(CPACK_SOURCE_IGNORE_FILES
+    "/\\\\.git"
+    "/autogen\\\\.sh"
+    "/tools/ci"
+    "/HOWTO_RELEASE"
+    "/autom4te\\\\.cache"
+    "\\\\.yml\$"
+    "\\\\.deps"
+    "/debian/"
+    "/php/"
+    "/.*build-.*/"
+    ${PROJECT_BINARY_DIR}
+    )
+
+  # message(STATUS "GEOS: CPACK_SOURCE_PACKAGE_FILE_NAME: ${CPACK_SOURCE_PACKAGE_FILE_NAME}")
+  # message(STATUS "GEOS: CPACK_SOURCE_IGNORE_FILES: ${CPACK_SOURCE_IGNORE_FILES}")
+  # message(STATUS "GEOS: CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}")
+  include(CPack)
+  add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+
+  message(STATUS "GEOS: Configured 'dist' target")
+endif()
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/geos-config.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake/geos-config"
-  @ONLY
-)
-install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/cmake/geos-config"
-  DESTINATION bin
-)
+#-----------------------------------------------------------------------------
+# "make check" workalike
+#-----------------------------------------------------------------------------
 
-################################################################################
-# DEBUG settings - TODO: make a summary
+add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test)
 
-message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
+#-----------------------------------------------------------------------------
+# "make distcheck" workalike
+#-----------------------------------------------------------------------------
+if(NOT _is_multi_config_generator)
+  find_package(MakeDistCheck)
+  AddMakeDistCheck()
+  message(STATUS "GEOS: Configured 'distcheck' target")
+endif()
 
-#message(STATUS "XXX: CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
-#message(STATUS "XXX: CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}")
-#message(STATUS "XXX: CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}")
+unset(_is_multi_config_generator)
diff --git a/Patches/GEOS/GenerateSourceGroups.cmake b/Patches/GEOS/GenerateSourceGroups.cmake
deleted file mode 100644
index 025e07bc..00000000
--- a/Patches/GEOS/GenerateSourceGroups.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-macro(GenerateSourceGroups curdir)
-  file(GLOB children RELATIVE ${PROJECT_SOURCE_DIR}/${curdir} ${PROJECT_SOURCE_DIR}/${curdir}/*)
-  foreach(child ${children})
-    if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/${curdir}/${child})
-      GenerateSourceGroups(${curdir}/${child})
-    else()
-      string(REPLACE "/" "\\" groupname ${curdir})
-      # I would like to call the src root folder in a different name, only in visual studio (not mandatory requirement)
-      string(REPLACE "src" "Source Files" groupname ${groupname})
-      source_group(${groupname} FILES ${PROJECT_SOURCE_DIR}/${curdir}/${child})
-    endif()
-  endforeach()
-endmacro()
diff --git a/Patches/GEOS/Info.plist.in b/Patches/GEOS/Info.plist.in
deleted file mode 100644
index 3e8cda8f..00000000
--- a/Patches/GEOS/Info.plist.in
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleExecutable</key>
-        <string>${MACOSX_FRAMEWORK_NAME}</string>
-        <key>CFBundleGetInfoString</key>
-        <string>GEOS ${VERSION}</string>
-        <key>CFBundleIdentifier</key>
-        <string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundleName</key>
-        <string>GEOS</string>
-        <key>CFBundlePackageType</key>
-        <string>FMWK</string>
-        <key>CFBundleShortVersionString</key>
-        <string>${MACOSX_FRAMEWORK_SHORT_VERSION_STRING}</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>${MACOSX_FRAMEWORK_BUNDLE_VERSION}</string>
-</dict>
-</plist>
diff --git a/Patches/GEOS/LineIntersector.cpp b/Patches/GEOS/LineIntersector.cpp
deleted file mode 100644
index 63d078e8..00000000
--- a/Patches/GEOS/LineIntersector.cpp
+++ /dev/null
@@ -1,883 +0,0 @@
-/**********************************************************************
- * $Id: LineIntersector.cpp 3340 2011-05-10 09:51:31Z strk $
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2005-2006 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: algorithm/RobustLineIntersector.java rev. 1.38 (JTS-1.10)
- *
- **********************************************************************/
-
-#include <geos/algorithm/LineIntersector.h>
-#include <geos/algorithm/CGAlgorithms.h>
-#include <geos/algorithm/HCoordinate.h>
-#include <geos/algorithm/NotRepresentableException.h>
-#include <geos/algorithm/CentralEndpointIntersector.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/PrecisionModel.h>
-#include <geos/geom/Envelope.h>
-
-//#include <geos/util/Assert.h> // changed to TopologyException
-//#include <geos/util/TopologyException.h> // we don't throw anymore
-
-#include <string>
-#include <cmath> // for fabs()
-#include <cassert>
-#include <algorithm>
-
-#ifndef GEOS_DEBUG
-#define GEOS_DEBUG 0
-#endif
-
-#ifdef GEOS_DEBUG
-#include <iostream>
-#endif
-
-#ifndef COMPUTE_Z
-#define COMPUTE_Z 1
-#endif // COMPUTE_Z
-
-using namespace std;
-
-using namespace geos::geom;
-
-namespace geos {
-namespace algorithm { // geos.algorithm
-
-/*public static*/
-double
-LineIntersector::computeEdgeDistance(const Coordinate& p,const Coordinate& p0,const Coordinate& p1)
-{
-	double dx=fabs(p1.x-p0.x);
-	double dy=fabs(p1.y-p0.y);
-	double dist=-1.0;	// sentinel value
-	if (p==p0) {
-		dist=0.0;
-	} else if (p==p1) {
-		if (dx>dy)
-			dist=dx;
-		else
-			dist=dy;
-	} else {
-		double pdx=fabs(p.x - p0.x);
-		double pdy=fabs(p.y - p0.y);
-		if (dx > dy)
-			dist = pdx;
-		else
-			dist = pdy;
-		// <FIX>
-		// hack to ensure that non-endpoints always have a non-zero distance
-		if (dist == 0.0 && !(p==p0)) {
-			dist=max(pdx,pdy);
-		}
-	}
-	assert(!(dist == 0.0 && !(p==p0))); // Bad distance calculation
-	return dist;
-}
-
-/*public*/
-void
-LineIntersector::computeIntersection(const Coordinate& p1,const Coordinate& p2,const Coordinate& p3,const Coordinate& p4)
-{
-	inputLines[0][0]=&p1;
-	inputLines[0][1]=&p2;
-	inputLines[1][0]=&p3;
-	inputLines[1][1]=&p4;
-	result=computeIntersect(p1,p2,p3,p4);
-	//numIntersects++;
-}
-
-/*public*/
-string
-LineIntersector::toString() const
-{
-	string str=inputLines[0][0]->toString()+"_"
-			  +inputLines[0][1]->toString()+" "
-			  +inputLines[1][0]->toString()+"_"
-			  +inputLines[1][1]->toString()+" : ";
-	if (isEndPoint()) {
-		str+=" endpoint";
-	}
-	if (isProperVar) {
-		str+=" proper";
-	}
-	if (isCollinear()) {
-		str+=" collinear";
-	}
-	return str;
-}
-
-/*public static*/
-bool
-LineIntersector::isSameSignAndNonZero(double a,double b)
-{
-	if (a==0 || b==0) {
-		return false;
-	}
-	return (a<0 && b<0) || (a>0 && b>0);
-}
-
-/*private*/
-void
-LineIntersector::computeIntLineIndex() {
-	computeIntLineIndex(0);
-	computeIntLineIndex(1);
-}
-
-/*public*/
-bool
-LineIntersector::isIntersection(const Coordinate& pt) const
-{
-	for (int i=0;i<result;i++) {
-		if (intPt[i].equals2D(pt)) {
-			return true;
-		}
-	}
-	return false;
-}
-
-/*public*/
-const Coordinate&
-LineIntersector::getIntersectionAlongSegment(int segmentIndex,int intIndex)
-{
-	// lazily compute int line array
-	computeIntLineIndex();
-	return intPt[intLineIndex[segmentIndex][intIndex]];
-}
-
-/*public*/
-int
-LineIntersector::getIndexAlongSegment(int segmentIndex,int intIndex)
-{
-	computeIntLineIndex();
-	return intLineIndex[segmentIndex][intIndex];
-}
-
-/*private*/
-void
-LineIntersector::computeIntLineIndex(int segmentIndex)
-{
-	double dist0=getEdgeDistance(segmentIndex,0);
-	double dist1=getEdgeDistance(segmentIndex,1);
-	if (dist0>dist1) {
-		intLineIndex[segmentIndex][0]=0;
-		intLineIndex[segmentIndex][1]=1;
-	} else {
-		intLineIndex[segmentIndex][0]=1;
-		intLineIndex[segmentIndex][1]=0;
-	}
-}
-
-/*public*/
-double
-LineIntersector::getEdgeDistance(int segmentIndex,int intIndex) const
-{
-	double dist=computeEdgeDistance(intPt[intIndex],
-		*inputLines[segmentIndex][0],
-		*inputLines[segmentIndex][1]);
-	return dist;
-}
-
-/*public*/
-bool
-LineIntersector::isInteriorIntersection()
-{
-	if (isInteriorIntersection(0)) return true;
-	if (isInteriorIntersection(1)) return true;
-	return false;
-}
-
-/*public*/
-bool
-LineIntersector::isInteriorIntersection(int inputLineIndex)
-{
-	for (int i=0; i<result; i++)
-	{
-		if (!(intPt[i].equals2D(*inputLines[inputLineIndex][0])
-			|| intPt[i].equals2D(*inputLines[inputLineIndex][1])))
-			{
-			return true;
-		}
-	}
-	return false;
-}
-
-/*public static*/
-double
-LineIntersector::interpolateZ(const Coordinate &p,
-	const Coordinate &p1, const Coordinate &p2)
-{
-#if GEOS_DEBUG
-	cerr<<"LineIntersector::interpolateZ("<<p.toString()<<", "<<p1.toString()<<", "<<p2.toString()<<")"<<endl;
-#endif
-
-	if ( ISNAN(p1.z) )
-	{
-#if GEOS_DEBUG
-		cerr<<" p1 do not have a Z"<<endl;
-#endif
-		return p2.z; // might be DoubleNotANumber again
-	}
-
-	if ( ISNAN(p2.z) )
-	{
-#if GEOS_DEBUG
-		cerr<<" p2 do not have a Z"<<endl;
-#endif
-		return p1.z; // might be DoubleNotANumber again
-	}
-
-	if (p==p1)
-	{
-#if GEOS_DEBUG
-		cerr<<" p==p1, returning "<<p1.z<<endl;
-#endif
-		return p1.z;
-	}
-	if (p==p2)
-	{
-#if GEOS_DEBUG
-		cerr<<" p==p2, returning "<<p2.z<<endl;
-#endif
-		return p2.z;
-	}
-
-	//double zgap = fabs(p2.z - p1.z);
-	double zgap = p2.z - p1.z;
-	if ( ! zgap )
-	{
-#if GEOS_DEBUG
-		cerr<<" no zgap, returning "<<p2.z<<endl;
-#endif
-		return p2.z;
-	}
-	double xoff = (p2.x-p1.x);
-	double yoff = (p2.y-p1.y);
-	double seglen = (xoff*xoff+yoff*yoff);
-	xoff = (p.x-p1.x);
-	yoff = (p.y-p1.y);
-	double pdist = (xoff*xoff+yoff*yoff);
-	double fract = sqrt(pdist/seglen);
-	double zoff = zgap*fract;
-	//double interpolated = p1.z < p2.z ? p1.z+zoff : p1.z-zoff;
-	double interpolated = p1.z+zoff;
-#if GEOS_DEBUG
-	cerr<<" zgap:"<<zgap<<" seglen:"<<seglen<<" pdist:"<<pdist
-		<<" fract:"<<fract<<" z:"<<interpolated<<endl;
-#endif
-	return interpolated;
-
-}
-
-
-/*public*/
-void
-LineIntersector::computeIntersection(const Coordinate& p,const Coordinate& p1,const Coordinate& p2)
-{
-	isProperVar=false;
-
-	// do between check first, since it is faster than the orientation test
-	if(Envelope::intersects(p1,p2,p)) {
-		if ((CGAlgorithms::orientationIndex(p1,p2,p)==0)&&
-			(CGAlgorithms::orientationIndex(p2,p1,p)==0)) {
-			isProperVar=true;
-			if ((p==p1)||(p==p2)) // 2d only test
-			{
-				isProperVar=false;
-			}
-#if COMPUTE_Z
-			intPt[0]=p;
-#if GEOS_DEBUG
-			cerr<<"RobustIntersector::computeIntersection(Coordinate,Coordinate,Coordinate) calling interpolateZ"<<endl;
-#endif
-			double z = interpolateZ(p, p1, p2);
-			if ( !ISNAN(z) )
-			{
-				if ( ISNAN(intPt[0].z) )
-					intPt[0].z = z;
-				else
-					intPt[0].z = (intPt[0].z+z)/2;
-			}
-#endif // COMPUTE_Z
-			result=POINT_INTERSECTION;
-			return;
-		}
-	}
-	result = NO_INTERSECTION;
-}
-
-/* public static */
-bool
-LineIntersector::hasIntersection(const Coordinate& p, const Coordinate& p1, const Coordinate& p2)
-{
-	if(Envelope::intersects(p1,p2,p)) {
-		if ((CGAlgorithms::orientationIndex(p1,p2,p)==0)&&
-			(CGAlgorithms::orientationIndex(p2,p1,p)==0)) {
-			return true;
-		}
-	}
-	return false;
-}
-
-/*private*/
-int
-LineIntersector::computeIntersect(const Coordinate& p1,const Coordinate& p2,const Coordinate& q1,const Coordinate& q2)
-{
-#if GEOS_DEBUG
-	cerr<<"LineIntersector::computeIntersect called"<<endl;
-	cerr<<" p1:"<<p1.toString()<<" p2:"<<p2.toString()<<" q1:"<<q1.toString()<<" q2:"<<q2.toString()<<endl;
-#endif // GEOS_DEBUG
-
-	isProperVar=false;
-
-	// first try a fast test to see if the envelopes of the lines intersect
-	if (!Envelope::intersects(p1,p2,q1,q2))
-	{
-#if GEOS_DEBUG
-		cerr<<" NO_INTERSECTION"<<endl;
-#endif
-		return NO_INTERSECTION;
-	}
-
-	// for each endpoint, compute which side of the other segment it lies
-	// if both endpoints lie on the same side of the other segment,
-	// the segments do not intersect
-	int Pq1=CGAlgorithms::orientationIndex(p1,p2,q1);
-	int Pq2=CGAlgorithms::orientationIndex(p1,p2,q2);
-
-	if ((Pq1>0 && Pq2>0) || (Pq1<0 && Pq2<0))
-	{
-#if GEOS_DEBUG
-		cerr<<" NO_INTERSECTION"<<endl;
-#endif
-		return NO_INTERSECTION;
-	}
-
-	int Qp1=CGAlgorithms::orientationIndex(q1,q2,p1);
-	int Qp2=CGAlgorithms::orientationIndex(q1,q2,p2);
-
-	if ((Qp1>0 && Qp2>0)||(Qp1<0 && Qp2<0)) {
-#if GEOS_DEBUG
-		cerr<<" NO_INTERSECTION"<<endl;
-#endif
-		return NO_INTERSECTION;
-	}
-
-	bool collinear=Pq1==0 && Pq2==0 && Qp1==0 && Qp2==0;
-	if (collinear) {
-#if GEOS_DEBUG
-		cerr<<" computingCollinearIntersection"<<endl;
-#endif
-		return computeCollinearIntersection(p1,p2,q1,q2);
-	}
-
-	/**
-	 * At this point we know that there is a single intersection point
-	 * (since the lines are not collinear).
-	 */
-
-	/*
-	 * Check if the intersection is an endpoint.
-	 * If it is, copy the endpoint as
-	 * the intersection point. Copying the point rather than
-	 * computing it ensures the point has the exact value,
-	 * which is important for robustness. It is sufficient to
-	 * simply check for an endpoint which is on the other line,
-	 * since at this point we know that the inputLines must
-	 *  intersect.
-	 */
-	if (Pq1==0 || Pq2==0 || Qp1==0 || Qp2==0) {
-#if COMPUTE_Z
-		int hits=0;
-		double z=0.0;
-#endif
-		isProperVar=false;
-
-		/* Check for two equal endpoints.
-		 * This is done explicitly rather than by the orientation tests
-		 * below in order to improve robustness.
-		 *
-		 * (A example where the orientation tests fail
-		 *  to be consistent is:
-		 *
-		 * LINESTRING ( 19.850257749638203 46.29709338043669,
-		 * 			20.31970698357233 46.76654261437082 )
-		 * and
-		 * LINESTRING ( -48.51001596420236 -22.063180333403878,
-		 * 			19.850257749638203 46.29709338043669 )
-		 *
-		 * which used to produce the result:
-		 * (20.31970698357233, 46.76654261437082, NaN)
-		 */
-
-		if ( p1.equals2D(q1) || p1.equals2D(q2) ) {
-			intPt[0]=p1;
-#if COMPUTE_Z
-			if ( !ISNAN(p1.z) )
-			{
-				z += p1.z;
-				hits++;
-			}
-#endif
-		}
-		else if ( p2.equals2D(q1) || p2.equals2D(q2) ) {
-			intPt[0]=p2;
-#if COMPUTE_Z
-			if ( !ISNAN(p2.z) )
-			{
-				z += p2.z;
-				hits++;
-			}
-#endif
-		}
-
-		/**
-		 * Now check to see if any endpoint lies on the interior of the other segment.
-		 */
-		else if (Pq1==0) {
-			intPt[0]=q1;
-#if COMPUTE_Z
-			if ( !ISNAN(q1.z) )
-			{
-				z += q1.z;
-				hits++;
-			}
-#endif
-		}
-		else if (Pq2==0) {
-			intPt[0]=q2;
-#if COMPUTE_Z
-			if ( !ISNAN(q2.z) )
-			{
-				z += q2.z;
-				hits++;
-			}
-#endif
-		}
-		else if (Qp1==0) {
-			intPt[0]=p1;
-#if COMPUTE_Z
-			if ( !ISNAN(p1.z) )
-			{
-				z += p1.z;
-				hits++;
-			}
-#endif
-		}
-		else if (Qp2==0) {
-			intPt[0]=p2;
-#if COMPUTE_Z
-			if ( !ISNAN(p2.z) )
-			{
-				z += p2.z;
-				hits++;
-			}
-#endif
-		}
-#if COMPUTE_Z
-#if GEOS_DEBUG
-		cerr<<"LineIntersector::computeIntersect: z:"<<z<<" hits:"<<hits<<endl;
-#endif // GEOS_DEBUG
-		if ( hits ) intPt[0].z = z/hits;
-#endif // COMPUTE_Z
-	} else {
-		isProperVar=true;
-		intersection(p1, p2, q1, q2, intPt[0]);
-	}
-#if GEOS_DEBUG
-	cerr<<" POINT_INTERSECTION; intPt[0]:"<<intPt[0].toString()<<endl;
-#endif // GEOS_DEBUG
-	return POINT_INTERSECTION;
-}
-
-/*private*/
-int
-LineIntersector::computeCollinearIntersection(const Coordinate& p1,const Coordinate& p2,const Coordinate& q1,const Coordinate& q2)
-{
-#if COMPUTE_Z
-	double ztot;
-	int hits;
-	double p2z;
-	double p1z;
-	double q1z;
-	double q2z;
-#endif // COMPUTE_Z
-
-#if GEOS_DEBUG
-	cerr<<"LineIntersector::computeCollinearIntersection called"<<endl;
-	cerr<<" p1:"<<p1.toString()<<" p2:"<<p2.toString()<<" q1:"<<q1.toString()<<" q2:"<<q2.toString()<<endl;
-#endif // GEOS_DEBUG
-
-	bool p1q1p2=Envelope::intersects(p1,p2,q1);
-	bool p1q2p2=Envelope::intersects(p1,p2,q2);
-	bool q1p1q2=Envelope::intersects(q1,q2,p1);
-	bool q1p2q2=Envelope::intersects(q1,q2,p2);
-
-	if (p1q1p2 && p1q2p2) {
-#if GEOS_DEBUG
-		cerr<<" p1q1p2 && p1q2p2"<<endl;
-#endif
-		intPt[0]=q1;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		q1z = interpolateZ(q1, p1, p2);
-		if (!ISNAN(q1z)) { ztot+=q1z; hits++; }
-		if (!ISNAN(q1.z)) { ztot+=q1.z; hits++; }
-		if ( hits ) intPt[0].z = ztot/hits;
-#endif
-		intPt[1]=q2;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		q2z = interpolateZ(q2, p1, p2);
-		if (!ISNAN(q2z)) { ztot+=q2z; hits++; }
-		if (!ISNAN(q2.z)) { ztot+=q2.z; hits++; }
-		if ( hits ) intPt[1].z = ztot/hits;
-#endif
-#if GEOS_DEBUG
-		cerr<<" intPt[0]: "<<intPt[0].toString()<<endl;
-		cerr<<" intPt[1]: "<<intPt[1].toString()<<endl;
-#endif
-		return COLLINEAR_INTERSECTION;
-	}
-	if (q1p1q2 && q1p2q2) {
-#if GEOS_DEBUG
-		cerr<<" q1p1q2 && q1p2q2"<<endl;
-#endif
-		intPt[0]=p1;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		p1z = interpolateZ(p1, q1, q2);
-		if (!ISNAN(p1z)) { ztot+=p1z; hits++; }
-		if (!ISNAN(p1.z)) { ztot+=p1.z; hits++; }
-		if ( hits ) intPt[0].z = ztot/hits;
-#endif
-		intPt[1]=p2;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		p2z = interpolateZ(p2, q1, q2);
-		if (!ISNAN(p2z)) { ztot+=p2z; hits++; }
-		if (!ISNAN(p2.z)) { ztot+=p2.z; hits++; }
-		if ( hits ) intPt[1].z = ztot/hits;
-#endif
-		return COLLINEAR_INTERSECTION;
-	}
-	if (p1q1p2 && q1p1q2) {
-#if GEOS_DEBUG
-		cerr<<" p1q1p2 && q1p1q2"<<endl;
-#endif
-		intPt[0]=q1;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		q1z = interpolateZ(q1, p1, p2);
-		if (!ISNAN(q1z)) { ztot+=q1z; hits++; }
-		if (!ISNAN(q1.z)) { ztot+=q1.z; hits++; }
-		if ( hits ) intPt[0].z = ztot/hits;
-#endif
-		intPt[1]=p1;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		p1z = interpolateZ(p1, q1, q2);
-		if (!ISNAN(p1z)) { ztot+=p1z; hits++; }
-		if (!ISNAN(p1.z)) { ztot+=p1.z; hits++; }
-		if ( hits ) intPt[1].z = ztot/hits;
-#endif
-#if GEOS_DEBUG
-		cerr<<" intPt[0]: "<<intPt[0].toString()<<endl;
-		cerr<<" intPt[1]: "<<intPt[1].toString()<<endl;
-#endif
-		return (q1==p1) && !p1q2p2 && !q1p2q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
-	}
-	if (p1q1p2 && q1p2q2) {
-#if GEOS_DEBUG
-		cerr<<" p1q1p2 && q1p2q2"<<endl;
-#endif
-		intPt[0]=q1;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		q1z = interpolateZ(q1, p1, p2);
-		if (!ISNAN(q1z)) { ztot+=q1z; hits++; }
-		if (!ISNAN(q1.z)) { ztot+=q1.z; hits++; }
-		if ( hits ) intPt[0].z = ztot/hits;
-#endif
-		intPt[1]=p2;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		p2z = interpolateZ(p2, q1, q2);
-		if (!ISNAN(p2z)) { ztot+=p2z; hits++; }
-		if (!ISNAN(p2.z)) { ztot+=p2.z; hits++; }
-		if ( hits ) intPt[1].z = ztot/hits;
-#endif
-#if GEOS_DEBUG
-		cerr<<" intPt[0]: "<<intPt[0].toString()<<endl;
-		cerr<<" intPt[1]: "<<intPt[1].toString()<<endl;
-#endif
-		return (q1==p2) && !p1q2p2 && !q1p1q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
-	}
-	if (p1q2p2 && q1p1q2) {
-#if GEOS_DEBUG
-		cerr<<" p1q2p2 && q1p1q2"<<endl;
-#endif
-		intPt[0]=q2;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		q2z = interpolateZ(q2, p1, p2);
-		if (!ISNAN(q2z)) { ztot+=q2z; hits++; }
-		if (!ISNAN(q2.z)) { ztot+=q2.z; hits++; }
-		if ( hits ) intPt[0].z = ztot/hits;
-#endif
-		intPt[1]=p1;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		p1z = interpolateZ(p1, q1, q2);
-		if (!ISNAN(p1z)) { ztot+=p1z; hits++; }
-		if (!ISNAN(p1.z)) { ztot+=p1.z; hits++; }
-		if ( hits ) intPt[1].z = ztot/hits;
-#endif
-#if GEOS_DEBUG
-		cerr<<" intPt[0]: "<<intPt[0].toString()<<endl;
-		cerr<<" intPt[1]: "<<intPt[1].toString()<<endl;
-#endif
-		return (q2==p1) && !p1q1p2 && !q1p2q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
-	}
-	if (p1q2p2 && q1p2q2) {
-#if GEOS_DEBUG
-		cerr<<" p1q2p2 && q1p2q2"<<endl;
-#endif
-		intPt[0]=q2;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		q2z = interpolateZ(q2, p1, p2);
-		if (!ISNAN(q2z)) { ztot+=q2z; hits++; }
-		if (!ISNAN(q2.z)) { ztot+=q2.z; hits++; }
-		if ( hits ) intPt[0].z = ztot/hits;
-#endif
-		intPt[1]=p2;
-#if COMPUTE_Z
-		ztot=0;
-		hits=0;
-		p2z = interpolateZ(p2, q1, q2);
-		if (!ISNAN(p2z)) { ztot+=p2z; hits++; }
-		if (!ISNAN(p2.z)) { ztot+=p2.z; hits++; }
-		if ( hits ) intPt[1].z = ztot/hits;
-#endif
-#if GEOS_DEBUG
-		cerr<<" intPt[0]: "<<intPt[0].toString()<<endl;
-		cerr<<" intPt[1]: "<<intPt[1].toString()<<endl;
-#endif
-		return (q2==p2) && !p1q1p2 && !q1p1q2 ? POINT_INTERSECTION : COLLINEAR_INTERSECTION;
-	}
-	return NO_INTERSECTION;
-}
-
-/*private*/
-void
-LineIntersector::intersection(const Coordinate& p1,
-	const Coordinate& p2, const Coordinate& q1, const Coordinate& q2,
-	Coordinate &intPt) const
-{
-
-	intersectionWithNormalization(p1, p2, q1, q2, intPt);
-
-	/*
-	 * Due to rounding it can happen that the computed intersection is
-	 * outside the envelopes of the input segments.  Clearly this
-	 * is inconsistent.
-	 * This code checks this condition and forces a more reasonable answer
-	 *
-	 * MD - May 4 2005 - This is still a problem.  Here is a failure case:
-	 *
-	 * LINESTRING (2089426.5233462777 1180182.3877339689,
-	 *             2085646.6891757075 1195618.7333999649)
-	 * LINESTRING (1889281.8148903656 1997547.0560044837,
-	 *             2259977.3672235999 483675.17050843034)
-	 * int point = (2097408.2633752143,1144595.8008114607)
-	 */
-
-	if (! isInSegmentEnvelopes(intPt))
-	{
-		intPt = CentralEndpointIntersector::getIntersection(p1, p2, q1, q2);
-#if GEOS_DEBUG
-		cerr << "Intersection outside segment envelopes, snapped to "
-		     << intPt.toString() << endl;
-#endif
-	}
-
-	if (precisionModel!=NULL) {
-		precisionModel->makePrecise(intPt);
-	}
-
-
-#if COMPUTE_Z
-	double ztot = 0;
-	double zvals = 0;
-	double zp = interpolateZ(intPt, p1, p2);
-	double zq = interpolateZ(intPt, q1, q2);
-	if ( !ISNAN(zp)) { ztot += zp; zvals++; }
-	if ( !ISNAN(zq)) { ztot += zq; zvals++; }
-	if ( zvals ) intPt.z = ztot/zvals;
-#endif // COMPUTE_Z
-
-}
-
-/*private*/
-void
-LineIntersector::intersectionWithNormalization(const Coordinate& p1,
-	const Coordinate& p2, const Coordinate& q1, const Coordinate& q2,
-	Coordinate &intPt) const
-{
-	Coordinate n1=p1;
-	Coordinate n2=p2;
-	Coordinate n3=q1;
-	Coordinate n4=q2;
-	Coordinate normPt;
-	normalizeToEnvCentre(n1, n2, n3, n4, normPt);
-
-	safeHCoordinateIntersection(n1, n2, n3, n4, intPt);
-
-	intPt.x += normPt.x;
-	intPt.y += normPt.y;
-}
-
-
-/*private*/
-double
-LineIntersector::smallestInAbsValue(double x1,double x2,double x3,double x4) const
-{
-	double x=x1;
-	double xabs=fabs(x);
-	if(fabs(x2)<xabs) {
-		x=x2;
-		xabs=fabs(x2);
-	}
-	if(fabs(x3)<xabs) {
-		x=x3;
-		xabs=fabs(x3);
-	}
-	if(fabs(x4)<xabs) {
-		x=x4;
-	}
-	return x;
-}
-
-/*private*/
-bool
-LineIntersector::isInSegmentEnvelopes(const Coordinate& intPt) const
-{
-	Envelope env0(*inputLines[0][0], *inputLines[0][1]);
-	Envelope env1(*inputLines[1][0], *inputLines[1][1]);
-	return env0.contains(intPt) && env1.contains(intPt);
-}
-
-/*private*/
-void
-LineIntersector::normalizeToEnvCentre(Coordinate &n00, Coordinate &n01,
-		Coordinate &n10, Coordinate &n11, Coordinate &normPt) const
-{
-	double minX0 = n00.x < n01.x ? n00.x : n01.x;
-	double minY0 = n00.y < n01.y ? n00.y : n01.y;
-	double maxX0 = n00.x > n01.x ? n00.x : n01.x;
-	double maxY0 = n00.y > n01.y ? n00.y : n01.y;
-
-	double minX1 = n10.x < n11.x ? n10.x : n11.x;
-	double minY1 = n10.y < n11.y ? n10.y : n11.y;
-	double maxX1 = n10.x > n11.x ? n10.x : n11.x;
-	double maxY1 = n10.y > n11.y ? n10.y : n11.y;
-
-	double intMinX = minX0 > minX1 ? minX0 : minX1;
-	double intMaxX = maxX0 < maxX1 ? maxX0 : maxX1;
-	double intMinY = minY0 > minY1 ? minY0 : minY1;
-	double intMaxY = maxY0 < maxY1 ? maxY0 : maxY1;
-
-	double intMidX = (intMinX + intMaxX) / 2.0;
-	double intMidY = (intMinY + intMaxY) / 2.0;
-
-	normPt.x = intMidX;
-	normPt.y = intMidY;
-
-	n00.x -= normPt.x;    n00.y -= normPt.y;
-	n01.x -= normPt.x;    n01.y -= normPt.y;
-	n10.x -= normPt.x;    n10.y -= normPt.y;
-	n11.x -= normPt.x;    n11.y -= normPt.y;
-
-#if COMPUTE_Z
-	double minZ0 = n00.z < n01.z ? n00.z : n01.z;
-	double minZ1 = n10.z < n11.z ? n10.z : n11.z;
-	double maxZ0 = n00.z > n01.z ? n00.z : n01.z;
-	double maxZ1 = n10.z > n11.z ? n10.z : n11.z;
-	double intMinZ = minZ0 > minZ1 ? minZ0 : minZ1;
-	double intMaxZ = maxZ0 < maxZ1 ? maxZ0 : maxZ1;
-	double intMidZ = (intMinZ + intMaxZ) / 2.0;
-	normPt.z = intMidZ;
-	n00.z -= normPt.z;
-	n01.z -= normPt.z;
-	n10.z -= normPt.z;
-	n11.z -= normPt.z;
-#endif
-}
-
-/*private*/
-void
-LineIntersector::safeHCoordinateIntersection(const Coordinate& p1,
-		const Coordinate& p2, const Coordinate& q1,
-		const Coordinate& q2, Coordinate& intPt) const
-{
-	try {
-		HCoordinate::intersection(p1, p2, q1, q2, intPt);
-#if GEOS_DEBUG
-		cerr<<" HCoordinate found intersection h:"<<intPt.toString()<<endl;
-#endif
-
-	} catch (const NotRepresentableException& /* e */) {
-		// compute an approximate result
-		intPt = CentralEndpointIntersector::getIntersection(p1, p2, q1, q2);
-	}
-}
-
-} // namespace geos.algorithm
-} // namespace geos
-
-/**********************************************************************
- * $Log$
- * Revision 1.42  2006/04/12 11:57:11  strk
- * Fixed debugging line
- *
- * Revision 1.41  2006/04/07 09:12:57  strk
- * kept isInSegmentEnvelopes() check even when not debugging
- *
- * Revision 1.40  2006/04/06 21:31:40  strk
- * Const correctness for debugging function
- *
- * Revision 1.39  2006/04/04 12:39:08  strk
- * Changed NotRepresentableCoordinate exception handler to throw
- * a TopologyException. This allows further handling.
- *
- * Revision 1.38  2006/03/21 11:12:23  strk
- * Cleanups: headers inclusion and Log section
- *
- * Revision 1.37  2006/03/16 10:38:14  strk
- * Bug #63 - Remove unreferenced local variable warning
- *
- * Revision 1.36  2006/03/09 16:46:45  strk
- * geos::geom namespace definition, first pass at headers split
- **********************************************************************/
diff --git a/Patches/GEOS/OffsetCurveSetBuilder.cpp b/Patches/GEOS/OffsetCurveSetBuilder.cpp
deleted file mode 100644
index 53333d52..00000000
--- a/Patches/GEOS/OffsetCurveSetBuilder.cpp
+++ /dev/null
@@ -1,403 +0,0 @@
-/**********************************************************************
- * $Id: OffsetCurveSetBuilder.cpp 3306 2011-04-27 14:13:45Z strk $
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2011 Sandro Santilli <strk@keybit.net>
- * Copyright (C) 2005 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: operation/buffer/OffsetCurveSetBuilder.java r378 (JTS-1.12)
- *
- **********************************************************************/
-
-#include <geos/algorithm/CGAlgorithms.h>
-#include <geos/algorithm/MinimumDiameter.h>
-#include <geos/util/UnsupportedOperationException.h>
-#include <geos/operation/buffer/OffsetCurveSetBuilder.h>
-#include <geos/operation/buffer/OffsetCurveBuilder.h>
-#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/Geometry.h>
-#include <geos/geom/GeometryFactory.h>
-#include <geos/geom/GeometryCollection.h>
-#include <geos/geom/Point.h>
-#include <geos/geom/LinearRing.h>
-#include <geos/geom/LineString.h>
-#include <geos/geom/Polygon.h>
-#include <geos/geom/Location.h>
-#include <geos/geom/Triangle.h>
-#include <geos/geomgraph/Position.h>
-#include <geos/geomgraph/Label.h>
-#include <geos/noding/NodedSegmentString.h>
-
-#include <cmath>
-#include <cassert>
-#include <memory>
-#include <vector>
-#include <typeinfo>
-#include <algorithm>
-
-#ifndef GEOS_DEBUG
-#define GEOS_DEBUG 0
-#endif
-
-//using namespace geos::operation::overlay;
-using namespace geos::geom;
-using namespace geos::noding; // SegmentString
-using namespace geos::geomgraph; // Label, Position
-using namespace geos::algorithm; // CGAlgorithms
-
-namespace geos {
-namespace operation { // geos.operation
-namespace buffer { // geos.operation.buffer
-
-OffsetCurveSetBuilder::OffsetCurveSetBuilder(const Geometry& newInputGeom,
-		double newDistance, OffsetCurveBuilder& newCurveBuilder):
-	inputGeom(newInputGeom),
-	distance(newDistance),
-	curveBuilder(newCurveBuilder),
-	curveList()
-{
-}
-
-OffsetCurveSetBuilder::~OffsetCurveSetBuilder()
-{
-	for (size_t i=0, n=curveList.size(); i<n; ++i)
-	{
-		SegmentString* ss = curveList[i];
-		delete ss->getCoordinates();
-		delete ss;
-	}
-	for (size_t i=0, n=newLabels.size(); i<n; ++i)
-		delete newLabels[i];
-}
-
-/* public */
-std::vector<SegmentString*>&
-OffsetCurveSetBuilder::getCurves()
-{
-	add(inputGeom);
-	return curveList;
-}
-
-/*public*/
-void
-OffsetCurveSetBuilder::addCurves(const std::vector<CoordinateSequence*>& lineList,
-	int leftLoc, int rightLoc)
-{
-	for (size_t i=0, n=lineList.size(); i<n; ++i)
-	{
-		CoordinateSequence *coords = lineList[i];
-		addCurve(coords, leftLoc, rightLoc);
-	}
-}
-
-/*private*/
-void
-OffsetCurveSetBuilder::addCurve(CoordinateSequence *coord,
-	int leftLoc, int rightLoc)
-{
-#if GEOS_DEBUG
-	std::cerr<<__FUNCTION__<<": coords="<<coord->toString()<<std::endl;
-#endif
-	// don't add null curves!
-	if (coord->getSize() < 2) {
-#if GEOS_DEBUG
-		std::cerr<<" skipped (size<2)"<<std::endl;
-#endif
-		delete coord;
-		return;
-	}
-
-	// add the edge for a coordinate list which is a raw offset curve
-	Label *newlabel = new Label(0, Location::BOUNDARY, leftLoc, rightLoc);
-
-	SegmentString *e=new NodedSegmentString(coord, newlabel);
-
-	// SegmentString doesnt own the sequence, so we need to delete in
-	// the destructor
-	newLabels.push_back(newlabel);
-	curveList.push_back(e);
-}
-
-
-/*private*/
-void
-OffsetCurveSetBuilder::add(const Geometry& g)
-{
-  if (g.isEmpty()) {
-#if GEOS_DEBUG
-    std::cerr<<__FUNCTION__<<": skip empty geometry"<<std::endl;
-#endif
-    return;
-  }
-
-	const Polygon *poly = dynamic_cast<const Polygon *>(&g);
-	if ( poly ) {
-		addPolygon(poly);
-		return;
-	}
-
-	const LineString *line = dynamic_cast<const LineString *>(&g);
-	if ( line ) {
-		addLineString(line);
-		return;
-	}
-
-	const Point *point = dynamic_cast<const Point *>(&g);
-	if ( point ) {
-		addPoint(point);
-		return;
-	}
-
-	const GeometryCollection *collection = dynamic_cast<const GeometryCollection *>(&g);
-	if ( collection ) {
-		addCollection(collection);
-		return;
-	}
-
-	std::string out=typeid(g).name();
-	throw util::UnsupportedOperationException("GeometryGraph::add(Geometry &): unknown geometry type: "+out);
-}
-
-/*private*/
-void
-OffsetCurveSetBuilder::addCollection(const GeometryCollection *gc)
-{
-	for (int i=0, n=gc->getNumGeometries(); i<n; i++) {
-		const Geometry *g=gc->getGeometryN(i);
-		add(*g);
-	}
-}
-
-/*private*/
-void
-OffsetCurveSetBuilder::addPoint(const Point *p)
-{
-	if (distance <= 0.0) return;
-	const CoordinateSequence *coord=p->getCoordinatesRO();
-	std::vector<CoordinateSequence*> lineList;
-	curveBuilder.getLineCurve(coord, distance, lineList);
-
-	addCurves(lineList, Location::EXTERIOR, Location::INTERIOR);
-	//delete lineList;
-}
-
-/*private*/
-void
-OffsetCurveSetBuilder::addLineString(const LineString *line)
-{
-	if (distance <= 0.0 && ! curveBuilder.getBufferParameters().isSingleSided())
-	{
-		return;
-	}
-
-#if GEOS_DEBUG
-	std::cerr<<__FUNCTION__<<": "<<line->toString()<<std::endl;
-#endif
-	std::auto_ptr<CoordinateSequence> coord(CoordinateSequence::removeRepeatedPoints(line->getCoordinatesRO()));
-#if GEOS_DEBUG
-	std::cerr<<" After coordinate removal: "<<coord->toString()<<std::endl;
-#endif
-	std::vector<CoordinateSequence*> lineList;
-	curveBuilder.getLineCurve(coord.get(), distance, lineList);
-	addCurves(lineList, Location::EXTERIOR, Location::INTERIOR);
-}
-
-/*private*/
-void
-OffsetCurveSetBuilder::addPolygon(const Polygon *p)
-{
-	double offsetDistance=distance;
-
-	int offsetSide=Position::LEFT;
-	if (distance < 0.0)
-	{
-		offsetDistance = -distance;
-		offsetSide = Position::RIGHT;
-	}
-
-	// FIXME: avoid the C-style cast
-	const LinearRing *shell=(const LinearRing *)p->getExteriorRing();
-
-	// optimization - don't bother computing buffer
-	// if the polygon would be completely eroded
-	if (distance < 0.0 && isErodedCompletely(shell, distance))
-	{
-#if GEOS_DEBUG
-		std::cerr<<__FUNCTION__<<": polygon is eroded completely "<<std::endl;
-#endif
-		return;
-	}
-
-	// don't attempt to buffer a polygon
-	// with too few distinct vertices
-	CoordinateSequence *shellCoord =
-		CoordinateSequence::removeRepeatedPoints(shell->getCoordinatesRO());
-	if (distance <= 0.0 && shellCoord->size() < 3)
-	{
-		delete shellCoord;
-		return;
-	}
-
-	addPolygonRing(
-		shellCoord,
-		offsetDistance,
-		offsetSide,
-		Location::EXTERIOR,
-		Location::INTERIOR);
-
-	delete shellCoord;
-
-	for (size_t i=0, n=p->getNumInteriorRing(); i<n; ++i)
-	{
-		const LineString *hls=p->getInteriorRingN(i);
-		assert(dynamic_cast<const LinearRing *>(hls));
-		const LinearRing *hole=static_cast<const LinearRing *>(hls);
-
-		// optimization - don't bother computing buffer for this hole
-		// if the hole would be completely covered
-		if (distance > 0.0 && isErodedCompletely(hole, -distance))
-		{
-			continue;
-		}
-
-		CoordinateSequence *holeCoord =
-			CoordinateSequence::removeRepeatedPoints(hole->getCoordinatesRO());
-
-		// Holes are topologically labelled opposite to the shell,
-		// since the interior of the polygon lies on their opposite
-		// side (on the left, if the hole is oriented CCW)
-		addPolygonRing(
-			holeCoord,
-			offsetDistance,
-			Position::opposite(offsetSide),
-			Location::INTERIOR,
-			Location::EXTERIOR);
-
-		delete holeCoord;
-	}
-}
-
-/* private */
-void
-OffsetCurveSetBuilder::addPolygonRing(const CoordinateSequence *coord,
-	double offsetDistance, int side, int cwLeftLoc, int cwRightLoc)
-{
-
-	// don't bother adding ring if it is "flat" and
-	// will disappear in the output
-	if (offsetDistance == 0.0 && coord->size() < LinearRing::MINIMUM_VALID_SIZE)
-		return;
-
-	int leftLoc=cwLeftLoc;
-	int rightLoc=cwRightLoc;
-#if GEOS_DEBUG
-	std::cerr<<"OffsetCurveSetBuilder::addPolygonRing: CCW: "<<CGAlgorithms::isCCW(coord)<<std::endl;
-#endif
-	if (coord->size() >= LinearRing::MINIMUM_VALID_SIZE
-			&& CGAlgorithms::isCCW(coord))
-	{
-		leftLoc=cwRightLoc;
-		rightLoc=cwLeftLoc;
-#if GEOS_DEBUG
-	std::cerr<<" side "<<side<<" becomes "<<Position::opposite(side)<<std::endl;
-#endif
-		side=Position::opposite(side);
-	}
-	std::vector<CoordinateSequence*> lineList;
-	curveBuilder.getRingCurve(coord, side, offsetDistance, lineList);
-	addCurves(lineList, leftLoc, rightLoc);
-}
-
-/*private*/
-bool
-OffsetCurveSetBuilder::isErodedCompletely(const LinearRing *ring,
-	double bufferDistance)
-{
-	const CoordinateSequence *ringCoord = ring->getCoordinatesRO();
-
-	// degenerate ring has no area
-	if (ringCoord->getSize() < 4)
-		return bufferDistance < 0;
-
-	// important test to eliminate inverted triangle bug
-	// also optimizes erosion test for triangles
-	if (ringCoord->getSize() == 4)
-		return isTriangleErodedCompletely(ringCoord, bufferDistance);
-
-  const Envelope* env = ring->getEnvelopeInternal();
-  double envMinDimension = std::min(env->getHeight(), env->getWidth());
-  if (bufferDistance < 0.0 && 2 * std::abs(bufferDistance) > envMinDimension)
-      return true;
-
-	/**
-	 * The following is a heuristic test to determine whether an
-	 * inside buffer will be eroded completely->
-	 * It is based on the fact that the minimum diameter of the ring
-	 * pointset
-	 * provides an upper bound on the buffer distance which would erode the
-	 * ring->
-	 * If the buffer distance is less than the minimum diameter, the ring
-	 * may still be eroded, but this will be determined by
-	 * a full topological computation->
-	 *
-	 */
-
-/* MD  7 Feb 2005 - there's an unknown bug in the MD code,
- so disable this for now */
-#if 0
-	MinimumDiameter md(ring); //=new MinimumDiameter(ring);
-	double minDiam = md.getLength();
-	return minDiam < (2 * std::fabs(bufferDistance));
-#endif
-
-  return false;
-}
-
-/*private*/
-bool
-OffsetCurveSetBuilder::isTriangleErodedCompletely(
-	const CoordinateSequence *triangleCoord, double bufferDistance)
-{
-	Triangle tri(triangleCoord->getAt(0), triangleCoord->getAt(1), triangleCoord->getAt(2));
-
-	Coordinate inCentre;
-	tri.inCentre(inCentre);
-	double distToCentre=CGAlgorithms::distancePointLine(inCentre, tri.p0, tri.p1);
-	bool ret = distToCentre < std::fabs(bufferDistance);
-	return ret;
-}
-
-
-} // namespace geos.operation.buffer
-} // namespace geos.operation
-} // namespace geos
-
-/**********************************************************************
- * $Log$
- * Revision 1.36  2006/06/12 11:29:23  strk
- * unsigned int => size_t
- *
- * Revision 1.35  2006/06/09 07:42:13  strk
- * * source/geomgraph/GeometryGraph.cpp, source/operation/buffer/OffsetCurveSetBuilder.cpp, source/operation/overlay/OverlayOp.cpp, source/operation/valid/RepeatedPointTester.cpp: Fixed warning after Polygon ring accessor methods changed to work with size_t. Small optimizations in loops.
- *
- * Revision 1.34  2006/05/03 09:14:22  strk
- * * source/operation/buffer/OffsetCurveSetBuilder.cpp: used auto_ptr to protect leaks of CoordinateSequence
- * * source/noding/ScaledNoder.cpp, source/headers/geos/noding/ScaledNoder.h: ported JTS bugfix in scale method.
- *
- * Revision 1.33  2006/03/27 17:04:18  strk
- * Cleanups and explicit initializations
- *
- * Revision 1.32  2006/03/22 11:18:39  strk
- * Changed back 'unable to find edge to compute depths' from assertion to TopologyException
- *
- **********************************************************************/
diff --git a/Patches/GEOS/Patch.cmake b/Patches/GEOS/Patch.cmake
old mode 100755
new mode 100644
index d892aa0e..ea8f146a
--- a/Patches/GEOS/Patch.cmake
+++ b/Patches/GEOS/Patch.cmake
@@ -6,27 +6,6 @@
 #-
 message("Patching geos")
 
-# Fix the version number to not contain "dev" and add a SOVERSION
-# for the public C API
-#file(COPY ${GEOS_patch}/CMakeLists.txt DESTINATION ${GEOS_source})
-
-# Fix ambiguous call to std::log(int) for VS2010
-#file(COPY ${GEOS_patch}/BufferOp.cpp DESTINATION ${GEOS_source}/src/operation/buffer)
-
-# Create a geos-config for installation to support pkgconfig builds
-#file(COPY ${GEOS_patch}/geos-config.in DESTINATION ${GEOS_source}/cmake)
-
-#file(COPY ${GEOS_patch}/Info.plist.in DESTINATION ${GEOS_source}/src)
-# Fix the horribly broken capi/CMakeLists.txt in GEOG 3.3.2 by using the one
-# from GEOS 3.4.2.
-file(COPY ${GEOS_patch}/capi/CMakeLists.txt DESTINATION ${GEOS_source}/capi)
-
-#file(COPY ${GEOS_patch}/LineIntersector.cpp DESTINATION ${GEOS_source}/src/algorithm)
-#file(COPY ${GEOS_patch}/WKTWriter.cpp DESTINATION ${GEOS_source}/src/io)
-#file(COPY ${GEOS_patch}/OffsetCurveSetBuilder.cpp DESTINATION ${GEOS_source}/src/operation/buffer)
-
-file(COPY
-  ${GEOS_patch}/GenerateSourceGroups.cmake
-  DESTINATION
-  ${GEOS_source}/cmake/modules/
-  )
+# This patch removes the GEOS doc directory
+# since it references tests which are disabled
+file(COPY ${GEOS_patch}/CMakeLists.txt DESTINATION ${GEOS_source}/)
diff --git a/Patches/GEOS/WKTWriter.cpp b/Patches/GEOS/WKTWriter.cpp
deleted file mode 100644
index 0052c5a7..00000000
--- a/Patches/GEOS/WKTWriter.cpp
+++ /dev/null
@@ -1,492 +0,0 @@
-/**********************************************************************
- * $Id: WKTWriter.cpp 3766 2013-02-21 10:25:43Z strk $
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2011 Sandro Santilli <strk@keybit.net>
- * Copyright (C) 2005-2006 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: io/WKTWriter.java rev. 1.34 (JTS-1.7)
- *
- **********************************************************************/
-
-#include <geos/io/WKTWriter.h>
-#include <geos/io/Writer.h>
-#include <geos/io/CLocalizer.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/Point.h>
-#include <geos/geom/LinearRing.h>
-#include <geos/geom/LineString.h>
-#include <geos/geom/Polygon.h>
-#include <geos/geom/MultiPoint.h>
-#include <geos/geom/MultiLineString.h>
-#include <geos/geom/MultiPolygon.h>
-#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/PrecisionModel.h>
-#include <geos/util/IllegalArgumentException.h>
-
-#include <typeinfo>
-#include <cstdio> // should avoid this
-#include <string>
-#include <sstream>
-#include <cassert>
-#include <cmath>
-#include <iomanip>
-#include <algorithm>
-
-using namespace std;
-using namespace geos::geom;
-
-namespace geos {
-namespace io { // geos.io
-
-WKTWriter::WKTWriter():
-  decimalPlaces(6),
-	isFormatted(false),
-	roundingPrecision(-1),
-	trim(false),
-	level(0),
-	defaultOutputDimension(2),
-	old3D(false)
-{
-}
-
-/* public */
-void
-WKTWriter::setOutputDimension(int dims)
-{
-	if ( dims < 2 || dims > 3 )
-		throw util::IllegalArgumentException("WKT output dimension must be 2 or 3");
-	defaultOutputDimension = dims;
-}
-
-WKTWriter::~WKTWriter() {}
-
-/*static*/
-string
-WKTWriter::toLineString(const CoordinateSequence& seq)
-{
-	stringstream buf(ios_base::in|ios_base::out);
-    buf << "LINESTRING ";
-	unsigned int npts = seq.getSize();
-	if ( npts == 0 )
-	{
-		buf << "EMPTY";
-	}
-	else
-	{
-		buf << "(";
-		for (unsigned int i=0; i<npts; ++i)
-		{
-			if (i) buf << ", ";
-			buf << seq.getX(i) << " " << seq.getY(i);
-#if PRINT_Z
-			buf << seq.getZ(i);
-#endif
-		}
-		buf << ")";
-	}
-
-	return buf.str();
-}
-
-/*static*/
-string
-WKTWriter::toLineString(const Coordinate& p0, const Coordinate& p1)
-{
-	stringstream ret(ios_base::in|ios_base::out);
-	ret << "LINESTRING (" << p0.x << " " << p0.y;
-#if PRINT_Z
-	ret << " " << p0.z;
-#endif
-	ret << ", " << p1.x << " " << p1.y;
-#if PRINT_Z
-	ret << " " << p1.z;
-#endif
-    ret << ")";
-
-	return ret.str();
-}
-
-/*static*/
-string
-WKTWriter::toPoint(const Coordinate& p0)
-{
-	stringstream ret(ios_base::in|ios_base::out);
-    ret << "POINT (";
-#if PRINT_Z
-	ret << p0.x << " " << p0.y  << " " << p0.z << " )";
-#else
-	ret << p0.x << " " << p0.y  << " )";
-#endif
-	return ret.str();
-}
-
-void
-WKTWriter::setRoundingPrecision(int p0)
-{
-	if(p0 < -1) {
-		p0 = -1;
-	}
-	roundingPrecision = p0;
-}
-
-void
-WKTWriter::setTrim(bool p0)
-{
-	trim = p0;
-}
-
-string WKTWriter::write(const Geometry *geometry) {
-	Writer sw;
-  writeFormatted(geometry,false,&sw);
-	string res=sw.toString();
-	return res;
-}
-
-void WKTWriter::write(const Geometry *geometry, Writer *writer) {
-	writeFormatted(geometry, false, writer);
-}
-
-string WKTWriter::writeFormatted(const Geometry *geometry) {
-	Writer sw;
-	writeFormatted(geometry, true, &sw);
-	return sw.toString();
-}
-
-void WKTWriter::writeFormatted(const Geometry *geometry, Writer *writer) {
-	writeFormatted(geometry, true, writer);
-}
-
-void
-WKTWriter::writeFormatted(const Geometry *geometry, bool isFormatted,
-                          Writer *writer)
-{
-        CLocalizer clocale;
-	this->isFormatted=isFormatted;
-  decimalPlaces = roundingPrecision == -1 ? geometry->getPrecisionModel()->getMaximumSignificantDigits() : roundingPrecision;
-	appendGeometryTaggedText(geometry, 0, writer);
-}
-
-void
-WKTWriter::appendGeometryTaggedText(const Geometry *geometry, int level,
-		Writer *writer)
-{
-  outputDimension = min( defaultOutputDimension,
-                         geometry->getCoordinateDimension() );
-
-  indent(level, writer);
-  if ( const Point* point = dynamic_cast<const Point*>(geometry) )
-  {
-    appendPointTaggedText(point->getCoordinate(),level,writer);
-  }
-  else if ( const LinearRing* lr =
-    dynamic_cast<const LinearRing*>(geometry) )
-  {
-    appendLinearRingTaggedText(lr, level, writer);
-  }
-  else if ( const LineString* ls =
-    dynamic_cast<const LineString*>(geometry) )
-  {
-    appendLineStringTaggedText(ls, level, writer);
-  }
-  else if ( const Polygon* x =
-    dynamic_cast<const Polygon*>(geometry) )
-  {
-    appendPolygonTaggedText(x, level, writer);
-  }
-  else if ( const MultiPoint* x =
-    dynamic_cast<const MultiPoint*>(geometry) )
-  {
-    appendMultiPointTaggedText(x, level, writer);
-  }
-  else if ( const MultiLineString* x =
-    dynamic_cast<const MultiLineString*>(geometry) )
-  {
-    appendMultiLineStringTaggedText(x, level, writer);
-  }
-  else if ( const MultiPolygon* x =
-    dynamic_cast<const MultiPolygon*>(geometry) )
-  {
-    appendMultiPolygonTaggedText(x, level, writer);
-  }
-  else if ( const GeometryCollection* x =
-    dynamic_cast<const GeometryCollection*>(geometry) )
-  {
-    appendGeometryCollectionTaggedText(x, level, writer);
-  }
-  else
-  {
-    assert(0); // Unsupported Geometry implementation
-  }
-}
-
-/*protected*/
-void
-WKTWriter::appendPointTaggedText(const Coordinate* coordinate, int level,
-		Writer *writer)
-{
-	writer->write("POINT ");
-    if( outputDimension == 3 && !old3D && coordinate != NULL )
-        writer->write( "Z " );
-
-	appendPointText(coordinate, level, writer);
-}
-
-void
-WKTWriter::appendLineStringTaggedText(const LineString *lineString, int level,
-		Writer *writer)
-{
-	writer->write("LINESTRING ");
-    if( outputDimension == 3 && !old3D && !lineString->isEmpty() )
-        writer->write( "Z " );
-
-	appendLineStringText(lineString, level, false, writer);
-}
-
-/*
- * Converts a <code>LinearRing</code> to &lt;LinearRing Tagged Text&gt;
- * format, then appends it to the writer.
- *
- * @param  linearRing  the <code>LinearRing</code> to process
- * @param  writer      the output writer to append to
- */
-void WKTWriter::appendLinearRingTaggedText(const LinearRing* linearRing, int level, Writer *writer) {
-	writer->write("LINEARRING ");
-    if( outputDimension == 3 && !old3D && !linearRing->isEmpty() )
-        writer->write( "Z " );
-	appendLineStringText((LineString*)linearRing, level, false, writer);
-}
-
-void WKTWriter::appendPolygonTaggedText(const Polygon *polygon, int level, Writer *writer) {
-	writer->write("POLYGON ");
-    if( outputDimension == 3 && !old3D && !polygon->isEmpty())
-        writer->write( "Z " );
-	appendPolygonText(polygon, level, false, writer);
-}
-
-void WKTWriter::appendMultiPointTaggedText(const MultiPoint *multipoint, int level, Writer *writer) {
-	writer->write("MULTIPOINT ");
-    if( outputDimension == 3 && !old3D && !multipoint->isEmpty() )
-        writer->write( "Z " );
-	appendMultiPointText(multipoint, level, writer);
-}
-
-void WKTWriter::appendMultiLineStringTaggedText(const MultiLineString *multiLineString, int level,Writer *writer) {
-	writer->write("MULTILINESTRING ");
-    if( outputDimension == 3 && !old3D && !multiLineString->isEmpty() )
-        writer->write( "Z " );
-	appendMultiLineStringText(multiLineString, level, false, writer);
-}
-
-void WKTWriter::appendMultiPolygonTaggedText(const MultiPolygon *multiPolygon, int level, Writer *writer) {
-	writer->write("MULTIPOLYGON ");
-    if( outputDimension == 3 && !old3D && !multiPolygon->isEmpty() )
-        writer->write( "Z " );
-	appendMultiPolygonText(multiPolygon, level, writer);
-}
-
-void WKTWriter::appendGeometryCollectionTaggedText(const GeometryCollection *geometryCollection, int level,Writer *writer) {
-	writer->write("GEOMETRYCOLLECTION ");
-    if( outputDimension == 3 && !old3D && !geometryCollection->isEmpty() )
-        writer->write( "Z " );
-	appendGeometryCollectionText(geometryCollection, level, writer);
-}
-
-void
-WKTWriter::appendPointText(const Coordinate* coordinate, int /*level*/,
-		Writer *writer)
-{
-	if (coordinate==NULL) {
-		writer->write("EMPTY");
-	} else {
-		writer->write("(");
-		appendCoordinate(coordinate, writer);
-		writer->write(")");
-	}
-}
-
-/* protected */
-void
-WKTWriter::appendCoordinate(const Coordinate* coordinate,
-		Writer *writer)
-{
-	writer->write(writeNumber(coordinate->x));
-	writer->write(" ");
-	writer->write(writeNumber(coordinate->y));
-	if( outputDimension == 3 )
-	{
-		writer->write(" ");
-		if( ISNAN(coordinate->z) )
-			writer->write(writeNumber(0.0));
-		else
-			writer->write(writeNumber(coordinate->z));
-	}
-}
-
-/* protected */
-string
-WKTWriter::writeNumber(double d) {
-
-  std::stringstream ss;
-
-  if ( ! trim ) ss << std::fixed;
-  ss << std::setprecision(decimalPlaces >= 0 ? decimalPlaces : 0) << d;
-
-	return ss.str();
-}
-
-void
-WKTWriter::appendLineStringText(const LineString *lineString, int level,
-		bool doIndent, Writer *writer)
-{
-	if (lineString->isEmpty()) {
-		writer->write("EMPTY");
-	} else {
-		if (doIndent) indent(level, writer);
-		writer->write("(");
-		for(size_t i=0, n=lineString->getNumPoints(); i<n; ++i)
-		{
-			if (i>0) {
-				writer->write(", ");
-				if (i%10==0) indent(level + 2, writer);
-			}
-			appendCoordinate(&(lineString->getCoordinateN(i)), writer);
-		}
-		writer->write(")");
-	}
-}
-
-void
-WKTWriter::appendPolygonText(const Polygon *polygon, int /*level*/,
-		bool indentFirst, Writer *writer)
-{
-	if (polygon->isEmpty()) {
-		writer->write("EMPTY");
-	} else {
-		if (indentFirst) indent(level, writer);
-		writer->write("(");
-		appendLineStringText(polygon->getExteriorRing(), level, false, writer);
-		for (size_t i=0, n=polygon->getNumInteriorRing(); i<n; ++i)
-		{
-			writer->write(", ");
-			const LineString *ls=polygon->getInteriorRingN(i);
-			appendLineStringText(ls, level + 1, true, writer);
-		}
-		writer->write(")");
-	}
-}
-
-void
-WKTWriter::appendMultiPointText(const MultiPoint *multiPoint,
-		int /*level*/, Writer *writer)
-{
-	if (multiPoint->isEmpty()) {
-		writer->write("EMPTY");
-	} else {
-		writer->write("(");
-		for (unsigned int i=0, n=multiPoint->getNumGeometries();
-				i<n; i++)
-		{
-			if (i > 0)
-			{
-				writer->write(", ");
-			}
-			appendCoordinate(
-				dynamic_cast<const Point*>(multiPoint->getGeometryN(i))->getCoordinate(),
-				writer);
-		}
-		writer->write(")");
-	}
-}
-
-void WKTWriter::appendMultiLineStringText(const MultiLineString *multiLineString, int level, bool indentFirst,
-											Writer *writer) {
-	if (multiLineString->isEmpty()) {
-		writer->write("EMPTY");
-	} else {
-		int level2=level;
-		bool doIndent=indentFirst;
-		writer->write("(");
-		for (unsigned int i=0, n=multiLineString->getNumGeometries();
-				i<n; i++)
-		{
-			if (i>0) {
-				writer->write(", ");
-				level2=level+1;
-				doIndent=true;
-			}
-			const LineString* ls = dynamic_cast<const LineString *>(
-			  multiLineString->getGeometryN(i)
-			);
-			appendLineStringText(ls, level2, doIndent, writer);
-		}
-		writer->write(")");
-	}
-}
-
-void WKTWriter::appendMultiPolygonText(const MultiPolygon *multiPolygon, int level, Writer *writer) {
-	if (multiPolygon->isEmpty()) {
-		writer->write("EMPTY");
-	} else {
-		int level2=level;
-		bool doIndent=false;
-		writer->write("(");
-		for (unsigned int i=0, n=multiPolygon->getNumGeometries();
-				i < n; i++)
-		{
-			if (i>0) {
-				writer->write(", ");
-				level2=level+1;
-				doIndent=true;
-			}
-			const Polygon *p = dynamic_cast<const Polygon *>(
-			  multiPolygon->getGeometryN(i)
-			);
-			appendPolygonText(p, level2, doIndent, writer);
-		}
-		writer->write(")");
-	}
-}
-
-void
-WKTWriter::appendGeometryCollectionText(
-		const GeometryCollection *geometryCollection,
-		int level,
-		Writer *writer)
-{
-	if (geometryCollection->isEmpty()) {
-		writer->write("EMPTY");
-	} else {
-		int level2=level;
-		writer->write("(");
-		for (unsigned int i=0, n=geometryCollection->getNumGeometries();
-				i < n ; ++i)
-		{
-			if (i>0) {
-				writer->write(", ");
-				level2=level+1;
-			}
-			appendGeometryTaggedText(geometryCollection->getGeometryN(i),level2,writer);
-		}
-		writer->write(")");
-	}
-}
-
-void WKTWriter::indent(int level, Writer *writer) {
-	if (!isFormatted || level<=0) return;
-	writer->write("\n");
-	writer->write(string(INDENT * level, ' '));
-}
-
-} // namespace geos.io
-} // namespace geos
diff --git a/Patches/GEOS/capi/CMakeLists.txt b/Patches/GEOS/capi/CMakeLists.txt
deleted file mode 100644
index a6e1869b..00000000
--- a/Patches/GEOS/capi/CMakeLists.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-#################################################################################
-#
-# GEOS C library build configuration for CMake build system
-#
-# Copyright (C) 2009 Mateusz Loskot <mateusz@loskot.net>
-#
-# This is free software; you can redistribute and/or modify it under
-# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
-# See the COPYING file for more information.
-#
-#################################################################################
-
-if(WIN32)
-    add_definitions("-DGEOS_DLL_EXPORT=1")
-endif()
-
-set(geos_c_SOURCES
-  geos_c.cpp
-  geos_ts_c.cpp)
-
-file(GLOB geos_capi_HEADERS ${CMAKE_BINARY_DIR}/capi/*.h) # fix source_group issue
-
-if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
-  # if building OS X framework, CAPI built into C++ library
-  add_library(geos_c SHARED ${geos_c_SOURCES})
-
-  target_link_libraries(geos_c geos-static)
-
-  if (WIN32)
-    set_target_properties(geos_c
-      PROPERTIES
-      VERSION ${CAPI_VERSION}
-      CLEAN_DIRECT_OUTPUT 1)
-  else()
-    set_target_properties(geos_c
-      PROPERTIES
-      VERSION ${CAPI_VERSION}
-      SOVERSION ${CAPI_SOVERSION}
-      CLEAN_DIRECT_OUTPUT 1)
-  endif()
-
-endif()
-
-#################################################################################
-# Installation
-#################################################################################
-
-if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos_c.h
-    DESTINATION GEOS.framework/Versions/${VERSION_MAJOR}/Headers)
-  install(CODE "execute_process(COMMAND sed -E -i \"\" \"s,# *include[[:space:]]+<geos/,#include <GEOS/,g\" \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/GEOS.framework/Versions/${VERSION_MAJOR}/Headers/geos_c.h\")")
-else()
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/geos_c.h
-    DESTINATION include)
-endif()
-
-if(NOT GEOS_ENABLE_MACOSX_FRAMEWORK)
-  install(TARGETS geos_c
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
-endif()
-
-#################################################################################
-# Group source files for IDE source explorers (e.g. Visual Studio)
-#################################################################################
-
-source_group("Header Files" FILES ${geos_capi_HEADERS})
diff --git a/Patches/GEOS/geos-config.in b/Patches/GEOS/geos-config.in
deleted file mode 100755
index cfa5f5e3..00000000
--- a/Patches/GEOS/geos-config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "--version" ]
-then
-  echo "@VERSION@"
-elif [ "$1" = "--ldflags" ]
-then
-  echo "-L@CMAKE_INSTALL_PREFIX@/lib -lgeos"
-elif [ "$1" = "--includes" ]
-then
-  echo "@CMAKE_INSTALL_PREFIX@/include"
-elif [ "$1" = "--cflags" ]
-then
-  echo "-I@CMAKE_INSTALL_PREFIX@/include"
-fi
-
diff --git a/Patches/PostgreSQL/12.3/CMakeLists.txt b/Patches/PostgreSQL/12.3/CMakeLists.txt
new file mode 100644
index 00000000..3d85486f
--- /dev/null
+++ b/Patches/PostgreSQL/12.3/CMakeLists.txt
@@ -0,0 +1,166 @@
+cmake_minimum_required(VERSION 2.8)
+project(pq)
+
+set(postgresql_SOURCE_DIR ${pq_SOURCE_DIR}/../../..)
+
+# add sources from different places in the source tree
+# takes a place in the tree, and a list of sources
+macro(add_sources dir)
+  foreach(src ${ARGN})
+    list(APPEND pq_SOURCES ${dir}/${src})
+  endforeach(src)
+endmacro(add_sources)
+
+set(pq_SOURCES)
+
+# add sources from port dir
+add_sources(../../port
+  chklocale.c
+  crypt.c
+  dirent.c
+  dirmod.c
+  getaddrinfo.c
+  inet_aton.c
+  inet_net_ntop.c
+  noblock.c
+  open.c
+  pgsleep.c
+  pgstrcasecmp.c
+  pqsignal.c
+  snprintf.c
+  strlcpy.c
+  system.c
+  thread.c
+  win32error.c
+  win32setlocale.c
+  )
+
+#add sources from backend dir
+add_sources(../../backend/libpq
+  pqsignal.c
+  )
+
+#add sources from backend dir
+add_sources(../../common/
+  fe_memutils.c
+  ip.c
+  md5.c
+  )
+
+# add sources from backend utils mb
+add_sources(../../backend/utils/mb
+  wchar.c
+  encnames.c)
+
+# create .def file
+file(READ ${pq_SOURCE_DIR}/libpqdll.def DEF_FILE)
+string(REPLACE "LIBRARY LIBPQ" "LIBRARY PQ" DEF_FILE "${DEF_FILE}")
+file(WRITE ${pq_BINARY_DIR}/pgdll.def "${DEF_FILE}")
+#file(APPEND ${pq_BINARY_DIR}/pgdll.def "pg_fe_scram_init          @ 177")
+
+# add sources in this directory
+list(APPEND pq_SOURCES
+  fe-auth.c
+  fe-connect.c
+  fe-exec.c
+  fe-lobj.c
+  fe-misc.c
+  fe-print.c
+  fe-protocol2.c
+  fe-protocol3.c
+  fe-secure.c
+  libpq-events.c
+  pqexpbuffer.c
+  pthread-win32.c
+  win32.c
+  ${pq_BINARY_DIR}/pgdll.def
+  )
+
+configure_file(${pq_SOURCE_DIR}/../../include/pg_config.h.win32
+  ${pq_BINARY_DIR}/pg_config.h)
+configure_file(${pq_SOURCE_DIR}/../../include/pg_config_ext.h.win32
+  ${pq_BINARY_DIR}/pg_config_ext.h)
+configure_file(${pq_SOURCE_DIR}/../../include/port/win32.h
+  ${pq_BINARY_DIR}/pg_config_os.h)
+file(WRITE ${pq_BINARY_DIR}/pg_config_paths.h
+  "#define SYSCONFDIR \"\"")
+
+add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -DFRONTEND -DWIN32)
+
+include_directories(${pq_BINARY_DIR}
+  ${pq_SOURCE_DIR}/../../../src/port
+  ${postgresql_SOURCE_DIR}/src/backend/
+  ${postgresql_SOURCE_DIR}/src/interfaces/libpq/
+  ${pq_SOURCE_DIR}/../../include
+  ${pq_SOURCE_DIR}/../../include/utils
+  ${pq_SOURCE_DIR}/../../include/port/win32
+  ${pq_SOURCE_DIR}/../../include/port
+  ${pq_SOURCE_DIR}/../../include/port/win32_msvc)
+
+add_library(pq ${pq_SOURCES})
+if(WIN32)
+  set_target_properties(pq PROPERTIES ARCHIVE_OUTPUT_NAME libpq)
+endif()
+target_link_libraries(pq ws2_32 Secur32)
+
+install(TARGETS pq
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib)
+
+#
+# The include installs were derived by examining CopyIncludeFiles
+# in Install.pm in the PostgreSQL distribution.  Server include
+# files were ignored.
+#
+install(FILES
+  ${pq_BINARY_DIR}/pg_config.h
+  ${pq_BINARY_DIR}/pg_config_os.h
+  ${pq_BINARY_DIR}/pg_config_ext.h
+  DESTINATION include
+  )
+
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/include/postgres_ext.h
+  ${postgresql_SOURCE_DIR}/src/include/pg_config_manual.h
+  DESTINATION include
+  )
+
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/include/libpq/libpq-fs.h
+  DESTINATION include/libpq
+  )
+
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/interfaces/libpq/fe-auth.h
+  ${postgresql_SOURCE_DIR}/src/interfaces/libpq/libpq-fe.h
+  ${postgresql_SOURCE_DIR}/src/interfaces/libpq/libpq-events.h
+  DESTINATION include
+  )
+
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/interfaces/libpq/libpq-int.h
+  ${postgresql_SOURCE_DIR}/src/interfaces/libpq/pqexpbuffer.h
+  DESTINATION include/libpq/internal
+  )
+
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/include/c.h
+  ${postgresql_SOURCE_DIR}/src/include/port.h
+  ${postgresql_SOURCE_DIR}/src/include/postgres_fe.h
+  DESTINATION include/libpq/internal
+  )
+
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/backend/utils/errcodes.h
+  DESTINATION include/backend/utils/
+  )
+  
+install(FILES
+  ${postgresql_SOURCE_DIR}/src/include/libpq/pqcomm.h
+  DESTINATION include/libpq/internal
+  )
+
+install(DIRECTORY ${postgresql_SOURCE_DIR}/src/include/catalog
+  DESTINATION include/postgresql/server PATTERN "*.h"
+  )
diff --git a/Patches/PostgreSQL/12.3/Patch.cmake b/Patches/PostgreSQL/12.3/Patch.cmake
new file mode 100644
index 00000000..0a7e59a4
--- /dev/null
+++ b/Patches/PostgreSQL/12.3/Patch.cmake
@@ -0,0 +1,52 @@
+#+
+# This file is called as CMake -P script for the patch step of
+# External_PostgreSQL.cmake on Windows platforms.  On Windows, for now,
+# we're only interested in building the PostgreSQL client library libpq.  To
+# faciliate this (since the PostgreSQL build for just libpq is somewhat
+# complex) we copy a CMakeLists.txt into the correct directory and build with
+# that.
+#
+# PostgreSQL_patch and PostgreSQL_source are defined on the command line along
+# with the call.
+#-
+
+if(WIN32)
+  file(WRITE ${PostgreSQL_source}/CMakeLists.txt "
+add_subdirectory(src)
+")
+  file(WRITE ${PostgreSQL_source}/src/CMakeLists.txt "
+add_subdirectory(interfaces)
+")
+  file(WRITE ${PostgreSQL_source}/src/interfaces/CMakeLists.txt "
+add_subdirectory(libpq)
+")
+  file(COPY ${PostgreSQL_patch}/CMakeLists.txt
+    DESTINATION ${PostgreSQL_source}/src/interfaces/libpq
+    )
+  file(COPY ${PostgreSQL_patch}/pg_config.h.win32
+    DESTINATION ${PostgreSQL_source}/src/include/
+    )
+  # file(COPY ${PostgreSQL_patch}/chklocale.c
+  #   DESTINATION  ${PostgreSQL_source}/src/port
+  #   )
+else()
+  # These are affectively install targets
+  file(COPY ${PostgreSQL_source}/src/backend/catalog/pg_tablespace_d.h
+    DESTINATION ${PostgreSQL_source}/src/include/catalog/
+    )
+  file(COPY ${PostgreSQL_source}/src/backend/catalog/pg_publication_d.h
+    DESTINATION ${PostgreSQL_source}/src/include/catalog/
+    )
+  file(COPY ${PostgreSQL_source}/src/backend/catalog/pg_attribute_d.h
+    DESTINATION ${PostgreSQL_source}/src/include/catalog/
+    )
+  file(COPY ${PostgreSQL_source}/src/backend/utils/errcodes.h
+    DESTINATION ${PostgreSQL_source}/src/include/utils/
+    )
+  file(COPY ${PostgreSQL_source}/src/backend/storage/lmgr/lwlocknames.h
+    DESTINATION ${PostgreSQL_source}/src/include/storage/
+    )
+  file(COPY ${PostgreSQL_source}/src/backend/parser/gram.h
+    DESTINATION ${PostgreSQL_source}/src/include/parser/
+    )
+endif()
diff --git a/Patches/PostgreSQL/12.3/pg_config.h.win32 b/Patches/PostgreSQL/12.3/pg_config.h.win32
new file mode 100644
index 00000000..a05dff38
--- /dev/null
+++ b/Patches/PostgreSQL/12.3/pg_config.h.win32
@@ -0,0 +1,808 @@
+/* src/include/pg_config.h.  Generated by configure.  */
+/* src/include/pg_config.h.in.  Generated from configure.in by autoheader.  */
+
+/* This file is generated from MingW ./configure, and with the following
+ * changes to be valid for Visual C++ (and compatible):
+ *
+ * HAVE_CBRT, HAVE_FUNCNAME_FUNC, HAVE_GETOPT, HAVE_GETOPT_H, HAVE_INTTYPES_H,
+ * HAVE_GETOPT_LONG, HAVE_LOCALE_T, HAVE_RINT, HAVE_STRINGS_H, HAVE_STRTOLL,
+ * HAVE_STRTOULL, HAVE_STRUCT_OPTION, ENABLE_THREAD_SAFETY,
+ * inline, USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
+ */
+
+/* Define to the type of arg 1 of 'accept' */
+#define ACCEPT_TYPE_ARG1 unsigned int
+
+/* Define to the type of arg 2 of 'accept' */
+#define ACCEPT_TYPE_ARG2 struct sockaddr *
+
+/* Define to the type of arg 3 of 'accept' */
+#define ACCEPT_TYPE_ARG3 int
+
+/* Define to the return type of 'accept' */
+#define ACCEPT_TYPE_RETURN unsigned int PASCAL
+
+/* The alignment requirement of a `double'. */
+#define ALIGNOF_DOUBLE 8
+
+/* The alignment requirement of a `int'. */
+#define ALIGNOF_INT 4
+
+/* The alignment requirement of a `long'. */
+#define ALIGNOF_LONG 4
+
+/* The alignment requirement of a `long long int'. */
+#define ALIGNOF_LONG_LONG_INT 8
+
+/* The normal alignment of `PG_INT128_TYPE', in bytes. */
+#undef ALIGNOF_PG_INT128_TYPE
+
+/* The alignment requirement of a `short'. */
+#define ALIGNOF_SHORT 2
+
+/* Size of a disk block --- this also limits the size of a tuple. You can set
+   it bigger if you need bigger tuples (although TOAST should reduce the need
+   to have large tuples, since fields can be spread across multiple tuples).
+   BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is
+   currently 2^15 (32768). This is determined by the 15-bit widths of the
+   lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h).
+   Changing BLCKSZ requires an initdb. */
+#define BLCKSZ 8192
+#define XLOG_BLCKSZ 8192
+
+/* Define to the default TCP port number on which the server listens and to
+   which clients will try to connect. This can be overridden at run-time, but
+   it's convenient if your clients have the right default compiled in.
+   (--with-pgport=PORTNUM) */
+#define DEF_PGPORT 5432
+
+/* Define to the default TCP port number as a string constant. */
+#define DEF_PGPORT_STR "5432"
+
+/* Define to nothing if C supports flexible array members, and to 1 if it does
+   not. That way, with a declaration like `struct s { int n; double
+   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
+   compilers. When computing the size of such an object, don't use 'sizeof
+   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
+   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
+   MSVC and with C++ compilers. */
+#define FLEXIBLE_ARRAY_MEMBER
+
+/* Define to 1 if you want National Language Support. (--enable-nls) */
+/* #undef ENABLE_NLS */
+
+/* Define to 1 to build client libraries as thread-safe code.
+   (--enable-thread-safety) */
+#define ENABLE_THREAD_SAFETY 1
+
+/* Define to 1 if gettimeofday() takes only 1 argument. */
+/* #undef GETTIMEOFDAY_1ARG */
+
+#ifdef GETTIMEOFDAY_1ARG
+# define gettimeofday(a,b) gettimeofday(a)
+#endif
+
+/* Define to 1 if you have the `ASN1_STRING_get0_data' function. */
+/* #undef HAVE_ASN1_STRING_GET0_DATA */
+
+/* Define to 1 if you have the `BIO_get_data' function. */
+/* #undef HAVE_BIO_GET_DATA */
+
+/* Define to 1 if you have the `BIO_meth_new' function. */
+/* #undef HAVE_BIO_METH_NEW */
+
+/* Define to 1 if you have the `cbrt' function. */
+//#define HAVE_CBRT 1
+
+/* Define to 1 if you have the `class' function. */
+/* #undef HAVE_CLASS */
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* Define to 1 if your compiler handles computed gotos. */
+/* #undef HAVE_COMPUTED_GOTO */
+
+/* Define to 1 if you have the `crypt' function. */
+/* #undef HAVE_CRYPT */
+
+/* Define to 1 if you have the <crypt.h> header file. */
+/* #undef HAVE_CRYPT_H */
+
+/* Define to 1 if you have the declaration of `fdatasync', and to 0 if you
+   don't. */
+#define HAVE_DECL_FDATASYNC 0
+
+/* Define to 1 if you have the declaration of `F_FULLFSYNC', and to 0 if you
+   don't. */
+#define HAVE_DECL_F_FULLFSYNC 0
+
+/* Define to 1 if you have the declaration of
+   `LLVMCreateGDBRegistrationListener', and to 0 if you don't. */
+#undef HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
+
+/* Define to 1 if you have the declaration of
+   `LLVMCreatePerfJITEventListener', and to 0 if you don't. */
+#undef HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER
+
+/* Define to 1 if you have the declaration of `LLVMGetHostCPUName', and to 0
+   if you don't. */
+#define HAVE_DECL_LLVMGETHOSTCPUNAME 0
+
+/* Define to 1 if you have the declaration of `LLVMGetHostCPUFeatures', and to 0
+   if you don't. */
+#define HAVE_DECL_LLVMGETHOSTCPUFEATURES 0
+
+/* Define to 1 if you have the declaration of `LLVMOrcGetSymbolAddressIn', and
+   to 0 if you don't. */
+#define HAVE_DECL_LLVMORCGETSYMBOLADDRESSIN 0
+
+/* Define to 1 if you have the declaration of `RTLD_GLOBAL', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_GLOBAL 0
+
+/* Define to 1 if you have the declaration of `RTLD_NOW', and to 0 if you
+   don't. */
+#define HAVE_DECL_RTLD_NOW 0
+
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNLEN 1
+
+/* Define to 1 if you have the `strtof' function. */
+#define HAVE_STRTOF 1
+
+/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRTOLL 1
+
+/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRTOULL 1
+
+/* Define to 1 if you have the `dlopen' function. */
+/* #undef HAVE_DLOPEN */
+
+/* Define to 1 if you have the <editline/history.h> header file. */
+/* #undef HAVE_EDITLINE_HISTORY_H */
+
+/* Define to 1 if you have the <editline/readline.h> header file. */
+/* #undef HAVE_EDITLINE_READLINE_H */
+
+/* Define to 1 if you have the `fcvt' function. */
+#define HAVE_FCVT 1
+
+/* Define to 1 if you have the `fdatasync' function. */
+/* #undef HAVE_FDATASYNC */
+
+/* Define to 1 if you have finite(). */
+#define HAVE_FINITE 1
+
+/* Define to 1 if you have the `fpclass' function. */
+/* #undef HAVE_FPCLASS */
+
+/* Define to 1 if you have the `fp_class' function. */
+/* #undef HAVE_FP_CLASS */
+
+/* Define to 1 if you have the `fp_class_d' function. */
+/* #undef HAVE_FP_CLASS_D */
+
+/* Define to 1 if you have the <fp_class.h> header file. */
+/* #undef HAVE_FP_CLASS_H */
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#define HAVE_FSEEKO 1
+
+/* Define to 1 if your compiler understands __func__. */
+//#define HAVE_FUNCNAME__FUNC 1
+
+/* Define to 1 if your compiler understands __FUNCTION__. */
+#define HAVE_FUNCNAME__FUNCTION 1
+
+/* Define to 1 if you have getaddrinfo(). */
+/* #undef HAVE_GETADDRINFO */
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+/* #undef HAVE_GETHOSTBYNAME_R */
+
+/* Define to 1 if you have the `getopt' function. */
+//#define HAVE_GETOPT 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+//#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+//#define HAVE_GETOPT_LONG 1
+
+/* Define to 1 if you have the `getpeereid' function. */
+/* #undef HAVE_GETPEEREID */
+
+/* Define to 1 if you have the `getpwuid_r' function. */
+/* #undef HAVE_GETPWUID_R */
+
+/* Define to 1 if you have the `getrusage' function. */
+/* #undef HAVE_GETRUSAGE */
+
+/* Define to 1 if you have the <history.h> header file. */
+/* #undef HAVE_HISTORY_H */
+
+/* Define to 1 if you have the <ieeefp.h> header file. */
+/* #undef HAVE_IEEEFP_H */
+
+/* Define to 1 if you have the `inet_aton' function. */
+/* #undef HAVE_INET_ATON */
+
+/* Define to 1 if the system has the type `int64'. */
+/* #undef HAVE_INT64 */
+
+/* Define to 1 if the system has the type `int8'. */
+/* #undef HAVE_INT8 */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+//#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the global variable 'int timezone'. */
+#define HAVE_INT_TIMEZONE 1
+
+/* Define to 1 if you have support for IPv6. */
+#define HAVE_IPV6 1
+
+/* Define to 1 if you have isinf(). */
+#define HAVE_ISINF 1
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+/* #undef HAVE_LANGINFO_H */
+
+/* Define to 1 if you have the <ldap.h> header file. */
+/* #undef HAVE_LDAP_H */
+
+/* Define to 1 if you have the `ldap_initialize' function. */
+/* #undef HAVE_LDAP_INITIALIZE */
+
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+/* #undef HAVE_LIBCRYPTO */
+
+/* Define to 1 if you have the `ldap' library (-lldap). */
+/* #undef HAVE_LIBLDAP */
+
+/* Define to 1 if you have the `pam' library (-lpam). */
+/* #undef HAVE_LIBPAM */
+
+/* Define if you have a function readline library */
+/* #undef HAVE_LIBREADLINE */
+
+/* Define to 1 if you have the `ssl' library (-lssl). */
+/* #undef HAVE_LIBSSL */
+
+/* Define to 1 if you have the `wldap32' library (-lwldap32). */
+/* #undef HAVE_LIBWLDAP32 */
+
+/* Define to 1 if you have the `z' library (-lz). */
+/* #undef HAVE_LIBZ */
+
+/* Define to 1 if the system has the type `locale_t'. */
+#define HAVE_LOCALE_T 1
+
+/* Define to 1 if `long int' works and is 64 bits. */
+/* #undef HAVE_LONG_INT_64 */
+
+/* Define to 1 if the system has the type `long long int'. */
+#if (_MSC_VER > 1200)
+#define HAVE_LONG_LONG_INT 1
+#endif
+
+/* Define to 1 if `long long int' works and is 64 bits. */
+#if (_MSC_VER > 1200)
+#define HAVE_LONG_LONG_INT_64 1
+#endif
+
+/* Define to 1 if you have the `mbstowcs_l' function. */
+#define HAVE_MBSTOWCS_L 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if the system has the type `MINIDUMP_TYPE'. */
+#define HAVE_MINIDUMP_TYPE 1
+
+/* Define to 1 if you have the `mkdtemp' function. */
+/* #undef HAVE_MKDTEMP */
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+/* #undef HAVE_NETINET_TCP_H */
+
+/* Define to 1 if you have the `OPENSSL_init_ssl' function. */
+/* #undef HAVE_OPENSSL_INIT_SSL */
+
+/* Define to 1 if you have the <pam/pam_appl.h> header file. */
+/* #undef HAVE_PAM_PAM_APPL_H */
+
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
+/* Define to 1 if you have the `poll' function. */
+/* #undef HAVE_POLL */
+
+/* Define to 1 if you have the <poll.h> header file. */
+/* #undef HAVE_POLL_H */
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+/* #undef HAVE_POSIX_FALLOCATE */
+
+/* Define to 1 if you have the `ppoll' function. */
+/* #undef HAVE_PPOLL */
+
+/* Define to 1 if you have the `pread' function. */
+/* #undef HAVE_PREAD */
+
+/* Define to 1 if you have the `pstat' function. */
+/* #undef HAVE_PSTAT */
+
+/* Define to 1 if the PS_STRINGS thing exists. */
+/* #undef HAVE_PS_STRINGS */
+
+/* Define to 1 if you have the `pwrite' function. */
+/* #undef HAVE_PWRITE */
+
+/* Define to 1 if you have the `random' function. */
+/* #undef HAVE_RANDOM */
+
+/* Define to 1 if you have the <readline.h> header file. */
+/* #undef HAVE_READLINE_H */
+
+/* Define to 1 if you have the <readline/history.h> header file. */
+/* #undef HAVE_READLINE_HISTORY_H */
+
+/* Define to 1 if you have the <readline/readline.h> header file. */
+/* #undef HAVE_READLINE_READLINE_H */
+
+/* Define to 1 if you have the `readlink' function. */
+/* #undef HAVE_READLINK */
+
+/* Define to 1 if you have the `rint' function. */
+#if (_MSC_VER >= 1800)
+#define HAVE_RINT 1
+#endif
+
+
+/* Define to 1 if you have the global variable
+   'rl_completion_append_character'. */
+/* #undef HAVE_RL_COMPLETION_APPEND_CHARACTER */
+
+/* Define to 1 if you have the `rl_completion_matches' function. */
+/* #undef HAVE_RL_COMPLETION_MATCHES */
+
+/* Define to 1 if you have the `rl_filename_completion_function' function. */
+/* #undef HAVE_RL_FILENAME_COMPLETION_FUNCTION */
+
+/* Define to 1 if you have the <security/pam_appl.h> header file. */
+/* #undef HAVE_SECURITY_PAM_APPL_H */
+
+/* Define to 1 if you have the `setproctitle' function. */
+/* #undef HAVE_SETPROCTITLE */
+
+/* Define to 1 if you have the `setsid' function. */
+/* #undef HAVE_SETSID */
+
+/* Define to 1 if you have spinlocks. */
+#define HAVE_SPINLOCKS 1
+
+/* Define to 1 if you have atomics. */
+#define HAVE_ATOMICS 1
+
+/* Define to 1 if you have the `srandom' function. */
+/* #undef HAVE_SRANDOM */
+
+/* Define to 1 if you have the `SSL_clear_options' function. */
+#define HAVE_SSL_CLEAR_OPTIONS 1
+
+/* Define to 1 if you have the `SSL_get_current_compression' function. */
+#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
+
+/* Define to 1 if stdbool.h conforms to C99. */
+#if (_MSC_VER >= 1800)
+#define HAVE_STDBOOL_H 1
+#endif
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchrnul' function. */
+/* #undef HAVE_STRCHRNUL */
+
+/* Define to 1 if you have the `strerror_r' function. */
+/* #undef HAVE_STRERROR_R */
+
+/* Define to 1 if you have the <strings.h> header file. */
+/*#define HAVE_STRINGS_H 1 */
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strsignal' function. */
+/* #undef HAVE_STRSIGNAL */
+
+/* Define to 1 if you have the `strtoll' function. */
+#ifdef HAVE_LONG_LONG_INT_64
+#define HAVE_STRTOLL 1
+/* Before VS2013, use Microsoft's nonstandard equivalent function */
+#if (_MSC_VER < 1800)
+#define strtoll _strtoi64
+#endif
+#endif
+
+/* Define to 1 if you have the `strtoull' function. */
+#ifdef HAVE_LONG_LONG_INT_64
+#define HAVE_STRTOULL 1
+/* Before VS2013, use Microsoft's nonstandard equivalent function */
+#if (_MSC_VER < 1800)
+#define strtoull _strtoui64
+#endif
+#endif
+
+/* Define to 1 if the system has the type `struct addrinfo'. */
+#if (_MSC_VER > 1200)
+#define HAVE_STRUCT_ADDRINFO 1
+#endif
+
+/* Define to 1 if the system has the type `struct cmsgcred'. */
+/* #undef HAVE_STRUCT_CMSGCRED */
+
+/* Define to 1 if the system has the type `struct option'. */
+//#define HAVE_STRUCT_OPTION 1
+
+/* Define to 1 if `sa_len' is member of `struct sockaddr'. */
+/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
+
+/* Define to 1 if the system has the type `struct sockaddr_storage'. */
+#if (_MSC_VER > 1200)
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+#endif
+
+/* Define to 1 if `ss_family' is member of `struct sockaddr_storage'. */
+#if (_MSC_VER > 1200)
+#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
+#endif
+
+/* Define to 1 if `ss_len' is member of `struct sockaddr_storage'. */
+/* #undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN */
+
+/* Define to 1 if `__ss_family' is member of `struct sockaddr_storage'. */
+/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY */
+
+/* Define to 1 if `__ss_len' is member of `struct sockaddr_storage'. */
+/* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN */
+
+/* Define to 1 if the system has the type `struct sockaddr_un'. */
+/* #undef HAVE_STRUCT_SOCKADDR_UN */
+
+/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* #undef HAVE_STRUCT_TM_TM_ZONE */
+
+/* Define to 1 if you have the `symlink' function. */
+#define HAVE_SYMLINK 1
+
+/* Define to 1 if you have the `sync_file_range' function. */
+/* #undef HAVE_SYNC_FILE_RANGE */
+
+/* Define to 1 if you have the `sysconf' function. */
+/* #undef HAVE_SYSCONF */
+
+/* Define to 1 if you have the syslog interface. */
+/* #undef HAVE_SYSLOG */
+
+/* Define to 1 if you have the <sys/ipc.h> header file. */
+/* #undef HAVE_SYS_IPC_H */
+
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+/* #undef HAVE_SYS_PRCTL_H */
+
+/* Define to 1 if you have the <sys/pstat.h> header file. */
+/* #undef HAVE_SYS_PSTAT_H */
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+/* #undef HAVE_SYS_SELECT_H */
+
+/* Define to 1 if you have the <sys/sem.h> header file. */
+/* #undef HAVE_SYS_SEM_H */
+
+/* Define to 1 if you have the <sys/shm.h> header file. */
+/* #undef HAVE_SYS_SHM_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/ucred.h> header file. */
+/* #undef HAVE_SYS_UCRED_H */
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+/* #undef HAVE_SYS_UN_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+/* #undef HAVE_TERMIOS_H */
+
+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
+/* #undef HAVE_TM_ZONE */
+
+/* Define to 1 if your compiler understands `typeof' or something similar. */
+/* #undef HAVE_TYPEOF */
+
+/* Define to 1 if you have the external array `tzname'. */
+/* #undef HAVE_TZNAME */
+
+/* Define to 1 if the system has the type `uint64'. */
+/* #undef HAVE_UINT64 */
+
+/* Define to 1 if the system has the type `uint8'. */
+/* #undef HAVE_UINT8 */
+
+/* Define to 1 if the system has the type `union semun'. */
+/* #undef HAVE_UNION_SEMUN */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have unix sockets. */
+/* #undef HAVE_UNIX_SOCKETS */
+
+/* Define to 1 if you have the `unsetenv' function. */
+/* #undef HAVE_UNSETENV */
+
+/* Define to 1 if you have the `uselocale' function. */
+/* #undef HAVE_USELOCALE */
+
+/* Define to 1 if you have the `utime' function. */
+#define HAVE_UTIME 1
+
+/* Define to 1 if you have the `utimes' function. */
+/* #undef HAVE_UTIMES */
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if you have the `wcstombs_l' function. */
+#define HAVE_WCSTOMBS_L 1
+
+/* Define to 1 if you have the <wctype.h> header file. */
+#define HAVE_WCTYPE_H 1
+
+/* Define to 1 if you have the <winldap.h> header file. */
+/* #undef HAVE_WINLDAP_H */
+
+/* Define to 1 if you have the `X509_get_signature_nid' function. */
+#define HAVE_X509_GET_SIGNATURE_NID 1
+
+/* Define to 1 if the assembler supports X86_64's POPCNTQ instruction. */
+/* #undef HAVE_X86_64_POPCNTQ */
+
+/* Define to 1 if the system has the type `_Bool'. */
+/* #undef HAVE__BOOL */
+
+/* Define to 1 if your compiler understands __builtin_bswap16. */
+/* #undef HAVE__BUILTIN_BSWAP16 */
+
+/* Define to 1 if your compiler understands __builtin_bswap32. */
+/* #undef HAVE__BUILTIN_BSWAP32 */
+
+/* Define to 1 if your compiler understands __builtin_bswap64. */
+/* #undef HAVE__BUILTIN_BSWAP64 */
+
+/* Define to 1 if your compiler understands __builtin_clz. */
+/* #undef HAVE__BUILTIN_CLZ */
+
+/* Define to 1 if your compiler understands __builtin_constant_p. */
+/* #undef HAVE__BUILTIN_CONSTANT_P */
+
+/* Define to 1 if your compiler understands __builtin_ctz. */
+/* #undef HAVE__BUILTIN_CTZ */
+
+/* Define to 1 if your compiler understands __builtin_$op_overflow. */
+/* #undef HAVE__BUILTIN_OP_OVERFLOW */
+
+/* Define to 1 if your compiler understands __builtin_popcount. */
+/* #undef HAVE__BUILTIN_POPCOUNT */
+
+/* Define to 1 if your compiler understands __builtin_types_compatible_p. */
+/* #undef HAVE__BUILTIN_TYPES_COMPATIBLE_P */
+
+/* Define to 1 if your compiler understands __builtin_unreachable. */
+/* #undef HAVE__BUILTIN_UNREACHABLE */
+
+/* Define to 1 if you have the `_configthreadlocale' function. */
+#define HAVE__CONFIGTHREADLOCALE 1
+
+/* Define to 1 if you have __cpuid. */
+#define HAVE__CPUID 1
+
+/* Define to 1 if you have __get_cpuid. */
+#undef HAVE__GET_CPUID
+
+/* Define to 1 if your compiler understands _Static_assert. */
+/* #undef HAVE__STATIC_ASSERT */
+
+/* Define to the appropriate printf length modifier for 64-bit ints. */
+#define INT64_MODIFIER "ll"
+
+/* Define to 1 if `locale_t' requires <xlocale.h>. */
+/* #undef LOCALE_T_IN_XLOCALE */
+
+/* Define to the location of locale files. */
+/* #undef LOCALEDIR */
+
+/* Define as the maximum alignment requirement of any C data type. */
+#define MAXIMUM_ALIGNOF 8
+
+/* Define bytes to use libc memset(). */
+#define MEMSET_LOOP_LIMIT 1024
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "pgsql-bugs@lists.postgresql.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "PostgreSQL"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "PostgreSQL 12.3"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "12.3"
+
+/* Define to the name of a signed 128-bit integer type. */
+#undef PG_INT128_TYPE
+
+/* Define to the name of a signed 64-bit integer type. */
+#define PG_INT64_TYPE long long int
+
+/* PostgreSQL version as a string */
+#define PG_VERSION "12.3"
+
+/* PostgreSQL version as a number */
+#define PG_VERSION_NUM 120003
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "postgresql"
+
+/* Define to the name of the default PostgreSQL service principal in Kerberos.
+   (--with-krb-srvnam=NAME) */
+#define PG_KRB_SRVNAM "postgres"
+
+/* A string containing the version number, platform, and C compiler */
+#define PG_VERSION_STR "Uninitialized version string (win32)"
+
+/* The size of `bool', as computed by sizeof. */
+#define SIZEOF_BOOL 1
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `size_t', as computed by sizeof. */
+#ifndef _WIN64
+#define SIZEOF_SIZE_T 4
+#else
+#define SIZEOF_SIZE_T 8
+#endif
+
+/* The size of `void *', as computed by sizeof. */
+#ifndef _WIN64
+#define SIZEOF_VOID_P 4
+#else
+#define SIZEOF_VOID_P 8
+#endif
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if strerror_r() returns int. */
+/* #undef STRERROR_R_INT */
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define to 1 to build with assertion checks. (--enable-cassert) */
+/* #undef USE_ASSERT_CHECKING */
+
+/* Define to 1 to build with Bonjour support. (--with-bonjour) */
+/* #undef USE_BONJOUR */
+
+/* Define to 1 to build with BSD Authentication support. (--with-bsd-auth) */
+/* #undef USE_BSD_AUTH */
+
+/* Define to use /dev/urandom for random number generation */
+/* #undef USE_DEV_URANDOM */
+
+/* Define to 1 to build with LDAP support. (--with-ldap) */
+/* #undef USE_LDAP */
+
+/* Define to 1 to build with LLVM based JIT support. (--with-llvm) */
+/* #undef USE_LLVM */
+
+/* Define to select named POSIX semaphores. */
+/* #undef USE_NAMED_POSIX_SEMAPHORES */
+
+/* Define to build with OpenSSL support. (--with-openssl) */
+/* #undef USE_OPENSSL */
+
+/* Define to use OpenSSL for random number generation */
+/* #undef USE_OPENSSL_RANDOM */
+
+/* Define to 1 to build with PAM support. (--with-pam) */
+/* #undef USE_PAM */
+
+/* Define to 1 to use software CRC-32C implementation (slicing-by-8). */
+#if (_MSC_VER < 1500)
+#define USE_SLICING_BY_8_CRC32C 1
+#endif
+
+/* Define to 1 use Intel SSE 4.2 CRC instructions. */
+/* #undef USE_SSE42_CRC32C */
+
+/* Define to 1 to use Intel SSE 4.2 CRC instructions with a runtime check. */
+#if (_MSC_VER >= 1500)
+#define USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
+#endif
+
+/* Define to select SysV-style semaphores. */
+/* #undef USE_SYSV_SEMAPHORES */
+
+/* Define to select SysV-style shared memory. */
+#define USE_SYSV_SHARED_MEMORY 1
+
+/* Define to select unnamed POSIX semaphores. */
+/* #undef USE_UNNAMED_POSIX_SEMAPHORES */
+
+/* Define to use native Windows API for random number generation */
+#define USE_WIN32_RANDOM 1
+
+/* Define to select Win32-style semaphores. */
+#define USE_WIN32_SEMAPHORES 1
+
+/* Define to 1 if `wcstombs_l' requires <xlocale.h>. */
+/* #undef WCSTOMBS_L_IN_XLOCALE */
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#define inline __inline
+#endif
+
+/* Define to keyword to use for C99 restrict support, or to nothing if this is
+   not supported */
+/* Works for C and C++ in Visual Studio 2008 and upwards */
+#if (_MSC_VER >= 1500)
+#define pg_restrict __restrict
+#else
+#define pg_restrict
+#endif
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+/* not defined, because it'd conflict with __declspec(restrict) */
+
+/* Define to empty if the C compiler does not understand signed types. */
+/* #undef signed */
+
+/* Define to how the compiler spells `typeof'. */
+/* #undef typeof */
diff --git a/Patches/PostgreSQL/CMakeLists.txt b/Patches/PostgreSQL/9.5.1/CMakeLists.txt
similarity index 100%
rename from Patches/PostgreSQL/CMakeLists.txt
rename to Patches/PostgreSQL/9.5.1/CMakeLists.txt
diff --git a/Patches/PostgreSQL/Patch.cmake b/Patches/PostgreSQL/9.5.1/Patch.cmake
similarity index 100%
rename from Patches/PostgreSQL/Patch.cmake
rename to Patches/PostgreSQL/9.5.1/Patch.cmake
diff --git a/Patches/PostgreSQL/chklocale.c b/Patches/PostgreSQL/9.5.1/chklocale.c
similarity index 100%
rename from Patches/PostgreSQL/chklocale.c
rename to Patches/PostgreSQL/9.5.1/chklocale.c
diff --git a/Patches/PostgreSQL/cube/.gitignore b/Patches/PostgreSQL/9.5.1/cube/.gitignore
similarity index 100%
rename from Patches/PostgreSQL/cube/.gitignore
rename to Patches/PostgreSQL/9.5.1/cube/.gitignore
diff --git a/Patches/PostgreSQL/cube/CHANGES b/Patches/PostgreSQL/9.5.1/cube/CHANGES
similarity index 100%
rename from Patches/PostgreSQL/cube/CHANGES
rename to Patches/PostgreSQL/9.5.1/cube/CHANGES
diff --git a/Patches/PostgreSQL/cube/Makefile b/Patches/PostgreSQL/9.5.1/cube/Makefile
similarity index 100%
rename from Patches/PostgreSQL/cube/Makefile
rename to Patches/PostgreSQL/9.5.1/cube/Makefile
diff --git a/Patches/PostgreSQL/cube/cube--1.0--1.1.sql b/Patches/PostgreSQL/9.5.1/cube/cube--1.0--1.1.sql
similarity index 100%
rename from Patches/PostgreSQL/cube/cube--1.0--1.1.sql
rename to Patches/PostgreSQL/9.5.1/cube/cube--1.0--1.1.sql
diff --git a/Patches/PostgreSQL/cube/cube--1.1.sql b/Patches/PostgreSQL/9.5.1/cube/cube--1.1.sql
similarity index 100%
rename from Patches/PostgreSQL/cube/cube--1.1.sql
rename to Patches/PostgreSQL/9.5.1/cube/cube--1.1.sql
diff --git a/Patches/PostgreSQL/cube/cube--unpackaged--1.0.sql b/Patches/PostgreSQL/9.5.1/cube/cube--unpackaged--1.0.sql
similarity index 100%
rename from Patches/PostgreSQL/cube/cube--unpackaged--1.0.sql
rename to Patches/PostgreSQL/9.5.1/cube/cube--unpackaged--1.0.sql
diff --git a/Patches/PostgreSQL/cube/cube.c b/Patches/PostgreSQL/9.5.1/cube/cube.c
similarity index 100%
rename from Patches/PostgreSQL/cube/cube.c
rename to Patches/PostgreSQL/9.5.1/cube/cube.c
diff --git a/Patches/PostgreSQL/cube/cube.control b/Patches/PostgreSQL/9.5.1/cube/cube.control
similarity index 100%
rename from Patches/PostgreSQL/cube/cube.control
rename to Patches/PostgreSQL/9.5.1/cube/cube.control
diff --git a/Patches/PostgreSQL/cube/cubedata.h b/Patches/PostgreSQL/9.5.1/cube/cubedata.h
similarity index 100%
rename from Patches/PostgreSQL/cube/cubedata.h
rename to Patches/PostgreSQL/9.5.1/cube/cubedata.h
diff --git a/Patches/PostgreSQL/cube/cubeparse.y b/Patches/PostgreSQL/9.5.1/cube/cubeparse.y
similarity index 100%
rename from Patches/PostgreSQL/cube/cubeparse.y
rename to Patches/PostgreSQL/9.5.1/cube/cubeparse.y
diff --git a/Patches/PostgreSQL/cube/cubescan.l b/Patches/PostgreSQL/9.5.1/cube/cubescan.l
similarity index 100%
rename from Patches/PostgreSQL/cube/cubescan.l
rename to Patches/PostgreSQL/9.5.1/cube/cubescan.l
diff --git a/Patches/PostgreSQL/cube/data/test_cube.data b/Patches/PostgreSQL/9.5.1/cube/data/test_cube.data
similarity index 100%
rename from Patches/PostgreSQL/cube/data/test_cube.data
rename to Patches/PostgreSQL/9.5.1/cube/data/test_cube.data
diff --git a/Patches/PostgreSQL/cube/expected/cube.out b/Patches/PostgreSQL/9.5.1/cube/expected/cube.out
similarity index 100%
rename from Patches/PostgreSQL/cube/expected/cube.out
rename to Patches/PostgreSQL/9.5.1/cube/expected/cube.out
diff --git a/Patches/PostgreSQL/cube/expected/cube_1.out b/Patches/PostgreSQL/9.5.1/cube/expected/cube_1.out
similarity index 100%
rename from Patches/PostgreSQL/cube/expected/cube_1.out
rename to Patches/PostgreSQL/9.5.1/cube/expected/cube_1.out
diff --git a/Patches/PostgreSQL/cube/expected/cube_2.out b/Patches/PostgreSQL/9.5.1/cube/expected/cube_2.out
similarity index 100%
rename from Patches/PostgreSQL/cube/expected/cube_2.out
rename to Patches/PostgreSQL/9.5.1/cube/expected/cube_2.out
diff --git a/Patches/PostgreSQL/cube/expected/cube_3.out b/Patches/PostgreSQL/9.5.1/cube/expected/cube_3.out
similarity index 100%
rename from Patches/PostgreSQL/cube/expected/cube_3.out
rename to Patches/PostgreSQL/9.5.1/cube/expected/cube_3.out
diff --git a/Patches/PostgreSQL/cube/sql/cube.sql b/Patches/PostgreSQL/9.5.1/cube/sql/cube.sql
similarity index 100%
rename from Patches/PostgreSQL/cube/sql/cube.sql
rename to Patches/PostgreSQL/9.5.1/cube/sql/cube.sql
diff --git a/Patches/PostgreSQL/src/bin/pg_rewind/copy_fetch.c b/Patches/PostgreSQL/9.5.1/src/bin/pg_rewind/copy_fetch.c
similarity index 100%
rename from Patches/PostgreSQL/src/bin/pg_rewind/copy_fetch.c
rename to Patches/PostgreSQL/9.5.1/src/bin/pg_rewind/copy_fetch.c