Index: sysutils/password-store/Makefile
===================================================================
--- sysutils/password-store/Makefile
+++ sysutils/password-store/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	password-store
-PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTVERSION=	1.6.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://git.zx2c4.com/password-store/snapshot/
 
@@ -35,14 +34,6 @@
 		xclip>=0:${PORTSDIR}/x11/xclip
 .endif
 
-.if ! ${PORT_OPTIONS:MGIT} && ! ${PORT_OPTIONS:MXCLIP}
-EXTRA_PATCHES=	${PATCHDIR}/git+xclip.patch:-p1
-.elif ! ${PORT_OPTIONS:MGIT}
-EXTRA_PATCHES=	${PATCHDIR}/git.patch:-p1
-.elif ! ${PORT_OPTIONS:MXCLIP}
-EXTRA_PATCHES=	${PATCHDIR}/xclip.patch:-p1
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|GETOPT="getopt"|GETOPT="${LOCALBASE}/bin/getopt"|' ${WRKSRC}/src/password-store.sh
 	@${REINPLACE_CMD} -Ee 's|SHRED="shred -f -z"|SHRED="rm -P -f"|' ${WRKSRC}/src/password-store.sh
@@ -51,17 +42,29 @@
 do-build:
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
-	@${LN} -s ${PREFIX}/libexec/pass ${STAGEDIR}${PREFIX}/bin/pass
+	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
+	${LN} -s ${PREFIX}/libexec/pass ${STAGEDIR}${PREFIX}/bin/pass
 
 .if ${PORT_OPTIONS:MCONTRIB}
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	@(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 .endif
 
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
+
+.if ${PORT_OPTIONS:MCONTRIB}
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/src/completion/pass.zsh-completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_pass
+
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/src/completion/pass.bash-completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/password-store
+
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/src/completion/pass.fish-completion ${STAGEDIR}${PREFIX}/share/fish/completions/password-store.fish
+.endif
 
 .include <bsd.port.mk>
Index: sysutils/password-store/distinfo
===================================================================
--- sysutils/password-store/distinfo
+++ sysutils/password-store/distinfo
@@ -1,2 +1,2 @@
-SHA256 (password-store-1.6.3.tar.gz) = 1a9437fe07fdce5f562f8b6bd7e8492416f5ad298f32b87a02984c3908267148
-SIZE (password-store-1.6.3.tar.gz) = 59408
+SHA256 (password-store-1.6.4.tar.gz) = 5796f1652631da91590c544da94d1921bb18eaeaa0964f5dc365d2549cb2ab7a
+SIZE (password-store-1.6.4.tar.gz) = 59838
Index: sysutils/password-store/pkg-plist
===================================================================
--- sysutils/password-store/pkg-plist
+++ sysutils/password-store/pkg-plist
@@ -1,6 +1,5 @@
 %%CONTRIB%%%%DATADIR%%/dmenu/README.md
 %%CONTRIB%%%%DATADIR%%/dmenu/passmenu
-%%CONTRIB%%%%DATADIR%%/emacs/.gitignore
 %%CONTRIB%%%%DATADIR%%/emacs/Cask
 %%CONTRIB%%%%DATADIR%%/emacs/README.md
 %%CONTRIB%%%%DATADIR%%/emacs/password-store.el
@@ -18,7 +17,11 @@
 %%CONTRIB%%%%DATADIR%%/pass.fish-completion
 %%CONTRIB%%%%DATADIR%%/pass.zsh-completion
 %%CONTRIB%%%%DATADIR%%/related-projects.txt
-%%PORTDOCS%%man/man1/pass.1.gz
+%%CONTRIB%%%%DATADIR%%/vim/noplaintext.vim
+%%CONTRIB%%etc/bash_completion.d/password-store
+%%CONTRIB%%share/fish/completions/password-store.fish
+%%CONTRIB%%share/zsh/site-function/_pass
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
 bin/pass
 libexec/pass
+man/man1/pass.1.gz