4 files changed, 39 insertions, 65 deletions

diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 592bef40a3d9..9839bb8e9da3 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -2,37 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.18
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/archive/v${PORTVERSION}.tar.gz?dummy=/:group1 \
 		https://bitbucket.org/kardianos/osext/get/:group2 \
 		LOCAL/swills:group3 \
 		LOCAL/swills:group4 \
 		LOCAL/swills:group5 \
-		https://codeload.github.com/bkaradzic/go-lz4/legacy.tar.gz/77e2ba8?dummy=/:group6 \
+		https://codeload.github.com/bkaradzic/go-lz4/legacy.tar.gz/93a831d?dummy=/:group6 \
 		https://codeload.github.com/calmh/xdr/legacy.tar.gz/e1714bb?dummy=/:group7 \
 		https://codeload.github.com/juju/ratelimit/legacy.tar.gz/f9f36d1?dummy=/:group8 \
-		https://codeload.github.com/syndtr/goleveldb/legacy.tar.gz/2b4cbca?dummy=/:group9 \
-		https://codeload.github.com/vitrun/qart/legacy.tar.gz/ccb109c?dummy=/:group10
+		https://codeload.github.com/syndtr/goleveldb/legacy.tar.gz/9bca75c?dummy=/:group9 \
+		https://codeload.github.com/vitrun/qart/legacy.tar.gz/ccb109c?dummy=/:group10 \
+		LOCAL/swills:group11 \
+		LOCAL/swills:group12
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:group1 \
 		5d3ddcf53a50${EXTRACT_SUFX}:group2 \
-		text.go-d65bffbc88a1${EXTRACT_SUFX}:group3 \
+		text.go-024681b033be${EXTRACT_SUFX}:group3 \
 		snappy-go-12e4b4183793${EXTRACT_SUFX}:group4 \
-		crypto.go-f3cebac2bd11${EXTRACT_SUFX}:group5 \
+		crypto.go-31393df5baea${EXTRACT_SUFX}:group5 \
 		bkaradzic-go-lz4-77e2ba8${EXTRACT_SUFX}:group6 \
 		calmh-xdr-e1714bb${EXTRACT_SUFX}:group7 \
 		juju-ratelimit-f9f36d1${EXTACT_SUFX}:group8 \
-		syndtr-goleveldb-2b4cbca${EXTRACT_SUFX}:group9 \
-		vitrun-qart-ccb109c${EXTRACT_SUFX}:group10
+		syndtr-goleveldb-9bca75c${EXTRACT_SUFX}:group9 \
+		vitrun-qart-ccb109c${EXTRACT_SUFX}:group10 \
+		tools.go-7a99b946364f${EXTRACT_SUFX}:group11 \
+		net.go-90e232e2462d${EXTRACT_SUFX}:group12
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Encrypted file sync tool
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_RC_SUBR=	syncthing
-PLIST_FILES=	bin/syncthing bin/stindex bin/stevents
+PLIST_FILES=	bin/syncthing
 PORTDOCS=	*
 
 USERS=		syncthing
@@ -50,25 +53,27 @@ post-patch:
 			src/github.com/vitrun \
 			src/github.com/syncthing/syncthing ; \
 		${MV} ${WRKDIR}/kardianos-osext-5d3ddcf53a50 ${WRKSRC}/src/bitbucket.org/kardianos/osext ; \
-		${MV} ${WRKDIR}/crypto.go-f3cebac2bd11/ src/code.google.com/p/go.crypto ; \
+		${MV} ${WRKDIR}/crypto.go-31393df5baea/ src/code.google.com/p/go.crypto ; \
 		${MV} ${WRKDIR}/snappy-go-12e4b4183793 src/code.google.com/p/snappy-go ; \
