update to 0.13.5

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

Module Name:	pkgsrc-wip
Committed By:	Izaac <izaac%setec.org@localhost>
Pushed By:	izaac
Date:		Tue Jun 7 17:39:15 2016 -0400
Changeset:	a3248d6468ae97a06cb7cebe9819d28514f5b7cd

Modified Files:
	syncthing-discosrv/Makefile
	syncthing-discosrv/distinfo
Removed Files:
	syncthing-discosrv/patches/patch-aa

Log Message:
update to 0.13.5

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

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

diffstat:
 syncthing-discosrv/Makefile         | 19 ++++++++++++-------
 syncthing-discosrv/distinfo         |  9 ++++-----
 syncthing-discosrv/patches/patch-aa | 18 ------------------
 3 files changed, 16 insertions(+), 30 deletions(-)

diffs:
diff --git a/syncthing-discosrv/Makefile b/syncthing-discosrv/Makefile
index 3c94be5..644c0bf 100644
--- a/syncthing-discosrv/Makefile
+++ b/syncthing-discosrv/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD$
 
-PKGNAME=	syncthing-discosrv-0.13.0
-PKGREVISION=	1
+PKGNAME=	syncthing-discosrv-0.13.5
 CATEGORIES=	local
-DISTNAME=	syncthing-discosrv-0.13.0
+DISTNAME=	syncthing-0.13.5
 MASTER_SITES=	${MASTER_SITE_GITHUB:=syncthing/}
-GITHUB_PROJECT=	discosrv
+GITHUB_PROJECT=	syncthing
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	izaac%setec.org@localhost
@@ -13,7 +12,8 @@ HOMEPAGE=	${MASTER_SITE_GITHUB:=syncthing/discosrv/}
 COMMENT=	Syncthing discovery server
 LICENSE=	mit
 
-WRKSRC=			${WRKDIR}/discosrv-0.13.0
+EXTRACT_USING=bsdtar
+WRKSRC=			${WRKDIR}/syncthing-0.13.5
 BUILD_DEPENDS+=		go-[0-9]*:../../lang/go
 NO_CONFIGURE=		yes
 USE_LANGUAGES= 		c # and go
@@ -40,10 +40,15 @@ RCD_SCRIPTS=                    stdisco
 
 MAKE_ENV+=	GOPATH=${WRKSRC}
 
+post-extract:
+	${MKDIR} ${WRKSRC}/src/github.com/syncthing
+	${LN} -s . ${WRKSRC}/src
+	${LN} -s ../.. ${WRKSRC}/src/github.com/syncthing/syncthing
+
 do-build:
-	cd ${WRKSRC} && ${MV} vendor src && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go build -i -v -ldflags -w
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/go run build.go build discosrv
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/discosrv-0.13.0 ${DESTDIR}${PREFIX}/bin/syncthing-discosrv
+	${INSTALL_PROGRAM} ${WRKSRC}/discosrv ${DESTDIR}${PREFIX}/bin/syncthing-discosrv
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/syncthing-discosrv/distinfo b/syncthing-discosrv/distinfo
index 8f0e355..4be4923 100644
--- a/syncthing-discosrv/distinfo
+++ b/syncthing-discosrv/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-SHA1 (syncthing-discosrv-0.13.0.tar.gz) = a26327ec1c86152ab53c5bef8deeb5792c4889fd
-RMD160 (syncthing-discosrv-0.13.0.tar.gz) = f59234a73c65d378dbe3dca1324b0bdf957ee3b1
-SHA512 (syncthing-discosrv-0.13.0.tar.gz) = cb8c1d5978b08c3e8c381b2be9baa95b9fbca39c46b28d3aceb744877803edcfb14897fb82bcb67ab883cfd012c67c269ba37d7a5b976e7773d7a2c9c7058868
-Size (syncthing-discosrv-0.13.0.tar.gz) = 2401348 bytes
-SHA1 (patch-aa) = 1259e1d0e06e6dd853167aa7c5811a836f98efc1
+SHA1 (syncthing-0.13.5.tar.gz) = 7e359c2bf23f24242f25c8ee566cbddb6266c827
+RMD160 (syncthing-0.13.5.tar.gz) = 431a0ff50ee3ca9db183a08318383cbf3df5a207
+SHA512 (syncthing-0.13.5.tar.gz) = a718a8a7d6a704ddadf3d8e701ce97eeba732593a1a8540a4423beb32a47c068e0d487e42a1827fc6d639ab0b3e920880e26554f009d1cd9c1d461b903a3e203
+Size (syncthing-0.13.5.tar.gz) = 4335533 bytes
diff --git a/syncthing-discosrv/patches/patch-aa b/syncthing-discosrv/patches/patch-aa
deleted file mode 100644
index f31dcb8..0000000
--- a/syncthing-discosrv/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
---- querysrv.go	2016-04-30 04:53:42.000000000 -0400
-+++ querysrv.go	2016-06-01 21:36:11.000000000 -0400
-@@ -329,10 +329,12 @@
- 		}
- 
- 		ip := net.ParseIP(host)
--		if len(ip) == 0 || ip.IsUnspecified() {
--			uri.Host = net.JoinHostPort(remote.String(), port)
-+		if host == "" || ip.IsUnspecified() {
-+			host = remote.String()
- 		}
- 
-+		uri.Host = net.JoinHostPort(host, port)
-+
- 		if err := s.updateAddress(ctx, tx, deviceID, uri.String()); err != nil {
- 			internalErr = err
- 			return