[vcpkg/scripts/make] trying to iron out some issues (#11836)

* take changes from fontconfig pr

* [farmhash] add autoconf

* [freexl] add autoconf

* [healpix] add autoconf

* [libb2] add autoconf

* [libwandio] add autoconf and patch

* more autoconf

* [x264] fix windows build issues

* minimal cleanup

* [libwandio] some fixes

* [vcpkg/scripts/make] add include to C/CXX flags correctly set machine flags for linker

* remove unnecessary comments part 1

* cleanup part 2

* cleanup

* remove unnecessary code

* [pbc] fix osx regressions

* [lzokay] format manifest

* try to copy sources to fix build issues

* add autoconfig to force updated configure scripts

* bump port versions of openmpi and ocilib

* added lib paths back into vcpkg_build_make because they are probably required

* Use CPP flags
add quotes around restoring of ENV
add LIB and LIBPATH correctly

* Apply suggestions from code review

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply more changes forom CR
- remove mingw make
- add doc for missing options
- introduce two new macros for backup/restore of env vars

* fix wrong variables.

* use the list macro instead of the single var macro

* also use it at the top

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

25 files changed, 161 insertions, 78 deletions

diff --git a/ports/farmhash/CONTROL b/ports/farmhash/CONTROL
index f27140fbd..7d7f4d386 100644
--- a/ports/farmhash/CONTROL
+++ b/ports/farmhash/CONTROL
@@ -1,5 +1,6 @@
 Source: farmhash
-Version: 1.1-1
+Version: 1.1
+Port-Version: 2
 Homepage: https://github.com/google/farmhash
 Description: FarmHash, a family of hash functions.
 Supports: !arm
diff --git a/ports/farmhash/portfile.cmake b/ports/farmhash/portfile.cmake
index d9bcc9240..801e05706 100644
--- a/ports/farmhash/portfile.cmake
+++ b/ports/farmhash/portfile.cmake
@@ -14,6 +14,7 @@ if((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) AND NOT ENV{CXX_FLAGS}) # This
 endif()
 file(REMOVE_RECURSE "${SOURCE_PATH}/configure")
 vcpkg_configure_make(
+        AUTOCONFIG
         SOURCE_PATH ${SOURCE_PATH}
 )
 
diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL
index 68d0d291f..1a887b193 100644
--- a/ports/freexl/CONTROL
+++ b/ports/freexl/CONTROL
@@ -1,5 +1,6 @@
 Source: freexl
-Version: 1.0.4-9
+Version: 1.0.4
+Port-Version: 10
 Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources
 Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet
 Build-Depends: libiconv
diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake
index 3c4629dce..6a79451dd 100644
--- a/ports/freexl/portfile.cmake
+++ b/ports/freexl/portfile.cmake
@@ -64,6 +64,7 @@ elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX
     )
     file(REMOVE_RECURSE "${SOURCE_PATH}/configure")
     vcpkg_configure_make(
+    AUTOCONFIG
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
         INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}"
diff --git a/ports/healpix/CONTROL b/ports/healpix/CONTROL
index 629b095ee..8b1e856e2 100644
--- a/ports/healpix/CONTROL
+++ b/ports/healpix/CONTROL
@@ -1,5 +1,6 @@
 Source: healpix
-Version: 1.12.10-5
+Version: 1.12.10
+Port-Version: 6
 Homepage: http://healpix.sourceforge.net/
 Description: HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere.
 Build-Depends: cfitsio
