Update to 20160110

5 files changed, 14 insertions, 34 deletions

diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile
index 16e2df8527d..3d8568f8c60 100644
--- a/net-im/xmpp-client/Makefile
+++ b/net-im/xmpp-client/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmpp-client
-PORTVERSION=	20151108
+PORTVERSION=	20160110
 CATEGORIES=	net-im
 MASTER_SITES=	http://c-s.li/ports/
 
@@ -10,7 +10,7 @@ COMMENT=	XMPP client with OTR support
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.crypto/bcrypt.a:${PORTSDIR}/security/go.crypto \
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:${PORTSDIR}/security/go.crypto \
 		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:${PORTSDIR}/net/go.net
 
 PLIST_FILES=	bin/xmpp-client
@@ -20,7 +20,6 @@ post-extract:
 	@${MKDIR} ${GO_WRKSRC:H}
 	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
 
-
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
 .include <bsd.port.post.mk>
diff --git a/net-im/xmpp-client/distinfo b/net-im/xmpp-client/distinfo
index 985effd810c..d104dec6ed6 100644
--- a/net-im/xmpp-client/distinfo
+++ b/net-im/xmpp-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmpp-client-20151108.tar.gz) = 27810493460d5664437bbb8759750bc70a027e65b67a0e8d9b5fea2af0b01580
-SIZE (xmpp-client-20151108.tar.gz) = 38815
+SHA256 (xmpp-client-20160110.tar.gz) = 3d1ef727c9bc2300a028e086c3858aeb8014494b3edd8a99ea9246bb0ca9ae41
+SIZE (xmpp-client-20160110.tar.gz) = 38833
diff --git a/net-im/xmpp-client/files/patch-config.go b/net-im/xmpp-client/files/patch-config.go
index a3df733316b..0397d5343e8 100644
--- a/net-im/xmpp-client/files/patch-config.go
+++ b/net-im/xmpp-client/files/patch-config.go
@@ -1,14 +1,10 @@
---- config.go.orig	2015-07-15 22:34:06.825572000 +0200
-+++ config.go	2015-07-15 22:36:21.406502000 +0200
-@@ -12,9 +12,9 @@
- 	"strings"
- 
+--- 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/crypto/otr"
+ 	"golang.org/x/crypto/ssh/terminal"
 -	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.crypto/otr"
-+	"code.google.com/p/go.crypto/ssh/terminal"
 +	"code.google.com/p/go.net/proxy"
  )
  
diff --git a/net-im/xmpp-client/files/patch-input.go b/net-im/xmpp-client/files/patch-input.go
deleted file mode 100644
index 2d4f886e550..00000000000
--- a/net-im/xmpp-client/files/patch-input.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- input.go.orig	2015-07-15 22:36:40.838076000 +0200
-+++ input.go	2015-07-15 22:36:50.956305000 +0200
-@@ -7,7 +7,7 @@
- 	"strings"
- 	"sync"
- 
--	"golang.org/x/crypto/ssh/terminal"
-+	"code.google.com/p/go.crypto/ssh/terminal"
- )
- 
- type uiCommand struct {
diff --git a/net-im/xmpp-client/files/patch-ui.go b/net-im/xmpp-client/files/patch-ui.go
index 1ae4f71ba87..0750f3f4260 100644
--- a/net-im/xmpp-client/files/patch-ui.go
+++ b/net-im/xmpp-client/files/patch-ui.go
@@ -1,15 +1,11 @@
---- ui.go.orig	2015-07-15 22:37:17.187612000 +0200
-+++ ui.go	2015-07-15 22:37:59.261081000 +0200
-@@ -23,10 +23,10 @@
- 	"time"
- 
+--- 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/crypto/otr"
+ 	"golang.org/x/crypto/ssh/terminal"
 -	"golang.org/x/net/html"
 -	"golang.org/x/net/proxy"
-+	"code.google.com/p/go.crypto/otr"
-+	"code.google.com/p/go.crypto/ssh/terminal"
 +	"code.google.com/p/go.net/html"
 +	"code.google.com/p/go.net/proxy"
  )