Index: head/sysutils/zfsnap2/Makefile
===================================================================
--- head/sysutils/zfsnap2/Makefile	(revision 482800)
+++ head/sysutils/zfsnap2/Makefile	(revision 482801)
@@ -1,50 +1,50 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	zfsnap
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.0-beta3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Portable performant script to make rolling ZFS snapshots easy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=		BASH ZSH DOCS EXAMPLES
+OPTIONS_DEFINE=		BASH ZSH DOCS
 OPTIONS_DEFAULT=	BASH ZSH
 OPTIONS_SUB=	yes
 
 PORTDOCS=	AUTHORS NEWS PORTABILITY README.md
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,# ZFSNAP_LIB_DIR=.*,ZFSNAP_LIB_DIR=${PREFIX}/share/zfsnap,g" ${WRKSRC}/sbin/zfsnap.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sbin/zfsnap.sh ${STAGEDIR}${PREFIX}/sbin/zfsnap
-	cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share
+	cd ${WRKSRC}/share && ${COPYTREE_SHARE} zfsnap ${STAGEDIR}${PREFIX}/share/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} completion ${STAGEDIR}${PREFIX}/share/zfsnap
+	cd ${WRKSRC} && ${COPYTREE_SHARE} periodic ${STAGEDIR}${PREFIX}/share/zfsnap
 	${INSTALL_MAN} ${WRKSRC}/man/man8/zfsnap.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/zfsnap.8
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} completion ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} periodic ${STAGEDIR}${EXAMPLESDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}/${file}
 .endfor
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
-	${INSTALL_DATA} ${WRKSRC}/completion/zfsnap-completion.bash \
+	${LN} -s ../../share/zfsnap/completion/zfsnap-completion.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/zfsnap.sh
 
 post-install-ZSH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/completion/zfsnap-completion.bash \
+	${LN} -s ../../share/zfsnap/completion/zfsnap-completion.zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_zfsnap
 
 .include <bsd.port.mk>
Index: head/sysutils/zfsnap2/pkg-plist
===================================================================
--- head/sysutils/zfsnap2/pkg-plist	(revision 482800)
+++ head/sysutils/zfsnap2/pkg-plist	(revision 482801)
@@ -1,13 +1,13 @@
 man/man8/zfsnap.8.gz
 sbin/zfsnap
 share/zfsnap/commands/destroy.sh
 share/zfsnap/commands/recurseback.sh
 share/zfsnap/commands/snapshot.sh
+share/zfsnap/completion/zfsnap-completion.bash
+share/zfsnap/completion/zfsnap-completion.tcsh
+share/zfsnap/completion/zfsnap-completion.zsh
 share/zfsnap/core.sh
+share/zfsnap/periodic/xPERIODICx_zfsnap_delete.sh
+share/zfsnap/periodic/xPERIODICx_zfsnap.sh
 %%BASH%%etc/bash_completion.d/zfsnap.sh
 %%ZSH%%share/zsh/site-functions/_zfsnap
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/periodic/xPERIODICx_zfsnap_delete.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/periodic/xPERIODICx_zfsnap.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/completion/zfsnap-completion.bash
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/completion/zfsnap-completion.tcsh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/completion/zfsnap-completion.zsh