git: 1868ef4d6cc2 - main - net/syncthing: Update to 2.0.3, fix CONFLICTS ...

The branch main has been updated by dvl:

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

commit 1868ef4d6cc2e5c714a8865e5ceea0a9289316cd
Author:     Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2025-08-25 14:02:07 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2025-08-25 14:40:09 +0000

    net/syncthing: Update to 2.0.3, fix CONFLICTS ...
    
    as we can't install port alongside net/syncthing1, but we can build both
    even if any of two installed.
    
    PR:             288903
---
 net/syncthing/Makefile  | 7 +++----
 net/syncthing/distinfo  | 6 +++---
 net/syncthing1/Makefile | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 31c0ec86c155..43c24d6f1c61 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	syncthing
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.2
-PORTREVISION=	1
+DISTVERSION=	2.0.3
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-source-${DISTVERSIONFULL}
@@ -24,14 +23,14 @@ BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
 MAKE_ENV+=	BUILD_HOST=freebsd \
 		BUILD_USER=ports
 
+CONFLICTS_INSTALL=	syncthing1
+
 NO_CCACHE=	yes
 NO_WRKSUBDIR=	yes
 
 USERS=		syncthing
 GROUPS=		syncthing
 
-CONFLICTS=	syncthing1
-
 .for x in ${BINS}
 PLIST_FILES+=	bin/${x}
 .endfor
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 49cb27008b8a..3e49d99dd739 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1755342797
-SHA256 (syncthing-source-v2.0.2.tar.gz) = 8738cf2a9563bfbf4c6c8923b4c048176c1e80baa88cd92778ef7fbed3f55a6a
-SIZE (syncthing-source-v2.0.2.tar.gz) = 62642068
+TIMESTAMP = 1756130379
+SHA256 (syncthing-source-v2.0.3.tar.gz) = 80ef0589c3949b2b48ae703106e4ce95474a111625923fb7d568f73c2537fe5d
+SIZE (syncthing-source-v2.0.3.tar.gz) = 62648435
diff --git a/net/syncthing1/Makefile b/net/syncthing1/Makefile
index 2d562963f6b7..236de13bcb11 100644
--- a/net/syncthing1/Makefile
+++ b/net/syncthing1/Makefile
@@ -25,14 +25,14 @@ BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
 MAKE_ENV+=	BUILD_HOST=freebsd \
 		BUILD_USER=ports
 
+CONFLICTS_INSTALL=	syncthing
+
 NO_CCACHE=	yes
 NO_WRKSUBDIR=	yes
 
 USERS=		syncthing
 GROUPS=		syncthing
 
-CONFLICTS=	syncthing
-
 .for x in ${BINS}
 PLIST_FILES+=	bin/${x}
 .endfor