Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Nov 2014 02:00:40 +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: r372131 - head/net/syncthing-discosrv
Message-ID:  <201411040200.sA420eNa063801@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Tue Nov  4 02:00:39 2014
New Revision: 372131
URL: https://svnweb.freebsd.org/changeset/ports/372131
QAT: https://qat.redports.org/buildarchive/r372131/

Log:
  net/syncthing-discosrv: update to new snapshot
  
  While here, use deps bundled with syncthing

Modified:
  head/net/syncthing-discosrv/Makefile
  head/net/syncthing-discosrv/distinfo

Modified: head/net/syncthing-discosrv/Makefile
==============================================================================
--- head/net/syncthing-discosrv/Makefile	Tue Nov  4 01:59:37 2014	(r372130)
+++ head/net/syncthing-discosrv/Makefile	Tue Nov  4 02:00:39 2014	(r372131)
@@ -2,23 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	syncthing-discosrv
-PORTVERSION=	0.0.0.2014081401
-PORTREVISION=	1
+PORTVERSION=	0.0.0.2014110101
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME}.tar.gz?dummy=/:group1 \
-		https://codeload.github.com/juju/ratelimit/legacy.tar.gz/f9f36d1?dummy=/:group2 \
-		https://github.com/syncthing/syncthing/archive/v0.9.4.tar.gz?dummy=/:group3 \
-		https://codeload.github.com/calmh/xdr/legacy.tar.gz/e1714bb?dummy=/:group4 \
-		LOCAL/swills:group5 \
-		https://codeload.github.com/bkaradzic/go-lz4/legacy.tar.gz/77e2ba8?dummy=/:group6 \
-		https://codeload.github.com/golang/groupcache/legacy.tar.gz/8b25adc?dummy=/:group7
-DISTFILES=	syncthing-discosrv-0.0.0.2014081401.tar.gz:group1 \
-		juju-ratelimit-f9f36d1${EXTACT_SUFX}:group2 \
-		syncthing-0.9.4${EXTRACT_SUFX}:group3 \
-		calmh-xdr-e1714bb${EXTRACT_SUFX}:group4 \
-		text.go-d65bffbc88a1${EXTRACT_SUFX}:group5 \
-		bkaradzic-go-lz4-77e2ba8${EXTRACT_SUFX}:group6 \
-		golang-groupcache-8b25adc${EXTRACT_SUFX}:group7
+		https://github.com/syncthing/syncthing/archive/v${SYNCTHING_VER}.tar.gz?dummy=/:group2 \
+		https://codeload.github.com/golang/groupcache/legacy.tar.gz/${GROUPCACHE_COMMIT}?dummy=/:group3
+DISTFILES=	syncthing-discosrv-${PORTVERSION}.tar.gz:group1 \
+		syncthing-${SYNCTHING_VER}${EXTRACT_SUFX}:group2 \
+		golang-groupcache-${GROUPCACHE_COMMIT}${EXTRACT_SUFX}:group3
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Discovery server for syncthing
@@ -27,9 +18,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:${POR
 
 GH_ACCOUNT=	syncthing
 GH_PROJECT=	discosrv
-GH_COMMIT=	f2b3bb063f83f24d6c6e10013ea467d5967eb0cf
+GH_COMMIT=	fcba610d30efa662d4435b3127300171aae7b0e9
 GH_TAGNAME=	${GH_COMMIT}
 
+SYNCTHING_VER=	0.10.4
+GROUPCACHE_COMMIT=	d2a1805
+
 WRKSRC=		${WRKDIR}/discosrv-${GH_COMMIT}
 
 PLIST_FILES=	bin/syncthing-discosrv
@@ -39,28 +33,32 @@ USERS=		syncthing
 GROUPS=		syncthing
 
 post-patch:
-	cd ${WRKSRC} ; \
-		${MKDIR} src/github.com/juju ; \
-		${MKDIR} src/github.com/calmh ; \
-		${MKDIR} src/code.google.com/p ; \
-		${MKDIR} src/github.com/bkaradzic ; \
-		${MKDIR} src/github.com/syncthing/syncthing ; \
-		${MKDIR} src/github.com/golang ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/discover src/github.com/syncthing/syncthing/ ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/beacon src/github.com/syncthing/syncthing/ ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/events src/github.com/syncthing/syncthing/ ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/logger src/github.com/syncthing/syncthing/ ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/protocol src/github.com/syncthing/syncthing/ ; \
-		${MV} ${WRKDIR}/juju-ratelimit-f9f36d1 src/github.com/juju/ratelimit ; \
-		${MV} ${WRKDIR}/calmh-xdr-e1714bb src/github.com/calmh/xdr ; \
-		${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}/golang-groupcache-8b25adc src/github.com/golang/groupcache ; \
-		${MV} ${WRKDIR}/syncthing-0.9.4/luhn src/github.com/syncthing/syncthing
+	@${MKDIR} ${WRKSRC}/src/code.google.com/p
+	@${MKDIR} ${WRKSRC}/src/github.com/bkaradzic
+	@${MKDIR} ${WRKSRC}/src/github.com/golang
+	@${MKDIR} ${WRKSRC}/src/github.com/juju
+	@${MKDIR} ${WRKSRC}/src/github.com/syncthing
+	@${MKDIR} ${WRKSRC}/src/github.com/syndtr
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/calmh \
+		${WRKSRC}/src/github.com
+	@${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/juju/ratelimit \
+		${WRKSRC}/src/github.com/juju
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER}/Godeps/_workspace/src/github.com/syndtr/goleveldb \
+		${WRKSRC}/src/github.com/syndtr
+	@${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/code.google.com/p/snappy-go \
+		${WRKSRC}/src/code.google.com/p
+	@${MV} ${WRKDIR}/syncthing-${SYNCTHING_VER} \
+		${WRKSRC}/src/github.com/syncthing/syncthing
+	@${MV} ${WRKDIR}/golang-groupcache-${GROUPCACHE_COMMIT} \
+		${WRKSRC}/src/github.com/golang/groupcache
 
 do-build:
-	cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
-	${MV} ${WRKSRC}/discosrv-${GH_COMMIT} ${WRKSRC}/syncthing-discosrv
+	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
+	@${MV} ${WRKSRC}/discosrv-${GH_COMMIT} ${WRKSRC}/syncthing-discosrv
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-discosrv ${STAGEDIR}${PREFIX}/bin/

Modified: head/net/syncthing-discosrv/distinfo
==============================================================================
--- head/net/syncthing-discosrv/distinfo	Tue Nov  4 01:59:37 2014	(r372130)
+++ head/net/syncthing-discosrv/distinfo	Tue Nov  4 02:00:39 2014	(r372131)
@@ -1,14 +1,6 @@
-SHA256 (syncthing-discosrv-0.0.0.2014081401.tar.gz) = 2d3280b7ed18338516e7c00f1658dd4f5fc38aecba26f54f6da9a27886294a54
-SIZE (syncthing-discosrv-0.0.0.2014081401.tar.gz) = 3370
-SHA256 (juju-ratelimit-f9f36d1) = d2117682d9ef68764cfdd4de51b4d150cd2c6c0b6a9fcaa50d5891443b42285a
-SIZE (juju-ratelimit-f9f36d1) = 7382
-SHA256 (syncthing-0.9.4.tar.gz) = e1cfbc3055ca26662d9f3664bd236357f84f6523360cc2aa4c3e83fcd74fcfad
-SIZE (syncthing-0.9.4.tar.gz) = 1814400
-SHA256 (calmh-xdr-e1714bb.tar.gz) = 354133594fc70dac499a44ffd6d857f1f730345f8db3d07def4e38daec5ec791
-SIZE (calmh-xdr-e1714bb.tar.gz) = 9250
-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 (golang-groupcache-8b25adc.tar.gz) = 458f35584a960462eec4b50e9068ff6095034c27db2a53cbe22e3e3e9e3fa35d
-SIZE (golang-groupcache-8b25adc.tar.gz) = 23823
+SHA256 (syncthing-discosrv-0.0.0.2014110101.tar.gz) = 226f68ae1196cd4c51f169b4653b97a49f386868da10e4e0d57532d88619d6c5
+SIZE (syncthing-discosrv-0.0.0.2014110101.tar.gz) = 16471
+SHA256 (syncthing-0.10.4.tar.gz) = aff9a358fd9021254afc5c8ec1fd92618eadf622c9dba240666ff41abba3ec00
+SIZE (syncthing-0.10.4.tar.gz) = 2996470
+SHA256 (golang-groupcache-d2a1805.tar.gz) = be22ff0c07a589fdb4665637787a2693e685e824a4ccb2bcfe8d9811d0c822a3
+SIZE (golang-groupcache-d2a1805.tar.gz) = 24094



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