From owner-svn-ports-head@freebsd.org  Sun Aug 30 16:38:47 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB2C09C4428;
 Sun, 30 Aug 2015 16:38:47 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DBB71FF7;
 Sun, 30 Aug 2015 16:38:47 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7UGcllQ027871;
 Sun, 30 Aug 2015 16:38:47 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7UGclDm027870;
 Sun, 30 Aug 2015 16:38:47 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201508301638.t7UGclDm027870@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Sun, 30 Aug 2015 16:38:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r395626 - head/net/syncthing-discosrv
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Aug 2015 16:38:48 -0000

Author: swills
Date: Sun Aug 30 16:38:47 2015
New Revision: 395626
URL: https://svnweb.freebsd.org/changeset/ports/395626

Log:
  Fix build by using Go 1.4 until upstream supports Go 1.5

Modified:
  head/net/syncthing-discosrv/Makefile

Modified: head/net/syncthing-discosrv/Makefile
==============================================================================
--- head/net/syncthing-discosrv/Makefile	Sun Aug 30 16:17:43 2015	(r395625)
+++ head/net/syncthing-discosrv/Makefile	Sun Aug 30 16:38:47 2015	(r395626)
@@ -9,7 +9,7 @@ CATEGORIES=	net
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Discovery server for syncthing
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go14>=1.4:${PORTSDIR}/lang/go14
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing golang:gc
@@ -34,7 +34,8 @@ post-patch:
 		${WRKSRC}/src/github.com/golang/groupcache
 
 do-build:
-	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
+	@cd ${WRKSRC} ; ${SETENV} PATH=${PATH}:${LOCALBASE}/go14/bin \
+	GOPATH=${WRKSRC} go build
 	@${MV} ${WRKSRC}/discosrv-${GH_TAGNAME} ${WRKSRC}/syncthing-discosrv
 
 do-install: