From 0ab8f0d69f469148f926afa796beddc096c45c84 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 14 Mar 2018 03:18:12 -0700
Subject: [libmariadb] Use vcpkg_from_github() and improve conflict check

---
 ports/libmariadb/portfile.cmake | 84 ++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
index 3aca7afb3..4486564f6 100644
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@@ -1,24 +1,24 @@
 
-if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h")
-	message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.")
+if (EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql")
+    message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.")
 endif()
 
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-3.0.2)
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/MariaDB/mariadb-connector-c/archive/v3.0.2.tar.gz"
-    FILENAME "mariadb-connector-c-3.0.2.tar.gz"
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO MariaDB/mariadb-connector-c
+    REF v3.0.2
     SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-	OPTIONS
-		-DWITH_UNITTEST=OFF
-		-DWITH_SSL=OFF
-		-DWITH_CURL=OFF
+    OPTIONS
+        -DWITH_UNITTEST=OFF
+        -DWITH_SSL=OFF
+        -DWITH_CURL=OFF
 )
 
 vcpkg_install_cmake()
@@ -28,47 +28,47 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # fix libmariadb lib & dll directory.
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-	file(RENAME
-		${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib
-		${CURRENT_PACKAGES_DIR}/lib/mariadbclient.lib)		
-	file(RENAME
-		${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib
-		${CURRENT_PACKAGES_DIR}/debug/lib/mariadbclient.lib)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib
+        ${CURRENT_PACKAGES_DIR}/lib/mariadbclient.lib)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib
+        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadbclient.lib)
 else()
-	file(MAKE_DIRECTORY
-		${CURRENT_PACKAGES_DIR}/bin
-		${CURRENT_PACKAGES_DIR}/debug/bin)
-	file(RENAME
-		${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll
-		${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll)
-	file(RENAME
-		${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll
-		${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll)
-	file(RENAME
-		${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib
-		${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib)
-	file(RENAME
-		${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib
-		${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib)
+    file(MAKE_DIRECTORY
+        ${CURRENT_PACKAGES_DIR}/bin
+        ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll
+        ${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll
+        ${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib
+        ${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib)
+    file(RENAME
+        ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib
+        ${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib)
 endif()
 
 # remove plugin folder
 file(REMOVE_RECURSE
-	${CURRENT_PACKAGES_DIR}/lib/plugin
-	${CURRENT_PACKAGES_DIR}/debug/lib/plugin
-	${CURRENT_PACKAGES_DIR}/lib/mariadb
-	${CURRENT_PACKAGES_DIR}/debug/lib/mariadb)
+    ${CURRENT_PACKAGES_DIR}/lib/plugin
+    ${CURRENT_PACKAGES_DIR}/debug/lib/plugin
+    ${CURRENT_PACKAGES_DIR}/lib/mariadb
+    ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb)
 
 # copy & remove header files
 file(GLOB HEADER_FILES ${CURRENT_PACKAGES_DIR}/include/mariadb/*)
 file(REMOVE
-	${CURRENT_PACKAGES_DIR}/include/mariadb/my_config.h.in
-	${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in
-	${CURRENT_PACKAGES_DIR}/include/mariadb/CMakeLists.txt
-	${CURRENT_PACKAGES_DIR}/include/mariadb/Makefile.am)
+    ${CURRENT_PACKAGES_DIR}/include/mariadb/my_config.h.in
+    ${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in
+    ${CURRENT_PACKAGES_DIR}/include/mariadb/CMakeLists.txt
+    ${CURRENT_PACKAGES_DIR}/include/mariadb/Makefile.am)
 file(RENAME
-	${CURRENT_PACKAGES_DIR}/include/mariadb
-	${CURRENT_PACKAGES_DIR}/include/mysql)
+    ${CURRENT_PACKAGES_DIR}/include/mariadb
+    ${CURRENT_PACKAGES_DIR}/include/mysql)
 
 # copy license file
 file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmariadb)
-- 
cgit v1.2.3