Index: www/pydio-cells/Makefile
===================================================================
--- www/pydio-cells/Makefile
+++ www/pydio-cells/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	cells
-PORTVERSION=	2.2.7
 DISTVERSIONPREFIX=	v
+DISTVERSION=	2.2.7
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	pydio-
 
@@ -10,20 +11,57 @@
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON=	Doesn't build on i386
+
+BUILD_DEPENDS=	pydio-packr:devel/pydio-packr
+
+USES=		go gmake
 
 GO_PKGNAME=	github.com/pydio/cells
+GO_BUILDFLAGS=	-ldflags "-X github.com/pydio/cells/common.version=${DISTVERSION}"
 USE_GITHUB=	yes
 GH_ACCOUNT=	pydio
 
 PLIST_FILES=	bin/cells
-PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DOCS
-DOCS_DESC=	Install pydio-cells README file
+OPTIONS_DEFINE=		BASH_COMPLETIONS ZSH_COMPLETIONS
+OPTIONS_DEFAULT=	BASH_COMPLETIONS ZSH_COMPLETIONS
+
+BASH_COMPLETIONS_DESC=	Install bash completions
+ZSH_COMPLETIONS_DESC=	Install zsh completions
+
+BASH_COMPLETIONS_PLIST_FILES=	etc/bash_completion.d/${PORTNAME}
+ZSH_COMPLETIONS_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
+
+post-patch:
+	${REINPLACE_CMD} -e "s|\$${GOPATH}/bin/packr|${LOCALBASE}/bin/pydio-packr|g" \
+		${WRKSRC}/Makefile
+
+pre-build:
+	@cd ${WRKSRC} && \
+		${MAKE_CMD} generate
+
+post-build-BASH_COMPLETIONS-on:
+	${SETENV} CELLS_WORKING_DIR=${WRKDIR}/wrkdir \
+		${GO_WRKDIR_BIN}/${PORTNAME} tools completion bash \
+		> ${WRKDIR}/bash_completions
+	@${REINPLACE_CMD} -e 's|${GO_WRKDIR_BIN}/||g' ${WRKDIR}/bash_completions
+
+post-build-ZSH_COMPLETIONS-on:
+	${SETENV} CELLS_WORKING_DIR=${WRKDIR}/wrkdir \
+		${GO_WRKDIR_BIN}/${PORTNAME} tools completion zsh \
+		> ${WRKDIR}/zsh_completions
+	@${REINPLACE_CMD} -e 's|${GO_WRKDIR_BIN}/||g' ${WRKDIR}/zsh_completions
+
+post-install-BASH_COMPLETIONS-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${WRKDIR}/bash_completions \
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
 
-do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+post-install-ZSH_COMPLETIONS-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKDIR}/zsh_completions \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 
 .include <bsd.port.mk>