diff --git a/ports/healpix/portfile.cmake b/ports/healpix/portfile.cmake
index 8b1a40151..c1fa90f36 100644
--- a/ports/healpix/portfile.cmake
+++ b/ports/healpix/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_sourceforge(
 )
 
 vcpkg_configure_make(
+    AUTOCONFIG
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH src/cxx
     COPY_SOURCE
diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake
index 2401cf0c1..992c59f4b 100644
--- a/ports/libb2/portfile.cmake
+++ b/ports/libb2/portfile.cmake
@@ -14,6 +14,7 @@ if(CMAKE_HOST_WIN32)
 endif()
 
 vcpkg_configure_make(
+    AUTOCONFIG
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS ${OPTIONS}
 )
diff --git a/ports/libb2/vcpkg.json b/ports/libb2/vcpkg.json
index 1d2f19db8..dbe8dc265 100644
--- a/ports/libb2/vcpkg.json
+++ b/ports/libb2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libb2",
   "version-string": "0.98.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp",
   "homepage": "https://github.com/BLAKE2/libb2",
   "supports": "!windows"
diff --git a/ports/libcrafter/CONTROL b/ports/libcrafter/CONTROL
index b8ebac0bf..47538dae9 100644
--- a/ports/libcrafter/CONTROL
+++ b/ports/libcrafter/CONTROL
@@ -1,5 +1,6 @@
 Source: libcrafter
-Version: 0.3-1
+Version: 0.3
+Port-Version: 2
 Homepage: https://github.com/pellegre/libcrafter
 Description: Libcrafter is a high level library for C++ designed to create and decode network packets.
-Build-Depends: libpcap
\ No newline at end of file
+Build-Depends: libpcap
diff --git a/ports/libcrafter/portfile.cmake b/ports/libcrafter/portfile.cmake
index 9965b7d3c..565a0c346 100644
--- a/ports/libcrafter/portfile.cmake
+++ b/ports/libcrafter/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
 )
 
 vcpkg_configure_make(
+    AUTOCONFIG
     SOURCE_PATH ${SOURCE_PATH}
     PROJECT_SUBPATH libcrafter
     OPTIONS
diff --git a/ports/libmagic/CONTROL b/ports/libmagic/CONTROL
index 07fce2a68..750b65139 100644
--- a/ports/libmagic/CONTROL
+++ b/ports/libmagic/CONTROL
@@ -1,4 +1,5 @@
 Source: libmagic
-Version: 5.37-1
+Version: 5.37
+Port-Version: 2
 Homepage: https://github.com/file/file
-Description: This library can be used to classify files according to magic number tests.
\ No newline at end of file
+Description: This library can be used to classify files according to magic number tests.
diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake
index 65fe8d8ab..363fa148f 100644
--- a/ports/libmagic/portfile.cmake
+++ b/ports/libmagic/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
 )
 
 vcpkg_configure_make(
+    AUTOCONFIG
     SOURCE_PATH ${SOURCE_PATH}
 )
 vcpkg_install_make()
diff --git a/ports/libwandio/CONTROL b/ports/libwandio/CONTROL
index 5fc36ba35..1150b06ec 100644
--- a/ports/libwandio/CONTROL
+++ b/ports/libwandio/CONTROL
@@ -1,5 +1,7 @@
 Source: libwandio

-Version: 4.2.1-2

+Version: 4.2.1

+Port-Version: 3

 Homepage: https://github.com/wanduow/wandio

 Description: C library for simple and efficient file IO.

-Build-Depends: zlib, zstd, liblzma, lz4, curl, pthread, bzip2
\ No newline at end of file
+Build-Depends: zlib, zstd, liblzma, lzo, lz4, curl, pthread, bzip2

+Supports: !windows

diff --git a/ports/libwandio/configure.lib.patch b/ports/libwandio/configure.lib.patch
index 57719581e..3898836b7 100644
--- a/ports/libwandio/configure.lib.patch
+++ b/ports/libwandio/configure.lib.patch
@@ -120,21 +120,3 @@ index 4579fbb3d..f6be008c8 100644
                  fi
                  AC_DEFINE(HAVE_LIBLZ4S, 1, "Compiled with lz4 stream support")
                  with_lz4=streamapi
