Dmitrij D. Czarkoff said:
> Edd Barrett said:
> > Here's an update to syncthing-0.12.23.
> >
> > OK?
>
> This patch makes syncthing's build as verbose as it is for other go
> ports. It also sets WRKDIST, so that the patch actually applies.
I overlooked the fact that MODGO_SUBDIR was used instead of WRKDIST.
--
Dmitrij D. Czarkoff
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/syncthing/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 9 May 2016 10:00:49 -0000 1.4
+++ Makefile 11 May 2016 00:39:57 -0000
@@ -2,8 +2,7 @@
COMMENT = open decentralized synchronization utility
-V = 0.12.22
-REVISION = 0
+V = 0.12.23
DISTNAME = syncthing-${V}
DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
@@ -19,12 +18,12 @@ WANTLIB += c pthread
MASTER_SITES = https://github.com/syncthing/syncthing/releases/download/v${V}/
+WRKDIST = ${WRKDIR}/syncthing
WRKSRC = ${WRKDIR}/go/src/github.com/syncthing/syncthing
SUBST_VARS += VARBASE
MODULES = lang/go
MODGO_TYPE = bin
-MODGO_SUBDIR = ${WRKDIR}/syncthing
MODGO_ENV = PATH="${PORTPATH}"
do-build:
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/syncthing/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 21 Apr 2016 19:01:31 -0000 1.1.1.1
+++ distinfo 10 May 2016 22:43:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (syncthing-source-v0.12.22.tar.gz) =
pgsw/av5FxD0LVycLIIwhziyq20RIBTBs+IL/RLsjbg=
-SIZE (syncthing-source-v0.12.22.tar.gz) = 4816944
+SHA256 (syncthing-source-v0.12.23.tar.gz) =
dc4mV6un+Fz9LqVVJy3D4hjZNjGFbVQXRUixGgAN+5E=
+SIZE (syncthing-source-v0.12.23.tar.gz) = 5266067
Index: patches/patch-build_go
===================================================================
RCS file: patches/patch-build_go
diff -N patches/patch-build_go
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-build_go 10 May 2016 22:55:13 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- build.go.orig Wed May 11 00:53:47 2016
++++ build.go Wed May 11 00:55:06 2016
+@@ -213,7 +213,7 @@ func install(pkg string, tags []string) {
+ log.Fatal(err)
+ }
+ os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
+- args := []string{"install", "-v", "-ldflags", ldflags()}
++ args := []string{"install", "-v", "-x", "-ldflags", ldflags()}
+ if len(tags) > 0 {
+ args = append(args, "-tags", strings.Join(tags, ","))
+ }
+@@ -232,7 +232,7 @@ func build(pkg string, tags []string) {
+ }
+
+ rmr(binary)
+- args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
++ args := []string{"build", "-i", "-v", "-x", "-ldflags", ldflags()}
+ if len(tags) > 0 {
+ args = append(args, "-tags", strings.Join(tags, ","))
+ }
