From ceb98163033f9a60a7fb73272f4c8b27d2dee892 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 13 Dec 2024 22:01:11 +0100
Subject: [PATCH] subversion: update to v1.14.5 and use default port for DSM 7
 packages

---
 cross/subversion/Makefile |  2 +-
 cross/subversion/digests  |  6 +++---
 spk/subversion/Makefile   | 10 +++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cross/subversion/Makefile b/cross/subversion/Makefile
index 621dae274b3..f04eaa91719 100644
--- a/cross/subversion/Makefile
+++ b/cross/subversion/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = subversion
-PKG_VERS = 1.14.4
+PKG_VERS = 1.14.5
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://archive.apache.org/dist/subversion
diff --git a/cross/subversion/digests b/cross/subversion/digests
index 7d9e61fe269..027f8dde0ad 100644
--- a/cross/subversion/digests
+++ b/cross/subversion/digests
@@ -1,3 +1,3 @@
-subversion-1.14.4.tar.bz2 SHA1 f2f620b173ae1f734f2a29f5c970925f3ebf3777
-subversion-1.14.4.tar.bz2 SHA256 44ead116e72e480f10f123c914bb6f9f8c041711c041ed7abff1b8634a199e3c
-subversion-1.14.4.tar.bz2 MD5 be9f6c5e8bb80e465152b4c5160d7f54
+subversion-1.14.5.tar.bz2 SHA1 5350ef7ea238b5fff21f822dc9dbeed6e0e426c2
+subversion-1.14.5.tar.bz2 SHA256 e78a29e7766b8b7b354497d08f71a55641abc53675ce1875584781aae35644a1
+subversion-1.14.5.tar.bz2 MD5 af6001dc7af2f1242a4f72e8a5c565d2
diff --git a/spk/subversion/Makefile b/spk/subversion/Makefile
index af290f7dcab..b184a5df19f 100644
--- a/spk/subversion/Makefile
+++ b/spk/subversion/Makefile
@@ -1,5 +1,5 @@
 SPK_NAME = subversion
-SPK_VERS = 1.14.4
+SPK_VERS = 1.14.5
 SPK_REV = 1
 SPK_ICON = src/subversion.png
 
@@ -14,7 +14,15 @@ CHANGELOG = "Initial SynoCommunity Package release."
 HOMEPAGE = https://subversion.apache.org/
 LICENSE  = Apache 2.0
 
+include ../../mk/spksrc.common.mk
+
+ifeq ($(call version_ge, ${TCVERSION}, 7.0),1)
+SERVICE_PORT = 3690
+else
 SERVICE_PORT = 3691
+DESCRIPTION += Port 3691 is used \(on DSM 6.x\) to avoid conflict with Subversion package of Synology.
+endif
+
 WIZARDS_DIR = src/wizard
 SERVICE_WIZARD_SHARENAME = wizard_repo_directory