-@@ -296,12 +304,14 @@ AC_ARG_WITH([http],
- AS_IF([test "x$with_http" != "xno"],
-         [
-         # we need curl_easy_pause which was added in 7.18.0
--        AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)
-+        AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d], have_curl=yes, have_curl=no, [-lssl -lcrypto $ac_cv_search_pthread_create -ldl])
-+        # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)
- 	], [have_curl=no])
- 
- AS_IF([test "x$have_curl" = "xyes"], [
--        if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then
--                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl"
-+        if test "$ac_cv_search_curl_easy_pause" != "none required"; then
-+                LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_curl_easy_pause -lssl -lcrypto $ac_cv_search_pthread_create -ldl"
-+                LIBS="$LIBS -lssl -lcrypto $ac_cv_search_pthread_create -ldl"
-         fi
-         AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support")
-         with_http=yes],
diff --git a/ports/libwandio/configure.patch b/ports/libwandio/configure.patch
new file mode 100644
index 000000000..929662d67
--- /dev/null
+++ b/ports/libwandio/configure.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index e250c0c31..0465120ba 100644
+--- a/configure.ac	
++++ b/configure.ac
+@@ -83,7 +83,7 @@ ADD_INCLS=""
+ ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib"

+ LIBWANDIO_LIBS=""

+ 

+-CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wextra -DLT_BUILDING_DLL=1"

++CFLAGS="$CFLAGS -Wall -DLT_BUILDING_DLL=1 -DNOMINMAX"

+-CXXFLAGS="$CXXFLAGS -Wall -DLT_BUILDING_DLL=1"
++CXXFLAGS="$CXXFLAGS -Wall -DLT_BUILDING_DLL=1 -DNOMINMAX"

+ 

+ # Check for -fvisibility

diff --git a/ports/libwandio/curl.patch b/ports/libwandio/curl.patch
new file mode 100644
index 000000000..326700ed0
--- /dev/null
+++ b/ports/libwandio/curl.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac

+index 4579fbb3d..f6be008c8 100644

+--- a/configure.ac	

++++ b/configure.ac

+@@ -296,12 +304,14 @@ AC_ARG_WITH([http],

+ AS_IF([test "x$with_http" != "xno"],

+         [

+         # we need curl_easy_pause which was added in 7.18.0

+-        AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)

++        AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d libcurl libcurl-d], have_curl=yes, have_curl=no, [-lCrypt32 -lWldap32 -lWs2_32 -ladvapi32])

++        # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)

+ 	], [have_curl=no])

+ 

