Index: sysutils/password-store/Makefile
===================================================================
--- sysutils/password-store/Makefile
+++ sysutils/password-store/Makefile
@@ -17,7 +17,7 @@
 		pwgen>=0:${PORTSDIR}/sysutils/pwgen \
 		tree>=1.7:${PORTSDIR}/sysutils/tree
 
-OPTIONS_DEFINE=		GIT XCLIP CONTRIB DOCS EXAMPLES
+OPTIONS_DEFINE=		GIT XCLIP CONTRIB EXAMPLES
 OPTIONS_SUB=	yes
 
 GIT_DESC=		Enable git storage
@@ -44,24 +44,25 @@
 .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
+	${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
 
 # empty to skip make
 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})
+	rm ${STAGEDIR}${DATADIR}/emacs/.gitignore
 .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
 
 .include <bsd.port.mk>
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
@@ -22,8 +21,8 @@
 %%CONTRIB%%@dirrmtry %%DATADIR%%/dmenu
 %%CONTRIB%%@dirrmtry %%DATADIR%%/emacs
 %%CONTRIB%%@dirrmtry %%DATADIR%%/importers
-%%PORTDOCS%%man/man1/pass.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 bin/pass
 libexec/pass
+man/man1/pass.1.gz