CVS commit: pkgsrc/net/syncthing

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

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.

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