+ AS_IF([test "x$have_curl" = "xyes"], [

+-        if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then

+-                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl"

++        if test "$ac_cv_search_curl_easy_pause" != "none required"; then

++                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lCrypt32 -lWldap32 -lWs2_32 -ladvapi32 $ac_cv_search_curl_easy_pause"

++                LIBS="$LIBS"

+         fi

+         AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support")

+         with_http=yes],

diff --git a/ports/libwandio/openssl.patch b/ports/libwandio/openssl.patch
new file mode 100644
index 000000000..586cdfab5
--- /dev/null
+++ b/ports/libwandio/openssl.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac

+index 4579fbb3d..f6be008c8 100644

+--- a/configure.ac	

++++ b/configure.ac

+@@ -296,12 +304,14 @@ AC_ARG_WITH([http],

+ AS_IF([test "x$with_http" != "xno"],

+         [

+         # we need curl_easy_pause which was added in 7.18.0

+-        AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)

++        AC_SEARCH_LIBS(curl_easy_pause, [curl curl-d], have_curl=yes, have_curl=no, [-lssl -lcrypto $ac_cv_search_pthread_create -ldl])

++        # AC_CHECK_LIB(curl, curl_easy_pause, have_curl=yes, have_curl=no)

+ 	], [have_curl=no])

+ 

+ AS_IF([test "x$have_curl" = "xyes"], [

+-        if test "$ac_cv_lib_curl_curl_easy_pause" != "none required"; then

+-                LIBWANDIO_LIBS="$LIBWANDIO_LIBS -lcurl"

++        if test "$ac_cv_search_curl_easy_pause" != "none required"; then

++                LIBWANDIO_LIBS="$LIBWANDIO_LIBS $ac_cv_search_curl_easy_pause -lssl -lcrypto $ac_cv_search_pthread_create -ldl"

++                LIBS="$LIBS -lssl -lcrypto $ac_cv_search_pthread_create -ldl"

+         fi

+         AC_DEFINE(HAVE_HTTP, 1, "Compiled with http support")

+         with_http=yes],

diff --git a/ports/libwandio/portfile.cmake b/ports/libwandio/portfile.cmake
index c9be34be6..a03d5c79f 100644
--- a/ports/libwandio/portfile.cmake
+++ b/ports/libwandio/portfile.cmake
@@ -1,3 +1,11 @@
+if(VCPKG_TARGET_IS_WINDOWS)

+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+    set(PATCHES curl.patch)

+    #TODO: Still does not work. Requires proper "signal" support and "unistd"

+else()

+    set(PATCHES openssl.patch) # needed if curl is using openssl

+endif()

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO wanduow/wandio

@@ -5,9 +13,12 @@ vcpkg_from_github(
     SHA512 e94a82038902c34933c4256f8bd4d7ef3f2cf32fea46f8e31a25df34cc90d3a275ff56d3bc9892aca0c85e6d875e696f96a836cc1444fe165db8364331e6e77d

     HEAD_REF master

     PATCHES configure.lib.patch # This is how configure.ac files with dependencies get fixed. 

+            configure.patch

+            ${PATCHES}

 )

 

 vcpkg_configure_make(

+    AUTOCONFIG

     SOURCE_PATH ${SOURCE_PATH}

     COPY_SOURCE

 )

diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL
index c5d4fbb37..a4d44f4a3 100644
--- a/ports/ocilib/CONTROL
+++ b/ports/ocilib/CONTROL
@@ -1,5 +1,6 @@
 Source: ocilib
-Version: 4.6.4-1
+Version: 4.6.4
+Port-Version: 2
 Homepage: https://vrogier.github.io/ocilib/
 Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.
 Supports: !(arm|uwp)
\ No newline at end of file
diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake
index 84912c10f..a8a451f48 100644
--- a/ports/ocilib/portfile.cmake
+++ b/ports/ocilib/portfile.cmake
@@ -1,62 +1,64 @@
 vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
 
 vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO vrogier/ocilib
-	REF v4.6.4
-	SHA512 83f5614a23c8fb4ab02517dec95d8b490c5ef472302735d5cc4cf483cc51513cc81ae2e1b4618c7c73fb5b071efe422e463b46fa79492ccb4775b511a943295a
-	HEAD_REF master
-	PATCHES
-		out_of_source_build_version_file_configure.patch
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO vrogier/ocilib
+    REF v4.6.4
+    SHA512 83f5614a23c8fb4ab02517dec95d8b490c5ef472302735d5cc4cf483cc51513cc81ae2e1b4618c7c73fb5b071efe422e463b46fa79492ccb4775b511a943295a
+    HEAD_REF master
+    PATCHES
+        out_of_source_build_version_file_configure.patch
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
-	if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
+    if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
         set(SOLUTION_TYPE vs2019)
         set(OCILIB_ARCH_X86 x86)
         set(OCILIB_ARCH_X64 x64)
-	elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(SOLUTION_TYPE vs2017)
         set(OCILIB_ARCH_X86 Win32)
         set(OCILIB_ARCH_X64 Win64)
-	else()
+    else()
         set(SOLUTION_TYPE vs2015)
         set(OCILIB_ARCH_X86 Win32)
         set(OCILIB_ARCH_X64 Win64)
-	endif()
+    endif()
     
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
         set(PLATFORM ${OCILIB_ARCH_X86})
     else()
         set(PLATFORM ${OCILIB_ARCH_X64})
     endif()
-	
-	# There is no debug configuration
-	# As it is a C library, build the release configuration and copy its output to the debug folder
-	set(VCPKG_BUILD_TYPE release)
-	vcpkg_install_msbuild(
-		SOURCE_PATH ${SOURCE_PATH}
-		PROJECT_SUBPATH proj/dll/ocilib_dll_${SOLUTION_TYPE}.sln
-		INCLUDES_SUBPATH include
-		LICENSE_SUBPATH LICENSE
-		RELEASE_CONFIGURATION "Release - ANSI"
-		PLATFORM ${PLATFORM}
-		USE_VCPKG_INTEGRATION
-		ALLOW_ROOT_INCLUDES)
+    
+    # There is no debug configuration
+    # As it is a C library, build the release configuration and copy its output to the debug folder
+    set(VCPKG_BUILD_TYPE release)
+    vcpkg_install_msbuild(
+        SOURCE_PATH ${SOURCE_PATH}
+        PROJECT_SUBPATH proj/dll/ocilib_dll_${SOLUTION_TYPE}.sln
+        INCLUDES_SUBPATH include
+        LICENSE_SUBPATH LICENSE
+        RELEASE_CONFIGURATION "Release - ANSI"
+        PLATFORM ${PLATFORM}
+        USE_VCPKG_INTEGRATION
+        ALLOW_ROOT_INCLUDES)
 
-	file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug)
-	file(COPY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug)
+    file(COPY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
 else()
-	vcpkg_configure_make(
-		SOURCE_PATH ${SOURCE_PATH}
-		OPTIONS 
-			--with-oracle-import=runtime
-	)
+    vcpkg_configure_make(
+        COPY_SOURCE
+        AUTOCONFIG
+        SOURCE_PATH ${SOURCE_PATH}
+        OPTIONS 
+            --with-oracle-import=runtime
+    )
 
-	vcpkg_install_make()
+    vcpkg_install_make()
 
-	file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-	file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/${PORT} ${CURRENT_PACKAGES_DIR}/share/${PORT})
-	file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
-	file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/${PORT} ${CURRENT_PACKAGES_DIR}/share/${PORT})
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
+    file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 endif()
diff --git a/ports/openmpi/CONTROL b/ports/openmpi/CONTROL
index 4da1df53e..37fe14b0c 100644
--- a/ports/openmpi/CONTROL
+++ b/ports/openmpi/CONTROL
@@ -1,5 +1,6 @@
 Source: openmpi
 Version: 4.0.3
