Index: branches/2018Q2/sysutils/password-store/Makefile
===================================================================
--- branches/2018Q2/sysutils/password-store/Makefile	(revision 472604)
+++ branches/2018Q2/sysutils/password-store/Makefile	(revision 472605)
@@ -1,70 +1,71 @@
 # $FreeBSD$
 
 PORTNAME=	password-store
-PORTVERSION=	1.7.1
-PORTREVISION=	2
+PORTVERSION=	1.7.2
 CATEGORIES=	sysutils
-MASTER_SITES=	http://git.zx2c4.com/password-store/snapshot/
+MASTER_SITES=	https://git.zx2c4.com/password-store/snapshot/
 
 MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Stores, retrieves, generates, and synchronizes passwords securely
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		tar:xz
 
 RUN_DEPENDS=	bash:shells/bash \
 		getopt>=0:misc/getopt \
 		gnupg>=2:security/gnupg \
 		tree>=1.7:sysutils/tree
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		CONTRIB EXAMPLES GIT XCLIP QRENCODE
 OPTIONS_DEFAULT=	CONTRIB XCLIP
 OPTIONS_SUB=		yes
 
 GIT_DESC=		Enable git storage
 XCLIP_DESC=		Enable xclip feature
 CONTRIB_DESC=		Include shell completions, import scripts, related projects
 QRENCODE_DESC=		Enable QR code support
 
 GIT_RUN_DEPENDS=	git>=0:devel/git
 XCLIP_RUN_DEPENDS=	base64>=0:converters/base64 \
 			xclip>=0:x11/xclip
 CONTRIB_RUN_DEPENDS=	pwgen>=0:sysutils/pwgen
 QRENCODE_RUN_DEPENDS=	qrencode>=0:graphics/libqrencode
 
 SUB_FILES=		pass
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/src/platform/freebsd.sh
 	@${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/lib/password-store/extensions"|g' \
 		${WRKSRC}/src/password-store.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pass ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/platform
 	${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/platform/
 	${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
 
 do-install-CONTRIB-on:
 	@${RM} ${WRKSRC}/contrib/emacs/.gitignore
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.zsh-completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_pass
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.bash-completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/password-store
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.fish-completion ${STAGEDIR}${PREFIX}/share/fish/completions/password-store.fish
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q2/sysutils/password-store/distinfo
===================================================================
--- branches/2018Q2/sysutils/password-store/distinfo	(revision 472604)
+++ branches/2018Q2/sysutils/password-store/distinfo	(revision 472605)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494164140
-SHA256 (password-store-1.7.1.tar.gz) = 3f7eadf5032ad7f966b408000827251b79cd5f3cfc0a0ba0c9d012764d0c303d
-SIZE (password-store-1.7.1.tar.gz) = 70522
+TIMESTAMP = 1529007518
+SHA256 (password-store-1.7.2.tar.xz) = 4768c5e1965c4d2aeb28818681e484fb105b6f46cbd75a97608615c4ec6980ea
+SIZE (password-store-1.7.2.tar.xz) = 63620
Index: branches/2018Q2/sysutils/password-store/pkg-plist
===================================================================
--- branches/2018Q2/sysutils/password-store/pkg-plist	(revision 472604)
+++ branches/2018Q2/sysutils/password-store/pkg-plist	(revision 472605)
@@ -1,32 +1,34 @@
 bin/pass
 libexec/pass
 libexec/platform/freebsd.sh
 man/man1/pass.1.gz
 %%CONTRIB%%%%DATADIR%%/dmenu/README.md
 %%CONTRIB%%%%DATADIR%%/dmenu/passmenu
 %%CONTRIB%%%%DATADIR%%/emacs/Cask
+%%CONTRIB%%%%DATADIR%%/emacs/CHANGELOG.md
 %%CONTRIB%%%%DATADIR%%/emacs/README.md
 %%CONTRIB%%%%DATADIR%%/emacs/password-store.el
 %%CONTRIB%%%%DATADIR%%/importers/1password2pass.rb
 %%CONTRIB%%%%DATADIR%%/importers/fpm2pass.pl
 %%CONTRIB%%%%DATADIR%%/importers/gorilla2pass.rb
 %%CONTRIB%%%%DATADIR%%/importers/kedpm2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/keepass2csv2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/keepass2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/keepassx2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/kwallet2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/lastpass2pass.rb
 %%CONTRIB%%%%DATADIR%%/importers/password-exporter2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/pwsafe2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/pwsafe2pass.sh
 %%CONTRIB%%%%DATADIR%%/importers/revelation2pass.py
 %%CONTRIB%%%%DATADIR%%/importers/roboform2pass.rb
 %%CONTRIB%%%%DATADIR%%/pass.applescript
 %%CONTRIB%%%%DATADIR%%/pass.bash-completion
 %%CONTRIB%%%%DATADIR%%/pass.fish-completion
 %%CONTRIB%%%%DATADIR%%/pass.zsh-completion
-%%CONTRIB%%%%DATADIR%%/vim/noplaintext.vim
+%%CONTRIB%%%%DATADIR%%/vim/redact_pass.txt
+%%CONTRIB%%%%DATADIR%%/vim/redact_pass.vim
 %%CONTRIB%%etc/bash_completion.d/password-store
 %%CONTRIB%%share/fish/completions/password-store.fish
 %%CONTRIB%%share/zsh/site-functions/_pass
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 472604)
+++ branches/2018Q2	(revision 472605)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r472398