net/syncthing-cli: update to new snapshot

While here, use deps bundled with syncthing as much as possible

3 files changed, 32 insertions, 73 deletions

diff --git a/net/syncthing-cli/Makefile b/net/syncthing-cli/Makefile
index 19576ab0ec4b..c7e9a6390661 100644
--- a/net/syncthing-cli/Makefile
+++ b/net/syncthing-cli/Makefile
@@ -2,22 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing-cli
-PORTVERSION=	0.0.0.2014081401
+PORTVERSION=	0.1.0.2014110101
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
-		https://codeload.github.com/AudriusButkevicius/cli/legacy.tar.gz/7f561c7?dummy=/:group2 \
-		https://github.com/syncthing/syncthing/archive/v0.9.4.tar.gz?dummy=/:group3 \
-		LOCAL/swills:group4 \
-		LOCAL/swills:group5 \
-		https://codeload.github.com/bkaradzic/go-lz4/legacy.tar.gz/77e2ba8?dummy=/:group6 \
-		https://codeload.github.com/calmh/xdr/legacy.tar.gz/e1714bb?dummy=/:group7
-DISTFILES=	syncthing-cli-0.0.0.2014081401.tar.gz:group1 \
-		AudriusButkevicius-cli-7f561c7${EXTACT_SUFX}:group2 \
-		syncthing-0.9.4${EXTRACT_SUFX}:group3 \
-		crypto.go-f3cebac2bd11${EXTRACT_SUFX}:group4 \
-		text.go-d65bffbc88a1${EXTRACT_SUFX}:group5 \
-		bkaradzic-go-lz4-77e2ba8${EXTRACT_SUFX}:group6 \
-		calmh-xdr-e1714bb${EXTRACT_SUFX}:group7
+		https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \
+		https://codeload.github.com/AudriusButkevicius/cli/legacy.tar.gz/7f561c7?dummy=/:group3
+DISTFILES=	syncthing-cli-${PORTVERSION}${EXTRACT_SUFX}:group1 \
+		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
+		AudriusButkevicius-cli-7f561c7${EXTACT_SUFX}:group3
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Syncthing CLI
@@ -26,33 +18,36 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 GH_ACCOUNT=	syncthing
 GH_PROJECT=	syncthing-cli
-GH_COMMIT=	7dab84f
+GH_COMMIT=	c87be74a305ef6b3f05debde4df84c27e9005035
 GH_TAGNAME=	${GH_COMMIT}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-7dab84f6edfbd873c5addac1c564fa1f64d0ff29
+SYNCTHING_VER=	0.10.4
+
+WRKSRC=		${WRKDIR}/syncthing-cli-${GH_COMMIT}
 
 PLIST_FILES=	bin/syncthing-cli
 
 post-patch:
-	cd ${WRKSRC} ; \
-		${MKDIR} src/github.com/AudriusButkevicius ; \
-		${MKDIR} src/github.com/syncthing/syncthing ; \
-		${MKDIR} src/github.com/bkaradzic ; \
-		${MKDIR} src/github.com/calmh ; \
-		${MKDIR} src/code.google.com/p ; \
-		${MV} ${WRKDIR}/AudriusButkevicius-cli-7f561c7 src/github.com/AudriusButkevicius/cli ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/config src/github.com/syncthing/syncthing/config ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/protocol src/github.com/syncthing/syncthing/protocol ; \
-		${MV} ${WRKDIR}/crypto.go-f3cebac2bd11 src/code.google.com/p/go.crypto ; \
-		${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}/syncthing-0.9.4/logger src/github.com/syncthing/syncthing ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/luhn src/github.com/syncthing/syncthing ; \
-		${MV} ${WRKDIR}/calmh-xdr-e1714bb src/github.com/calmh/xdr
+	@${MKDIR} ${WRKSRC}/src/github.com/syncthing
+	@${MKDIR} ${WRKSRC}/src/github.com/AudriusButkevicius
+	@${MKDIR} ${WRKSRC}/src/code.google.com/p
+	@${MKDIR} ${WRKSRC}/src/github.com/bkaradzic
+	@${MV} ${WRKDIR}/AudriusButkevicius-cli-7f561c7 \
+		${WRKSRC}/src/github.com/AudriusButkevicius/cli
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/code.google.com/p/go.crypto \
+                ${WRKSRC}/src/code.google.com/p
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/code.google.com/p/go.text \
+                ${WRKSRC}/src/code.google.com/p
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/bkaradzic/go-lz4 \
+                ${WRKSRC}/src/github.com/bkaradzic
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \
+		${WRKSRC}/src/github.com/calmh
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \
+		${WRKSRC}/src/github.com/syncthing/syncthing
 
 do-build:
