From 9c2f5897f7269f3ca541cc794b2aab3d5249862c Mon Sep 17 00:00:00 2001
From: Carlo Strub <cs@FreeBSD.org>
Date: Wed, 3 Aug 2016 19:40:40 +0000
Subject: [PATCH] - Update to 20160717 - Remove patches as go.net and go.crypto
 are now in the standard library locations

---
 net-im/xmpp-client/Makefile              |  8 +++++---
 net-im/xmpp-client/distinfo              |  5 +++--
 net-im/xmpp-client/files/patch-config.go | 11 -----------
 net-im/xmpp-client/files/patch-ui.go     | 13 -------------
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 net-im/xmpp-client/files/patch-config.go
 delete mode 100644 net-im/xmpp-client/files/patch-ui.go

diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile
index dca1a14d696c..cfac7a0b5abb 100644
--- a/net-im/xmpp-client/Makefile
+++ b/net-im/xmpp-client/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xmpp-client
-PORTVERSION=	20160110
+PORTVERSION=	20160717
 CATEGORIES=	net-im
-MASTER_SITES=	http://c-s.li/ports/
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	XMPP client with OTR support
@@ -11,8 +10,11 @@ COMMENT=	XMPP client with OTR support
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/go.crypto \
-		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:net/go.net
+		${LOCALBASE}/${GO_LIBDIR}/golang.org/x/net/dict.a:net/go.net
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	agl
+GH_TAGNAME=	abbf9020393e8caae3e8996a16ce48446e31cf0e
 USES=		go
 PLIST_FILES=	bin/xmpp-client
 GO_PKGNAME=	github.com/agl/${PORTNAME}
diff --git a/net-im/xmpp-client/distinfo b/net-im/xmpp-client/distinfo
index d104dec6ed60..e79b9a86df77 100644
--- a/net-im/xmpp-client/distinfo
+++ b/net-im/xmpp-client/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xmpp-client-20160110.tar.gz) = 3d1ef727c9bc2300a028e086c3858aeb8014494b3edd8a99ea9246bb0ca9ae41
-SIZE (xmpp-client-20160110.tar.gz) = 38833
+TIMESTAMP = 1470252820
+SHA256 (agl-xmpp-client-20160717-abbf9020393e8caae3e8996a16ce48446e31cf0e_GH0.tar.gz) = 29a7ed8c97d3d313d0979296728d44f94693354d5218e19f29927a1ee57b3678
+SIZE (agl-xmpp-client-20160717-abbf9020393e8caae3e8996a16ce48446e31cf0e_GH0.tar.gz) = 38832
diff --git a/net-im/xmpp-client/files/patch-config.go b/net-im/xmpp-client/files/patch-config.go
deleted file mode 100644
index 0397d5343e8d..000000000000
--- a/net-im/xmpp-client/files/patch-config.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.go.orig	2016-01-13 19:22:20 UTC
-+++ config.go
-@@ -14,7 +14,7 @@ import (
- 	"github.com/agl/xmpp-client/xmpp"
- 	"golang.org/x/crypto/otr"
- 	"golang.org/x/crypto/ssh/terminal"
--	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.net/proxy"
- )
- 
- type Config struct {
diff --git a/net-im/xmpp-client/files/patch-ui.go b/net-im/xmpp-client/files/patch-ui.go
deleted file mode 100644
index 0750f3f42609..000000000000
--- a/net-im/xmpp-client/files/patch-ui.go
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui.go.orig	2016-01-13 19:21:21 UTC
-+++ ui.go
-@@ -26,8 +26,8 @@ import (
- 	"github.com/agl/xmpp-client/xmpp"
- 	"golang.org/x/crypto/otr"
- 	"golang.org/x/crypto/ssh/terminal"
--	"golang.org/x/net/html"
--	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.net/html"
-+	"code.google.com/p/go.net/proxy"
- )
- 
- var configFile *string = flag.String("config-file", "", "Location of the config file")