Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Apr 2019 16:53:37 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r497854 - in head/net/syncthing: . files
Message-ID:  <201904041653.x34GrbMm017472@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Thu Apr  4 16:53:37 2019
New Revision: 497854
URL: https://svnweb.freebsd.org/changeset/ports/497854

Log:
  net/syncthing: update to 1.1.1

Added:
  head/net/syncthing/files/patch-syncthing_build.go   (contents, props changed)
Modified:
  head/net/syncthing/Makefile   (contents, props changed)
  head/net/syncthing/distinfo   (contents, props changed)

Modified: head/net/syncthing/Makefile
==============================================================================
--- head/net/syncthing/Makefile	Thu Apr  4 16:44:51 2019	(r497853)
+++ head/net/syncthing/Makefile	Thu Apr  4 16:53:37 2019	(r497854)
@@ -1,22 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
+MASTER_SITES=	https://github.com/syncthing/syncthing/releases/download/v${PORTVERSION}/
+DISTNAME=	${PORTNAME}-source-${DISTVERSIONPREFIX}${PORTVERSION}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Encrypted file sync tool
 
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/${PORTNAME}/LICENSE
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
-USE_GITHUB=	yes
-GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv
-BINS=		stbench stcli stcompdirs stdisco stdiscosrv stevents stfileinfo \
-		stfinddevice stgenfiles stindex strelaypoolsrv strelaysrv \
-		stsigtool sttestutil stvanity stwatchfile syncthing
 
+BINS=		syncthing stdiscosrv strelaysrv strelaypoolsrv
+
 .for x in ${BINS}
 PLIST_FILES+=	bin/${x}
 .endfor
@@ -28,20 +30,24 @@ GROUPS=		syncthing
 
 OPTIONS_DEFINE=	DOCS
 
+NO_WRKSUBDIR=	yes
+
 do-build:
-	@cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; \
-		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 go run build.go -no-upgrade=true -version v${PORTVERSION}
-	@${MV} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/testutil \
-		${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/sttestutil
+	@( cd ${WRKSRC}/${PORTNAME} ; \
+		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build ; \
+		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build stdiscosrv ; \
+		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaysrv ; \
+		${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOFLAGS="-mod=vendor" go run build.go -version v${PORTVERSION} -no-upgrade build strelaypoolsrv ; \
+		)
 
 do-install:
 .for x in ${BINS}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/${x} \
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${PREFIX}/bin/
 .endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in AUTHORS LICENSE README.md
-	${INSTALL_DATA} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/${x} \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${x} \
 		${STAGEDIR}${DOCSDIR}
 .endfor
 

Modified: head/net/syncthing/distinfo
==============================================================================
--- head/net/syncthing/distinfo	Thu Apr  4 16:44:51 2019	(r497853)
+++ head/net/syncthing/distinfo	Thu Apr  4 16:53:37 2019	(r497854)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546704293
-SHA256 (syncthing-syncthing-v1.0.0_GH0.tar.gz) = 737161bc87c1f414c142d95e04102de2bbdc8b0bfff908a114898305956a16c1
-SIZE (syncthing-syncthing-v1.0.0_GH0.tar.gz) = 10601948
+TIMESTAMP = 1554384503
+SHA256 (syncthing-source-v1.1.1.tar.gz) = a796583c12894765394be38e8de858705491dc674289bb6936e68aeb4be23477
+SIZE (syncthing-source-v1.1.1.tar.gz) = 6966579

Added: head/net/syncthing/files/patch-syncthing_build.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/syncthing/files/patch-syncthing_build.go	Thu Apr  4 16:53:37 2019	(r497854)
@@ -0,0 +1,11 @@
+--- syncthing/build.go.orig	2019-04-04 16:46:36 UTC
++++ syncthing/build.go
+@@ -398,7 +398,7 @@ func build(target target, tags []string) {
+ 
+ 	rmr(target.BinaryName())
+ 
+-	args := []string{"build", "-v"}
++	args := []string{"build"}
+ 	args = appendParameters(args, tags, target)
+ 
+ 	os.Setenv("GOOS", goos)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904041653.x34GrbMm017472>