Attachment #232991 for bug #262808




		GOARM=${GOARM}

.if ${go_ARGS:Mmodules}
GO_BUILDFLAGS+=	-mod=vendor
GO_TESTFLAGS+=	-mod=vendor
GO_GOPATH=	${DISTDIR}/go/${PKGORIGIN:S,/,_,g}
GO_WRKSRC=	${WRKSRC}
GO_ENV+=	GOPATH="${GO_GOPATH}" \

post-extract:
	@${MKDIR} ${GO_WRKSRC:H}
	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
.  endif
post-extract:
	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor)
.  endif 
.endif

.if !target(do-build) && empty(go_ARGS:Mno_targets)




PORTNAME=	syncthing
PORTVERSION=	1.19.2
DISTVERSIONPREFIX=	v
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/
DISTNAME=	${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION}
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	swills@FreeBSD.org
COMMENT=	Encrypted file sync tool

LICENSE=	MPL20
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		cpe go:modules

USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv

BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv

GO_MODULE=	github.com/syncthing/syncthing

.for x in ${BINS}
PLIST_FILES+=	bin/${x}
.endfor


OPTIONS_DEFINE=	DOCS

NO_WRKSUBDIR=	yes

do-build:
	@( cd ${WRKSRC} ; \
		${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build ; \
		${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \
		${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \
		${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \
		)

do-install:
.for x in ${BINS}
	${INSTALL_PROGRAM} ${WRKSRC}/${x} \
		${STAGEDIR}${PREFIX}/bin/
.endfor
	${MKDIR} ${STAGEDIR}${DOCSDIR}
.for x in AUTHORS LICENSE README.md
	${INSTALL_DATA} ${WRKSRC}/${x} \
		${STAGEDIR}${DOCSDIR}
.endfor


Lines 1-3 Link Here

(-)b/net/syncthing/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1647122497	1	TIMESTAMP = 1649227889
2	SHA256 (syncthing-source-v1.19.1.tar.gz) = ffc5ec2f232314122a216884f63a48eea7c8739f9779e249be1f4776d7a55127	2	SHA256 (go/net_syncthing/syncthing-v1.19.2/v1.19.2.mod) = 0c7e983332becec6f5e820a8a3f91fd1863350976fc9626848851b01c4a8f6b0
3	SIZE (syncthing-source-v1.19.1.tar.gz) = 13216635	3	SIZE (go/net_syncthing/syncthing-v1.19.2/v1.19.2.mod) = 2528
		4	SHA256 (go/net_syncthing/syncthing-v1.19.2/v1.19.2.zip) = bda604d746dbf327497f2713dc8eca4850346ca51fb6b25fb121a947ce0a19d3
		5	SIZE (go/net_syncthing/syncthing-v1.19.2/v1.19.2.zip) = 5539613

Lines 1-5 Link Here

(-)b/net/syncthing/files/patch-lib_beacon_multicast.go (-3 / +2 lines)
1	--- syncthing/lib/beacon/multicast.go.orig 2021-07-06 12:51:32 UTC	1	--- lib/beacon/multicast.go.orig 2021-07-06 12:51:32 UTC
2	+++ syncthing/lib/beacon/multicast.go	2	+++ lib/beacon/multicast.go
3	@@ -126,6 +126,9 @@ func readMulticasts(ctx context.Context, outbox chan<-	3	@@ -126,6 +126,9 @@ func readMulticasts(ctx context.Context, outbox chan<-
4	pconn := ipv6.NewPacketConn(conn)	4	pconn := ipv6.NewPacketConn(conn)
5	joined := 0	5	joined := 0
6	-

Return to bug 262808

Lines 109-116 GO_ENV+= CGO_ENABLED=${CGO_ENABLED} \ Link Here

(-)b/Mk/Uses/go.mk (-6 / +1 lines)
109	GOARM=${GOARM}	109	GOARM=${GOARM}
110		110
111	.if ${go_ARGS:Mmodules}	111	.if ${go_ARGS:Mmodules}
112	GO_BUILDFLAGS+= -mod=vendor
113	GO_TESTFLAGS+= -mod=vendor
114	GO_GOPATH= ${DISTDIR}/go/${PKGORIGIN:S,/,_,g}	112	GO_GOPATH= ${DISTDIR}/go/${PKGORIGIN:S,/,_,g}
115	GO_WRKSRC= ${WRKSRC}	113	GO_WRKSRC= ${WRKSRC}
116	GO_ENV+= GOPATH="${GO_GOPATH}" \	114	GO_ENV+= GOPATH="${GO_GOPATH}" \
Lines 168-177 post-fetch: Link Here
168	post-extract:	166	post-extract:
169	@${MKDIR} ${GO_WRKSRC:H}	167	@${MKDIR} ${GO_WRKSRC:H}
170	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}	168	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
171	. elif ${go_ARGS:Mmodules} && defined(GO_MODULE)	169	. endif
172	post-extract:
173	@(cd ${GO_WRKSRC}; ${SETENV} ${GO_ENV} GOPROXY=off ${GO_CMD} mod vendor)
174	. endif
175	.endif	170	.endif
176		171
177	.if !target(do-build) && empty(go_ARGS:Mno_targets)	172	.if !target(do-build) && empty(go_ARGS:Mno_targets)

Lines 1-24 Link Here

(-)b/net/syncthing/Makefile (-15 / +12 lines)
1	PORTNAME= syncthing	1	PORTNAME= syncthing
2	PORTVERSION= 1.19.1	2	PORTVERSION= 1.19.2
3	DISTVERSIONPREFIX= v	3	DISTVERSIONPREFIX= v
4	PORTREVISION= 1	4	PORTREVISION= 1
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/
7	DISTNAME= ${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION}
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9		6
10	MAINTAINER= swills@FreeBSD.org	7	MAINTAINER= swills@FreeBSD.org
11	COMMENT= Encrypted file sync tool	8	COMMENT= Encrypted file sync tool
12		9
13	LICENSE= MPL20	10	LICENSE= MPL20
14	LICENSE_FILE= ${WRKSRC}/${PORTNAME}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
15		12
16	USES= cpe go	13	USES= cpe go:modules
17		14
18	USE_RC_SUBR= syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv	15	USE_RC_SUBR= syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv
19		16
20	BINS= syncthing stdiscosrv strelaysrv strelaypoolsrv	17	BINS= syncthing stdiscosrv strelaysrv strelaypoolsrv
21		18
		19	GO_MODULE= github.com/syncthing/syncthing
		20
22	.for x in ${BINS}	21	.for x in ${BINS}
23	PLIST_FILES+= bin/${x}	22	PLIST_FILES+= bin/${x}
24	.endfor	23	.endfor
Lines 33-56 MAKE_ENV+= BUILD_USER=ports BUILD_HOST=freebsd Link Here
33		32
34	OPTIONS_DEFINE= DOCS	33	OPTIONS_DEFINE= DOCS
35		34
36	NO_WRKSUBDIR= yes
37
38	do-build:	35	do-build:
39	@( cd ${WRKSRC}/${PORTNAME} ; \	36	@( cd ${WRKSRC} ; \
40	${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build ; \	37	${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build ; \
41	${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \	38	${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \
42	${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \	39	${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \
43	${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \	40	${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \
44	)	41	)
45		42
46	do-install:	43	do-install:
47	.for x in ${BINS}	44	.for x in ${BINS}
48	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \	45	${INSTALL_PROGRAM} ${WRKSRC}/${x} \
49	${STAGEDIR}${PREFIX}/bin/	46	${STAGEDIR}${PREFIX}/bin/
50	.endfor	47	.endfor
51	${MKDIR} ${STAGEDIR}${DOCSDIR}	48	${MKDIR} ${STAGEDIR}${DOCSDIR}
52	.for x in AUTHORS LICENSE README.md	49	.for x in AUTHORS LICENSE README.md
53	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${x} \	50	${INSTALL_DATA} ${WRKSRC}/${x} \
54	${STAGEDIR}${DOCSDIR}	51	${STAGEDIR}${DOCSDIR}
55	.endfor	52	.endfor
56		53