Index: head/sysutils/password-store/Makefile
===================================================================
--- head/sysutils/password-store/Makefile	(revision 493885)
+++ head/sysutils/password-store/Makefile	(revision 493886)
@@ -1,73 +1,73 @@
 # $FreeBSD$
 
 PORTNAME=	password-store
 PORTVERSION=	1.7.3
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	https://git.zx2c4.com/password-store/snapshot/
+MASTER_SITES=	https://git.zx2c4.com/${PORTNAME}/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}/libexec/password-store/extensions"|g' \
-		${WRKSRC}/src/password-store.sh
+	@${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/libexec/${PORTNAME}/extensions"|g' \
+		${WRKSRC}/src/${PORTNAME}.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pass ${STAGEDIR}${PREFIX}/bin/
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/password-store/extensions
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/password-store/platform
-	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/password-store/pass
-	${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/password-store/platform/
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/extensions
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/platform
+	${INSTALL_SCRIPT} ${WRKSRC}/src/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/pass
+	${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/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
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.bash-completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
-	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.fish-completion ${STAGEDIR}${PREFIX}/share/fish/completions/password-store.fish
+	${INSTALL_DATA} ${STAGEDIR}${DATADIR}/pass.fish-completion ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/man/example-filter.sh ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/password-store/pkg-descr
===================================================================
--- head/sysutils/password-store/pkg-descr	(revision 493885)
+++ head/sysutils/password-store/pkg-descr	(revision 493886)
@@ -1,18 +1,18 @@
 Password management should be simple and follow Unix philosophy. With pass, each
 password lives inside of a gpg encrypted file whose filename is the title of the
 website or resource that requires the password. These encrypted files may be
 organized into meaningful folder hierarchies, copied from computer to computer,
 and, in general, manipulated using standard command line file management
 utilities.
 
 pass makes managing these individual password files extremely easy. All
 passwords live in ~/.password-store, and pass provides some nice commands for
 adding, editing, generating, and retrieving passwords. It is a very short and
 simple shell script. It's capable of temporarily putting passwords on your
 clipboard and tracking password changes using git.
 
 You can edit the password store using ordinary Unix shell commands alongside the
 pass command. There are no funky file formats or new paradigms to learn. There
 is bash completion so that you can simply hit tab to fill in names.
 
-WWW: http://zx2c4.com/projects/password-store/
+WWW: https://www.password-store.org/