[libxslt] Fix install tools and pkgconfig (#14476)

* [libxslt] Fix install tools and pkgconfig

* [libxml2] install pkgconfig

5 files changed, 19 insertions, 19 deletions

diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt
index 69fc246f9..a7118bec9 100644
--- a/ports/libxml2/CMakeLists.txt
+++ b/ports/libxml2/CMakeLists.txt
@@ -150,3 +150,12 @@ install(TARGETS libxml2
     ARCHIVE DESTINATION lib
     ${TARGET_INSTALL_OPTIONS}
 )
+
+# pkgconfig
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix "\${prefix}")
+set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR})
+set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
+
+configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/libxml-2.0.pc DESTINATION lib/pkgconfig)
\ No newline at end of file
diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL
index 6f8d18956..462ecfec6 100644
--- a/ports/libxml2/CONTROL
+++ b/ports/libxml2/CONTROL
@@ -1,5 +1,6 @@
 Source: libxml2
 Version: 2.9.10
+Port-Version: 1
 Homepage: https://xmlsoft.org/
 Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform)
 Build-Depends: zlib, libiconv, liblzma
diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake
index 7dda32359..43aae1de5 100644
--- a/ports/libxml2/portfile.cmake
+++ b/ports/libxml2/portfile.cmake
@@ -19,15 +19,13 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-# Handle copyright
-configure_file(${SOURCE_PATH}/Copyright ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# Install usage
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+vcpkg_fixup_pkgconfig()
 
 vcpkg_copy_pdbs()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
 endif()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL
index 04730c946..1e00a1e65 100644
--- a/ports/libxslt/CONTROL
+++ b/ports/libxslt/CONTROL
@@ -1,6 +1,6 @@
 Source: libxslt
 Version: 1.1.33-7
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/GNOME/libxslt
 Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT
 Build-Depends: libxml2, liblzma
diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake
index 86b633ee5..63cb6d322 100644
--- a/ports/libxslt/portfile.cmake
+++ b/ports/libxslt/portfile.cmake
@@ -21,7 +21,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
         prefix=@INSTALL_DIR@
         include=@INCLUDE_DIR@
         lib=@LIB_DIR@
-        bindir=$(PREFIX)\\tools
+        bindir=$(PREFIX)\\bin
         sodir=$(PREFIX)\\bin
     )
     # Debug params
@@ -60,6 +60,8 @@ if (VCPKG_TARGET_IS_WINDOWS)
         OPTIONS rebuild
     )
     
+    vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN)
+    
     # The makefile builds both static and dynamic libraries, so remove the ones we don't want
     if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})
@@ -103,16 +105,8 @@ else()
     )
     
     vcpkg_install_make()
-    #vcpkg_fixup_pkgconfig()?
+    vcpkg_fixup_pkgconfig()
     
-    if (EXISTS ${CURRENT_PACKAGES_DIR}/bin/xslt-config)
-        file(COPY ${CURRENT_PACKAGES_DIR}/bin/xslt-config DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-        file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/xslt-config)
-    endif()
-    if (EXISTS ${CURRENT_PACKAGES_DIR}/bin/xsltproc)
-        file(COPY ${CURRENT_PACKAGES_DIR}/bin/xsltproc DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-        file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/xslt-config)
-    endif()
     if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         file(COPY ${CURRENT_PACKAGES_DIR}/lib/libxslt.so ${CURRENT_PACKAGES_DIR}/bin/)
     else()
@@ -143,8 +137,6 @@ endif()
 file(WRITE ${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h "${EXSLTEXPORTS_H}")
 
 # Remove tools and debug include directories
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)