2 files changed, 7 insertions, 8 deletions
diff --git a/ports/libtasn1/portfile.cmake b/ports/libtasn1/portfile.cmake
index 700bb977e..902dff196 100644
--- a/ports/libtasn1/portfile.cmake
+++ b/ports/libtasn1/portfile.cmake
@@ -18,21 +18,20 @@ vcpkg_extract_source_archive_ex(
         ${PATCHES}
 )
 
-if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+set(EXTRA_OPTS "")
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
     # $LIBS is an environment variable that vcpkg already pre-populated with some libraries. 
     # We need to re-purpose it when passing LIBS option to make to avoid overriding the vcpkg's own list.  
-    set(EXTRA_OPTS "LIBS=\"$LIBS -lgettimeofday -lgetopt\"")
+    list(APPEND EXTRA_OPTS "LIBS=-lgettimeofday -lgetopt \$LIBS")
 else()
     # restore the default ac_cv_prog_cc_g flags, otherwise it fails to compile
-    set(EXTRA_OPTS)
     set(VCPKG_C_FLAGS "-g -O2") 
     set(VCPKG_CXX_FLAGS "-g -O2")
 endif()
 
 # The upstream doesn't add this macro to the configure
 if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-
-    set(EXTRA_OPTS "${EXTRA_OPTS} CFLAGS=\"$CFLAGS -DASN1_STATIC\"")
+    list(APPEND EXTRA_OPTS "CFLAGS=\$CFLAGS -DASN1_STATIC")
 endif()
 
 set(ENV{GTKDOCIZE} true)
diff --git a/ports/libtasn1/vcpkg.json b/ports/libtasn1/vcpkg.json
index e61d35e03..fd021c21c 100644
--- a/ports/libtasn1/vcpkg.json
+++ b/ports/libtasn1/vcpkg.json
@@ -1,18 +1,18 @@
 {
   "name": "libtasn1",
   "version": "4.17.0",
-  "port-version": 1,
+  "port-version": 3,
   "description": "A secure communications library implementing the SSL, TLS and DTLS protocols",
   "homepage": "https://www.gnutls.org/",
   "supports": "!uwp",
   "dependencies": [
     {
       "name": "getopt",
-      "platform": "windows"
+      "platform": "windows & !mingw"
     },
     {
       "name": "gettimeofday",
-      "platform": "windows"
+      "platform": "windows & !mingw"
     }
   ]
 }