Index: net/cf/Makefile
===================================================================
--- net/cf/Makefile
+++ net/cf/Makefile
@@ -1,49 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	cf
-PORTVERSION=	6.12.2
+PORTVERSION=	6.22.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	CLI for Cloud Foundry written in Go
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go \
-		${LOCALBASE}/bin/go-bindata:devel/go-bindata
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/go-bindata:devel/go-bindata
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudfoundry
 GH_PROJECT=	cli
 
+USES=		go
+GO_PKGNAME=	code.cloudfoundry.org/cli
+
 PLIST_FILES=	bin/cf
 
-PORTDOCS=	BUILDING.md CHANGELOG.md INSTALL.md LICENSE README.md VERSION
+PORTDOCS=	CHANGELOG.md LICENSE NOTICE README.md
 
 STRIP=		# stripping can break go binaries
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/BUILT_FROM_SOURCE/${PORTVERSION}/g" ${WRKSRC}/cf/app_constants.go
-	@cd ${WRKSRC} ; ${MKDIR} Godeps/_workspace/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${CP} -R .gitignore .travis.yml BUILDING.md CHANGELOG.md \
-		INSTALL.md LICENSE README.md VERSION bin cf \
-		cf_commands_excluded.json ci excluded.json fileutils fixtures \
-		flags generic glob installers json main makefile plugin \
-		plugin_examples release testhelpers utils words \
-		Godeps/_workspace/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-do-build:
-	cd ${WRKSRC}/Godeps/_workspace/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${SETENV} GOPATH=${WRKSRC}/Godeps/_workspace go-bindata -pkg \
-		resources -o cf/resources/i18n_resources.go \
-		cf/i18n/resources/...  cf/i18n/test_fixtures/...
-	cd ${WRKSRC} ; \
-		${SETENV} GOPATH=${WRKSRC}/Godeps/_workspace go build -o out/cf ./main
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/out/cf \
-		${STAGEDIR}${PREFIX}/bin/
+	@${REINPLACE_CMD} \
+		-e "s/BUILT_FROM_SOURCE/${PORTVERSION}/g" \
+		${WRKSRC}/cf/app_constants.go
+	@: ${LN} -s ../.. ${WRKSRC}/vendor/code.cloudfoundry.org/cli
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -51,4 +39,7 @@
 	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/bin/cli ${STAGEDIR}${PREFIX}/bin/cf
+
 .include <bsd.port.mk>
Index: net/cf/distinfo
===================================================================
--- net/cf/distinfo
+++ net/cf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cloudfoundry-cli-v6.12.2_GH0.tar.gz) = caa601410ff8b98b15e59171e042c88c09835d668b48560dde19c7a0e0ebc3fb
-SIZE (cloudfoundry-cli-v6.12.2_GH0.tar.gz) = 2292064
+TIMESTAMP = 1479575472
+SHA256 (cloudfoundry-cli-v6.22.2_GH0.tar.gz) = fa5254a6e7197d9de86f3f9e1084d1f51f04cfa201b27c85b467a3320dbecda6
+SIZE (cloudfoundry-cli-v6.22.2_GH0.tar.gz) = 5399810
Index: net/cf/files/patch-cf_app_app.go
===================================================================
--- net/cf/files/patch-cf_app_app.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/app/app.go.orig	2015-04-29 12:36:58.960111000 +0000
-+++ cf/app/app.go	2015-04-29 12:37:20.199807000 +0000
-@@ -98,7 +98,7 @@
-    {{.Version}}
- 
- {{.Title "` + T("BUILD TIME:") + `"}}
--   {{.Compiled}}
-+   BUILT_AT_UNKNOWN_TIME
-    {{range .Commands}}
- {{.SubTitle .Name}}{{range .CommandSubGroups}}
- {{range .}}   {{.Name}} {{.Description}}