From 8b783efcedff627c5097fec796d295450b6fdcde Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Thu, 13 Oct 2022 12:53:51 -0400 Subject: [PATCH 01/10] Update DTL (Diff template library) version to 1.20 --- ports/dtl/portfile.cmake | 4 ++-- ports/dtl/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/dtl/portfile.cmake b/ports/dtl/portfile.cmake index d36e30760eda63..ba257115c55f65 100644 --- a/ports/dtl/portfile.cmake +++ b/ports/dtl/portfile.cmake @@ -4,8 +4,8 @@ include(CMakePackageConfigHelpers) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cubicdaiya/dtl - REF v1.19 - SHA512 77c767451b1b78ce49085da6ff5bb8a23c96dec56a37d96ef357a6b69a1b2cd45e2c6c4e8f91ee34ca080ce03a26518c478ff207309326a4bc7e729eaa2824b2 + REF v1.20 + SHA512 44cdaf190d8a103effbca8df244c652b642590795f7307f5f7fdf64fc34bdbe2fa5ab2e1a08185abf099e35b0d9158306a80a8dc24bba9eccab4c77c7b1eed5e HEAD_REF master ) diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json index d4a6964742dfb3..e5135a191845fd 100644 --- a/ports/dtl/vcpkg.json +++ b/ports/dtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dtl", - "version-string": "1.19", + "version-string": "1.20", "port-version": 1, "description": "Diff template library" } From d02e962589ab05a749b0877ce542250f748db6ee Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Thu, 13 Oct 2022 13:01:55 -0400 Subject: [PATCH 02/10] use "version" instead of "version-string" --- ports/dtl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json index e5135a191845fd..88d56907a32bc3 100644 --- a/ports/dtl/vcpkg.json +++ b/ports/dtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dtl", - "version-string": "1.20", + "version": "1.20", "port-version": 1, "description": "Diff template library" } From 26e6b424f22c5d1e9d8dde245fd47ca565dc45bf Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Thu, 13 Oct 2022 13:30:27 -0400 Subject: [PATCH 03/10] Update port version --- ports/dtl/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/dtl.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json index 88d56907a32bc3..28d5f08c92e922 100644 --- a/ports/dtl/vcpkg.json +++ b/ports/dtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dtl", "version": "1.20", - "port-version": 1, + "port-version": 0, "description": "Diff template library" } diff --git a/versions/baseline.json b/versions/baseline.json index 7d73dca0cddbaa..862a8bb4d8fceb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2025,8 +2025,8 @@ "port-version": 0 }, "dtl": { - "baseline": "1.19", - "port-version": 1 + "baseline": "1.20", + "port-version": 0 }, "duckx": { "baseline": "1.2.2", diff --git a/versions/d-/dtl.json b/versions/d-/dtl.json index ebed0a267a219c..bc5fbcd4ed6253 100644 --- a/versions/d-/dtl.json +++ b/versions/d-/dtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62373390d5401f7889cc6964a4a584d7835b50da", + "version": "1.20", + "port-version": 0 + }, { "git-tree": "67d6f73d3a78adeb42c9eee4c75d55c17ce1ea18", "version-string": "1.19", From e35fbe4b4d0c59dda26416c4b9bde01a1d107a39 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Thu, 13 Oct 2022 13:37:31 -0400 Subject: [PATCH 04/10] fix json format --- ports/dtl/vcpkg.json | 1 - versions/d-/dtl.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json index 28d5f08c92e922..25bc788e573248 100644 --- a/ports/dtl/vcpkg.json +++ b/ports/dtl/vcpkg.json @@ -1,6 +1,5 @@ { "name": "dtl", "version": "1.20", - "port-version": 0, "description": "Diff template library" } diff --git a/versions/d-/dtl.json b/versions/d-/dtl.json index bc5fbcd4ed6253..39492a4b41aad9 100644 --- a/versions/d-/dtl.json +++ b/versions/d-/dtl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "62373390d5401f7889cc6964a4a584d7835b50da", + "git-tree": "1e00ed3c55ed3b50e45097fe2ffbf34a1c55f277", "version": "1.20", "port-version": 0 }, From 61f53c5e8f3c6d438494bb80786da52239b0fd48 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Thu, 13 Oct 2022 14:36:19 -0400 Subject: [PATCH 05/10] Update version database --- versions/d-/dtl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/dtl.json b/versions/d-/dtl.json index 39492a4b41aad9..47cb74d5a55fd7 100644 --- a/versions/d-/dtl.json +++ b/versions/d-/dtl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1e00ed3c55ed3b50e45097fe2ffbf34a1c55f277", + "git-tree": "d3aeb9af90cef97c31eed1a38a4fed497250e40b", "version": "1.20", "port-version": 0 }, From f764dc5b20f84005ffe08af7d3890e25a1be61a4 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Fri, 14 Oct 2022 08:17:30 -0400 Subject: [PATCH 06/10] added license field --- ports/dtl/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json index 25bc788e573248..e215d3ccceff60 100644 --- a/ports/dtl/vcpkg.json +++ b/ports/dtl/vcpkg.json @@ -1,5 +1,6 @@ { "name": "dtl", "version": "1.20", - "description": "Diff template library" + "description": "Diff template library", + "license": "BSD-4-Clause", } From f2f20279aee9cf9c69f6e2eb40d7507773baa244 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Fri, 14 Oct 2022 08:22:01 -0400 Subject: [PATCH 07/10] added license field --- ports/dtl/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json index e215d3ccceff60..86bb8cefc2cd6b 100644 --- a/ports/dtl/vcpkg.json +++ b/ports/dtl/vcpkg.json @@ -2,5 +2,5 @@ "name": "dtl", "version": "1.20", "description": "Diff template library", - "license": "BSD-4-Clause", + "license": "BSD-4-Clause" } From 1cd2b1e3cae6a157715cf2125d95ed47444cb573 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Fri, 14 Oct 2022 11:40:27 -0400 Subject: [PATCH 08/10] update version database --- versions/d-/dtl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/dtl.json b/versions/d-/dtl.json index 47cb74d5a55fd7..94c5bdd817b3d7 100644 --- a/versions/d-/dtl.json +++ b/versions/d-/dtl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d3aeb9af90cef97c31eed1a38a4fed497250e40b", + "git-tree": "27dce1165703ccd273e4646722c195368b258878", "version": "1.20", "port-version": 0 }, From 2602107864bd4bda6c0a4d1cf014cf851af50066 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Mon, 17 Oct 2022 06:25:41 -0400 Subject: [PATCH 09/10] quote all paths to allow for spaces in the path --- ports/dtl/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/dtl/portfile.cmake b/ports/dtl/portfile.cmake index ba257115c55f65..590dbea91cb801 100644 --- a/ports/dtl/portfile.cmake +++ b/ports/dtl/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/dtl - DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION - ${CURRENT_PACKAGES_DIR}/share/dtl RENAME copyright) +file(INSTALL "${SOURCE_PATH}/${PORT}" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From b142587a522da632d451fb5dcdd625c8bcf07f43 Mon Sep 17 00:00:00 2001 From: Bob Kast <13680319+bobk2824@users.noreply.github.com> Date: Mon, 17 Oct 2022 06:26:59 -0400 Subject: [PATCH 10/10] update version db --- versions/d-/dtl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/dtl.json b/versions/d-/dtl.json index 94c5bdd817b3d7..dc365642b11933 100644 --- a/versions/d-/dtl.json +++ b/versions/d-/dtl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "27dce1165703ccd273e4646722c195368b258878", + "git-tree": "26d9843aad03516522a267da5b086985a413eed5", "version": "1.20", "port-version": 0 },