From d0165d7036d1e55373cab58a59acdabc532409fd Mon Sep 17 00:00:00 2001
From: Charlie Root <root@db.2.localnet.cc>
Date: Sun, 10 May 2015 19:19:05 +0000
Subject: update dependencies. don't execute go get

---
 databases/influxdb/Makefile | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

(limited to 'databases/influxdb/Makefile')

diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index 302e980..ffc756d 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	GITHUB:github	\
 		https://codeload.github.com/kimor79/gollectd/legacy.tar.gz/${GOLLECTD_GH_COMMIT}?dummy=/:gollectd \
 		https://codeload.github.com/peterh/liner/legacy.tar.gz/${LINER_GH_COMMIT}?dummy=/:liner \
 		https://codeload.github.com/rakyll/statik/legacy.tar.gz/${STATIK_GH_COMMIT}?dummy=/:statik \
-		https://codeload.github.com/alecthomas/log4go/legacy.tar.gz/${LOG4GO_GH_COMMIT}?dummy=/:log4go \
-		https://codeload.github.com/cheffo/crypto/legacy.tar.gz/${GOCRYPTO_GH_COMMIT}?dummy=/:crypto \
-		https://codeload.github.com/cheffo/go-uuid/legacy.tar.gz/${GO_UUID_GH_COMMIT}?dummy=/:uuid
+		https://codeload.github.com/golang/crypto/legacy.tar.gz/${GOCRYPTO_GH_COMMIT}?dummy=/:crypto
+
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:github \
 		BurntSushi-toml-${TOML_GH_COMMIT}.tar.gz:toml \
 		bmizerany-pat-${PAT_GH_COMMIT}.tar.gz:pat \
@@ -20,9 +19,7 @@ DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:github \
 		kimor79-gollectd-${GOLLECTD_GH_COMMIT}.tar.gz:gollectd \
 		peterh-liner-${LINER_GH_COMMIT}.tar.gz:liner \
 		rakyll-statik-${STATIK_GH_COMMIT}.tar.gz:statik \
-		alecthomas-log4go-${LOG4GO_GH_COMMIT}.tar.gz:log4go \
-		cheffo-crypto-${GOCRYPTO_GH_COMMIT}.tar.gz:crypto \
-		cheffo-go-uuid-${GO_UUID_GH_COMMIT}.tar.gz:uuid
+		golang-crypt-${GOCRYPTO_GH_COMMIT}.tar.gz:crypto
 
 MAINTAINER=	cheffo@freebsd-bg.org
 COMMENT=	Open-source distributed time series database
@@ -40,19 +37,16 @@ USE_RC_SUBR=	influxd
 USE_GITHUB=	yes
 GH_ACCOUNT=	influxdb
 GH_PROJECT=	influxdb
-# GH_COMMIT=	v0.9.0-rc29
 GH_TAGNAME=	v0.9.0-rc29
-#${GH_COMMIT}
 
-TOML_GH_COMMIT=		443a628
+# all id's last fixed on 2015-05-10 21:00
+TOML_GH_COMMIT=		056c9bc
 PAT_GH_COMMIT=		b8a3500
-BOLT_GH_COMMIT=		550b8c7
-GOLLECTD_GH_COMMIT=	1d0fc88
-LINER_GH_COMMIT=	29f6a64
-STATIK_GH_COMMIT=	4a16c83
-LOG4GO_GH_COMMIT=	1bcc57d
-GOCRYPTO_GH_COMMIT=	1351f93
-GO_UUID_GH_COMMIT=	ed3ca8a
+BOLT_GH_COMMIT=		2c04100
+GOLLECTD_GH_COMMIT=	cf6dec9
+LINER_GH_COMMIT=	1bb0d1c
+STATIK_GH_COMMIT=	274df12
+GOCRYPTO_GH_COMMIT=	24ffb5f
 
 SUB_FILES=	influxd
 SUB_LIST+=	INFLUXD_USER=${INFLUXD_USER} \
@@ -80,7 +74,6 @@ GROUPS=		${INFLUXD_GROUP}
 STRIP=		# stripping can break go binaries
 
 post-patch:
-	@${MKDIR} ${WRKDIR}/src/code.google.com/p
 	@${MKDIR} ${WRKDIR}/src/github.com/BurntSushi
 	@${MKDIR} ${WRKDIR}/src/github.com/bmizerany
 	@${MKDIR} ${WRKDIR}/src/github.com/boltdb
@@ -89,20 +82,17 @@ post-patch:
 	@${MKDIR} ${WRKDIR}/src/github.com/peterh
 	@${MKDIR} ${WRKDIR}/src/github.com/rakyll
 	@${MKDIR} ${WRKDIR}/src/golang.org/x
-	@${MV} ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} ${WRKDIR}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-	@${MV} ${WRKDIR}/cheffo-go-uuid-${GO_UUID_GH_COMMIT} ${WRKDIR}/src/code.google.com/p/go-uuid
-	@${MV} ${WRKDIR}/alecthomas-log4go-${LOG4GO_GH_COMMIT} ${WRKDIR}/src/code.google.com/p/log4go
+	@${LN} -s ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT} ${WRKDIR}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
 	@${MV} ${WRKDIR}/BurntSushi-toml-${TOML_GH_COMMIT} ${WRKDIR}/src/github.com/BurntSushi/toml
 	@${MV} ${WRKDIR}/bmizerany-pat-${PAT_GH_COMMIT} ${WRKDIR}/src/github.com/bmizerany/pat
 	@${MV} ${WRKDIR}/boltdb-bolt-${BOLT_GH_COMMIT} ${WRKDIR}/src/github.com/boltdb/bolt
 	@${MV} ${WRKDIR}/kimor79-gollectd-${GOLLECTD_GH_COMMIT} ${WRKDIR}/src/github.com/kimor79/gollectd
 	@${MV} ${WRKDIR}/peterh-liner-${LINER_GH_COMMIT} ${WRKDIR}/src/github.com/peterh/liner
 	@${MV} ${WRKDIR}/rakyll-statik-${STATIK_GH_COMMIT} ${WRKDIR}/src/github.com/rakyll/statik
-	@${MV} ${WRKDIR}/cheffo-crypto-${GOCRYPTO_GH_COMMIT} ${WRKDIR}/src/golang.org/x/crypto
+	@${MV} ${WRKDIR}/golang-crypto-${GOCRYPTO_GH_COMMIT} ${WRKDIR}/src/golang.org/x/crypto
 
 do-build:
-		@cd ${WRKDIR}/src/github.com/influxdb/ &&  ${SETENV} ${GO_ENV} go get ./...
-		@cd ${WRKDIR}/src/github.com/influxdb/ &&  ${SETENV} ${GO_ENV} go build ./...
+		@cd ${WRKDIR}/src/github.com/influxdb/influxdb &&  ${SETENV} ${GO_ENV} go install -v -x ./cmd/influx ./cmd/influxd
 
 do-install:
 		${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
-- 
cgit v1.2.1