git: 82f91a78b753 - main - net/syncthing: Format patches I missed before

The branch main has been updated by dvl:

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

commit 82f91a78b753fa5c6db227eb9430f3430635b2c0
Author:     Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2025-05-06 23:06:30 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2025-05-17 11:35:58 +0000

    net/syncthing: Format patches I missed before
    
    In 3283046e4d19e44049dac619ac43802a7eb4e67a I overlooked the patch
    provided by Anton Saietskii. His commit message would have been:
    
    Update to 1.29.6
    
    Since upstream commit 6a14709, minimum Go version is 1.23.
    
    While here, pet portclippy/portfmt and disable ccache (as it doesn't
    support Go, but still got installed, for example, in poudriere).
    
    PR:             285838
---
 net/syncthing/Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index e4c4df0aa0ec..25cdfe2c307a 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -19,22 +19,23 @@ USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv \
 
 BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
 
-.for x in ${BINS}
-PLIST_FILES+=	bin/${x}
-.endfor
+# Anonymize
+MAKE_ENV+=	BUILD_HOST=freebsd \
+		BUILD_USER=ports
 
-PORTDOCS=	*
+NO_CCACHE=	yes
+NO_WRKSUBDIR=	yes
 
 USERS=		syncthing
 GROUPS=		syncthing
 
-# Anonymize
-MAKE_ENV+=	BUILD_HOST=freebsd \
-		BUILD_USER=ports
+.for x in ${BINS}
+PLIST_FILES+=	bin/${x}
+.endfor
 
-OPTIONS_DEFINE=	DOCS
+PORTDOCS=	*
 
-NO_WRKSUBDIR=	yes
+OPTIONS_DEFINE=	DOCS
 
 do-build:
 	@( cd ${WRKSRC}/${PORTNAME} ; \
@@ -44,11 +45,6 @@ do-build:
 		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade build strelaypoolsrv; \
 		)
 
-do-test:
-	@( cd ${WRKSRC}/${PORTNAME} ; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade test ; \
-		)
-
 do-install:
 .for x in ${BINS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \
@@ -60,4 +56,8 @@ do-install:
 		${STAGEDIR}${DOCSDIR}
 .endfor
 
+do-test:
+	@( cd ${WRKSRC}/${PORTNAME} ; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run build.go -version v${DISTVERSION} -no-upgrade test ; \
+		)
 .include <bsd.port.mk>