syncthing-{discosrv,relaysrv}: update to 1.3.3

[Izaac <izaac%setec.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Izaac <izaac%setec.org@localhost>
Pushed By:	izaac
Date:		Thu Jan 9 19:50:00 2020 +0000
Changeset:	abc35124172f87e0df115cc6e0f1ddf525f2f732

Modified Files:
	syncthing-discosrv/Makefile
	syncthing-discosrv/distinfo
	syncthing-relaysrv/Makefile
	syncthing-relaysrv/distinfo

Log Message:
syncthing-{discosrv,relaysrv}: update to 1.3.3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=abc35124172f87e0df115cc6e0f1ddf525f2f732

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

diffstat:
 syncthing-discosrv/Makefile | 18 +++++++-----------
 syncthing-discosrv/distinfo |  8 ++++----
 syncthing-relaysrv/Makefile | 18 +++++++-----------
 syncthing-relaysrv/distinfo |  8 ++++----
 4 files changed, 22 insertions(+), 30 deletions(-)

diffs:
diff --git a/syncthing-discosrv/Makefile b/syncthing-discosrv/Makefile
index f71ff8a04a..9d1ed22e9d 100644
--- a/syncthing-discosrv/Makefile
+++ b/syncthing-discosrv/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
-PKGNAME=	syncthing-discosrv-1.0.0
+PKGNAME=	syncthing-discosrv-1.3.3
 CATEGORIES=	net
-DISTNAME=	syncthing-1.0.0
+DISTNAME=	syncthing-source-v1.3.3
 MASTER_SITES=	${MASTER_SITE_GITHUB:=syncthing/}
 GITHUB_PROJECT=	syncthing
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	izaac%setec.org@localhost
 HOMEPAGE=	https://github.com/syncthing/discosrv/
@@ -16,6 +16,8 @@ EXTRACT_USING=		bsdtar
 BUILD_DEPENDS+=		go-[0-9]*:../../lang/go
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c # and go
+GO_SRCPATH=		github.com/syncthing/syncthing
+GO_DIST_BASE=		syncthing
 INSTALLATION_DIRS=	bin
 
 BUILD_DEFS+=			VARBASE
@@ -37,17 +39,11 @@ FILES_SUBST+=			STDISCO_GROUP=${STDISCO_GROUP}
 FILES_SUBST+=			STDISCO_USER=${STDISCO_USER}
 RCD_SCRIPTS=			stdisco
 
-MAKE_ENV+=	GOPATH=${WRKSRC}
-
-post-extract:
-	${MKDIR} ${WRKSRC}/github.com/syncthing
-	${LN} -s ../.. ${WRKSRC}/github.com/syncthing/syncthing
-	${LN} -s . ${WRKSRC}/src
-
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go build stdiscosrv
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} run build.go build stdiscosrv
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stdiscosrv ${DESTDIR}${PREFIX}/bin/syncthing-discosrv
 
+.include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/syncthing-discosrv/distinfo b/syncthing-discosrv/distinfo
index 3a6ab75e66..68ae045a32 100644
--- a/syncthing-discosrv/distinfo
+++ b/syncthing-discosrv/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (syncthing-1.0.0.tar.gz) = 96de67fd9df9c7760db717723d6faec03ab1ef99
-RMD160 (syncthing-1.0.0.tar.gz) = 67616fe8b39f18ec5f3d93f6cb5affbcc44f1dd1
-SHA512 (syncthing-1.0.0.tar.gz) = 79adbce03524665d02c1ca772fdf5aca68d9e41ee4bc02bcb9ac6ed0d8dca2fe8582139f52a0fe895ad5eb15c372d686277077ff884b67de1d45419e19407603
-Size (syncthing-1.0.0.tar.gz) = 10601948 bytes
+SHA1 (syncthing-source-v1.3.3.tar.gz) = 24d61bc34a40ebc44f80c54dc6e83fea1af26ed0
+RMD160 (syncthing-source-v1.3.3.tar.gz) = ee24fcbfa6d11bf240034f85b6405316d4b9c091
+SHA512 (syncthing-source-v1.3.3.tar.gz) = 43504c7ee79db96c1251a52ac0f96178f35926af6fbd4e97a661e4ff222d43e5fd8cfd0a312dd0cea9a2562010ecccdad3e8555495c81a759d92838e6c97b409
+Size (syncthing-source-v1.3.3.tar.gz) = 10334164 bytes
diff --git a/syncthing-relaysrv/Makefile b/syncthing-relaysrv/Makefile
index ff8bcbf4f6..1af0d0b9fb 100644
--- a/syncthing-relaysrv/Makefile
+++ b/syncthing-relaysrv/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
-PKGNAME=	syncthing-relaysrv-1.0.0
+PKGNAME=	syncthing-relaysrv-1.3.3
 CATEGORIES=	net
