net/syncthing: update to 0.10.0

4 files changed, 37 insertions, 79 deletions

diff --git a/net/syncthing/Makefile b/net/syncthing/Makefile
index 11464819a543..aa09a5583819 100644
--- a/net/syncthing/Makefile
+++ b/net/syncthing/Makefile
@@ -2,33 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing
-PORTVERSION=	0.9.18
-PORTREVISION=	2
+PORTVERSION=	0.10.0
 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/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/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 \
-		snappy-go-12e4b4183793${EXTRACT_SUFX}:group4 \
-		crypto.go-31393df5baea${EXTRACT_SUFX}:group5 \
-		bkaradzic-go-lz4-93a831d${EXTRACT_SUFX}:group6 \
-		calmh-xdr-e1714bb${EXTRACT_SUFX}:group7 \
-		juju-ratelimit-f9f36d1${EXTACT_SUFX}:group8 \
-		syndtr-goleveldb-9bca75c${EXTRACT_SUFX}:group9 \
-		vitrun-qart-ccb109c${EXTRACT_SUFX}:group10 \
-		tools.go-7a99b946364f${EXTRACT_SUFX}:group11 \
-		net.go-90e232e2462d${EXTRACT_SUFX}:group12
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/archive/v${PORTVERSION}.tar.gz?dummy=/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Encrypted file sync tool
@@ -43,40 +20,20 @@ USERS=		syncthing
 GROUPS=		syncthing
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/build.sh
-	cd ${WRKSRC} ; \
-		${MKDIR} src/code.google.com/p \
-			src/bitbucket.org/kardianos \
-			src/github.com/bkaradzic \
-			src/github.com/calmh \
-			src/github.com/juju \
-			src/github.com/syndtr \
-			src/github.com/vitrun \
-			src/github.com/syncthing/syncthing ; \
-		${MV} ${WRKDIR}/kardianos-osext-5d3ddcf53a50 ${WRKSRC}/src/bitbucket.org/kardianos/osext ; \
-		${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}/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-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 ignore stats fnmatch cmd \
-		upgrade upnp src/github.com/syncthing/syncthing
+	cd ${WRKSRC} ; ${MKDIR} src/github.com/${PORTNAME}/${PORTNAME} ; \
+		${MV} .gitignore CONTRIBUTING.md CONTRIBUTORS Godeps LICENSE \
+		README.md assets build.go build.sh check-contrib.sh cmd gui \
+		internal protocol test src/github.com/${PORTNAME}/${PORTNAME}
 
 do-build:
 	# 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
+	cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} GOPATH=${WRKSRC} go run build.go
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/syncthing ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/bin/syncthing ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in CONTRIBUTORS LICENSE README.md
-	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/syncthing/distinfo b/net/syncthing/distinfo
index 4778e638292d..c68a45e1b170 100644
--- a/net/syncthing/distinfo
+++ b/net/syncthing/distinfo
@@ -1,24 +1,2 @@
-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) = c78ad1d2bbd296ccddba7c86e4250f66490a3479c068a78a520fd42d68e0aa9d
-SIZE (text.go-d65bffbc88a1.tar.gz) = 3234551
-SHA256 (snappy-go-12e4b4183793.tar.gz) = fb220046f526122a219aa22f34edbdd236343c4cf3439e79a6d56a145a006194
-SIZE (snappy-go-12e4b4183793.tar.gz) = 7785
-SHA256 (crypto.go-31393df5baea.tar.gz) = ad51b826e2198cc99a0b5fa38077bab8e1c44dc3e8a2e65ab2289f06f4bb31f3
-SIZE (crypto.go-31393df5baea.tar.gz) = 850477
-SHA256 (bkaradzic-go-lz4-93a831d.tar.gz) = f11a2a4eadb525360dba2517abcbcb1a18d67f606a1311b8263fb5a0bca67e5b
-SIZE (bkaradzic-go-lz4-93a831d.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-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
+SHA256 (syncthing-0.10.0.tar.gz) = 99c1460ba52e03cfdb349a3d2d41bb5cdd65bc722d9a0f02b9bf0cd3dee21e6e
+SIZE (syncthing-0.10.0.tar.gz) = 2952791
diff --git a/net/syncthing/files/patch-build.go b/net/syncthing/files/patch-build.go
new file mode 100644
index 000000000000..128c24e3b946
--- /dev/null
+++ b/net/syncthing/files/patch-build.go
@@ -0,0 +1,23 @@
+--- build.go.orig	2014-10-10 03:17:54.000000000 +0000
++++ build.go	2014-10-10 03:21:21.000000000 +0000
+@@ -299,18 +299,11 @@
+ }
+ 
+ func version() string {
+-	v := run("git", "describe", "--always", "--dirty")
+-	v = versionRe.ReplaceAllFunc(v, func(s []byte) []byte {
+-		s[0] = '+'
+-		return s
+-	})
+-	return string(v)
++	return string("v0.10.0")
+ }
+ 
+ func buildStamp() int64 {
+-	bs := run("git", "show", "-s", "--format=%ct")
+-	s, _ := strconv.ParseInt(string(bs), 10, 64)
+-	return s
++	return 1412769521
+ }
+ 
+ func buildUser() string {
diff --git a/net/syncthing/files/patch-upgrade__upgrade_supported.go b/net/syncthing/files/patch-upgrade__upgrade_supported.go
index 76c5bc7dc330..4da0dcce9edc 100644
--- a/net/syncthing/files/patch-upgrade__upgrade_supported.go
+++ b/net/syncthing/files/patch-upgrade__upgrade_supported.go
@@ -1,5 +1,5 @@
---- upgrade/upgrade_supported.go.orig	2014-09-28 21:24:06.335428814 +0000
-+++ upgrade/upgrade_supported.go	2014-09-28 21:24:59.699424791 +0000
+--- internal/upgrade/upgrade_supported.go.orig	2014-09-28 21:24:06.335428814 +0000
++++ internal/upgrade/upgrade_supported.go	2014-09-28 21:24:59.699424791 +0000
 @@ -70,6 +70,7 @@
  
  // Returns the latest release, including prereleases or not depending on the argument