-	cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
-	${MV} ${WRKSRC}/syncthing-cli-7dab84f6edfbd873c5addac1c564fa1f64d0ff29 ${WRKSRC}/syncthing-cli
+	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
+	@${MV} ${WRKSRC}/syncthing-cli-${GH_COMMIT} ${WRKSRC}/syncthing-cli
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-cli ${STAGEDIR}${PREFIX}/bin/
diff --git a/net/syncthing-cli/distinfo b/net/syncthing-cli/distinfo
index ecb4de44dfd9..b577460d8cbe 100644
--- a/net/syncthing-cli/distinfo
+++ b/net/syncthing-cli/distinfo
@@ -1,14 +1,6 @@
-SHA256 (syncthing-cli-0.0.0.2014081401.tar.gz) = 556ae864df96dc1a1987a43ddd0d1552a7b269f6a763a7f8dd11cede4030e742
-SIZE (syncthing-cli-0.0.0.2014081401.tar.gz) = 8308
+SHA256 (syncthing-cli-0.1.0.2014110101.tar.gz) = 9ed3e61a8d54518f0b46309ab57f1eb2973bbe86db237966a7cdcd02a6ffcb1e
+SIZE (syncthing-cli-0.1.0.2014110101.tar.gz) = 8788
+SHA256 (syncthing-0.10.4.tar.gz) = aff9a358fd9021254afc5c8ec1fd92618eadf622c9dba240666ff41abba3ec00
+SIZE (syncthing-0.10.4.tar.gz) = 2996470
 SHA256 (AudriusButkevicius-cli-7f561c7) = ad64f151c314333f714ef600f65a4fb512ce7242bc2100074775581a56ad439a
 SIZE (AudriusButkevicius-cli-7f561c7) = 14736
-SHA256 (syncthing-0.9.4.tar.gz) = e1cfbc3055ca26662d9f3664bd236357f84f6523360cc2aa4c3e83fcd74fcfad
-SIZE (syncthing-0.9.4.tar.gz) = 1814400
-SHA256 (crypto.go-f3cebac2bd11.tar.gz) = 9de8c02f5f4b29db4ec31e772acc5b2b75323d5a20f58bfadfe1d10300256f37
-SIZE (crypto.go-f3cebac2bd11.tar.gz) = 326871
-SHA256 (text.go-d65bffbc88a1.tar.gz) = c78ad1d2bbd296ccddba7c86e4250f66490a3479c068a78a520fd42d68e0aa9d
-SIZE (text.go-d65bffbc88a1.tar.gz) = 3234551
-SHA256 (bkaradzic-go-lz4-77e2ba8.tar.gz) = 8d6a3f73bb2e21a64292d14af1a8466707c14f71b70d48fde317746cd2ac8d0e
-SIZE (bkaradzic-go-lz4-77e2ba8.tar.gz) = 232876
-SHA256 (calmh-xdr-e1714bb.tar.gz) = 354133594fc70dac499a44ffd6d857f1f730345f8db3d07def4e38daec5ec791
-SIZE (calmh-xdr-e1714bb.tar.gz) = 9250
diff --git a/net/syncthing-cli/files/patch-cmd_options.go b/net/syncthing-cli/files/patch-cmd_options.go
deleted file mode 100644
index 508f6cbda491..000000000000
--- a/net/syncthing-cli/files/patch-cmd_options.go
+++ /dev/null
@@ -1,28 +0,0 @@
---- cmd_options.go.orig	2014-08-14 20:00:24.000000000 +0000
-+++ cmd_options.go	2014-08-14 20:00:35.000000000 +0000
-@@ -46,7 +46,6 @@
- 	fmt.Fprintln(writer, "Local discovery port:\t", cfg.LocalAnnPort, "\t(localannport)")
- 
- 	fmt.Fprintln(writer, "Maximum outstanding requests:\t", cfg.ParallelRequests, "\t(requests)")
--	fmt.Fprintln(writer, "Maximum file change rate in KiB/s:\t", cfg.MaxChangeKbps, "\t(maxchange)")
- 	fmt.Fprintln(writer, "Outgoing rate limit in KiB/s:\t", cfg.MaxSendKbps, "\t(maxsend)")
- 	fmt.Fprintln(writer, "Rescan interval in seconds:\t", cfg.RescanIntervalS, "\t(rescan)")
- 	fmt.Fprintln(writer, "Reconnect interval in seconds:\t", cfg.ReconnectIntervalS, "\t(reconnect)")
-@@ -85,8 +84,6 @@
- 		fmt.Println(cfg.ParallelRequests)
- 	case "maxsend":
- 		fmt.Println(cfg.MaxSendKbps)
--	case "maxchange":
--		fmt.Println(cfg.MaxChangeKbps)
- 	case "rescan":
- 		fmt.Println(cfg.RescanIntervalS)
- 	case "reconnect":
-@@ -134,8 +131,6 @@
- 		config.Options.ParallelRequests = parseUint(val)
- 	case "maxsend":
- 		config.Options.MaxSendKbps = parseUint(val)
--	case "maxchange":
--		config.Options.MaxChangeKbps = parseUint(val)
- 	case "rescan":
- 		config.Options.RescanIntervalS = parseUint(val)
- 	case "reconnect":