-		${MV} ${WRKDIR}/text.go-d65bffbc88a1 src/code.google.com/p/go.text ; \
-		${MV} ${WRKDIR}/bkaradzic-go-lz4-77e2ba8 src/github.com/bkaradzic/go-lz4 ; \
+		${MV} ${WRKDIR}/text.go-024681b033be src/code.google.com/p/go.text ; \
+		${MV} ${WRKDIR}/tools.go-7a99b946364f src/code.google.com/p/go.tools ; \
+		${MV} ${WRKDIR}/net.go-90e232e2462d src/code.google.com/p/go.net ; \
+		${MV} ${WRKDIR}/bkaradzic-go-lz4-93a831d src/github.com/bkaradzic/go-lz4 ; \
 		${MV} ${WRKDIR}/calmh-xdr-e1714bb src/github.com/calmh/xdr ; \
 		${MV} ${WRKDIR}/juju-ratelimit-f9f36d1 src/github.com/juju/ratelimit ; \
-		${MV} ${WRKDIR}/syndtr-goleveldb-2b4cbca src/github.com/syndtr/goleveldb ; \
+		${MV} ${WRKDIR}/syndtr-goleveldb-9bca75c src/github.com/syndtr/goleveldb ; \
 		${MV} ${WRKDIR}/vitrun-qart-ccb109c src/github.com/vitrun/qart ; \
 		${CP} -r lamport luhn beacon scanner versioner files \
-		protocol auto config discover events logger model osutil \
+		protocol auto config discover events logger model osutil ignore stats fnmatch cmd \
 		upgrade upnp src/github.com/syncthing/syncthing
 
 do-build:
-	cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} bash ./build.sh
+	# timestamp here refers to source, not build time
+	cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.Version v${PORTVERSION} -X main.BuildStamp 1411588890 -X main.BuildUser ${USER} -X main.BuildHost ${HOST}" github.com/syncthing/syncthing/cmd/syncthing
+	${STRIP_CMD} ${WRKSRC}/syncthing
 
 do-install:
-.for x in stevents stindex syncthing
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${x} ${STAGEDIR}${PREFIX}/bin
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/syncthing ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in CONTRIBUTORS LICENSE README.md
 	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index cac6d8074adb..a13c34d767bb 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,20 +1,24 @@
-SHA256 (syncthing-0.9.5.tar.gz) = df27d0920d77f82e8dc30bb95c40001828e70b6a7568156a6a47b7caf22765b4
-SIZE (syncthing-0.9.5.tar.gz) = 1840605
+SHA256 (syncthing-0.9.18.tar.gz) = 4ce72566dc59101683371b85fc905baf3bf23749f7d077443e39c37cc2ac7274
+SIZE (syncthing-0.9.18.tar.gz) = 1942823
 SHA256 (5d3ddcf53a50.tar.gz) = d39ed6aa63c76b62d6cd5850128f7205f0d983ffbb78f121afbd4a3c85937587
 SIZE (5d3ddcf53a50.tar.gz) = 3060
-SHA256 (text.go-d65bffbc88a1.tar.gz) = 5b87e4dddc48c363bf190982a0d229ed5c9b57793ae4ec68004dc1c2f2a31309
-SIZE (text.go-d65bffbc88a1.tar.gz) = 3231005
+SHA256 (text.go-024681b033be.tar.gz) = 79239141a7a5ba59276982491aa4431b2b0adf2da79464c55307529767e8c974
+SIZE (text.go-024681b033be.tar.gz) = 3241194
 SHA256 (snappy-go-12e4b4183793.tar.gz) = fb220046f526122a219aa22f34edbdd236343c4cf3439e79a6d56a145a006194
 SIZE (snappy-go-12e4b4183793.tar.gz) = 7785
-SHA256 (crypto.go-f3cebac2bd11.tar.gz) = 9de8c02f5f4b29db4ec31e772acc5b2b75323d5a20f58bfadfe1d10300256f37
-SIZE (crypto.go-f3cebac2bd11.tar.gz) = 326871
-SHA256 (bkaradzic-go-lz4-77e2ba8.tar.gz) = 8d6a3f73bb2e21a64292d14af1a8466707c14f71b70d48fde317746cd2ac8d0e
-SIZE (bkaradzic-go-lz4-77e2ba8.tar.gz) = 232876
+SHA256 (crypto.go-31393df5baea.tar.gz) = ad51b826e2198cc99a0b5fa38077bab8e1c44dc3e8a2e65ab2289f06f4bb31f3
+SIZE (crypto.go-31393df5baea.tar.gz) = 850477
+SHA256 (bkaradzic-go-lz4-77e2ba8.tar.gz) = f11a2a4eadb525360dba2517abcbcb1a18d67f606a1311b8263fb5a0bca67e5b
+SIZE (bkaradzic-go-lz4-77e2ba8.tar.gz) = 232907
 SHA256 (calmh-xdr-e1714bb.tar.gz) = 354133594fc70dac499a44ffd6d857f1f730345f8db3d07def4e38daec5ec791
 SIZE (calmh-xdr-e1714bb.tar.gz) = 9250
 SHA256 (juju-ratelimit-f9f36d1) = d2117682d9ef68764cfdd4de51b4d150cd2c6c0b6a9fcaa50d5891443b42285a
 SIZE (juju-ratelimit-f9f36d1) = 7382
