Received: by mail.netbsd.org (Postfix, from userid 605)
	id 9E9A085083; Tue, 17 Jul 2018 19:20:44 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 99AC385080
	for <pkgsrc-changes@NetBSD.org>; Tue, 17 Jul 2018 19:20:43 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id o6uX7TbfRGPJ for <pkgsrc-changes@netbsd.org>;
	Tue, 17 Jul 2018 19:20:43 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id C8DB48506A
	for <pkgsrc-changes@NetBSD.org>; Tue, 17 Jul 2018 19:20:42 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id B801EFA76; Tue, 17 Jul 2018 19:20:42 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1531855242263090"
MIME-Version: 1.0
Date: Tue, 17 Jul 2018 19:20:42 +0000
From: "Benny Siegert" <bsiegert@netbsd.org>
Subject: CVS commit: pkgsrc/net/syncthing
To: pkgsrc-changes@NetBSD.org
Reply-To: bsiegert@netbsd.org
X-Mailer: log_accum
Message-Id: <20180717192042.B801EFA76@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1531855242263090
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	bsiegert
Date:		Tue Jul 17 19:20:42 UTC 2018

Modified Files:
	pkgsrc/net/syncthing: Makefile

Log Message:
Make invocations of the go tool also use the correct path.

Fixes building (hopefully for good) if pkg_alternative is not installed.

Reported by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/net/syncthing/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1531855242263090
Content-Disposition: inline
Content-Length: 1027
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/syncthing/Makefile
diff -u pkgsrc/net/syncthing/Makefile:1.71 pkgsrc/net/syncthing/Makefile:1.72
--- pkgsrc/net/syncthing/Makefile:1.71	Sun Jul 15 16:26:07 2018
+++ pkgsrc/net/syncthing/Makefile	Tue Jul 17 19:20:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2018/07/15 16:26:07 bsiegert Exp $
+# $NetBSD: Makefile,v 1.72 2018/07/17 19:20:42 bsiegert Exp $
 
 # Upstream regularly breaks protocol compatibility.  While users of
 # pkgsrc syncthing on multiple systems can update synchronously, an
@@ -69,6 +69,8 @@ SUBST_MESSAGE.version=	Fixing version st
 SUBST_FILES.version=	build.go
 SUBST_SED.version=	-e 's|runError("git", "describe", "--always", "--dirty")|runError("echo","v${PKGVERSION_NOREV}")|'
 SUBST_SED.version+=	-e 's|runError("git", "show", "-s", "--format=%ct")|runError("false")|'
+SUBST_SED.version+=	-e 's|"go"|"${GO}"|'
+
 
 # Create WRKPLACE's parent, but not WRKPLACE.  Move the contents of
 # the distribution tarball to the directory name desired by upstream's


--_----------=_1531855242263090--