3 files changed, 30 insertions, 8 deletions
diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch
new file mode 100644
index 000000000..0efecec2d
--- /dev/null
+++ b/ports/harfbuzz/0001-fix-cmake-export.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e881dbd1..69496561 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -761,11 +761,17 @@ endif ()
+ 
+ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+   install(TARGETS harfbuzz
++    EXPORT harfbuzzConfig
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     FRAMEWORK DESTINATION Library/Frameworks
+   )
++  install(EXPORT harfbuzzConfig
++      NAMESPACE unofficial::harfbuzz::
++      FILE unofficial-harfbuzz-config.cmake
++      DESTINATION share/unofficial-harfbuzz
++  )
+   if (HB_BUILD_UTILS)
+     install(TARGETS hb-view
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index fc9ce8370..da621b58d 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 1.8.4
+Version: 1.8.4-1
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel
 Default-Features: ucdn
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 4a1a0309b..0a92439dc 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -6,14 +6,11 @@ vcpkg_from_github(
     REF 1.8.4
     SHA512 92742b754713d1df8975d4d8467de04765784d7fd566b7e07e7e7a261b0338e997a5fc11fa4fe282d6d5540d242db40c993812fbc4a881becd95fd3aae598c80
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/find-package-freetype-2.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/glib-cmake.patch"
+        0001-fix-uwp-build.patch
+        find-package-freetype-2.patch
+        glib-cmake.patch
+        0001-fix-cmake-export.patch
 )
 
 SET(HB_HAVE_ICU "OFF")
@@ -59,8 +56,11 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-harfbuzz TARGET_PATH share/unofficial-harfbuzz)
 vcpkg_copy_pdbs()
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/harfbuzz/COPYING ${CURRENT_PACKAGES_DIR}/share/harfbuzz/copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME unofficial-harfbuzz)