-SHA256 (syndtr-goleveldb-2b4cbca.tar.gz) = aa0c0917c51de5fa5bf6bd7a2a410bdbc7f27d72146ffb2bf7376273c02275c5
-SIZE (syndtr-goleveldb-2b4cbca.tar.gz) = 106774
+SHA256 (syndtr-goleveldb-9bca75c.tar.gz) = 68353a47e33b81d47c3cb0c3058011a391a5d7a65e20c7cf5b1d8e08a19d129f
+SIZE (syndtr-goleveldb-9bca75c.tar.gz) = 112667
 SHA256 (vitrun-qart-ccb109c.tar.gz) = 6daeaea6334827e56daa82d601df9bca1bb48dd9b1deb2f8708ffb3867afd112
 SIZE (vitrun-qart-ccb109c.tar.gz) = 23243
+SHA256 (tools.go-7a99b946364f.tar.gz) = 6b67d2cd7b06c197296f0d89bd623bf4b4c518ce7962268cec1ecdbe9a228757
+SIZE (tools.go-7a99b946364f.tar.gz) = 1636949
+SHA256 (net.go-90e232e2462d.tar.gz) = 5bac84792244e0b5d12d573cbe9234e49d1fc54095bf32ebbe8e0419f0378249
+SIZE (net.go-90e232e2462d.tar.gz) = 391242
diff --git a/net/syncthing/files/patch-build.sh b/net/syncthing/files/patch-build.sh
deleted file mode 100644
index 4db53623439f..000000000000
--- a/net/syncthing/files/patch-build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- build.sh.orig	2014-08-12 22:35:37.000000000 +0000
-+++ build.sh	2014-08-14 15:44:43.884147180 +0000
-@@ -5,11 +5,9 @@
- 
- distFiles=(README.md LICENSE CONTRIBUTORS) # apart from the binary itself
- 
--# replace "...-12-g123abc" with "...+12-g123abc" to remain semver compatible-ish
--version=$(git describe --always --dirty)
--version=$(echo "$version" | sed 's/-\([0-9]\{1,3\}-g[0-9a-f]\{5,10\}\)/+\1/')
-+version=v%%PORTVERSION%%
- 
--date=$(git show -s --format=%ct)
-+date=$(date +%Y%m%d%H%M%S)
- user=$(whoami)
- host=$(hostname)
- host=${host%%.*}
-@@ -169,7 +167,7 @@
- 	"")
- 		shift
- 		export GOBIN=$(pwd)/bin
--		godep go install $* -ldflags "$ldflags" ./cmd/...
-+		go install $* -ldflags "$ldflags" ./cmd/...
- 		;;
- 
- 	clean)
diff --git a/net/syncthing/files/patch-upgrade__upgrade_supported.go b/net/syncthing/files/patch-upgrade__upgrade_supported.go
deleted file mode 100644
index 64f6214c1ea2..000000000000
--- a/net/syncthing/files/patch-upgrade__upgrade_supported.go
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./upgrade/upgrade_supported.go.orig	2014-08-14 02:03:33.321542734 +0000
-+++ ./upgrade/upgrade_supported.go	2014-08-14 02:03:37.807542195 +0000
-@@ -70,6 +70,7 @@
- 
- // Returns the latest release, including prereleases or not depending on the argument
- func LatestRelease(prerelease bool) (Release, error) {
-+	return Release{}, ErrVersionUnknown
- 	resp, err := http.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=10")
- 	if err != nil {
- 		return Release{}, err