+Port-Version: 2
 Homepage: https://www.open-mpi.org/
 Description: The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.
 Supports: !(windows|uwp)
diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake
index 6dbb01127..0ef3c3c6a 100644
--- a/ports/openmpi/portfile.cmake
+++ b/ports/openmpi/portfile.cmake
@@ -21,6 +21,7 @@ get_filename_component(PERL_PATH ${PERL} DIRECTORY)
 vcpkg_add_to_path(${PERL_PATH})
 
 vcpkg_configure_make(
+        COPY_SOURCE
         SOURCE_PATH ${SOURCE_PATH}
         OPTIONS
             --with-hwloc=internal
diff --git a/ports/pbc/CONTROL b/ports/pbc/CONTROL
index 06aa2ca5c..e7f0cc3c0 100644
--- a/ports/pbc/CONTROL
+++ b/ports/pbc/CONTROL
@@ -1,7 +1,7 @@
 Source: pbc
 Version: 0.5.14
-Port-Version: 3
-Build-Depends: mpir (windows), gmp(!windows)
+Port-Version: 4
+Build-Depends: mpir (windows), gmp (!windows)
 Homepage: https://crypto.stanford.edu/pbc
 Description: Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.
 Supports: !uwp
diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL
index b49bf0a77..0a4af3912 100644
--- a/ports/x264/CONTROL
+++ b/ports/x264/CONTROL
@@ -1,5 +1,6 @@
 Source: x264
-Version: 157-303c484ec828ed0-8
+Version: 157-303c484ec828ed0
+Port-Version: 9
 Homepage: https://github.com/mirror/x264
 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
-Build-Depends: pthread (linux&osx)
\ No newline at end of file
+Build-Depends: pthread (linux&osx)
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index d7aff89d7..1c9e32e92 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -12,9 +12,24 @@ vcpkg_from_github(
         "uwp-cflags.patch"
 )
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    _vcpkg_determine_autotools_host_cpu(BUILD_ARCH)
+    _vcpkg_determine_autotools_target_cpu(HOST_ARCH)
+    list(APPEND OPTIONS --build=${BUILD_ARCH}-pc-mingw32)
+    list(APPEND OPTIONS --host=${HOST_ARCH}-pc-mingw32)
+endif()
+
+if(VCPKG_TARGET_IS_UWP)
+    list(APPEND OPTIONS --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00)
+    list(APPEND OPTIONS --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib)
+endif()
+
+
 vcpkg_configure_make(
     SOURCE_PATH ${SOURCE_PATH}
+    NO_ADDITIONAL_PATHS
     OPTIONS
+        ${OPTIONS}
         --enable-strip
         --disable-lavf
         --disable-swscale
@@ -24,21 +39,17 @@ vcpkg_configure_make(
         --disable-lsmash
         --disable-asm
         --enable-debug
+
 )
 
 vcpkg_install_make()
-vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES -lpthread -lm -ldl)
+vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN)
 
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/lib/pkgconfig
-    ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
-    ${CURRENT_PACKAGES_DIR}/debug/bin/x264.exe
-    ${CURRENT_PACKAGES_DIR}/debug/include
-)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/x264.lib)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/x264.lib)
 else()
     # force U_STATIC_IMPLEMENTATION macro
     file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS)
@@ -51,6 +62,8 @@ else()
     )
 endif()
 
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES -lpthread -lm -ldl)
+
 vcpkg_copy_pdbs()
 
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)