[apr-util] no absolute paths (microsoft#21453)

ports/apr-util/portfile.cmake

@@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH SOURCE_PATH
-        ARCHIVE ${ARCHIVE}
+        ARCHIVE "${ARCHIVE}"
         PATCHES
             use-vcpkg-expat.patch
             apr.patch
@@ -22,17 +22,16 @@ if(VCPKG_TARGET_IS_WINDOWS)
       set(APU_DECLARE_STATIC ON)
     endif()
 
-    vcpkg_configure_cmake(
-      SOURCE_PATH ${SOURCE_PATH}
-      PREFER_NINJA
+    vcpkg_cmake_configure(
+      SOURCE_PATH "${SOURCE_PATH}"
       OPTIONS
         -DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT}
         -DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC}
       OPTIONS_DEBUG
         -DDISABLE_INSTALL_HEADERS=ON
     )
 
-    vcpkg_install_cmake()
+    vcpkg_cmake_install()
     vcpkg_copy_pdbs()
 
     file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h  APU_H)
@@ -43,7 +42,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endif()
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}")
 
-else(VCPKG_TARGET_IS_WINDOWS)
+else()
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH SOURCE_PATH
         ARCHIVE ${ARCHIVE} 
@@ -77,7 +76,15 @@ else(VCPKG_TARGET_IS_WINDOWS)
 
     vcpkg_install_make()
 
+    vcpkg_fixup_pkgconfig()
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/bin/apu-1-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/bin/apu-1-config" "${CURRENT_BUILDTREES_DIR}" "not/existing")
+    if(NOT VCPKG_BUILD_TYPE)
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/debug/bin/apu-1-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/debug/bin/apu-1-config" "${CURRENT_BUILDTREES_DIR}" "not/existing")
+    endif()
+
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/apr-util/vcpkg.json

@@ -1,12 +1,17 @@
 {
   "name": "apr-util",
   "version-string": "1.6.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
   "dependencies": [
     "apr",
     "expat",
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true,
+      "platform": "windows"
+    }
   ]
 }

versions/a-/apr-util.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dfc76280690e9d419c43ee5242466de5b4e317c2",
+      "version-string": "1.6.1",
+      "port-version": 5
+    },
     {
       "git-tree": "cf1a0e97d00a5748dc58db7d0a5da0fd7d5efb66",
       "version-string": "1.6.1",

versions/baseline.json

@@ -114,7 +114,7 @@
     },
     "apr-util": {
       "baseline": "1.6.1",
-      "port-version": 4
+      "port-version": 5
     },
     "apsi": {
       "baseline": "0.7.0",