From 07039e2f12dbcaf2e6703672fe65a7df4516324d Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Wed, 29 Nov 2023 06:59:27 +0100
Subject: [PATCH] [log4cplus] Update to 2.1.1 (#35339)

* [log4cplus] Update to 2.1.1

* version

* Fix debug pc file

* version
---
 ports/log4cplus/portfile.cmake | 15 ++++++++++-----
 ports/log4cplus/vcpkg.json     |  3 ++-
 versions/baseline.json         |  2 +-
 versions/l-/log4cplus.json     |  5 +++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake
index ddc9756078..938e87e158 100644
--- a/ports/log4cplus/portfile.cmake
+++ b/ports/log4cplus/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO log4cplus/log4cplus
-    REF REL_2_1_0
-    SHA512 fd26ae73e898af6896046e5e567bfc664bc8e81568c8cdbe5ff6316054b875af7fa946f7b1f011a96b0d3b53dc3f7f9411cbc2ffa07b674777cb0def2743ede8
+    REF REL_2_1_1
+    SHA512 ddc63ad574aed7d13980308c1f4d3a31a7fa9c7d4a14de923f9b3a851492d17f64f34166b6be77fc8584c0e98cd1f34ed3d9ba268e7456fd1ff3b7d8125dbe3a
     HEAD_REF master
 )
 
@@ -42,11 +42,16 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_fixup_pkgconfig()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus)
-
 vcpkg_copy_pdbs()
 
+if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/log4cplus.pc" "-llog4cplus" "-llog4cplusD")
+endif()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/ChangeLog"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE"
+    "${CURRENT_PACKAGES_DIR}/share/${PORT}/README.md")
 
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json
index 0b0bf070f5..2d3bd2f320 100644
--- a/ports/log4cplus/vcpkg.json
+++ b/ports/log4cplus/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "log4cplus",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration",
   "homepage": "https://github.com/log4cplus/log4cplus",
+  "license": "Apache-2.0 AND BSD-2-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/versions/baseline.json b/versions/baseline.json
index 32f652fca7..dd2f099e3a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5245,7 +5245,7 @@
       "port-version": 0
     },
     "log4cplus": {
-      "baseline": "2.1.0",
+      "baseline": "2.1.1",
       "port-version": 0
     },
     "log4cpp-log4cpp": {
diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json
index 8c6f6e4e16..b9feeb216e 100644
--- a/versions/l-/log4cplus.json
+++ b/versions/l-/log4cplus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "450db8aa0bcccc8479b3f3d2d1c63b71510c5dd4",
+      "version": "2.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "c0a2d8577299ff33c61cbb08d3eb4d4616e4e392",
       "version": "2.1.0",