Index: head/net/cf/Makefile
===================================================================
--- head/net/cf/Makefile	(revision 434885)
+++ head/net/cf/Makefile	(revision 434886)
@@ -1,45 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	cf
-PORTVERSION=	6.22.2
+PORTVERSION=	6.24.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	CLI for Cloud Foundry written in Go
 
 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=	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
-	@: ${LN} -s ../.. ${WRKSRC}/vendor/code.cloudfoundry.org/cli
+do-build:
+	(cd ${WRKDIR}; \
+	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} \
+		install -v -ldflags="-X code.cloudfoundry.org/cli/version.binaryVersion=${PORTVERSION}" ${GO_TARGET})
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/cli ${STAGEDIR}${PREFIX}/bin/cf
 
 .include <bsd.port.mk>
Index: head/net/cf/distinfo
===================================================================
--- head/net/cf/distinfo	(revision 434885)
+++ head/net/cf/distinfo	(revision 434886)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479575472
-SHA256 (cloudfoundry-cli-v6.22.2_GH0.tar.gz) = fa5254a6e7197d9de86f3f9e1084d1f51f04cfa201b27c85b467a3320dbecda6
-SIZE (cloudfoundry-cli-v6.22.2_GH0.tar.gz) = 5399810
+TIMESTAMP = 1487333583
+SHA256 (cloudfoundry-cli-v6.24.0_GH0.tar.gz) = bb62e9bed4b95b0042426dab9fd40890de48ed04a9ff654193cf803d35422f75
+SIZE (cloudfoundry-cli-v6.24.0_GH0.tar.gz) = 5632074