svn commit: r416209 - in head/sysutils/password-store: . files

[Rene Ladan]

Author: rene
Date: Tue May 31 16:24:27 2016
New Revision: 416209
URL: https://svnweb.freebsd.org/changeset/ports/416209

Log:
  sysutils/password-store: update to version 1.6.5
  
  - enable shell completions by default (bash, fish, zsh) [1]
  - do not remove XClip and GIT functionality [2]
  
  PR:		195951 [1]
  Submitted by:	rs.os at t-online.de [1], milki [2]
  Reviewed by:	milki [2], eadler [2]
  Differential Revision:	https://reviews.freebsd.org/D4208 [2] (to 1.6.4)

Deleted:
  head/sysutils/password-store/files/
Modified:
  head/sysutils/password-store/Makefile
  head/sysutils/password-store/distinfo
  head/sysutils/password-store/pkg-plist

Modified: head/sysutils/password-store/Makefile
==============================================================================
--- head/sysutils/password-store/Makefile	Tue May 31 16:22:58 2016	(r416208)
+++ head/sysutils/password-store/Makefile	Tue May 31 16:24:27 2016	(r416209)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	password-store
-PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTVERSION=	1.6.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://git.zx2c4.com/password-store/snapshot/
 
@@ -22,6 +21,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		GIT XCLIP CONTRIB DOCS EXAMPLES
+OPTIONS_DEFAULT=	CONTRIB
 OPTIONS_SUB=		yes
 
 GIT_DESC=		Enable git storage
@@ -34,26 +34,24 @@ XCLIP_RUN_DEPENDS=	base64>=0:converters/
 
 .include <bsd.port.options.mk>
 
-.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
 
 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
 
 do-install-CONTRIB-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@(cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	@(cd ${WRKSRC}/src/completion && ${COPYTREE_SHARE} . ${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}

Modified: head/sysutils/password-store/distinfo
==============================================================================
--- head/sysutils/password-store/distinfo	Tue May 31 16:22:58 2016	(r416208)
+++ head/sysutils/password-store/distinfo	Tue May 31 16:24:27 2016	(r416209)
@@ -1,2 +1,3 @@
-SHA256 (password-store-1.6.3.tar.gz) = 1a9437fe07fdce5f562f8b6bd7e8492416f5ad298f32b87a02984c3908267148
-SIZE (password-store-1.6.3.tar.gz) = 59408
+TIMESTAMP = 1464706588
+SHA256 (password-store-1.6.5.tar.gz) = 0b70e27babed42209544acafbfdaddc222933977883b1dcd9db2acb142045608
+SIZE (password-store-1.6.5.tar.gz) = 61020

Modified: head/sysutils/password-store/pkg-plist
==============================================================================
--- head/sysutils/password-store/pkg-plist	Tue May 31 16:22:58 2016	(r416208)
+++ head/sysutils/password-store/pkg-plist	Tue May 31 16:24:27 2016	(r416209)
@@ -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-functions/_pass
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
 bin/pass
 libexec/pass
+man/man1/pass.1.gz