sysutils/password-store: update to 1.7.1

This release adds new convertors and fixes quite some unit tests.

PR:		218162
Submitted by:	Joris Dedieu

4 files changed, 27 insertions, 13 deletions

diff --git a/sysutils/password-store/Makefile b/sysutils/password-store/Makefile
index 3ca7ea64ab0d..010e9f8a27ac 100644
--- a/sysutils/password-store/Makefile
+++ b/sysutils/password-store/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	password-store
-PORTVERSION=	1.6.5
-PORTREVISION=	2
+PORTVERSION=	1.7.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://git.zx2c4.com/password-store/snapshot/
 
@@ -21,30 +20,36 @@ RUN_DEPENDS=	bash:shells/bash \
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=		CONTRIB EXAMPLES GIT XCLIP
+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
+QRENCODE_RUN_DEPENDS=	qrencode>=0:graphics/libqrencode
+
+SUB_FILES=		pass
 
 .include <bsd.port.options.mk>
 
 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
+	@${REINPLACE_CMD} -Ee 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/src/platform/freebsd.sh
 
 do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/pass ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
-	${LN} -s ${PREFIX}/libexec/pass ${STAGEDIR}${PREFIX}/bin/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})
diff --git a/sysutils/password-store/distinfo b/sysutils/password-store/distinfo
index 2818000cb7a1..c8364343aa1e 100644
--- a/sysutils/password-store/distinfo
+++ b/sysutils/password-store/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464706588
-SHA256 (password-store-1.6.5.tar.gz) = 0b70e27babed42209544acafbfdaddc222933977883b1dcd9db2acb142045608
-SIZE (password-store-1.6.5.tar.gz) = 61020
+TIMESTAMP = 1494164140
+SHA256 (password-store-1.7.1.tar.gz) = 3f7eadf5032ad7f966b408000827251b79cd5f3cfc0a0ba0c9d012764d0c303d
+SIZE (password-store-1.7.1.tar.gz) = 70522
diff --git a/sysutils/password-store/files/pass.in b/sysutils/password-store/files/pass.in
new file mode 100644
index 000000000000..027f7665591d
--- /dev/null
+++ b/sysutils/password-store/files/pass.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd %%PREFIX%%/libexec
+exec %%PREFIX%%/libexec/pass "$@"
diff --git a/sysutils/password-store/pkg-plist b/sysutils/password-store/pkg-plist
index 4a3f3e8b2ab4..42e08a83d800 100644
--- a/sysutils/password-store/pkg-plist
+++ b/sysutils/password-store/pkg-plist
@@ -1,3 +1,7 @@
+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
@@ -7,21 +11,22 @@
 %%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%%/related-projects.txt
 %%CONTRIB%%%%DATADIR%%/vim/noplaintext.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
-bin/pass
-libexec/pass
-man/man1/pass.1.gz