7 files changed, 81 insertions, 0 deletions

diff --git a/net-im/Makefile b/net-im/Makefile
index 078b499d4958..261520b8d8bf 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -180,6 +180,7 @@
     SUBDIR += uTox
     SUBDIR += vacuum-im
     SUBDIR += vqcc-gtk
+    SUBDIR += xmpp-client
     SUBDIR += yoono
     SUBDIR += zephyr
 
diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile
new file mode 100644
index 000000000000..2a73c55bbee0
--- /dev/null
+++ b/net-im/xmpp-client/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME=	xmpp-client
+PORTVERSION=	20150208
+CATEGORIES=	net-im
+MASTER_SITES=	http://c-s.li/ports/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
+		xmpp-20150105.tar.gz
+
+MAINTAINER=	cs@FreeBSD.org
+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 \
+		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:${PORTSDIR}/net/go.net
+
+PLIST_FILES=	bin/xmpp-client
+GO_PKGNAME=	github.com/agl/${PORTNAME}
+
+post-extract:
+	@${MKDIR} ${GO_WRKSRC:H}
+	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
+	@${LN} -sf ${WRKDIR}/xmpp-20150105 ${GO_WRKDIR_SRC}/github.com/agl/xmpp
+
+
+.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
new file mode 100644
index 000000000000..b6515e752da4
--- /dev/null
+++ b/net-im/xmpp-client/distinfo
@@ -0,0 +1,4 @@
+SHA256 (xmpp-client-20150208.tar.gz) = 9a2f079ee5b075d1af073e1dd566d4e2f2844d4383fa84668e94c41c33d9cba7
+SIZE (xmpp-client-20150208.tar.gz) = 23272
+SHA256 (xmpp-20150105.tar.gz) = f7b8867ebd943f859f5c98594874f282d3b6066af741e4a0eeaab7dfb1347f36
+SIZE (xmpp-20150105.tar.gz) = 12825
diff --git a/net-im/xmpp-client/files/patch-config.go b/net-im/xmpp-client/files/patch-config.go
new file mode 100644
index 000000000000..8d04bdc3f831
--- /dev/null
+++ b/net-im/xmpp-client/files/patch-config.go
@@ -0,0 +1,15 @@
+--- config.go.orig	2015-03-07 22:36:57.219206000 +0100
++++ config.go	2015-03-07 22:39:28.246637000 +0100
+@@ -12,9 +12,9 @@
+ 	"strings"
+ 
+ 	"github.com/agl/xmpp"
+-	"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"
+ )
+ 
+ type Config struct {
diff --git a/net-im/xmpp-client/files/patch-input.go b/net-im/xmpp-client/files/patch-input.go
new file mode 100644
index 000000000000..c6e33fa2b4b3
--- /dev/null
+++ b/net-im/xmpp-client/files/patch-input.go
@@ -0,0 +1,11 @@
+--- input.go.orig	2015-03-07 22:39:38.830132000 +0100
++++ input.go	2015-03-07 22:39:59.824941000 +0100
+@@ -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
new file mode 100644
index 000000000000..161b3853d94a
--- /dev/null
+++ b/net-im/xmpp-client/files/patch-ui.go
@@ -0,0 +1,17 @@
+--- ui.go.orig	2015-03-07 22:40:10.096733000 +0100
++++ ui.go	2015-03-07 22:41:07.136470000 +0100
+@@ -22,10 +22,10 @@
+ 	"time"
+ 
+ 	"github.com/agl/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.crypto/otr"
++	"code.google.com/p/go.crypto/ssh/terminal"
++	"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")
diff --git a/net-im/xmpp-client/pkg-descr b/net-im/xmpp-client/pkg-descr
new file mode 100644
index 000000000000..0211cb2e3ec0
--- /dev/null
+++ b/net-im/xmpp-client/pkg-descr
@@ -0,0 +1,4 @@
+xmpp-client is a simple XMPP client written in pure Go. It supports the OTR
+protocol.
+
+WWW: https://github.com/agl/xmpp-client