git: f521a39a95fd - main - devel/svn2git: Update to 1.0.20

The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f521a39a95fd0a0cfe837d7fe0aa11853ad5404c

commit f521a39a95fd0a0cfe837d7fe0aa11853ad5404c
Author:     Zsolt Udvari <uzsolt@FreeBSD.org>
AuthorDate: 2025-04-30 05:23:04 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2025-04-30 05:27:58 +0000

    devel/svn2git: Update to 1.0.20
    
    Use flavors to LTS subversion.
    Switch to DISTVERSION.
    Take maintainership.
    Change WWW to github.
    Remove FreeBSD repository-specific patch.
---
 devel/svn2git/Makefile                   | 39 ++++++++++++--------------------
 devel/svn2git/distinfo                   |  6 ++---
 devel/svn2git/files/freebsd-export-patch | 17 --------------
 3 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile
index 4a3ddf78c004..52d87cc83dc5 100644
--- a/devel/svn2git/Makefile
+++ b/devel/svn2git/Makefile
@@ -1,47 +1,38 @@
 PORTNAME=	svn2git
-PORTVERSION=	1.0.18
-PORTREVISION=	1
+DISTVERSION=	1.0.20
 CATEGORIES=	devel kde
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Imports svn repositories into git
-WWW=		http://gitorious.org/svn2git/svn2git
+WWW=		https://github.com/svn-all-fast-export/svn2git
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1
-.if ${WITH_SUBVERSION_VER:U} == LTS
-LIB_DEPENDS+=	libsvn_client-1.so:devel/subversion-lts
-.else
-LIB_DEPENDS+=	libsvn_client-1.so:devel/subversion
-.endif
 RUN_DEPENDS=	git:devel/git \
+		p5-subversion>=0:devel/p5-subversion \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
-.if ${WITH_SUBVERSION_VER:U} == LTS
-RUN_DEPENDS+=	p5-subversion-lts>=0:devel/p5-subversion
-.else
-RUN_DEPENDS+=	p5-subversion>=0:devel/p5-subversion
-.endif
+
+FLAVORS=		default lts
+FLAVOR?=		${FLAVORS:[1]}
+default_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
+lts_PKGNAMESUFFIX=	lts
+lts_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion-lts
 
 USES=		compiler:c++11-lang qmake qt:5
 USE_GITHUB=	yes
-USE_QT=		core
 GH_ACCOUNT=	svn-all-fast-export
+USE_QT=		core
+QMAKE_ARGS=	APR_INCLUDE=${LOCALBASE}/include/apr-1 \
+		SVN_INCLUDE=${LOCALBASE}/include/subversion-1 \
+		SVN_LIBDIR=${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	FREEBSD_REPO
-FREEBSD_REPO_DESC=	FreeBSD-repo only mode
-
-QMAKE_ARGS=	SVN_INCLUDE=${LOCALBASE}/include/subversion-1 \
-		SVN_LIBDIR=${LOCALBASE}/lib \
-		APR_INCLUDE=${LOCALBASE}/include/apr-1
 PLIST_FILES=	bin/svn2git
 
-FREEBSD_REPO_EXTRA_PATCHES=	${PATCHDIR}/freebsd-export-patch
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|"  \
-		-e "s/VERSION = .*/VERSION = ${PORTVERSION}/" ${WRKSRC}/src/src.pro
+		-e "s/VERSION = .*/VERSION = ${DISTVERSION}/" ${WRKSRC}/src/src.pro
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/svn2git ${STAGEDIR}${PREFIX}/bin/
diff --git a/devel/svn2git/distinfo b/devel/svn2git/distinfo
index cd11c27210f8..292643da406f 100644
--- a/devel/svn2git/distinfo
+++ b/devel/svn2git/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587887918
-SHA256 (svn-all-fast-export-svn2git-1.0.18_GH0.tar.gz) = edd776db0cdddb3bc8f2e3a711bd15580e965024c27d8674cf624e62b75b0aac
-SIZE (svn-all-fast-export-svn2git-1.0.18_GH0.tar.gz) = 53514
+TIMESTAMP = 1745949831
+SHA256 (svn-all-fast-export-svn2git-1.0.20_GH0.tar.gz) = 09572c1351283b7808ee922ec96ee08d09fe0c7a2e5a086c468ff809751f0407
+SIZE (svn-all-fast-export-svn2git-1.0.20_GH0.tar.gz) = 54669
diff --git a/devel/svn2git/files/freebsd-export-patch b/devel/svn2git/files/freebsd-export-patch
deleted file mode 100644
index 4f5819225fd2..000000000000
--- a/devel/svn2git/files/freebsd-export-patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/svn.cpp.orig	2018-05-27 18:34:59 UTC
-+++ src/svn.cpp
-@@ -873,7 +873,13 @@ int SvnRevision::exportInternal(const ch
-     // changes across directory re-organizations and wholesale branch
-     // imports.
-     //
--    if (path_from != NULL && preveffectiverepository == effectiveRepository && prevbranch != branch) {
-+    // NOTE(uqs): HACK ALERT! Only merge between head, projects, and user
-+    // branches for the FreeBSD repositories. Never merge into stable or
-+    // releng, as we only ever cherry-pick changes to those branches.
-+    // FIXME: Needs to move into the ruleset ...
-+    if (path_from != NULL && preveffectiverepository == effectiveRepository && prevbranch != branch &&
-+            (branch.startsWith("master") || branch.startsWith("head") ||
-+             branch.startsWith("projects") || branch.startsWith("user"))) {
-         if(ruledebug)
-             qDebug() << "copy from branch" << prevbranch << "to branch" << branch << "@rev" << rev_from;
-         txn->noteCopyFromBranch (prevbranch, rev_from);