-DISTNAME=	syncthing-1.0.0
+DISTNAME=	syncthing-source-v1.3.3
 MASTER_SITES=	${MASTER_SITE_GITHUB:=syncthing/}
 GITHUB_PROJECT=	syncthing
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	izaac%setec.org@localhost
 HOMEPAGE=	https://github.com/syncthing/relaysrv/
@@ -16,6 +16,8 @@ EXTRACT_USING=		bsdtar
 BUILD_DEPENDS+=		go-[0-9]*:../../lang/go
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c # and go
+GO_SRCPATH=		github.com/syncthing/syncthing
+GO_DIST_BASE=		syncthing
 INSTALLATION_DIRS=	bin
 
 BUILD_DEFS+=			VARBASE
@@ -37,17 +39,11 @@ FILES_SUBST+=			STRELAY_GROUP=${STRELAY_GROUP}
 FILES_SUBST+=			STRELAY_USER=${STRELAY_USER}
 RCD_SCRIPTS=			strelay
 
-MAKE_ENV+=	GOPATH=${WRKSRC}
-
-post-extract:
-	${MKDIR} ${WRKSRC}/github.com/syncthing
-	${LN} -s ../.. ${WRKSRC}/github.com/syncthing/syncthing
-	${LN} -s . ${WRKSRC}/src
-
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go build strelaysrv
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO} run build.go build strelaysrv
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/strelaysrv ${DESTDIR}${PREFIX}/bin/syncthing-relaysrv
 
+.include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/syncthing-relaysrv/distinfo b/syncthing-relaysrv/distinfo
index 3a6ab75e66..68ae045a32 100644
--- a/syncthing-relaysrv/distinfo
+++ b/syncthing-relaysrv/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (syncthing-1.0.0.tar.gz) = 96de67fd9df9c7760db717723d6faec03ab1ef99
-RMD160 (syncthing-1.0.0.tar.gz) = 67616fe8b39f18ec5f3d93f6cb5affbcc44f1dd1
-SHA512 (syncthing-1.0.0.tar.gz) = 79adbce03524665d02c1ca772fdf5aca68d9e41ee4bc02bcb9ac6ed0d8dca2fe8582139f52a0fe895ad5eb15c372d686277077ff884b67de1d45419e19407603
-Size (syncthing-1.0.0.tar.gz) = 10601948 bytes
+SHA1 (syncthing-source-v1.3.3.tar.gz) = 24d61bc34a40ebc44f80c54dc6e83fea1af26ed0
+RMD160 (syncthing-source-v1.3.3.tar.gz) = ee24fcbfa6d11bf240034f85b6405316d4b9c091
+SHA512 (syncthing-source-v1.3.3.tar.gz) = 43504c7ee79db96c1251a52ac0f96178f35926af6fbd4e97a661e4ff222d43e5fd8cfd0a312dd0cea9a2562010ecccdad3e8555495c81a759d92838e6c97b409
+Size (syncthing-source-v1.3.3.tar.gz) = 10334164 bytes