longhuan2018 · longhuan2018 · Dec 10, 2020 · Dec 2, 2020 · Dec 2, 2020 · Dec 2, 2020
diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md
@@ -1,57 +1,57 @@
 <!-- Run regenerate.ps1 to extract documentation from scripts/cmake/*.cmake -->
 
-# Portfile helper functions
-- [execute\_process](execute_process.md)
-- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)
-- [vcpkg\_add\_to\_path](vcpkg_add_to_path.md)
-- [vcpkg\_apply\_patches](vcpkg_apply_patches.md)
-- [vcpkg\_build\_cmake](vcpkg_build_cmake.md)
-- [vcpkg\_build\_gn](vcpkg_build_gn.md)
-- [vcpkg\_build\_make](vcpkg_build_make.md)
-- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
-- [vcpkg\_build\_ninja](vcpkg_build_ninja.md)
-- [vcpkg\_build\_nmake](vcpkg_build_nmake.md)
-- [vcpkg\_build\_qmake](vcpkg_build_qmake.md)
-- [vcpkg\_buildpath\_length\_warning](vcpkg_buildpath_length_warning.md)
-- [vcpkg\_check\_features](vcpkg_check_features.md)
-- [vcpkg\_check\_linkage](vcpkg_check_linkage.md)
-- [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md)
-- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md)
-- [vcpkg\_common\_definitions](vcpkg_common_definitions.md)
-- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
-- [vcpkg\_configure\_gn](vcpkg_configure_gn.md)
-- [vcpkg\_configure\_make](vcpkg_configure_make.md)
-- [vcpkg\_configure\_meson](vcpkg_configure_meson.md)
-- [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md)
-- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
-- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md)
-- [vcpkg\_copy\_tools](vcpkg_copy_tools.md)
-- [vcpkg\_download\_distfile](vcpkg_download_distfile.md)
-- [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md)
-- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md)
-- [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md)
-- [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md)
-- [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md)
-- [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md)
-- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md)
-- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)
-- [vcpkg\_find\_fortran](vcpkg_find_fortran.md)
-- [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md)
-- [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md)
-- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)
-- [vcpkg\_from\_git](vcpkg_from_git.md)
-- [vcpkg\_from\_github](vcpkg_from_github.md)
-- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md)
-- [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md)
-- [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md)
-- [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md)
-- [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
-- [vcpkg\_install\_gn](vcpkg_install_gn.md)
-- [vcpkg\_install\_make](vcpkg_install_make.md)
-- [vcpkg\_install\_meson](vcpkg_install_meson.md)
-- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
-- [vcpkg\_install\_nmake](vcpkg_install_nmake.md)
-- [vcpkg\_install\_qmake](vcpkg_install_qmake.md)
-- [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md)
-- [vcpkg\_prettify\_command](vcpkg_prettify_command.md)
+# Portfile helper functions
+- [execute\_process](execute_process.md)
+- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)
+- [vcpkg\_add\_to\_path](vcpkg_add_to_path.md)
+- [vcpkg\_apply\_patches](vcpkg_apply_patches.md)
+- [vcpkg\_build\_cmake](vcpkg_build_cmake.md)
+- [vcpkg\_build\_gn](vcpkg_build_gn.md)
+- [vcpkg\_build\_make](vcpkg_build_make.md)
+- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
+- [vcpkg\_build\_ninja](vcpkg_build_ninja.md)
+- [vcpkg\_build\_nmake](vcpkg_build_nmake.md)
+- [vcpkg\_build\_qmake](vcpkg_build_qmake.md)
+- [vcpkg\_buildpath\_length\_warning](vcpkg_buildpath_length_warning.md)
+- [vcpkg\_check\_features](vcpkg_check_features.md)
+- [vcpkg\_check\_linkage](vcpkg_check_linkage.md)
+- [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md)
+- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md)
+- [vcpkg\_common\_definitions](vcpkg_common_definitions.md)
+- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
+- [vcpkg\_configure\_gn](vcpkg_configure_gn.md)
+- [vcpkg\_configure\_make](vcpkg_configure_make.md)
+- [vcpkg\_configure\_meson](vcpkg_configure_meson.md)
+- [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md)
+- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
+- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md)
+- [vcpkg\_copy\_tools](vcpkg_copy_tools.md)
+- [vcpkg\_download\_distfile](vcpkg_download_distfile.md)
+- [vcpkg\_execute\_build\_process](vcpkg_execute_build_process.md)
+- [vcpkg\_execute\_in\_download\_mode](vcpkg_execute_in_download_mode.md)
+- [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md)
+- [vcpkg\_execute\_required\_process\_repeat](vcpkg_execute_required_process_repeat.md)
+- [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md)
+- [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md)
+- [vcpkg\_fail\_port\_install](vcpkg_fail_port_install.md)
+- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)
+- [vcpkg\_find\_fortran](vcpkg_find_fortran.md)
+- [vcpkg\_fixup\_cmake\_targets](vcpkg_fixup_cmake_targets.md)
+- [vcpkg\_fixup\_pkgconfig](vcpkg_fixup_pkgconfig.md)
+- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)
+- [vcpkg\_from\_git](vcpkg_from_git.md)
+- [vcpkg\_from\_github](vcpkg_from_github.md)
+- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md)
+- [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md)
+- [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md)
+- [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md)
+- [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
+- [vcpkg\_install\_gn](vcpkg_install_gn.md)
+- [vcpkg\_install\_make](vcpkg_install_make.md)
+- [vcpkg\_install\_meson](vcpkg_install_meson.md)
+- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
+- [vcpkg\_install\_nmake](vcpkg_install_nmake.md)
+- [vcpkg\_install\_qmake](vcpkg_install_qmake.md)
+- [vcpkg\_internal\_get\_cmake\_vars](vcpkg_internal_get_cmake_vars.md)
+- [vcpkg\_prettify\_command](vcpkg_prettify_command.md)
 - [vcpkg\_replace\_string](vcpkg_replace_string.md)
diff --git a/docs/maintainers/vcpkg_fixup_pkgconfig.md b/docs/maintainers/vcpkg_fixup_pkgconfig.md
@@ -7,8 +7,6 @@ Fix common paths in *.pc files and make everything relativ to $(prefix)
 vcpkg_fixup_pkgconfig(
     [RELEASE_FILES <PATHS>...]
     [DEBUG_FILES <PATHS>...]
-    [SYSTEM_LIBRARIES <NAMES>...]
-    [IGNORE_FLAGS <FLAGS>]
     [SKIP_CHECK]
 )
 ```
@@ -22,21 +20,24 @@ Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR} without ${CURR
 Specifies a list of files to apply the fixes for debug paths.
 Defaults to every *.pc file in the folder ${CURRENT_PACKAGES_DIR}/debug/
 
-### SYSTEM_LIBRARIES
-If the *.pc file contains system libraries outside vcpkg these need to be listed here.
-VCPKG checks every -l flag for the existence of the required library within vcpkg.
+### SKIP_CHECK
+Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases.
 
-### IGNORE_FLAGS
-If the *.pc file contains flags in the lib field which are not libraries. These can be listed here
+### SYSTEM_PACKAGES (deprecated)
+This argument has been deprecated and has no effect.
 
-### SKIP_CHECK
-Skips the library checks in vcpkg_fixup_pkgconfig. Only use if the script itself has unhandled cases. 
+### SYSTEM_LIBRARIES (deprecated)
+This argument has been deprecated and has no effect.
+
+### IGNORE_FLAGS (deprecated)
+This argument has been deprecated and has no effect.
 
 ## Notes
 Still work in progress. If there are more cases which can be handled here feel free to add them
 
 ## Examples
-Just call `vcpkg_fixup_pkgconfig()` after any install step which installs *.pc files.
+
+* [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake)
 
 ## Source
 [scripts/cmake/vcpkg_fixup_pkgconfig.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_pkgconfig.cmake)
diff --git a/docs/maintainers/vcpkg_from_github.md b/docs/maintainers/vcpkg_from_github.md
@@ -13,6 +13,7 @@ vcpkg_from_github(
     [PATCHES <patch1.patch> <patch2.patch>...]
     [GITHUB_HOST <https://github.com>]
     [AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>]
+    [FILE_DISAMBIGUATOR <N>]
 )
 ```
 

diff --git a/docs/maintainers/vcpkg_from_gitlab.md b/docs/maintainers/vcpkg_from_gitlab.md
@@ -12,6 +12,7 @@ vcpkg_from_gitlab(
     [SHA512 <45d0d7f8cc350...>]
     [HEAD_REF <master>]
     [PATCHES <patch1.patch> <patch2.patch>...]
+    [FILE_DISAMBIGUATOR <N>]
 )
 ```
 
@@ -51,6 +52,9 @@ A list of patches to be applied to the extracted sources.
 
 Relative paths are based on the port directory.
 
+### FILE_DISAMBIGUATOR
+A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name.
+
 ## Notes:
 At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
 

diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1
@@ -13,9 +13,7 @@ if (-not (Test-Path "$VcpkgRoot/.vcpkg-root")) {
     throw "Invalid vcpkg instance, did you forget -VcpkgRoot?"
 }
 
-Set-Content `
-    -Path "$PSScriptRoot/maintainers/portfile-functions.md" `
-    -Value "<!-- Run regenerate.ps1 to extract documentation from scripts/cmake/*.cmake -->`n`n# Portfile helper functions"
+$tableOfContents = @()
 
 Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object {
     $filename = $_
@@ -72,10 +70,23 @@ Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object {
 
     if ($contents) {
         Set-Content -Path "$PSScriptRoot/maintainers/$($filename.BaseName).md" -Value "$($contents -join "`n")`n`n## Source`n[scripts/cmake/$($filename.Name)](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/$($filename.Name))"
-        "- [$($filename.BaseName -replace "_","\_")]($($filename.BaseName).md)" `
-        | Out-File -Enc Ascii -Append -FilePath "$PSScriptRoot/maintainers/portfile-functions.md"
+
+        $tableOfContents += $filename.BaseName
     } elseif (-not $filename.Name.StartsWith("vcpkg_internal")) {
         # don't worry about undocumented internal functions
         Write-Warning "The cmake function in file $filename doesn't seem to have any documentation. Make sure the documentation comments are correctly written."
     }
 }
+
+$portfileFunctionsContent = @(
+    '<!-- Run regenerate.ps1 to extract documentation from scripts/cmake/*.cmake -->',
+    '',
+    '# Portfile helper functions')
+
+$tableOfContents | Sort-Object -Culture '' | ForEach-Object {
+    $portfileFunctionsContent += "- [$($_ -replace '_','\_')]($_.md)"
+}
+
+Set-Content `
+    -Path "$PSScriptRoot/maintainers/portfile-functions.md" `
+    -Value ($portfileFunctionsContent -join "`n")
diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md
@@ -86,7 +86,7 @@ More information about Azure DevOps Artifacts' NuGet support is available in the
 
 ## Configuration
 
-Binary caching is configured via a combination of defaults, the environment variable `VCPKG_BINARY_SOURCES` (set to `<source>;<source>;...`), and the command line option `--binarysource=<source>`. Source options are evaluated in order of defaults, then environment, then command line.
+Binary caching is configured via a combination of defaults, the environment variable `VCPKG_BINARY_SOURCES` (set to `<source>;<source>;...`), and the command line option `--binarysource=<source>`. Source options are evaluated in order of defaults, then environment, then command line. Binary caching can be completely disabled by passing `--binarysource=clear` as the last command line option.
 
 By default, zip-based archives will be cached at the first valid location of:
 
@@ -115,6 +115,47 @@ By default, zip-based archives will be cached at the first valid location of:
 The `<rw>` optional parameter for certain sources controls whether they will be consulted for
 downloading binaries (`read`), whether on-demand builds will be uploaded to that remote (`write`), or both (`readwrite`).
 
+### Nuget Provider Configuration
+
+#### Credentials
+
+Many NuGet servers require additional credentials to access. The most flexible way to supply credentials is via the `nugetconfig` provider with a custom `nuget.config` file. See https://docs.microsoft.com/en-us/nuget/consume-packages/consuming-packages-authenticated-feeds for more information on authenticating via `nuget.config`.
+
+However, it is still possible to authenticate against many servers using NuGet's built-in credential providers or via customizing your environment's default `nuget.config`. The default config can be extended via nuget client calls such as
+```
+nuget sources add -Name MyRemote -Source https://... -Username $user -Password $pass
+```
+and then passed to vcpkg via `--binarysource=nuget,MyRemote,readwrite`. You can get a path to the precise copy of NuGet used by vcpkg by running `vcpkg fetch nuget`, which will report something like:
+```
+$ vcpkg fetch nuget
+/vcpkg/downloads/tools/nuget-5.5.1-linux/nuget.exe
+```
+Non-Windows users will need to call this through mono via `mono /path/to/nuget.exe sources add ...`.
+
+##### Credential Example for Azure Dev Ops
+```bash
+# On Linux or OSX
+$ mono `vcpkg fetch nuget | tail -n1` sources add \
+  -name ADO \
+  -Source https://pkgs.dev.azure.com/$ORG/_packaging/$FEEDNAME/nuget/v3/index.json \
+  -Username $USERNAME \
+  -Password $PAT
+$ export VCPKG_BINARY_SOURCES="nuget,ADO,readwrite"
+```
+```powershell
+# On Windows Powershell
+PS> & $(vcpkg fetch nuget | select -last 1) sources add `
+  -name ADO `
+  -Source https://pkgs.dev.azure.com/$ORG/_packaging/$FEEDNAME/nuget/v3/index.json `
+  -Username $USERNAME `
+  -Password $PAT
+PS> $env:VCPKG_BINARY_SOURCES="nuget,ADO,readwrite"
+```
+
+We recommend using a Personal Access Token (PAT) as the password for maximum security. You can generate a PAT in User Settings -> Personal Access Tokens or `https://dev.azure.com/$ORG/_usersSettings/tokens`.
+
+#### `metadata.repository`
+
 The `nuget` and `nugetconfig` source providers additionally respect certain environment variables while generating nuget packages. The `metadata.repository` field of any packages will be generated as:
 ```
     <repository type="git" url="${VCPKG_NUGET_REPOSITORY}"/>
@@ -128,8 +169,6 @@ or
 ```
 if the appropriate environment variables are defined and non-empty. This is specifically used to associate packages in GitHub Packages with the _building_ project and not intended to associate with the original package sources.
 
-Finally, binary caching can be completely disabled by passing `--no-binarycaching` on the command line.
-
 ## Implementation Notes (internal details subject to change without notice)
 
 Binary caching relies on hashing everything that contributes to a particular package build. This includes:

diff --git a/ports/arrayfire/build.patch b/ports/arrayfire/build.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1108c60..670f271b 100644
+index 1f30a5b3..f93e4ed9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -104,18 +104,11 @@ mark_as_advanced(
@@ -62,13 +62,6 @@ index 2c7b96ea..b5006ee0 100644
  endif()
 
  # Libraries
-diff --git a/assets b/assets
-index cd08d749..c53bfab9 160000
---- a/assets
-+++ b/assets
-@@ -1 +1 @@
--Subproject commit cd08d749611b324012555ad6f23fd76c5465bd6c
-+Subproject commit c53bfab909adfeed626f91ed419555711e20bca5
 diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt
 index 967eaa63..ff04392c 100644
 --- a/src/api/unified/CMakeLists.txt
@@ -131,7 +124,7 @@ index 170bb0f3..c6e20177 100644
  arrayfire_set_default_cxx_flags(afcpu)
 
 diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
-index 7e3e4089..bbd8d838 100644
+index 7e3e4089..a3a53087 100644
 --- a/src/backend/cuda/CMakeLists.txt
 +++ b/src/backend/cuda/CMakeLists.txt
 @@ -110,7 +110,11 @@ cuda_include_directories(
@@ -147,6 +140,31 @@ index 7e3e4089..bbd8d838 100644
  endif()
 
  file(GLOB jit_src "kernel/jit.cuh")
+@@ -240,9 +244,14 @@ if(AF_WITH_NONFREE)
+   set(cxx_definitions -DAF_WITH_NONFREE_SIFT)
+ endif()
+
++# New API of cuSparse was introduced in 10.1.168 for Linux and the older
++# 10.1.105 fix version doesn't it. Unfortunately, the new API was introduced in
++# in a fix release of CUDA - unconventionally. As CMake's FindCUDA module
++# doesn't provide patch/fix version number, we use 10.2 as the minimum
++# CUDA version to enable this new cuSparse API.
+ if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR
+    (UNIX AND
+-    CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0))
++    CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 1))
+   list(APPEND cxx_definitions -DAF_USE_NEW_CUSPARSE_API)
+ endif()
+
+@@ -301,7 +310,7 @@ set_target_properties(af_cuda_static_cuda_library
+
+ if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR
+    (UNIX AND
+-    CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0))
++    CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 1))
+   target_compile_definitions(af_cuda_static_cuda_library PRIVATE AF_USE_NEW_CUSPARSE_API)
+ endif()
+
 diff --git a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt
 index 9a796c9e..d9864b00 100644
 --- a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt
@@ -191,10 +209,3 @@ index d618ff2f..9f517398 100644
        )
 
      set_target_properties(opencl_sort_by_key_${SBK_TYPE}
-diff --git a/test/data b/test/data
-index 408f4405..6a48c886 160000
---- a/test/data
-+++ b/test/data
-@@ -1 +1 @@
--Subproject commit 408f44059015c57a66e13b4c98df86ebcb427950
-+Subproject commit 6a48c88658bcd68392e99344714cb0dccd4ec285
diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "arrayfire",
   "version-string": "3.7.3",
+  "port-version": 2,
   "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.",
   "supports": "x64",
   "dependencies": [

diff --git a/ports/atk/CMakeLists.txt → ports/atk/CMakeLists.txt.in b/ports/atk/CMakeLists.txt → ports/atk/CMakeLists.txt.in
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 project(atk C)
 
-set(ATK_LIB_SUFFIX 1.0)
-set(ATK_DLL_SUFFIX 1)
-set(GLIB_LIB_VERSION 2.0)
+set(ATK_LIB_SUFFIX @ATK_LIB_SUFFIX@)
+set(ATK_DLL_SUFFIX @ATK_DLL_SUFFIX@)
+set(GLIB_LIB_VERSION @GLIB_LIB_VERSION@)
 
 if(BUILD_SHARED_LIBS)
     set(ATK_EXPORT_MACRO DLL_EXPORT)
@@ -142,3 +142,14 @@ message(STATUS "  " ${LIBINTL_LIBRARY})
 foreach(GL ${GLIB_LIBRARIES})
     message(STATUS "  " ${GL})
 endforeach()
+
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+set(ATK_API_VERSION @ATK_API_VERSION@)
+set(VERSION @ATK_VERSION@)
+set(GLIB_PACKAGES "glib-${GLIB_LIB_VERSION} gobject-${GLIB_LIB_VERSION} gmodule-${GLIB_LIB_VERSION}")
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/atk.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/atk.pc" DESTINATION lib/pkgconfig)
diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL
@@ -1,5 +1,6 @@
 Source: atk
 Version: 2.24.0-5
+Port-Version: 1
 Homepage: https://developer.gnome.org/atk/
 Description: GNOME Accessibility Toolkit
 Build-Depends: glib, gettext